222

src/views/dashboard/monitor/monitor.vue

@@ -50,16 +50,16 @@
         status-icon
       >
         <el-form-item label="车间名称" prop="name">
-          <el-input v-model="name" />
+          <el-input v-model="ruleForm.name" />
         </el-form-item>
         <el-form-item label="上级场景" prop="seniorScene">
-          <el-input v-model="seniorScene" />
+          <el-input v-model="ruleForm.seniorScene" />
         </el-form-item>
         <el-form-item label="车间代码" prop="workshopCode">
-          <el-input v-model="workshopCode" />
+          <el-input v-model="ruleForm.workshopCode" />
         </el-form-item>
         <el-form-item label="场景标签" prop="sceneCode">
-          <el-input v-model="sceneCode" />
+          <el-input v-model="ruleForm.sceneCode" />
         </el-form-item>
         <el-form-item label="状态">
           <el-switch v-model="addEnable" active-value="1" inactive-value="0" class="switchUse" />
@@ -86,16 +86,16 @@
         status-icon
       >
         <el-form-item label="车间名称" prop="name">
-          <el-input v-model="name" />
+          <el-input v-model="ruleForm.name" />
         </el-form-item>
         <el-form-item label="上级场景">
-          <el-input v-model="seniorScene" disabled="true" />
+          <el-input v-model="ruleForm.seniorScene" disabled="true" />
         </el-form-item>
         <el-form-item label="车间代码" prop="workshopCode">
-          <el-input v-model="workshopCode" />
+          <el-input v-model="ruleForm.workshopCode" />
         </el-form-item>
         <el-form-item label="场景标签" prop="sceneCode">
-          <el-input v-model="sceneCode" />
+          <el-input v-model="ruleForm.sceneCode" />
         </el-form-item>
         <el-form-item label="状态">
           <el-switch v-model="addEnable" active-value="1" inactive-value="0" class="switchUse" />
@@ -224,13 +224,8 @@
   const table = ref(false);
 
   const companyAdd = () => {
-    const newData = {
-      name: name.value,
-      tag: sceneCode.value,
-      code: workshopCode.value,
-    };
     table.value = true;
-    seniorScene.value = '顶级场景';
+    ruleForm.seniorScene = '顶级场景';
   };
 
   const updateData = (data, targetName, newAdd) => {
@@ -259,57 +254,63 @@
   };
 
   const resetDraw = () => {
-    name.value = '';
-    seniorScene.value = '';
-    workshopCode.value = '';
-    sceneCode.value = '';
+    ruleForm.name = '';
+    ruleForm.seniorScene = '';
+    ruleForm.workshopCode = '';
+    ruleForm.sceneCode = '';
   };
 
   const addNewType = () => {
     const newData = {
-      name: name.value,
-      tag: sceneCode.value,
-      code: workshopCode.value,
+      name: ruleForm.name,
+      tag: ruleForm.sceneCode,
+      code: ruleForm.workshopCode,
     };
 
-    if (seniorScene.value === '顶级场景') {
+    if (ruleForm.seniorScene === '顶级场景') {
       tableData.value.push(newData);
     } else {
-      updateData(tableData.value, seniorScene.value, newData);
+      updateData(tableData.value, ruleForm.seniorScene, newData);
     }
 
     resetDraw();
     table.value = false;
   };
   //添加中的内容板块
-  const name = ref('');
-  const seniorScene = ref('');
-  const workshopCode = ref('');
-  const sceneCode = ref('');
+  // const name = ref('');
+  // const seniorScene = ref('');
+  // const workshopCode = ref('');
+  // const sceneCode = ref('');
 
   // 新增类型的参数值
   const addName = ref('');
   const addEnable = ref('1');
 
   const ruleFormRef = ref<FormInstance>();
-  const ruleForm = ref({
-    typeName: '',
-    partType: 0,
-    partName: '',
-    partNo: '',
-    interiorNs: '',
+
+  interface RuleForm {
+    name: string;
+    seniorScene: string;
+    workshopCode: string;
+    sceneCode: string;
+  }
+  const ruleForm = reactive<RuleForm>({
+    name: '',
+    seniorScene: '',
+    workshopCode: '',
+    sceneCode: '',
   });
-  const rules = reactive({
+  const rules = reactive<FormRules<RuleForm>>({
     name: [
-      { required: true, message: '请输入名称', trigger: 'blur' },
-      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
+      { required: true, message: '', trigger: 'blur' },
+      { min: 1, max: 100, message: 'Length should be 3 to 5', trigger: 'blur' },
     ],
     workshopCode: [
-      { required: true, message: '请输入车间代码', trigger: 'blur' },
+      { required: true, message: '', trigger: 'blur' },
       { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
     ],
     sceneCode: [
-      { required: true, message: '请输入场景代码', trigger: 'blur' },
+      { required: true, message: '', trigger: 'blur' },
       { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
     ],
   });
@@ -323,7 +324,7 @@
   //操作列
   const actionColumn: BasicColumn = reactive({
     width: 250,
-    title: '操作',
+    label: '操作',
     key: 'action',
     fixed: 'right',
     render(record) {
@@ -355,7 +356,7 @@
     console.log(row);
 
     table.value = true;
-    seniorScene.value = row.name;
+    ruleForm.seniorScene = row.name;
   };
 
   const handleDelete = (row: Recordable) => {