From 938ebf1e281c19b94c3dcb3710322f1a2b3a875f Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 25 Jan 2022 09:56:14 +0800
Subject: [PATCH] denglijiekou

---
 hb_client/src/router/index.js                 |  8 ++---
 hb_client/src/views/dashboard/index.vue       |  4 +--
 .../em/{detection.vue => monitoring.vue}      | 36 ++++++++-----------
 hb_client/src/views/qm/processtest.vue        | 27 +++++++-------
 hb_client/src/views/qm/product.vue            |  9 +----
 hb_client/src/views/qm/producttest.vue        |  7 +---
 hb_client/src/views/qm/unproduct.vue          |  7 +---
 hb_client/src/views/wpm/operationdo.vue       | 32 +++++++++--------
 8 files changed, 53 insertions(+), 77 deletions(-)
 rename hb_client/src/views/em/{detection.vue => monitoring.vue} (95%)

diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index 61be661..7d95558 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -263,10 +263,10 @@ export const asyncRoutes = [
         meta: { title: '生产设备', icon: 'example', perms: ['em_equipment'] }
       },
       {
-        path: 'detection ',
-        name: 'detection ',
-        component: () => import('@/views/em/detection'),
-        meta: { title: '监视和测量设备', icon: 'example', perms: ['em_detection'] }
+        path: 'monitoring ',
+        name: 'monitoring ',
+        component: () => import('@/views/em/monitoring'),
+        meta: { title: '监视和测量设备', icon: 'example', perms: ['em_monitoring'] }
       },
       {
         path: 'record',
diff --git a/hb_client/src/views/dashboard/index.vue b/hb_client/src/views/dashboard/index.vue
index 1fbc573..b50b02a 100644
--- a/hb_client/src/views/dashboard/index.vue
+++ b/hb_client/src/views/dashboard/index.vue
@@ -820,9 +820,7 @@
       this.getStatisticsData();
       this.getNoticeData();
     },
-    updated() {
-      this.drawChart()
-    }
+  
   }
 </script>
 
diff --git a/hb_client/src/views/em/detection.vue b/hb_client/src/views/em/monitoring.vue
similarity index 95%
rename from hb_client/src/views/em/detection.vue
rename to hb_client/src/views/em/monitoring.vue
index c45bf3c..7ea762e 100644
--- a/hb_client/src/views/em/detection.vue
+++ b/hb_client/src/views/em/monitoring.vue
@@ -7,7 +7,7 @@
         >
         <el-input
           v-model="listQuery.search"
-          placeholder="设备名称/设备编号/备注"
+          placeholder="检测设备名称/检测设备编号/备注"
           style="width: 300px"
           class="filter-item"
           @keyup.enter.native="handleFilter"
@@ -40,7 +40,7 @@
         v-el-height-adaptive-table="{ bottomOffset: 42 }"
       >
         <el-table-column type="index" width="50" />
-        <el-table-column label="设备编号">
+        <el-table-column label="设备编号" width="100">
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
 
@@ -70,7 +70,7 @@
         <el-table-column label="设备名称">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
-        <el-table-column label="型号规格">
+        <el-table-column label="型号规格" width="100">
           <template slot-scope="scope">{{ scope.row.model }}</template>
         </el-table-column>
 
@@ -89,7 +89,7 @@
             scope.row.keeper_.username
           }}</template>
         </el-table-column>
-        <el-table-column label="存放位置">
+        <el-table-column label="存放位置" width="100">
           <template slot-scope="scope">{{ scope.row.place }}</template>
         </el-table-column>
         <el-table-column label="绑定工序">
@@ -199,9 +199,9 @@
               >
                 <el-option
                   v-for="item in mgmoptions"
-                  :key="item.value"
+                  :key="item.id"
                   :label="item.label"
-                  :value="item.value"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>
@@ -226,9 +226,9 @@
               >
                 <el-option
                   v-for="item in keeperOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>
@@ -307,8 +307,7 @@
     </el-dialog>
   </div>
 </template>
