fix:设备台账三色灯修改

src/views/andonManagement/AndonAlarmLevel/index.vue

@@ -39,8 +39,7 @@
         <el-table-column type="selection" width="50" align="center"/>
         <!-- <el-table-column prop="id" label="主键" align="center" /> -->
         <el-table-column prop="levelName" label="报警等级名称" align="center" :show-overflow-tooltip="true" />
-        <el-table-column prop="lightColor" label="三色灯颜色" align="center" :show-overflow-tooltip="true" />
-        <el-table-column prop="handleTimeout" label="处理时限（分钟）" align="center" />
+        <el-table-column prop="lightColor" label="灯光颜色" align="center" :show-overflow-tooltip="true" />
         <el-table-column prop="applyScenario" label="适用场景" align="center" :show-overflow-tooltip="true" />
         <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
         <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
@@ -63,67 +62,27 @@
         <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
           <el-row :gutter="20">
               
-            <!-- <el-col :lg="12" v-if="opertype == 2">
-              <el-form-item label="主键">{{form.id}}</el-form-item>
-            </el-col> -->
-  
             <el-col :lg="12">
               <el-form-item label="报警等级名称" prop="levelName">
-                <!-- <el-input v-model="form.levelName" placeholder="请输入报警等级名称" /> -->
-                <el-select v-model="form.levelName" placeholder="请选择报警等级名称">
-                  <el-option v-for="item in levelNameOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
-                
-                </el-select>
+                <el-input v-model="form.levelName" placeholder="请输入报警等级名称" />
               </el-form-item>
             </el-col>
   
             <el-col :lg="12">
-              <el-form-item label="三色灯颜色" prop="lightColor">
-                <!-- <el-input v-model="form.lightColor" placeholder="请输入三色灯颜色" /> -->
-                <el-select v-model="form.lightColor" placeholder="请选择三色灯颜色">
+              <el-form-item label="灯光颜色" prop="lightColor">
+                <el-select v-model="form.lightColor" placeholder="请选择灯光颜色">
                   <el-option v-for="item in lightColorOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 
                 </el-select>
               </el-form-item>
             </el-col>
       
-            <el-col :lg="12">
-              <el-form-item label="处理时限" prop="handleTimeout">
-                <!-- <el-input v-model="form.handleTimeout" placeholder="请输入处理时限（分钟）" /> -->
-                <el-input-number v-model="form.handleTimeout" @change="handleChange" :min="0"  ></el-input-number>
-              </el-form-item>
-            </el-col>
-  
             <el-col :lg="12">
               <el-form-item label="适用场景" prop="applyScenario">
                 <el-input v-model="form.applyScenario" placeholder="请输入适用场景" />
               </el-form-item>
             </el-col>
   
-            <!-- <el-col :lg="12">
-              <el-form-item label="创建人" prop="createdBy">
-                <el-input v-model="form.createdBy" placeholder="请输入创建人" />
-              </el-form-item>
-            </el-col>
-  
-            <el-col :lg="12">
-              <el-form-item label="创建时间" prop="createdTime">
-                <el-date-picker v-model="form.createdTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
-              </el-form-item>
-            </el-col>
-  
-            <el-col :lg="12">
-              <el-form-item label="更新人" prop="updatedBy">
-                <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
-              </el-form-item>
-            </el-col>
-  
-            <el-col :lg="12">
-              <el-form-item label="更新时间" prop="updatedTime">
-                <el-date-picker v-model="form.updatedTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
-              </el-form-item>
-            </el-col> -->
-  
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -148,7 +107,7 @@
     data() {
       return {
         labelWidth: "100px",
-        formLabelWidth:"100px",
+        formLabelWidth:"120px",
         // 选中id数组
         ids: [],
         // 非单个禁用
@@ -180,8 +139,7 @@
         columns: [
           { index: 0, key: 'id', label: `主键`, checked:  true  },
           { index: 1, key: 'levelName', label: `报警等级名称`, checked:  true  },
-          { index: 2, key: 'lightColor', label: `三色灯颜色`, checked:  true  },
-          { index: 3, key: 'handleTimeout', label: `处理时限（分钟）`, checked:  true  },
+          { index: 2, key: 'lightColor', label: `灯光颜色`, checked:  true  },
           { index: 4, key: 'applyScenario', label: `适用场景`, checked:  true  },
           { index: 5, key: 'createdBy', label: `创建人`, checked:  true  },
           { index: 6, key: 'createdTime', label: `创建时间`, checked:  true  },
@@ -191,7 +149,6 @@
         lightColorOptions:[
           { value: '红色', label: '红色' },
           { value: '黄色', label: '黄色' },
-          { value: '绿色', label: '绿色' },
         ],
         // 数据列表
         dataList: [],
@@ -201,6 +158,12 @@
         btnSubmitVisible: true,
         // 表单校验
         rules: {
+          levelName: [
+            { required: true, message: "请输入报警等级名称", trigger: "blur" },
+          ],
+          lightColor: [
+            { required: true, message: "请选择灯光颜色", trigger: "blur" },
+          ],
         },
       };
     },

src/views/productManagement/completion_statistics.vue

@@ -151,8 +151,8 @@ export default {
     }
   },
   created() {
-    this.getList()
-    this.getStatistics()
+    // this.getList()
+    // this.getStatistics()
   },
   methods: {
     // 获取报工列表

src/views/productManagement/workorder2.vue

@@ -307,7 +307,6 @@ export default {
 		checkNumOption() {
 			let list = [0, 0, 0, 0, 0, 0];
 			for (let item of this.tableAllData) {
-				console.log(item,'list123');
 				list[item.state]++;
 			}