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

src/business/platform/data/templaterender/templates/list.vue

@@ -799,7 +799,7 @@ export default {
     getResponseData(buttonType, ids, exportColumns) {
       const { template, dataTemplate, fields, pagination, sorts } = this
       const params = {}
-      template.filter_conditions = []
+    //   template.filter_conditions = []
       let response_data = JSON.parse(JSON.stringify(dataTemplate))
       if (this.$utils.isEmpty(template.export_columns)) {
         const arr = dataTemplate.datasets.filter(d => d.type !== 'table')

src/views/platform/bpmn/bpmInstHis/listType/CMAOjiancedangan.vue

@@ -23,7 +23,6 @@
       </div>
       <el-table
         :data="tableData"
-        border
         :stripe="true"
         style="width: 100%"
         height="75vh"
@@ -279,6 +278,7 @@
         fileType: '',
         fileOption: {user: {}},
         jianceFileList:[],
+        pageSize:15,
       };
     },
     components: {
@@ -487,14 +487,12 @@
       },
       handleSizeChange(value) {
         this.currentPage4 = 1;
-        let sql =
-          "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit 0," +
-          value;
+        let sql = "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit 0," + value;
+        this.pageSize =Number(value);
         this.loadData(sql);
       },
       handleCurrentChange(value) {
-        let sql =
-          "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit " +(value-1)*15 +","+value*15;
+        let sql = "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit " + (value-1) * this.pageSize +","+ this.pageSize;
         this.loadData(sql);
       },
       // 获取附件信息

src/views/platform/bpmn/bpmInstHis/listType/CMAjiancedangan.vue

@@ -23,7 +23,6 @@
       </div>
       <el-table
         :data="tableData"
-        border
         :stripe="true"
         style="width: 100%"
         height="75vh"
@@ -272,6 +271,7 @@
         fileType: '',
         fileOption: {user: {}},
         jianceFileList:[],
+        pageSize:15
       };
     },
     components: {
@@ -479,11 +479,12 @@
       handleSizeChange(value) {
         this.currentPage4 = 1;
         let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit 0," + value;
+        this.pageSize =Number(value);
         this.loadData(sql);
       },
       handleCurrentChange(value) {
-        let sql =
-          "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit " +(value-1)*15 +","+value*15;
+        let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit " + (value-1) * this.pageSize +","+ this.pageSize;
+        
         this.loadData(sql);
       },
       // 获取附件信息

src/views/platform/bpmn/bpmInstHis/listType/CNASjiancedangan.vue

@@ -23,9 +23,9 @@
     </div>
     <el-table
       :data="tableData"
-      border
       :stripe="true"
-      style="width: 100%"
+      style="width: 100%;"
+      height="75vh"
       :header-cell-style="{
         color: '#000',
         'font-size': '14px',
@@ -47,38 +47,25 @@
       </el-table-column>
       <el-table-column prop="jian_ce_kai_shi_s" label="检测时间" width="100">
       </el-table-column>
-      <el-table-column
-        prop="wei_tuo_zhan_shi_"
-        label="检测委托单号"
-        width="180"
-      >
+      <el-table-column  prop="wei_tuo_zhan_shi_"  label="检测委托单号"  width="180">
         <template slot-scope="scope">
           {{ scope.row.wei_tuo_zhan_shi_ | returnweituobianhao(wTBH) }}
         </template>
       </el-table-column>
       <el-table-column prop="wei_tuo_ri_qi_" label="委托日期" width="100">
       </el-table-column>
-      <el-table-column prop="yang_pin_bian_hao" label="样品编号" width="150">
+      <el-table-column prop="yang_pin_bian_hao" label="样品编号" width="135">
       </el-table-column>
-      <el-table-column prop="yang_pin_ming_che" label="样品名称" width="120">
+      <el-table-column prop="yang_pin_ming_che" label="样品名称" width="145">
       </el-table-column>
       <el-table-column prop="shi_fou_yu_bao_ga" label="是否预报告" width=""></el-table-column>
-      <el-table-column label="操作" align="left" width="100">
+      <el-table-column label="操作"  width="100">
         <template slot-scope="scope">
           <el-popover placement="left" width="150" trigger="click">
             <div slot="reference" class="more">
               <i class="el-icon-caret-bottom"></i>查阅
             </div>
-            <div
-              class="item"
-              style="color: #85ce61"
-              @click="
-                alertReport(
-                  reports.jianceshenqingdan,
-                  scope.row.jian_ce_shen_qing
-                )
-              "
-            >
+            <div class="item" style="color:#85ce61" @click="alertReport(reports.jianceshenqingdan,scope.row.jian_ce_shen_qing)">
               <i class="el-icon-s-order"></i> 检测委托单
             </div>
             <!-- <div
@@ -92,21 +79,11 @@
             </div> -->
             <div>
               <el-popover placement="left" width="200" trigger="click">
-                <div
-                  class="div_test item"
-                  style="color: #85ce61"
-                  slot="reference"
-                  @click="juTiItem(scope.row)"
-                >
+                <div class="div_test item" style="color: #85ce61" slot="reference" @click="juTiItem(scope.row)">
                   <i class="el-icon-s-order"></i> 检测记录
                 </div>
                 <div class="three-item">
-                  <div
-                    style="color: #85ce61; cursor: pointer"
-                    v-for="it in itemInfo"
-                    :key="it.id_"
-                    @click="formEvent(it.id_,it.shujuid)"
-                  >
+                  <div style="color: #85ce61; cursor: pointer" v-for="it in itemInfo" :key="it.id_" @click="formEvent(it.id_,it.shujuid)" >
                     {{ it.jian_ce_xiang_mu_ }}记录
                   </div>
                 </div>
@@ -114,12 +91,7 @@
             </div>
             <div>
               <el-popover placement="left" width="200" trigger="click">
-                <div
-                  class="div_test item"
-                  style="color: #85ce61"
-                  slot="reference"
-                  @click="getjianceFile(scope.row)"
-                >
+                <div  class="div_test item" style="color: #85ce61" slot="reference" @click="getjianceFile(scope.row)">
                   <i class="el-icon-s-order"></i> 检测附件
                 </div>
                 <div class="three-item">
@@ -278,6 +250,7 @@ export default {
       fileType: '',
       fileOption: {user: {}},
       jianceFileList:[],
+      pageSize :15,
     };
   },
   components: {
@@ -364,8 +337,7 @@ export default {
       });
       sqlStr = sqlStr.substring(0, sqlStr.length - 1);
       sqlStr = "(" + sqlStr + ")";
