代码更新

mes/qd/src/api/wms/sb/devicefaultcae.js

@@ -24,4 +24,11 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function getFaultList() {
+  return request({
+    url: 'api/devicefaultcae/getFaultList',
+    method: 'post'
+  })
+}
+
+export default { add, edit, del, getFaultList }

mes/qd/src/views/wms/sb/stat/devicefaultcae/index.vue

@@ -22,13 +22,20 @@
           </el-form-item>
 
           <el-form-item label="设备故障">
-            <treeselect
+            <el-select
               v-model="query.device_gz"
-              :load-options="loadClass"
-              :options="classes2"
-              style="width: 200px;"
+              clearable
+              size="mini"
               placeholder="请选择"
-            />
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in FaultList"
+                :label="item.device_faultclass_name"
+                :value="item.device_faultclass_id"
+              />
+            </el-select>
           </el-form-item>
 
           <el-form-item label="日期">
@@ -69,8 +76,8 @@
         </el-table-column>
         <el-table-column prop="device_model" label="型号规格" />
         <el-table-column prop="nunm" label="故障次数" />
-        <el-table-column prop="" label="平均故障间隔时间" />
-        <el-table-column prop="" label="平均故障修复时间" />
+        <el-table-column prop="avgVal_time" label="平均故障间隔时间(小时)" :formatter="crud.formatNum2" />
+        <el-table-column prop="avgRep_time" label="平均故障修复时间(小时)" :formatter="crud.formatNum2" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -96,6 +103,7 @@ import DateRangePicker from '@/components/DateRangePicker'
 import DtlDialog from '@/views/wms/sb/stat/devicefaultcae/DtlDialog'
 
 const defaultForm = { }
+const start = new Date()
 export default {
   name: 'Devicefaultcae',
   components: { pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, DtlDialog },
@@ -113,6 +121,9 @@ export default {
         del: false,
         download: false,
         reset: true
+      },
+      query: {
+        createTime: [start.daysAgo(30), new Date()]
       }
     })
   },
@@ -124,6 +135,7 @@ export default {
       class_idStr2: null,
       materOpt_code: '23',
       materOpt_code2: '24',
+      FaultList: [],
       openParam: null,
       dtlDialog: false,
       permission: {
@@ -140,14 +152,17 @@ export default {
       this.crud.toQuery()
       this.queryClassId()
     })
-    const param2 = {
-      'materOpt_code': this.materOpt_code2
-    }
-    crudMaterialbase.getMaterOptType(param2).then(res => {
-      this.class_idStr2 = res.class_idStr
-      this.crud.query.class_idStr2 = this.class_idStr2
-      this.crud.toQuery()
-      this.queryClassId2()
+    // const param2 = {
+    //   'materOpt_code': this.materOpt_code2
+    // }
+    // crudMaterialbase.getMaterOptType(param2).then(res => {
+    //   this.class_idStr2 = res.class_idStr
+    //   this.crud.query.class_idStr2 = this.class_idStr2
+    //   this.crud.toQuery()
+    //   this.queryClassId2()
+    // })
+    crudDevicefaultcae.getFaultList().then(res => {
+      this.FaultList = res
     })
   },
   methods: {

mes/qd/src/views/wms/sb/stat/task/bigScreen.vue

@@ -27,7 +27,7 @@ export default {
   mixins: [crud],
   data() {
     return {
-      path: 'ws://localhost:8010/webSocket/20',
+      path: 'ws://192.168.81.252:8086//webSocket/20',
       currentDate: new Date(),
       getTime: '',
       getDate: '',

mes/qd/src/views/wms/sb/stat/taskscreen/taskScreen.vue

@@ -36,7 +36,7 @@ export default {
   name: 'Test',
   data() {
     return {
-      path: 'ws://localhost:8010/webSocket/21',
+      path: 'ws://192.168.81.252:8086//webSocket/21',
       table: [
         { 'fault_time': '暂无数据', 'create_time': '暂无数据', 'name': '暂无数据', 'device_name': '暂无数据', 'class_name': '暂无数据' }
       ],