模型管理页面增加字段

imcs-tenant-admin/src/views/zuihou/internetCenter/moduleMgr/Index.vue

@@ -6,7 +6,7 @@
 				<span>模型名称：</span>
 				<el-input v-model="queryParams.model.name" placeholder="请输入名称" style="width: 150px;" size="medium"/>
 			</span>
-			
+
 			<span class="rearchItem">
 				<span>启用状态：</span>
 				<el-select v-model="queryParams.model.status" placeholder="请选择启用状态" size="medium" style="width: 150px;">
@@ -18,7 +18,7 @@
 				    </el-option>
           </el-select>
 			</span>
-			
+
 			<span class="rearchItem">
 				<span>类型：</span>
 				<el-select style="width:150px;" placeholder="请选择类型" v-model="queryParams.model.nodeType" value>
@@ -34,7 +34,7 @@
 	      </el-button>
       </span>
     </div>
-    
+
     <el-row class="filter-container">
     	<el-col>
     		<el-button type="primary" icon="el-icon-plus" size="medium" @click="add">
@@ -187,7 +187,8 @@ export default {
 	      MODEL_CATEGORY: {},  //分类
 	      MODEL_NODE_TYPE: {},  //节点类型
 	      MODEL_NET_MODE: {},  //联网方式
-	      MODEL_JOIN_AGREEMENT: {} //接入盒子协议
+        MODEL_JOIN_AGREEMENT: {}, //接入盒子协议
+        MODEL_CNC_SYSTEM: {}, //cnc数控系统
 	    },
       dialog: {
         isVisible: false,
@@ -231,11 +232,14 @@ export default {
 	  },
 	  jionAgreementList() {
 	    return convertEnum(this.dicts.MODEL_JOIN_AGREEMENT)
-	  }
+	  },
+    cncSystemList() {
+      return convertEnum(this.dicts.MODEL_CNC_SYSTEM)
+    }
   },
   mounted () {
   	// 初始化，【字典】数据
-  	initDicts(['MODEL_CATEGORY', 'MODEL_NODE_TYPE', 'MODEL_NET_MODE', 'MODEL_JOIN_AGREEMENT'], this.dicts);
+  	initDicts(['MODEL_CATEGORY', 'MODEL_NODE_TYPE', 'MODEL_NET_MODE', 'MODEL_JOIN_AGREEMENT','MODEL_CNC_SYSTEM'], this.dicts);
     this.fetch()
   },
   methods: {
@@ -375,7 +379,7 @@ export default {
         })
         return
       }
-      
+
 			if (this.selection.length > 1) {
         this.$message({
           message: "请只能选择一条数据！",
@@ -548,5 +552,5 @@ export default {
 	}
 </style>
 <style lang="scss" scoped>
-	
+
 </style>

imcs-tenant-admin/src/views/zuihou/internetCenter/moduleMgr/components/Edit.vue

@@ -48,6 +48,22 @@
           <i class="el-icon-plus" />
         </imgUpload>
       </el-form-item>
+
+      <el-form-item label="是否机床：" prop="cncFlag">
+        <template>
+          <el-radio v-model="tenant.cncFlag" label="1">是</el-radio>
+          <el-radio v-model="tenant.cncFlag" label="0">否</el-radio>
+        </template>
+      </el-form-item>
+      <el-form-item label="机床系统：" prop="cncFilePath">
+        <el-input v-model="tenant.cncFilePath" style="width: 93%;"/>
+      </el-form-item>
+      <el-form-item label="机床系统：" prop="cncSystem">
+        <el-select style="width:93%" placeholder="请选择数控系统" v-model="tenant.cncSystem.key">
+          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.MODEL_CNC_SYSTEM" />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="所属品牌：" prop="brandId">
         <el-select style="width:93%" placeholder="请选择所属品牌" v-model="tenant.brandId" @change="brandChange">
           <el-option :key="index" :label="item.brand" :value="item.id" v-for="(item, index) in brandList" />
@@ -112,22 +128,6 @@ export default {
       // 上传成功数
       successNum: 0,
     	selectTableVisible: false,
-    	options: [{
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }, {
-          value: '选项3',
-          label: '蚵仔煎'
-        }, {
-          value: '选项4',
-          label: '龙须面'
-        }, {
-          value: '选项5',
-          label: '北京烤鸭'
-        }],
       type: 'add',
       brandList: [], // [所属品牌]下拉数据
       specificationList: [], // [规格]下拉数据
@@ -136,7 +136,8 @@ export default {
 	      MODEL_CATEGORY: {},  //分类
 	      MODEL_NODE_TYPE: {},  //节点类型
 	      MODEL_NET_MODE: {},  //联网方式
-	      MODEL_JOIN_AGREEMENT: {} //接入盒子协议
+	      MODEL_JOIN_AGREEMENT: {}, //接入盒子协议
+        MODEL_CNC_SYSTEM: {}, //cnc数控系统
 	    },
       screenWidth: 0,
       width: this.initWidth(),
@@ -232,6 +233,8 @@ export default {
         name: '',
         status: '1',
         pic: '',
+        cncFlag: '',
+        cncFilePath: '',
         remark: '',
         category: {
           key: ""
@@ -245,6 +248,9 @@ export default {
         joinAgreement: {
           key: ""
         },
+        cncSystem: {
+          key: ""
+        },
       }
     },
     initWidth () {
@@ -281,7 +287,7 @@ export default {
     	}
       // 设置【字典】
       this.dicts = dicts;
-      
+
       this.imgFileData.bizId = this.tenant.id
       this.$nextTick(() => {
         this.$refs.imgFileRef.init({