-      let sql =
-        "select he_tong_bian_hao_,id_ from t_bjd WHERE id_ in " + sqlStr;
+      let sql ="select he_tong_bian_hao_,id_ from t_bjd WHERE id_ in " + sqlStr;
       curdPost("sql", sql).then((res) => {
         this_.hetong = res.variables.data;
       });
@@ -477,25 +449,27 @@ export default {
     },
     search() {
       let moreSql = this.selectSplit();
-      var sql =
-        "select * from t_mjjcbg " +
-        moreSql +
-        " wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu = 'cnas' and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成' ORDER BY yang_pin_bian_hao  DESC limit 0,15";
+      var sql ="select * from t_mjjcbg " +moreSql + " wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu = 'cnas' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit 0,15";
+      console.log(sql,"21")
       this.loadData(sql);
     },
     handleSizeChange(value) {
       this.currentPage4 = 1;
-      let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND  lei_bie_qu_fen_yu ='CNAS'  and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成'  ORDER BY yang_pin_bian_hao  DESC limit 0,15" +value;
+      let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND  lei_bie_qu_fen_yu ='CNAS'  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')  ORDER BY yang_pin_bian_hao  DESC limit 0,15" +value;
+      this.pageSize =Number(value);
       this.loadData(sql);
     },
     handleCurrentChange(value) {
-      let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='CNAS'  and zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成' ORDER BY yang_pin_bian_hao  DESC limit " +(value-1)*15 +","+value*15;
+      console.log(this.pageSize)
+      let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='CNAS'  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit " + (value-1) * this.pageSize +","+ this.pageSize;
+      console.log(sql,"1")
       this.loadData(sql);
     },
     // 获取附件信息
     getFile (data) {
         this.fileList = []
         let sql = `select id_ as id, file_name_ as fileName, ext_ as ext from ibps_file_attachment where find_in_set(id_, '${data}')`
+
         curdPost('sql', sql).then(res => {
             this.fileList = res.variables && res.variables.data
         })

src/views/platform/bpmn/bpmInstHis/listType/feijiancedangan.vue

@@ -24,7 +24,6 @@
       </div>
       <el-table
         :data="tableData"
-        border
         :stripe="true"
         style="width: 100%"
         height="75vh"
@@ -284,6 +283,7 @@
         fileType: '',
         fileOption: {user: {}},
         jianceFileList:[],
+        pageSize:15
       };
     },
     mixins: [GetReport],
