5.18

src/views/consumablesManagement/inAndOutManagement.vue

@@ -53,7 +53,7 @@ import {
   getMaterialManagePage,
   outInRecordRecordExport
 } from '@/api/consumablesManagement'
-import { sideLibraryList, materialList } from '@/api/basicConfig'
+import { sideLibraryList, getMaterialArr } from '@/api/basicConfig'
 const tableProps = [
   {
     prop: 'line',
@@ -154,6 +154,7 @@ export default {
           labelField: 'name',
           valueField: 'name',
           defaultSelect: '',
+          filterable: true,
           width: 150
         },
         {
@@ -230,7 +231,7 @@ export default {
       }
     },
     getMaterialList() {
-      materialList().then((res) => {
+      getMaterialArr().then((res) => {
         console.log(res)
         if (res.code === 0) {
           this.formConfig[2].selectOptions = res.data

src/views/deviceManagement/alarmInformation/realTimeAlarm.vue

@@ -48,7 +48,7 @@ const tableProps = [
     label: '报警内容'
   },
   {
-    prop: 'startTime',
+    prop: 'startAlertTime',
     label: '报警开始时间',
     filter: timeFormatter,
     minWidth: 160

src/views/deviceManagement/spareParts/sparePartsAdd.vue

@@ -22,6 +22,7 @@
           <el-select
             v-model="form.type"
             placeholder="备件类别"
+            @change="selectName"
             style="width: 100%"
           >
             <el-option
@@ -170,6 +171,9 @@ export default {
         this.sparePartsSpecList = []
       })
     },
+    selectName(val) {
+      console.log(val)
+    },
     selectModel(val) {
       getModelList({
         name: val

src/views/home/components/RingChart.vue

@@ -67,16 +67,13 @@ export default {
             zlevel: 2, // 层级
             radius: ['47%', '50%'],
             center: ['50%', '45%'],
+            label: {
+              show: false
+            },
             itemStyle: {
               shadowBlur: 10,
               shadowColor: 'rgba(209, 204, 214, 0.64)',
-              color: '#fff',
-              label: {
-                show: false
-              },
-              labelLine: {
-                show: false
-              }
+              color: '#fff'
             },
             tooltip: {
               show: false
@@ -92,16 +89,13 @@ export default {
             radius: ['60%', '61%'],
             center: ['50%', '45%'],
             zlevel: 1, // 层级
+            label: {
+              show: false
+            },
             itemStyle: {
               shadowBlur: 10,
               shadowColor: 'rgba(0,0,0,.5)',
-              color: '#fff',
-              label: {
-                show: false
-              },
-              labelLine: {
-                show: false
-              }
+              color: '#fff'
             },
             tooltip: {
               show: false

src/views/productionScheduling/components/RingChart.vue

@@ -79,16 +79,13 @@ export default {
             zlevel: 1, // 层级
             radius: ['55%', '58%'],
             center: ['50%', '40%'],
+            label: {
+              show: false
+            },
             itemStyle: {
               shadowBlur: 10,
               shadowColor: 'rgba(209, 204, 214, 0.64)',
-              color: '#fff',
-              label: {
-                show: false
-              },
-              labelLine: {
-                show: false
-              }
+              color: '#fff'
             },
             tooltip: {
               show: false
@@ -104,16 +101,13 @@ export default {
             radius: ['70%', '71%'],
             center: ['50%', '40%'],
             zlevel: 1, // 层级
+            label: {
+              show: false
+            },
             itemStyle: {
               shadowBlur: 10,
               shadowColor: 'rgba(0,0,0,.5)',
-              color: '#fff',
-              label: {
-                show: false
-              },
-              labelLine: {
-                show: false
-              }
+              color: '#fff'
             },
             tooltip: {
               show: false

src/views/qualityManagement/components/processFlowDetail.vue

@@ -54,6 +54,7 @@
 import { tableHeight } from '@/utils/index'
 import { pageProcess } from '@/api/qualityManagement'
 import { timeFormatter } from '@/utils'
+import { getParamList } from '@/api/processManagement'
 const tableProps = [
   {
     prop: 'unitName',
@@ -185,10 +186,16 @@ export default {
       console.log(val)
       if (val.type === 'processParameters') {
         this.processParametersVisible = true
+        this.getProcess()
       } else if (val.type === 'deviceParameters') {
         this.deviceParametersVisible = true
       }
     },
+    getProcess() {
+      getParamList().then((res) => {
+        console.log(res)
+      })
+    },
     handleCloseProcess() {},
     handleCloseDevice() {}
   }