-<style>
-</style>
+
 <script>
 import {
   getpEquipmentList,
@@ -317,10 +316,8 @@ import {
   deleteEquipment,
 } from "@/api/equipment";
 import { getUserList } from "@/api/user";
-import { getOrgList } from "@/api/org";
 import checkPermission from "@/utils/permission";
 
-import { genTree } from "@/utils";
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 const defaultequipment = {
   name: "",
@@ -411,7 +408,7 @@ export default {
         type: [{ required: true, message: "请输入", trigger: "blur" }],
         model: [{ required: true, message: "请输入", trigger: "blur" }],
         state: [{ required: true, message: "请选择", trigger: "blur" }],
-        belong_dept: [{ required: true, message: "请选择", trigger: "blur" }],
+      
       },
       datatime: null,
     };
@@ -422,7 +419,7 @@ export default {
     this.getList();
 
     this.getUserList();
-    this.getOrgList();
+  
   },
   methods: {
     checkPermission,
@@ -473,15 +470,10 @@ export default {
     //组员列表
     getUserList() {
       getUserList({ page: 0 }).then((res) => {
-        this.keeperOptions = genTree(res.data);
-      });
-    },
-    //部门列表
-    getOrgList() {
-      getOrgList({ page: 0 }).then((res) => {
-        this.depOptions = genTree(res.data);
+        this.keeperOptions = res.data;
       });
     },
+    
 
     handleFilter() {
       this.listQuery.page = 1;
diff --git a/hb_client/src/views/qm/processtest.vue b/hb_client/src/views/qm/processtest.vue
index 76d49b8..d87eccc 100644
--- a/hb_client/src/views/qm/processtest.vue
+++ b/hb_client/src/views/qm/processtest.vue
@@ -8,67 +8,66 @@
             border
             fit
             stripe
-            highlight-current-row
             height="620"
             v-el-height-adaptive-table="{ bottomOffset: 40 }"
           >
             <el-table-column type="index" width="50" />
-            <el-table-column label="任务编号">
+            <el-table-column label="任务编号" align="center">
               <template slot-scope="scope">{{ scope.row.number }}</template>
             </el-table-column>
-            <el-table-column label="产品名称">
+            <el-table-column label="产品名称" align="center">
               <template slot-scope="scope">{{
                 scope.row.product_.name
               }}</template>
             </el-table-column>
-            <el-table-column label="规格型号">
+            <el-table-column label="规格型号" align="center">
               <template slot-scope="scope">{{
                 scope.row.product_.specification
               }}</template>
             </el-table-column>
-            <el-table-column label="合格率">
-              <el-table-column label="冷加工">
+            <el-table-column label="合格率" align="center">
+              <el-table-column label="冷加工" align="center">
                 <template slot-scope="scope" v-if="scope.row.process_json['01']"
                   >{{ scope.row.process_json["01"].rate }}%</template
                 >
               </el-table-column>
-              <el-table-column label="热弯">
+              <el-table-column label="热弯" align="center">
                 <template slot-scope="scope" v-if="scope.row.process_json['02']"
                   >{{ scope.row.process_json["02"].rate }}%</template
                 >
               </el-table-column>
-              <el-table-column label="化学钢化">
+              <el-table-column label="化学钢化" align="center">
                 <template slot-scope="scope" v-if="scope.row.process_json['03']"
                   >{{ scope.row.process_json["03"].rate }}%</template
                 >
               </el-table-column>
-              <el-table-column label="镀膜">
+              <el-table-column label="镀膜" align="center">
                 <template slot-scope="scope" v-if="scope.row.process_json['05']"
                   >{{ scope.row.process_json["05"].rate }}%</template
                 >
               </el-table-column>
-              <el-table-column label="夹层">
+              <el-table-column label="夹层" align="center">
                 <template slot-scope="scope" v-if="scope.row.process_json['06']"
                   >{{ scope.row.process_json["06"].rate }}%</template
                 >
               </el-table-column>
-              <el-table-column label="包边">
+              <el-table-column label="包边" align="center">
                 <template slot-scope="scope" v-if="scope.row.process_json['07']"
                   >{{ scope.row.process_json["07"].rate }}%</template
                 >
               </el-table-column>
-              <el-table-column label="装框">
+              <el-table-column label="装框" align="center">
                 <template slot-scope="scope" v-if="scope.row.process_json['08']"
                   >{{ scope.row.process_json["08"].rate }}%</template
                 >
               </el-table-column>
             </el-table-column>
-            <el-table-column label="创建时间">
+            <el-table-column label="创建时间" align="center">
               <template slot-scope="scope">{{
                 scope.row.create_time
               }}</template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-link
                   v-if="checkPermission(['material_update'])"
diff --git a/hb_client/src/views/qm/product.vue b/hb_client/src/views/qm/product.vue
index 987e253..9468158 100644
--- a/hb_client/src/views/qm/product.vue
+++ b/hb_client/src/views/qm/product.vue
@@ -28,14 +28,7 @@
         <el-table-column label="所在仓库">
           <template slot-scope="scope">{{ scope.row.warehouse_.name }}</template>
         </el-table-column>
-          <el-table-column label="是否已军检">
-          <template slot-scope="scope">
-          
-
-             <el-tag v-if="scope.row.is_mtested == false">未军检</el-tag>
-              <el-tag v-else>已军检</el-tag></template>
-
-        </el-table-column>
+         
         
    <el-table-column label="军检">
           <template slot-scope="scope">
diff --git a/hb_client/src/views/qm/producttest.vue b/hb_client/src/views/qm/producttest.vue
index c8e9e87..e20975a 100644
--- a/hb_client/src/views/qm/producttest.vue
+++ b/hb_client/src/views/qm/producttest.vue
@@ -23,12 +23,7 @@
         <el-table-column label="型号规格">
           <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.specification }}</template>
         </el-table-column>
-        <el-table-column label="军检状态">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.is_mtested==false">未军检</el-tag>
-            <el-tag v-if="scope.row.is_mtested==true">已军检</el-tag>
-          </template>
-        </el-table-column>
+      
         <el-table-column label="军检结论">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.is_mtestok==false">不合格</el-tag>
diff --git a/hb_client/src/views/qm/unproduct.vue b/hb_client/src/views/qm/unproduct.vue
index d864ac2..a859847 100644
--- a/hb_client/src/views/qm/unproduct.vue
+++ b/hb_client/src/views/qm/unproduct.vue
@@ -25,12 +25,7 @@
         <el-table-column label="型号规格">
           <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.specification }}</template>
         </el-table-column>
