From 874a19bfb2d1437d8c1465263b76553a37835964 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 11 二月 2025 18:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index 802ba97..449364a 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -143,6 +143,19 @@
</a-col>
</a-row>
+ <a-row :gutter="24" v-if="systemType">
+ <a-col :span='24'>
+ <a-form-model-item label="绯荤粺绫诲瀷" :labelCol="{span:3}" :wrapperCol="{span:21}">
+ <a-radio-group name="radioGroup" v-model="systemValue">
+ <a-radio value="1">DNC</a-radio>
+ <a-radio value="2">MDC</a-radio>
+ <a-radio value="3">閫氱敤</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+
<a-row :gutter="24">
<a-col :span='12'>
<a-form-model-item v-if="isDepartType == 0" label="绯荤粺鐗堟湰鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -246,7 +259,9 @@
driveType: "",
systemType: "",
deviceLevel: "",
- deviceCategory: ""
+ deviceCategory: "",
+ deviceTypeDnc:"",
+ deviceTypeMdc:"",
},
labelCol: {
xs: { span: 24 },
@@ -259,6 +274,8 @@
uploadLoading:false,
confirmLoading: false,
headers:{},
+ systemType:false,
+ systemValue:"3",
url: {
fileUpload: window._CONFIG['domianURL']+"/sys/common/upload",
userWithDepart: "/mdc/mdcEquipment/equipmentDepartList", // 寮曞叆涓烘寚瀹氱敤鎴锋煡鐪嬮儴闂ㄤ俊鎭渶瑕佺殑url
@@ -283,6 +300,7 @@
this.headers = {"X-Access-Token":token}
this.queryGroup()
this.queryTreeData()
+ this.getAppPlatformName();
// this.initRoleList()
// this.initTenantList()
},
@@ -305,6 +323,13 @@
});
}
}).finally(() =>{
+ })
+ },
+ getAppPlatformName(){
+ getAction(`/system/sysParams/query/by/settingKey?settingKey=system_type`).then(res=>{
+ if(res.success){
+ this.systemType = res.result.settingValue === '0';
+ }
})
},
queryGroup() {
@@ -356,13 +381,18 @@
// that.userId = record.id;
// console.log(record)
+ if (record.systemValue!=null){
+ this.systemValue=record.systemValue;
+ }else {
+ this.systemValue="3"
+ }
that.model = Object.assign({}, record);
// that.model = Object.assign({},{selectedroles:'',selectedProduction:''}, record);
// this.model = Object.assign({}, record)
this.$nextTick(() => {
this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedProduction', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
- 'driveType', 'sortNo', 'remark','systemVersion','devicePower','controlSystem','saveTableName'))
+ 'driveType', 'sortNo', 'remark','systemVersion','devicePower','controlSystem','saveTableName','systemValue'))
})
if(record.hasOwnProperty("id")){
// that.getUserRoles(record.id);
@@ -485,8 +515,10 @@
let obj;
if(!this.model.id){
this.model.id = this.userId;
+ this.model.systemValue=this.systemValue;
obj=addEquipment(this.model);
}else{
+ this.model.systemValue=this.systemValue;
obj=editEquipment(this.model,{
id: this.model.id
});
--
Gitblit v1.9.3