@@ -479,10 +479,11 @@
       handleSizeChange(value) {
         this.currentPage4 = 1;
         let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit 0," + value;
+        this.pageSize =Number(value);
         this.loadData(sql);
       },
       handleCurrentChange(value) {
-        let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit " +(value-1)*15 +","+value*15;
+        let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '客户委托' AND lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit " + (value-1) * this.pageSize +","+ this.pageSize;
         this.loadData(sql);
       },
       // 获取附件信息

src/views/platform/bpmn/bpmInstHis/listType/nenglljiancedangan.vue

@@ -24,7 +24,6 @@
     </div>
     <el-table
       :data="tableData"
-      border
       :stripe="true"
       style="width: 100%"
       height="75vh"
@@ -284,6 +283,7 @@ export default {
       fileType: '',
       fileOption: {user: {}},
       jianceFileList:[],
+      pageSize:15
     };
   },
   mixins: [GetReport],
@@ -502,14 +502,12 @@ export default {
     },
     handleSizeChange(value) {
       this.currentPage4 = 1;
-      let sql =
-        "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '能力验证' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit 0," +
-        value;
+      let sql = "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '能力验证' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit 0," + value;
+      this.pageSize =Number(value);
       this.loadData(sql);
     },
     handleCurrentChange(value) {
-      let sql =
-        "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '能力验证' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit " +(value-1)*15 +","+value*15;
+      let sql = "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '能力验证' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao  DESC limit " + (value-1) * this.pageSize +","+ this.pageSize;
       this.loadData(sql);
     },
     // 获取附件信息

src/views/platform/bpmn/bpmInstHis/listType/zhikongJancedangan.vue

@@ -24,7 +24,6 @@
     </div>
     <el-table
       :data="tableData"
-      border
       :stripe="true"
       style="width: 100%"
       height="75vh"
@@ -284,6 +283,7 @@ export default {
       fileType: '',
       fileOption: {user: {}},
       jianceFileList:[],
+      pageSize:15
     };
   },
   mixins: [GetReport],
@@ -502,14 +502,12 @@ export default {
     },
     handleSizeChange(value) {
       this.currentPage4 = 1;
-      let sql =
-        "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '内部质控' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit 0," +
-        value;
+      let sql = "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '内部质控' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit 0," + value;
+      this.pageSize =Number(value);
       this.loadData(sql);
     },
     handleCurrentChange(value) {
-      let sql =
-        "select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '内部质控' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit " +(value-1)*15 +","+value*15;
+      let sql ="select * from  t_mjjcbg WHERE  wei_tuo_lei_xing_ = '内部质控' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY yang_pin_bian_hao DESC limit " + (value-1) * this.pageSize +","+ this.pageSize;
       this.loadData(sql);
     },
     // 获取附件信息

src/views/platform/message/inner/detail/dialog.vue