-        <el-table-column label="军检状态">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.is_mtested==false">未军检</el-tag>
-            <el-tag v-if="scope.row.is_mtested==true">已军检</el-tag>
-          </template>
-        </el-table-column>
+       
         <el-table-column label="军检结论">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.is_mtestok==false">不合格</el-tag>
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index 3cf6c68..daf5a94 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -131,18 +131,13 @@
                 </el-table-column>
                    <el-table-column  label="设备状态">
                       <template slot-scope="scope">
-            <el-tag v-if="scope.row.state===0" type="success">
+            <el-tag v-if="scope.row.equip_.type===1&&scope.row.equip_.state===10" type="success">
             {{ state_[scope.row.equip_.state] }}
             </el-tag>
-            <el-tag v-else-if="scope.row.state===1" type="warning">
-            {{ state_[scope.row.equip_.state] }}
-            </el-tag>
-            <el-tag v-else-if="scope.row.state===2" >
-            {{ state_[scope.row.equip_.state] }}
-            </el-tag>
-             <el-tag v-else type="danger">
-            {{ state_[scope.row.equip_.state] }}
+            <el-tag v-else-if="scope.row.equip_.type===2&&scope.row.equip_.state===10" type="warning">
+            {{ state2_[scope.row.equip_.state] }}
             </el-tag>
+         
             </template>
                 </el-table-column>
                 
@@ -572,8 +567,12 @@
   </div>
 </template>
 <style scoped>
+ .word-wrap {
+  padding: 25px;
+};
 .box-card {
   height: 300px;
+ 
 }
 </style>
   <script>
@@ -619,11 +618,16 @@ export default {
         page: 1,
         page_size: 20,
       },
-       state_:{
-        0:'完好',
-        1:'限用',
-        2:'在修',
-        3:'禁用',
+        state_:{
+        10:'完好',
+        20:'限用',
+        30:'在修',
+        40:'禁用',
+      },
+        state2_: {
+        10: "合格",
+
+        40: "禁用",
       },
       scrap: [
         { lable: "使用", value: true },