Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/views/system/jbdHome/board/component/CarouselTabl.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="width: 100%;height: 100%;">
-    <div class="title">停用/报废列表</div>   
+    <div class="title" style="vertical-align: top; height: 35px;font-size: 18px;">停用/报废列表</div>
     <div style="width:100%;display: inline-block;background-color: #06163f;">
       <dv-scroll-board :config="info" style="width:100%;height:320px" />
     </div>
@@ -9,20 +9,20 @@
 
 <script>
 export default {
-  data(){
-    return{
-    }
+  data() {
+    return {};
   },
-  props:{
-    info:{
-      type:Object,
-      default:{}
-    }
+  props: {
+    info: {
+      type: Object,
+      default: {},
+    },
   },
 };
 </script>
 <style lang="scss" module>
-.pieView{
+.pieView {
   width: 100%;
+
 }
 </style>

src/views/system/jbdHome/board/component/equipmentBoardTopcard.vue

@@ -7,8 +7,8 @@
           <div v-for="(v, i) in item.children" :key="i" class="box1" >
             <div class="label" style="text-align: center; ">{{ v.label }}</div>
             <div class="count" style="display: flex;justify-content: center;">
-              <div :style="{color:v.data.style.fill}" style="font: size 18px;font-weight:bold;">{{v.value}}</div>
-              <div class="unit">{{ v.unit }}</div>
+              <div :style="{color:v.data.style.fill}" style="font-weight:bold;font-size: 27px;">{{v.value}}</div>
+              <div class="unit" style="line-height: 34px;">{{ v.unit }}</div>
             </div>
           </div>  
         </div>
@@ -194,6 +194,8 @@ export default {
         }
         .unit {
           margin-left: 10px;
+          font-size: 18px;
+          line-height: 27px;
           box-sizing: border-box;
         }
       }

src/views/system/jbdHome/board/component/zhuzhuangtu.vue

@@ -127,6 +127,7 @@ export default {
 .pieView {
   display: flex;
   width: 100%;
+  height: 100%;
   background-color: rgba(6,30,93,.5);
 }
 </style>

src/views/system/jbdHome/board/equipmentBoard.vue

@@ -472,7 +472,7 @@ export default {
   .header {
     position: relative;
     width: 100%;
-    height: 8%;
+    height: 9%;
     display: flex;
     justify-content: space-between;
     flex-shrink: 0;
@@ -550,7 +550,7 @@ export default {
       height: 100%;
     }
     .middleCardRight{
-      width: 40%;
+      width: 43%;
       height: 100%;
     }
     // .middleCardRight1{
@@ -587,8 +587,8 @@ export default {
   }
 }
 .dv-decoration-10 {
-  width: 92%;
-  margin: 7px 0 0;
+  width: 95%;
+  margin: 7px 2% 0;
   height: 5px;
 }
 </style>

src/views/system/jbdScan/goods/neishenzhuangtai.vue

@@ -27,7 +27,7 @@
                   class="step"
                   v-for="(i, index) in stepList"
                   :key="index"
-                  :class="activeIndex == i.stepIndex || i.stepIndex <= activeIndex? 'step-active': ''"
+                  :class="(i.stepIndex < activeIndex || activeIndex == 100? 'step-active': (i.stepIndex == activeIndex ? 'current-active':''))"
                 >
                   <span class="step-num">
                     <i class="el-icon-caret-right icon" v-if="index != 0"></i>
@@ -53,7 +53,7 @@
               <div style="width: 90%; margin: 0 auto; line-height: 35px">
                 内审不符合项汇总表(CNAS)
               </div>
-              <el-table :data="CNASTableData" style="width: 90%; margin: 0 auto">
+              <el-table :data="CNASTableData" border style="width: 90%; margin: 0 auto">
                 <el-table-column
                   prop="bu_fu_he_xiang_mi"
                   label="不符合项描述"
@@ -115,9 +115,13 @@
               <div style="width: 90%; margin: 0 auto; line-height: 35px">
                 内审不符合项汇总表(CMA)
               </div>
-              <el-table :data="CMAtable"  style="width: 90%; margin: 0 auto">
+              <el-table
+                :data="CMAtable"
+                border
+                style="width: 90%; margin: 0 auto"
+              >
                 <el-table-column
-                  prop="bu_fu_he_xiang_mi"
+                  prop="xiang_miao_shu_r_"
                   label="不符合项描述"
                   width="300"
                 >
@@ -216,7 +220,7 @@ export default {
         },
         {
           stepIndex: 22,
-          title: "内审实施计划编制",
+          title: "实施计划编制",
           post:'内审组长'
         },
         {
@@ -240,12 +244,12 @@ export default {
           post:'内审组长'
         },
         {
-          stepIndex: 77,
+          stepIndex: 78,
           title: "不符合项整改",
           post:'内审员/部门负责人'
         },
         {
-          stepIndex: 88,
+          stepIndex: 90,
           title: "内审报告",
           post:'内审组长'
         },
@@ -269,6 +273,7 @@ export default {
   },
   filters: {
     emfiltes: function (value, arr) {
+      for (let i = 0; i < arr.length; i++) {
       if(value.includes(",")){
         let part = "";
         let parts = []
@@ -280,12 +285,9 @@ export default {
             }
           }
         }
-        return part.slice(1,part.length)
-      }else{  
-        for (let i = 0; i < arr.length; i++) {
-          if (arr[i].ID_ == value) {
-            return arr[i].NAME_;
-          }
+        return part.slice(1,part.length);
+      }else if (arr[i].ID_ == value) {
+          return arr[i].NAME_;
         }
       }
     },
@@ -438,7 +440,7 @@ export default {
             fontSize: 10,
           },
         },
-        yAxis: { type: "category" },
+        yAxis: { name: "条款编号",type: "category" },
         visualMap: {
           orient: "horizontal",
           left: "center",
@@ -627,13 +629,11 @@ export default {
       } else if (value.includes("6")) {
         return 66;
       } else if (value.includes("7")) {
-        return 77;
+        return 78;
       } else if (value.includes("8")) {
-        return 88;
-      }else if (value.includes("8")) {
+        return 90;
+      }else if (value.includes("9")) {
         return 100;
-      }else {
-        return 0;
       }
     },
     //不符合项条款统计数据
@@ -698,8 +698,6 @@ export default {
             arr[index].ze_ren_shi_ = str.slice(1,str.length);
           }
         });
-
-
       });
       let map = new Map();
       for (let item of arr) {
@@ -726,12 +724,16 @@ export default {
     },
     getInit() {
       let data = this.obj[0];
+      console.log(data)
       let jieduanvalue;
       if (data.shi_fou_guo_shen_ == "已编制" && data.jie_dian_ren_wu_ == "") {
         jieduanvalue = "2";
       } else if (data.shi_fou_guo_shen_ == "1" && data.jie_dian_ren_wu_ == "") {
         jieduanvalue = "3";
-      } else {
+      }else if(!data.shi_fou_guo_shen_){
+        jieduanvalue = "2";
+      }
+       else {
         jieduanvalue = data.jie_dian_ren_wu_;
       }
       this.activeIndex = this.jieduan(jieduanvalue);
@@ -810,7 +812,7 @@ export default {
       position: absolute;
       top: 27px;
       left: 5%;
-      background: #8ab4f3;
+      background: #67c23a;
       width: 95%;
       height: 2px;
       overflow: hidden;
@@ -820,7 +822,7 @@ export default {
         left: 0;
         height: 2px;
         transition: 0.5s;
-        background: #8ab4f3;
+        background: #37a2da;
       }
     }
     .Article-steps {
@@ -852,10 +854,11 @@ export default {
           align-items: center;
           .icon {
             position: absolute;
-            left: -11px;
-            color: #8ab4f3;
+            left: -12px;
+            color: #8ab;
             font-size: 16px;
             font-weight: bold;
+            top: 35%;
           }
           p {
             line-height: 20px;
@@ -884,14 +887,20 @@ export default {
       }
     }
 
-    //当前所在位置样式
-    .step-active {
+    // //当前所在位置样式
+    .current-active 
+    {
       .step-num {
         background: #2d7df5 !important;
-        //   transform: rotate(90deg);
-        //   .num {
-        //     // transform: rotate(-90deg);
-        //   }
+      }
+      .title {
+        color: #2d7df5 !important;
+      }
+    }
+    .step-active 
+    {
+      .step-num {
+        background: #00CC00 !important;
       }
       .title {
         color: #2d7df5 !important;