@@ -126,7 +126,11 @@ export default {
       }).then(() => {
         // TODO 受控文件逻辑处理
         const perInfosId = this.$store.getters.userInfo.user.id
-        const perInfosorgId = this.$store.getters.userInfo.org.id
+        const perInfosOrg = this.$store.getters.userInfo.org
+        if (!perInfosOrg) {
+            alert('系统所登录的账户并没有所属部门，请先在系统设置完再进行确认！')
+            return
+          }
         let sql = "select qian_zi_tu_wen_ FROM t_ryjbqk WHERE parent_id_ = '" + perInfosId + "'"
         curdPost("sql", sql).then((ryjbqkRes) => {
           let ryjbqkDatas = ryjbqkRes.variables.data
@@ -137,7 +141,7 @@ export default {
           let tempObj = {
             id_: generateUUID(),
             parent_id_: this.tableId,
-            tong_zhi_bu_men_i: perInfosorgId,
+            tong_zhi_bu_men_i: perInfosOrg.id,
             que_ren_qian_ming: JSON.stringify([{
               id: ryjbqkDatas[0].qian_zi_tu_wen_,
               fileName: '确认签名'

src/views/system/jbdHome/board/component/equipment/getPieView.vue

@@ -1,9 +1,12 @@
 <template>
   <div class="pieView">
-    <div style="height: 20%;text-align: left;padding-left: 10px;">{{info.config.title||""}}</div>   
-    <div style="width:100%;height:80%;display: inline-block; overflow: hidden;">
+    <div style="height: 10%;text-align: left;padding-left: 10px;">{{info.config.title||""}}</div>   
+    <div style="width:100%;height:90%;display: inline-block; overflow: hidden;" v-show="showChart">
       <div :id="info.config.idSelector" style="width:100%;height:95%;overflow: hidden;"> </div>
     </div>
+    <div style="background: #061237; width: 100%;height: 70%;display: flex;justify-content: cne;justify-content: center;align-items: center;" v-if="!showChart">
+      <div style="color:#c7c7c7;">目前无数据</div>
+    </div>
   </div>
 </template>
 
@@ -12,6 +15,7 @@ import * as echarts from "echarts";
 export default {
   data(){
     return{
+      showChart:true,
     }
   },
   props:{
@@ -29,13 +33,22 @@ export default {
   },
   methods:{
     getMiddleLeft(){ 
+      const radius = window.innerWidth > 1600 ? '55%' : '45%';
+      let inData = this.info.data;
+      let num = 0;
+      for(let i in inData){
+        num += inData[i].value;
+      }
+      if(num == 0){
+        this.showChart = false;
+      }
       let chartDom = document.getElementById(this.info.config.idSelector);
       var myChart = echarts.init(chartDom);
       var option;
       option = {
         title: {
           show: true,
-          left: 'center',
+          left: 'top',
           textStyle: {
             color: '#fff',
             fontSize: 20,
@@ -53,7 +66,7 @@ export default {
         legend: {
           show: true,
           z: 3,
-          orient: 'vertical',
+          orient: 'left',
           left: 'right',
           textStyle:{
             color: '#fff'
@@ -61,7 +74,7 @@ export default {
         },
         series: [{
           type: 'pie',
-          radius: '50%',
+          radius,
           center: ['50%', '50%'],
           data:this.info.data,
           emphasis: {

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

@@ -31,7 +31,6 @@
               <middleCard v-if="eBgRateData.data.length" :info="eBgRateData" ref="middleCardCenter" />
             </div>
             <dv-decoration-2 v-if="eBgRateData.data.length" :reverse="true" style="width:2%;height:100%;overflow: hidden;box-sizing: border-box;" />
-
             <div class="middleCardRight1">
               <CarouselTabl v-if="shiyonglvConfig.data.length" :info="shiyonglvConfig" title="设备使用记录" />
             </div>
@@ -48,7 +47,7 @@
             <zhuzhuangtu v-if="sheBeiData.data.length" :info="sheBeiData" ref="sheBeiDataDataref" />
           </div>
           <dv-decoration-2 v-if="bottomData.data.length" :reverse="true" style="width:2%;height:100%;" />
-          <div style="width:25%;display:flex;overflow: hidden;">
+          <div style="width:24%;display:flex;overflow: hidden;">
             <div class="bottomCardLeft0">
               <middleCard v-if="weiHuSheBeiDataShow" :info="weiHuSheBeiData" ref="sheBeiWeiHuRef" />
             </div>
@@ -59,7 +58,7 @@
           </div>
 
           <dv-decoration-2 v-if="bottomData.data.length" :reverse="true" style="width:2%;height:100%;" />
-          <div style="width:25%;display:flex;overflow: hidden;">
+          <div style="width:24%;display:flex;overflow: hidden;">
             <!-- <div style="width:40%">
               <zhuzhuangtu v-if="zhuantaiEData.data.length" :info="zhuantaiEData" ref="zhuantaiEDataref" />
             </div> -->
@@ -139,13 +138,13 @@ export default {
       config: {
         header: ["设备名称", "编号", "状态"],
         data: [],
-        columnWidth: ["100", "110", "85"],
+        columnWidth: ["160", "110", "85"],
         rowNum: 6,
       },
       shiyonglvConfig: {
         header: ["设备名称", "使用时间", "使人","存放位置","状态", "频率"],
         data: [],
-        columnWidth: ["120", "120", "100", "160","120", "50"],
+        columnWidth: ["175", "110", "80", "140","100", "60"],
         rowNum: 6,
       },
       zichan: 0,
@@ -217,8 +216,8 @@ export default {
       (select count(*) as Equipments from t_sbdj) as a,
       (select bei_zhu_ as mony FROM t_sbdj) as a1,
       (select count(*) as addEquipments  from t_sbdj where gou_jin_ri_qi_ LIKE '${this_.month}%') as b,
-      (select count(*) as testEquipments from t_mjsbxzqrb where  shi_fou_guo_shen_ ='1') as c,
-      (select count(*) as testNoEquipments from t_mjsbjdxzjhzb where create_time_ LIKE '${this_.month}%') as c1,
+      (select count(*) as testEquipments from t_mjsbxzqrb where  shi_fou_guo_shen_ ='1' and create_time_ LIKE '${this_.month.slice(0,4)}%') as c,
+      (select count(*) as testNoEquipments from t_mjsbjdxzjhzb where create_time_ LIKE '${this_.month.slice(0,4)}%') as c1,
       (select count(*) as checkEquipments from t_mjyqsbwxsqb where create_time_ LIKE '${this_.month}%') as d,
       (select count(*) as checkNoEquipments from t_mjsbwxqrb where create_time_ LIKE '${this_.month}%' and shi_fou_guo_shen_ ='1') as d1,
       (select count(*) as goodEquipments  from t_sbdj where she_bei_zhuang_ta ='正常使用' ) as e,
@@ -384,7 +383,7 @@ export default {
           this_.sheBeiData.data.push(data[0].goodEquipments);
           this_.sheBeiData.data.push(data[0].limitedEquipments);
           this_.sheBeiData.data.push(data[0].scrapEquipments);
-          this_.sheBeiData.config.title = "设备数量情况一览";
+          this_.sheBeiData.config.title = "设备各工作状态数量统计";
           this_.sheBeiData.config.idSelector = "main8";
           this_.bottomData.data=[];
           this_.bottomData.xData = ["计划核查数", "本月已核查数"];
@@ -427,7 +426,7 @@ export default {
           objRate.name = "故障率";
           this_.eBgRateData.data.push(objRate);
           this_.eBgRateData.color = ["#339933", "#FF0033"];
-          this_.eBgRateData.config.title = "设备工作状态情况";
+          this_.eBgRateData.config.title = "设备完好情况";
           this_.eBgRateData.config.idSelector = "main1";
           //设备维护
           let objweihu = {};
@@ -440,13 +439,12 @@ export default {
           objweihu.name = "已维护数";
           this_.weiHuSheBeiData.data.push(objweihu);
           this_.weiHuSheBeiData.color = ["#5470c6", "#38a838"];
-          this_.weiHuSheBeiData.config.title = "设备维护完成图";
+          this_.weiHuSheBeiData.config.title = "设备维护完成情况";
           this_.weiHuSheBeiData.config.idSelector = "mainWeiHu";
           this_.weiHuSheBeiDataShow = true;
           //设备核查
           let objHeCha = {}; //核查改维修
           this_.sheBeiHeChaData.data =[];
-          debugger
           objHeCha.name = "维修申请数";
           objHeCha.value = data[0].checkNoEquipments;
           this_.sheBeiHeChaData.data.push(objHeCha);
@@ -455,7 +453,7 @@ export default {
           objHeCha.name = "已完成数";
           this_.sheBeiHeChaData.data.push(objHeCha);
           this_.sheBeiHeChaData.color = ["#5470c6", "#38a838"];
-          this_.sheBeiHeChaData.config.title = "设备维修分布";
+          this_.sheBeiHeChaData.config.title = "设备维修情况";
           this_.sheBeiHeChaData.config.idSelector = "mainHeCha";
           this_.sheBeiHeChaDataShow = true;
           //设备检定校准
@@ -470,7 +468,7 @@ export default {
           objJianding.name = "已完成数";
           this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
           this_.jianDingjiaoZhunSheBeiData.color = ["#5470c6", "#38a838"];
-          this_.jianDingjiaoZhunSheBeiData.config.title = "设备检定校准分布率";
+          this_.jianDingjiaoZhunSheBeiData.config.title = "设备检定/校准完成情况";
           this_.jianDingjiaoZhunSheBeiData.config.idSelector = "mainJianDing";
           this_.jianDingjiaoZhunSheBeiDataShow = true;
           // setTimeout(() => {
@@ -698,20 +696,20 @@ export default {
       box-sizing: border-box;
     }
     .middleCardCenter {
-      width: 28%;
+      width: 24%;
       height: 100%;
       overflow: hidden;
       box-sizing: border-box;
     }
     .middleCardRight {
-      width: 28%;
+      width: 24%;
       height: 100%;
       overflow: hidden;
       box-sizing: border-box;
     }
     .middleCardRight1 {
       height: 100%;
-      width: 40%;
+      width: 48%;
       overflow: hidden;
       box-sizing: border-box;
     }

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

@@ -418,10 +418,15 @@ export default {
     getLoadEchartsTwo() {
       var chartDom = document.getElementById("in-echarts");
       const setEchartWH = {
-        //设置控制图表大小变量
-        width: 400,
-        height: 300,
-      };
+        // 设置控制图表大小变量
+        width: 500,
+        height: this.source.length < 7 ? 350 : (this.source.length - 1) * 30 + 100
+      }
+      // const setEchartWH = {
+      //   //设置控制图表大小变量
+      //   width: 400,
+      //   height: 300,
+      // };
 
       var myChart = echarts.init(chartDom, null, setEchartWH);
       var option;
@@ -464,7 +469,7 @@ export default {
               // Map the "product" column to Y axis
               y: "product",
             },
-            barWidth: 30,
+            barWidth: 15,
           },
         ],
       };
@@ -475,10 +480,15 @@ export default {
     getLoadCmaEchartsX() {
       var chartDom = document.getElementById("in-CMAecharts");
       const setEchartWH = {
-        //设置控制图表大小变量
-        width: 400,
-        height: 300,
-      };
+        // 设置控制图表大小变量
+        width: 500,
+        height: this.source.length < 7 ? 350 : (this.source.length - 1) * 30 + 100
+      }
+      // const setEchartWH = {
+      //   //设置控制图表大小变量
+      //   width: 400,
+      //   height: 300,
+      // };
 
       var myChart = echarts.init(chartDom, null, setEchartWH);
       var option;
@@ -520,7 +530,7 @@ export default {
               // Map the "product" column to Y axis
               y: "product",
             },
-            barWidth: 30,
+            barWidth: 15,
           },
         ],
       };
@@ -949,6 +959,7 @@ export default {
     .department {
       width: 400px;
       height: 300px;
+      margin-left: 60px;
     }
     #department {
       width: 400px;

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

@@ -53,7 +53,7 @@
 
                   <div class="lh">
                     <div>流转状态：</div>
-                    <div>▢待检，▢在检，▢已检，▢留样</div>
+                    <div>▢待检，▢在检，▢检毕，▢留样</div>
                   </div>
                  
                   <div class="ewm">