Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/basicData/teamManagement.vue

@@ -773,6 +773,7 @@ export default {
     onLoad() {
       this.loading = true;
       getList({
+        descs:'TS_CODE',
         current:this.page.currentPage,
         size:this.page.pageSize,
         ...this.query

src/views/processManagement/platingAssort.vue

@@ -400,6 +400,7 @@ export default {
       this.loading = true;
 
       getList({
+        descs:'CODE',
         current:this.page.currentPage,
         size:this.page.pageSize,
         ...this.query

src/views/processManagement/processCapability.vue

@@ -538,6 +538,7 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       let param = {
+        descs:'CA_CODE',
         ...this.query,
         startTime:this.query.updateTime && this.query.updateTime.length != 0 && this.query.updateTime[0],
         endTime:this.query.updateTime && this.query.updateTime.length != 0 && this.query.updateTime[1],

src/views/safetyManagement/equipmentInspectionPoint/addInspectDailog.vue

@@ -61,7 +61,7 @@
                     </template>
                     <template #default="scope">
                         <el-form-item :prop="`tableData[${scope.$index}].insCycle`" :rules="formRules.insCycle">
-                            <el-input v-model="scope.row.insCycle" placeholder="请输入" style="width: 100%"></el-input>
+                            <el-input-number controls-position="right" v-model="scope.row.insCycle" placeholder="请输入" style="width: 100%"></el-input-number>
                         </el-form-item>
                     </template>
                 </el-table-column>

src/views/safetyManagement/equipmentInspectionPoint/index.vue

@@ -166,7 +166,7 @@ export default {
             span: 24,
             search: false,
             searchLabelWidth: 90,
-            // type: 'number',
+            type: 'number',
             rules: [
               {
                 required: true,

src/views/safetyManagement/safetyInspectionTask/index.vue

@@ -65,7 +65,6 @@ export default {
         dialogWidth: 600,
         dialogClickModal: false,
         searchEnter: true,
-        excelBtn: false,
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
@@ -83,31 +82,6 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         column: [
-          {
-            label: "任务状态",
-            prop: "taskStatus",
-            sortable: true,
-            filter: true,
-            search: true,
-            type: "select",
-            // value: "2",
-            searchLabelWidth: 80,
-            dicData: [
-              {
-                label: "已检",
-                value: "1",
-              },
-              {
-                label: "待检",
-                value: "2",
-              },
-              {
-                label: "未准时完成",
-                value: "3",
-              }
-
-            ],
-          },
           {
             label: "巡检点编号",
             prop: "insNum",
@@ -191,7 +165,31 @@ export default {
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
             // searchRange: true,
           },
+        {
+            label: "任务状态",
+            prop: "taskStatus",
+            sortable: true,
+            filter: true,
+            search: true,
+            type: "select",
+            // value: "2",
+            searchLabelWidth: 80,
+            dicData: [
+              {
+                label: "已检",
+                value: "1",
+              },
+              {
+                label: "待检",
+                value: "2",
+              },
+              {
+                label: "未准时完成",
+                value: "3",
+              }
 
+            ],
+          },
           {
             label: "备注",
             prop: "memo",

src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue

@@ -86,26 +86,6 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         column: [
-          {
-            label: "状态",
-            prop: "dealStatus",
-            search: true,
-            searchLabelWidth: 50,
-            sortable: true,
-            filter: true,
-            type: "select",
-            value:1,
-            dicData: [  
-              {
-                label: "已处理",
-                value: 0,
-              },
-              {
-                label: "未处理",
-                value: 1,
-              }
-            ],
-          },
           {
             label: "编码",
             prop: "btCode",
@@ -115,7 +95,7 @@ export default {
             searchLabelWidth: 50,
           },
           {
-            label: "日期",
+            label: "时间",
             prop: "queryBtDate",
             search: true,
             searchLabelWidth: 50,
@@ -130,7 +110,7 @@ export default {
             endPlaceholder: "结束时间"
           },
           {
-            label: "日期",
+            label: "时间",
             prop: "btDate",
             sortable: true,
             filter: true,
@@ -155,6 +135,26 @@ export default {
             sortable: true,
             filter: true,
           },
+          {
+            label: "状态",
+            prop: "dealStatus",
+            search: true,
+            searchLabelWidth: 50,
+            sortable: true,
+            filter: true,
+            type: "select",
+            value:1,
+            dicData: [  
+              {
+                label: "已处理",
+                value: 0,
+              },
+              {
+                label: "未处理",
+                value: 1,
+              }
+            ],
+          },
           {
             label: "持续时间",
             prop: "consLong",