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

src/business/platform/bpmn/form/action.js

@@ -686,6 +686,10 @@ export default {
                     const fileId = res.data && res.data.id ? res.data.id : ''
                     const fileParams = fileId ? { kuai_zhao_: fileId } : {}
                     this.updateState(id, code, '已完成', fileParams)
+                }).catch(() => {
+                    // 生成快照接口调用失败时，也需要更新状态为已完成
+                    this.$message.error('提交快照生成失败！')
+                    this.updateState(id, code, '已完成')
                 })
             })
         },

src/views/platform/data/dataset/list.vue

@@ -109,7 +109,7 @@ export default {
         },
         // 表格字段配置
         columns: [
-          { prop: 'name', label: '名称', sortable: true },
+          { prop: 'name', label: '名称', sortable: true, minWidth: 200 },
           { prop: 'key', label: '业务主键', sortable: true, width: 120 },
           { prop: 'type', label: '类型', tags: datasetTypeOptions, sortable: true, width: 100 },
           {prop:'typeId', label:'归分类型', sortable: true, width: 120 },
@@ -133,7 +133,7 @@ export default {
         }
       },
       pagination: {},
-      sorts: {}
+      sorts: { CREATE_TIME_: 'DESC' }
 
     }
   },

src/views/platform/org/employee/list.vue

@@ -327,7 +327,6 @@ export default {
                         this.$set(item, 'positionsName', name)
                         // 转换岗位路径
                         const path = this.getPositionsPath(item.positions)
-                        console.log(path)
                         this.$set(item, 'positionsPath', path)
                     }
                 })
@@ -350,7 +349,6 @@ export default {
             return list.join('，')
         },
         getPositionsPath (valueList) {
-            console.log(valueList)
             const postList = valueList.split(',')
             const list = []
             if (!postList.length) {
@@ -359,7 +357,6 @@ export default {
             postList.forEach((item) => {
                 const temp = this.positionsList.find(i => i.ID_ === item)
                 const pathList = temp ? temp.PATH_.split('.') : []
-                console.log(pathList)
                 let p = ''
                 pathList.filter(i => i).forEach(k => {
                     const t = this.positionsList.find(i => i.ID_ === k)

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

@@ -1,7 +1,6 @@
 <template>
   <div id="top-bar" style="width:100%;height:100%">
     <div class="content">
-      <!-- <div class="title">设备信息情况</div> -->
       <div class="bar">
         <div v-for="(item, index) in topBarData" :key="index" class="item">
           <div v-for="(v, i) in item.children" :key="i" class="box1" >
@@ -23,7 +22,6 @@
 </template>
 <script>
 import color from '@/store/modules/ibps/modules/color';
-
 export default {
   name: "topBar",
   props: {
@@ -80,30 +78,21 @@ export default {
             textAlign: "center",
             style: {
               fill: this.fontColor[this.getRandom(0, 11)],
-              //  formatter
             },
           };
           i.unit = i.danwei;
         });
       });
       this.topBarData = JSON.parse(JSON.stringify(this.info));
-      // console.log(this.topBarData);
     },
   },
 };
 </script>
-
 <style lang="scss" scoped>
 .content{
   height: 100%;
   width: 100%;
   min-height: 0px
-  // background-color: rgba(6, 30, 93, 0.5);
-  // .title{
-  //   // width: 100%;
-  //   margin: 20px 2%;
-    
-  // }
 }
 .bar {
   position: relative;
@@ -116,12 +105,11 @@ export default {
   background-color: rgba(6, 30, 93, 0.5);
   .item {
     width: 20%;
-    // width: calc(100% / 13);
     height: 60%;
     padding: 6px 6px;
     border-left: 5px solid rgb(6, 30, 93);
     &:first-child {
-      width: 30%;
+      width: 33%;
       display: flex;
       justify-content: space-around;
       align-items: center;
@@ -131,7 +119,7 @@ export default {
       }
     }
     &:nth-child(2) {
-      width: 15%;
+      width: 18%;
       display: flex;
       justify-content: space-around;
       align-items: center;
@@ -141,17 +129,7 @@ export default {
       }
     }
     &:nth-child(3) {
-      width: 16%;
-      display: flex;
-      justify-content: space-around;
-      align-items: center;
-      box-sizing: border-box;
-      .box1 {
-        width: 50%;
-      }
-    }
-    &:nth-child(4) {
-      width: 15%;
+      width: 19%;
       display: flex;
       justify-content: space-around;
       align-items: center;
@@ -161,7 +139,7 @@ export default {
       }
     }
     &:last-child {
-      width: 24%;
+      width: 27%;
       display: flex;
       justify-content: space-around;
       align-items: center;

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

@@ -2,7 +2,7 @@
   <div class="pieView">
     <div style="height: 14%;line-height: 30px;text-align: left;padding-left: 10px;color: white;">{{info.config.title||""}}</div>   
     <div style="width:100%;height:86%;display: inline-block; overflow: hidden;">
-      <div :id="info.config.idSelector" style="width:100%;height:95%;overflow: hidden;"> </div>
+      <div :id="info.config.idselector" style="width:100%;height:95%;overflow: hidden;"> </div>
     </div>
   </div>
 </template>
@@ -25,16 +25,10 @@ export default {
     this.$nextTick(()=>{
       this_.getMiddleLeft();
     })
-    
   },
   methods:{
     getMiddleLeft(){ 
-      let chartDom = document.getElementById(this.info.config.idSelector);
-      // const setEchartWH = {
-      //   //设置控制图表大小变量
-      //   width: 350,
-      //   height: 320,
-      // };
+      let chartDom = document.getElementById(this.info.config.idselector);
       var myChart = echarts.init(chartDom);
       var option;
       option = {
@@ -47,7 +41,6 @@ export default {
             fontWeight: '600'
         },
         },
-        
         color:this.info.color,
         tooltip: {
           trigger: 'item',
@@ -61,8 +54,6 @@ export default {
         legend: {
           show: true,
           z: 3,
-          
-          // orient: 'vertical', 标题横竖//
           left: 'right',
           textStyle:{
             color: '#fff'
@@ -70,7 +61,7 @@ export default {
         },
         series: [{
           type: 'pie',
-          radius: '50%',
+          radius: '70%',
           center: ['50%', '50%'],
           data:this.info.data,
           emphasis: {
@@ -82,19 +73,16 @@ export default {
           },
           labelLine: {
               distanceToLabelLine: 0,
-             
             },
         }]
       };
       myChart.setOption(option);
     },
-
   }
 };
 </script>
 <style lang="scss" scoped>
 .pieView{
-  // display: flex;
   width: 100%;
   height: 100%;
   overflow: hidden;

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

@@ -2,7 +2,7 @@
   <div class="pieView">
     <div style="height: 10%;line-height: 30px;text-align: left;padding-left: 10px;width: 100%;">{{info.config.title}}</div>   
     <div style="width:100%;height:90%;display: inline-block;">
-      <div :id="info.config.idSelector" style="width:100%;height:100%;"> </div>
+      <div :id="info.config.idselector" style="width:100%;height:100%;"> </div>
     </div>
   </div>
 </template>
@@ -30,13 +30,10 @@ export default {
   },
   methods: {
     getMiddleLeft() {
-      var chartDom = document.getElementById(this.info.config.idSelector);
+      debugger 
+      console.log(this.info,"this.info1231")
+      var chartDom = document.getElementById(this.info.config.idselector);
       var myChart = echarts.init(chartDom);
-      // const setEchartWH = {
-      //   //设置控制图表大小变量
-      //   width: 250,
-      //   height: 300,
-      // };
       let ay =this.info.data;
       let yc;
       ay[0] > ay[1]?yc=ay[0]:yc=ay[1];
@@ -86,7 +83,6 @@ export default {
                 } else {
                     return value;
                 } 
-            
             },
             },
             axisLine: {
@@ -100,7 +96,6 @@ export default {
         yAxis: [
           {
             type: "value",
-          
           axisLine: {
             lineStyle: {
               color: "#fff"

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

@@ -8,7 +8,7 @@
         <dv-decoration-8 class="right" :reverse="true" />
         <div class="title">{{ titleName }}</div>
         <div class="time">
-          <span>月份：</span>
+          <span>月份:</span>
           <el-date-picker v-model="month" type="month" value-format="yyyy-MM" format="yyyy-MM" placeholder="日期选择" style="width: 120px" :readonly="false" :editable="true" :clearable="false" @change="updateAll" />
         </div>
         <div class="back" @click.prevent="goBack()">
@@ -24,15 +24,12 @@
         <div class="middleCard">
           <div style="width:100%;height: 100%;box-sizing: border-box;overflow: hidden;">
             <div class="middleCardLeft">
-              <middleCard v-if="MiddleLeftPieViewList.data.length" :info="MiddleLeftPieViewList" ref="middleCardLeft" />
+              <zhuzhuangtu v-if="sheBeiData.data.length" :info="sheBeiData" ref="sheBeiDataDataref" />
             </div>
             <dv-decoration-2 :reverse="true" style="width:2%;height: 100%;" />
             <div class="middleCardRight1">
               <CarouselTabl v-if="shiyonglvConfig.data.length" :info="shiyonglvConfig" title="仪器设备列表" isup=isup />
             </div>
-            <!-- <div class="middleCardCenter">
-            <middleCard v-if="eBgRateData.data.length" :info="eBgRateData" ref="middleCardCenter"/>
-          </div> -->
             <dv-decoration-2 :reverse="true" style="width:2%;height:100%;" />
             <div class="middleCardRight">
               <CarouselTabl v-if="config.data.length" :info="config" title="设备报废列表" />
@@ -41,40 +38,21 @@
         </div>
         <dv-decoration-10 style="height:2%;display:flex;" />
         <div class="bottomCard">
-          <div style="width:24%">
-            <zhuzhuangtu v-if="sheBeiData.data.length" :info="sheBeiData" ref="sheBeiDataDataref" />
+          <div style="width:33%">
+            <middleCard v-if="MiddleLeftPieViewList.data.length" :info="MiddleLeftPieViewList" ref="middleCardLeft" />
           </div>
           <dv-decoration-2 :reverse="true" style="width:1%;height:100%;overflow: hidden;box-sizing: border-box;" />
-          <div style="width:25%;height: 100%;overflow: hidden;box-sizing: border-box;display:flex;">
+          <div style="width:32%;height: 100%;overflow: hidden;box-sizing: border-box;display:flex;">
             <div class="bottomCardLeft0">
               <middleCard v-if="weiHuSheBeiData.data.length" :info="weiHuSheBeiData" ref="sheBeiWeiHuRef" />
             </div>
-            <!-- <dv-decoration-2 :reverse="true" style="width:3%;height:100%;;margin: 0 10px;" /> -->
-            <!-- <div style="width:37%">
-              <zhuzhuangtu v-if="sheBeiweiHuData.data.length" :info="sheBeiweiHuData"  ref="sheBeiWeiHuDataref"/>
-            </div> -->
           </div>
           <dv-decoration-2 :reverse="true" style="width:1%;height:100%;overflow: hidden;box-sizing: border-box;" />
-          <div style="width:25%;display:flex;">
-            <!-- <div style="width:40%">
-              <zhuzhuangtu v-if="zhuantaiEData.data.length" :info="zhuantaiEData" ref="zhuantaiEDataref" />
-            </div> -->
-            <!-- <dv-decoration-2 :reverse="true" style="width:3%;height:100%;" /> -->
+          <div style="width:33%;display:flex;">
             <div class="bottomCardright">
               <middleCard v-if="jianDingjiaoZhunSheBeiData.data.length" :info="jianDingjiaoZhunSheBeiData" ref="jiandingRef" />
             </div>
           </div>
-          <dv-decoration-2 :reverse="true" style="width:1%;height:100%;overflow: hidden;box-sizing: border-box;" />
-          <div style="width:24%;overflow: hidden;box-sizing: border-box;display:flex;">
-            <div class="bottomCardLeft">
-              <middleCard v-if="sheBeiHeChaData.data.length" :info="sheBeiHeChaData" ref="sheBeiHeChaRef"/>
-            </div>
-            <!-- <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin: 0 10px;" /> -->
-            <!-- <div style="width:100%">
-              <zhuzhuangtu v-if="bottomData.data.length" :info="bottomData" ref="bottomCardLeft" />
-            </div> -->
-          </div>
-
         </div>
       </dv-border-box-1>
     </dv-full-screen-container>
@@ -83,10 +61,6 @@
 <script>
 import screenfull from "screenfull";
 import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
-import { color } from "echarts/lib/export";
-// import { config } from 'public/lib/UEditor/third-party/zeroclipboard/ZeroClipboard';
-// import { acceptList } from "./data.js";
-// import { number } from 'echarts/lib/export';
 export default {
   name: "checkBoard",
   components: {
@@ -109,17 +83,10 @@ export default {
       sheBeiHeChaData: {},
       jianDingjiaoZhunSheBeiData: {},
       weiHuSheBeiData: {},
-      shiyonglvConfig: {
-        header: ["编号","名称","存放位置","状态","保管人",],//仪器设备
-        // header: ["名称","编号","使用时间","存放位置", "状态", "频率"], //设备使用列表
-        data: [],
-        // columnWidth: ["180","130","120","150","110","120"],//设备使用列表
-        columnWidth: ["180","180","150","110","110"],
-        rowNum: 7,
-      },
+      shiyonglvConfig: {header: ["编号","名称","存放位置","状态","保管人",],data: [],columnWidth: ["180","180","150","110","110"],rowNum: 7,},
       bottomData: {},
       zhuantaiEData: {},
-      sheBeiData: { xData: [], data: [], config: { idSelector: "" } },
+      sheBeiData: { xData: [], data: [], config: { idselector: "" } },
       sheBeiDataShow:false,
       sheBeiweiHuData: {},
       config: {},
@@ -137,110 +104,67 @@ export default {
       screenfull.toggle();
     }
   },
+  watch:{
+    month(newValue,oldValue){
+      this.updateAll();
+    }
+  },
   methods: {
-    allView() {
-      // 默认显示全屏
+    allView() {// 默认显示全屏
       screenfull.request();
     },
     goBack() {
       this.$router.back(-1);
     },
     updateAll(e) {
-      // this.getSheBeiMony();
       this.getCarouselShiYonglvTable();
       this.getTopBarData();
-      this.getMiddleLeftPieView();
       this.getCarouselTable();
-      // this.getbottomData();
     },
     async getTopBarData() {
       let this_ = this;
-
-      this.MiddleLeftPieViewList = {
-        data: [],
-        config: { idSelector: "main" },
-        rowNum: 7,
-        color: [],
-      };
+      this.MiddleLeftPieViewList = {data: [],config: { idselector: "main" },rowNum: 7,color: [],
+};
       this_.sheBeiDataShow = false;
       this.eBgRateData = { data: [], config: {} };
       this.sheBeiHeChaData = { data: [], config: {} };
       this.jianDingjiaoZhunSheBeiData = { data: [], config: {} };
-      this.sheBeiData={ xData: [], data: [], config: { idSelector: "" } };
+      this.sheBeiData={ xData: [], data: [], config: { idselector: "" } };
       this.weiHuSheBeiData = { data: [], config: {} };
-      this.bottomData = { xData: [], data: [], config: { idSelector: "" } };
-      this.zhuantaiEData = { xData: [], data: [], config: { idSelector: "" } };
-      this.sheBeiweiHuData = {
-        xData: [],
-        data: [],
-        config: { idSelector: "" },
-      };
-      let sql = `select a.Equipments,a1.mony,b.addEquipments,c.testEquipments,c1.testNoEquipments,d.checkEquipments,
-      d1.checkNoEquipments,e.goodEquipments,f.scrapEquipments,g.limitedEquipments,h.weiHuNoEquipments,h1.weiHuEquipments
-      from
-      (select count(*) as Equipments from t_sbdj) as a,
-      (select zi_chan_yuan_zhi_ 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_sbjdxzqr where shi_fou_guo_shen_ ='1') as c,
-      (select count(*) as testNoEquipments from t_sbjdxzqr) as c1,
-      (select count(*) as checkEquipments from t_sbhcjlb where create_time_ LIKE '${this_.month}' and shi_fou_guo_shen_ ='1') as d,
-      (select count(*) as checkNoEquipments from t_sbhcjlb where create_time_ LIKE '${this_.month}') as d1,
-      (select count(*) as goodEquipments  from t_sbdj where she_bei_zhuang_ta ='正常') as e,
-      (select count(*) as scrapEquipments  from t_sbdj where she_bei_zhuang_ta ='停用' or she_bei_zhuang_ta ='报废' or she_bei_zhuang_ta ='报废/停用') as f,
-      (select count(*) as limitedEquipments  from t_sbdj where she_bei_zhuang_ta ='限制使用' or she_bei_zhuang_ta ='备用') as g,
-      (select count(*) as weiHuNoEquipments  from t_mjsbwhjhzb where create_time_ LIKE '${this_.month}') as h,
-      (select count(*) as weiHuEquipments  from t_mjsbwhbyjlby where create_time_ LIKE '${this_.month}' and shi_fou_guo_shen_ ='1') as h1`;
+      this.bottomData = { xData: [], data: [], config: { idselector: "" } };
+      this.zhuantaiEData = { xData: [], data: [], config: { idselector: "" } };
+      this.sheBeiweiHuData = {xData: [],data: [],config: { idselector: "" },};
+      let sql =
+      `select a.Equipments,a1.mony,b.addEquipments,c.testEquipments,c1.testNoEquipments,e.goodEquipments,f.scrapEquipments,g.limitedEquipments,h.weiHuNoEquipments,h1.weiHuEquipments  FROM  
+      (select COUNT(*) AS Equipments FROM t_sbdj) AS a, 
+      (select zi_chan_yuan_zhi_ AS mony FROM t_sbdj) AS a1, 
+      (select COUNT(*) AS addEquipments  FROM t_yqsbysb WHERE bian_zhi_shi_jian LIKE '%${this_.month}%' AND shi_fou_guo_shen_ ='已完成') AS b,
+      (select COUNT(*) AS testNoEquipments FROM t_mjsbjdxzjhzb WHERE parent_id_ IN (select id_ FROM t_mjsbjdxzjh WHERE shi_fou_guo_shen_ ='已完成')) AS c1,    
+      (select COUNT(*) AS testEquipments FROM t_jyxtxzjgyzhqrjlb WHERE shi_fou_guo_shen_ ='已完成') AS c,  
+      (select COUNT(*) AS goodEquipments  FROM t_sbdj WHERE she_bei_zhuang_ta ='使用') AS e,    
+      (select COUNT(*) AS scrapEquipments  FROM t_sbdj WHERE she_bei_zhuang_ta ='停用' OR she_bei_zhuang_ta ='暂停使用') AS f,      
+      (select COUNT(*) AS limitedEquipments  FROM t_sbdj WHERE she_bei_zhuang_ta ='报废') AS g,    
+      (select  COUNT(*) AS weiHuNoEquipments FROM t_mjsbwhjhzb WHERE parent_id_ IN (select id_ FROM t_mjsbwhjhb WHERE shi_fou_guo_shen_ ='已完成')) AS h,  
+      (select COUNT(*) AS weiHuEquipments  FROM t_mjsbwhbyjlby WHERE bian_zhi_shi_jian LIKE '%${this_.month}%' AND shi_fou_guo_shen_ ='已完成') AS h1`
       await curdPost("sql", sql)
         .then((res) => {
           const data = res.variables.data;
           let zichan = this_.getAllMonyInt(data);
           zichan = zichan +''
           zichan =zichan.substring(0,zichan.length-4)
-          let eIntactnessRate = Number(
-            (
-              (data[0].goodEquipments / data[0].Equipments).toFixed(2) * 100 +
-              ""
-            ).slice(0, 5)
-          );
-          let eBadRate = Number(
-            ((100 - eIntactnessRate).toFixed(4) + "").slice(0, 4)
-          );
+          let eIntactnessRate = Number(((data[0].goodEquipments / data[0].Equipments).toFixed(2) * 100 +"").slice(0, 5));
+          let eBadRate = Number(((100 - eIntactnessRate).toFixed(4) + "").slice(0, 4));
           let obj = {};
-          obj.value = Number(
-            (
-              (data[0].goodEquipments / data[0].Equipments).toFixed(4) * 100 +
-              ""
-            ).slice(0, 5)
-          );
+          obj.value = Number(((data[0].goodEquipments / data[0].Equipments).toFixed(4) * 100 +"").slice(0, 5));
           obj.name = "正常设备数";
           this_.MiddleLeftPieViewList.data.push(obj);
           obj = {};
-          obj.value = Number(
-            (
-              (data[0].limitedEquipments / data[0].Equipments).toFixed(4) *
-                100 +
-              ""
-            ).slice(0, 5)
-          );
-          obj.name = "受限设备数";
-          this_.MiddleLeftPieViewList.data.push(obj);
-          obj = {};
-          obj.value = Number(
-            (
-              (data[0].scrapEquipments / data[0].Equipments).toFixed(4) * 100 +
-              ""
-            ).slice(0, 5)
-          );
+          obj.value = Number(((data[0].scrapEquipments / data[0].Equipments).toFixed(4) * 100 +"").slice(0, 5));
           obj.name = "停用/报废";
           this_.MiddleLeftPieViewList.data.push(obj);
           this_.MiddleLeftPieViewList.color = ["#339933", "#FFFF66", "#FF0033"];
           this_.MiddleLeftPieViewList.config.title = "设备工作状态情况";
-          this_.MiddleLeftPieViewList.config.idSelector = "main2";
-          this_.$nextTick(() => {
-            // setTimeout(() => {
-            // this_.$refs.middleCardLeft.getMiddleLeft(); // hhhh xxxx
-            // }, 1000)
-          });
+          this_.MiddleLeftPieViewList.config.idselector = "main2";
           obj = {};
           let result = [
             {
@@ -261,12 +185,6 @@ export default {
                   value: data[0].goodEquipments,
                   danwei: "",
                 },
-
-                {
-                  label: "受限数",
-                  value: data[0].limitedEquipments,
-                  danwei: "",
-                },
                 {
                   label: "报废/停用数",
                   value: data[0].scrapEquipments,
@@ -304,21 +222,6 @@ export default {
                 },
               ],
             },
-            {
-              title: "",
-              children: [
-                {
-                  label: "本月计划核查数",
-                  value: data[0].checkNoEquipments,
-                  danwei: "",
-                },
-                {
-                  label: "本月已核查数",
-                  value: data[0].checkEquipments,
-                  danwei: "",
-                },
-              ],
-            },
             {
               title: "",
               children: [
@@ -332,64 +235,36 @@ export default {
                   value: eBadRate,
                   danwei: "%",
                 },
-                {
-                  label: "总值(万元)",
-                  value: zichan,
-                  danwei: "",
-                },
+                // {
+                //   label: "总值(万元)",
+                //   value: zichan,
+                //   danwei: "",
+                // },
               ],
             },
           ];
           //设备数量统计
-          this_.sheBeiData.xData = [
-            "设备总数",
-            "新增数",
-            "良好数",
-            "受限数",
-            "报废停用数",
-          ];
-
+          this_.sheBeiData.xData = ["设备总数","新增数","良好数","报废停用数",];
           this_.sheBeiData.data.push(data[0].Equipments);
           this_.sheBeiData.data.push(data[0].addEquipments);
           this_.sheBeiData.data.push(data[0].goodEquipments);
-          this_.sheBeiData.data.push(data[0].limitedEquipments);
+          // this_.sheBeiData.data.push(data[0].limitedEquipments);
           this_.sheBeiData.data.push(data[0].scrapEquipments);
           this_.sheBeiData.config.title = "设备数量情况一览";
-          this_.sheBeiData.config.idSelector = "main8";
+          this_.sheBeiData.config.idselector = "main8";
+          console.log(this_.sheBeiData,"1231231")
           this_.sheBeiDataShow = true;
-          //
-          this_.bottomData.xData = ["本月计划核查数", "本月已核查数"];
-          this_.bottomData.data.push(data[0].checkNoEquipments);
-          this_.bottomData.data.push(data[0].checkEquipments);
-          this_.bottomData.config.title = "核查设备完成图";
-          this_.bottomData.config.idSelector = "main4";
-          // this_.$nextTick(()=>{
-          //   setTimeout(() => {
-
-          // 	}, 1000)
-          // })
-          this_.zhuantaiEData.xData = [
-            "计划检定/校准数",
-            "已完成检定/校准数",
-          ];
+          this_.zhuantaiEData.xData = ["计划检定/校准数","已完成检定/校准数",];
           this_.zhuantaiEData.data.push(data[0].testNoEquipments);
           this_.zhuantaiEData.data.push(data[0].testEquipments);
           this_.zhuantaiEData.config.title = "检定/校准设备完成图";
-          this_.zhuantaiEData.config.idSelector = "main3";
+          this_.zhuantaiEData.config.idselector = "main3";
           //维护设备数柱状图
           this_.sheBeiweiHuData.xData = ["计划维护数", "已完成数"];
           this_.sheBeiweiHuData.data.push(data[0].weiHuNoEquipments);
           this_.sheBeiweiHuData.data.push(data[0].weiHuEquipments);
           this_.sheBeiweiHuData.config.title = "设备维护柱状图";
-          this_.sheBeiweiHuData.config.idSelector = "mainWeiHuZ";
-          this_.$nextTick(() => {
-            // setTimeout(() => {
-            // this_.$refs.zhuantaiEDataref.getMiddleLeft(); // hhhh xxxx
-            // this_.$refs.bottomCardLeft.getMiddleLeft(); // hhhh xxxx
-            // this_.$refs.sheBeiWeiHuDataref.getMiddleLeft();
-            // }, 1000)
-          });
-
+          this_.sheBeiweiHuData.config.idselector = "mainWeiHuZ";
           let objRate = {};
           objRate.name = "完好率";
           objRate.value =eIntactnessRate;
@@ -400,7 +275,7 @@ export default {
           this_.eBgRateData.data.push(objRate);
           this_.eBgRateData.color = ["#339933", "#FF0033"];
           this_.eBgRateData.config.title = "设备工作状态完成率";
-          this_.eBgRateData.config.idSelector = "main1";
+          this_.eBgRateData.config.idselector = "main1";
           //设备数维护
           let objweihu = {};
           objweihu.name = "计划维护数";
@@ -412,19 +287,7 @@ export default {
           this_.weiHuSheBeiData.data.push(objweihu);
           this_.weiHuSheBeiData.color = ["#5470c6", "#38a838"];
           this_.weiHuSheBeiData.config.title = "设备维护完成率";
-          this_.weiHuSheBeiData.config.idSelector = "mainWeiHu";
-          //设备数核查
-          let objHeCha = {};
-          objHeCha.name = "本月计划核查数";
-          objHeCha.value = data[0].checkNoEquipments;
-          this_.sheBeiHeChaData.data.push(objHeCha);
-          objHeCha = {};
-          objHeCha.value = data[0].checkEquipments;
-          objHeCha.name = "本月已核查数";
-          this_.sheBeiHeChaData.data.push(objHeCha);
-          this_.sheBeiHeChaData.color = ["#5470c6", "#38a838"];
-          this_.sheBeiHeChaData.config.title = "设备核查完成率";
-          this_.sheBeiHeChaData.config.idSelector = "mainHeCha";
+          this_.weiHuSheBeiData.config.idselector = "mainWeiHu";
           //设备数检定校准
           let objJianding = {};
           objJianding.name = "计划检定/校准数";
@@ -436,14 +299,7 @@ export default {
           this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
           this_.jianDingjiaoZhunSheBeiData.color = ["#5470c6", "#38a838"];
           this_.jianDingjiaoZhunSheBeiData.config.title = "设备检定/校准完成率";
-          this_.jianDingjiaoZhunSheBeiData.config.idSelector = "mainJianDing";
-          this_.$nextTick(() => {
-            // setTimeout(() => {
-            // this_.$refs.middleCardCenter.getMiddleLeft();// hhhh xxxx
-            // this_.$refs.sheBeiHeChaRef.getMiddleLeft();//
-            // this_.$refs.jiandingRef.getMiddleLeft();
-            // }, 1000)
-          });
+          this_.jianDingjiaoZhunSheBeiData.config.idselector = "mainJianDing";
           objRate = {};
           this_.topBarData = result;
         })
@@ -451,10 +307,6 @@ export default {
           console.log(err);
         });
     },
-    getMiddleLeftPieView() {
-      // [ { value: 1048, name: 'Search Engine' },]
-      console.log();
-    },
     async getCarouselShiYonglvTable() { //设备建档信息
       let this_ = this;
       const sql = `select a.she_bei_shi_bie_h,a.she_bei_ming_cheng_,a.cun_fang_di_dian_,a.she_bei_zhuang_ta,b.name_ FROM t_sbdj AS a JOIN ibps_party_employee AS b ON a.guan_li_ren_ = b.ID_`;
@@ -479,46 +331,11 @@ export default {
         });
       this.isup = true;
     },
-    // async getCarouselShiYonglvTable() {设备使用列表
-    //   let this_ = this;
-    //   const sql = `select a.she_bei_ming_chen ,a.create_time_,a.shi_yong_qian_qin,b.name_,c.cun_fang_di_dian_,c.she_bei_shi_bie_h,d.name_ as bumen,COUNT(*) AS pinlv FROM  t_yqsbsydjb as a join ibps_party_employee as b on a.shi_yong_ren_ = b.ID_ join t_sbdj as c on a.yi_qi_bian_hao_ = c.she_bei_shi_bie_h join ibps_party_org as d on d.id_ = a.bian_zhi_bu_men_ GROUP BY create_time_  HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
-    //   let data1 = [];
-    //   let res1 = [];
-    //   this_.shiyonglvConfig.data = [];
-    //   await curdPost("sql", sql)
-    //     .then((res) => {
-    //       const result = res.variables.data;
-    //       result.forEach((item) => {
-    //         data1 = [];
-    //         data1.push(item.she_bei_ming_chen);
-    //         data1.push(item.she_bei_shi_bie_h);
-    //         // data1.push(item.bumen);
-    //         // data1.push(item.name_);
-    //         data1.push(this_.timestampToTime(item.create_time_ / 1000));
-    //         data1.push(item.cun_fang_di_dian_);
-    //         // data1.push(item.create_time_);
-    //         data1.push(item.shi_yong_qian_qin);
-    //         data1.push(item.pinlv);
-    //         this_.shiyonglvConfig.data.push(data1);
-    //         // this_.$forceUpdate()
-    //       });
-
-    //       // console.log(this_.shiyonglvConfig.data);
-    //     })
-    //     .catch((err) => {
-    //       console.log(err);
-    //     });
-    //   this.isup = true;
-    // },
     timestampToTime(timestamp) {
       var date = new Date(timestamp * 1000);
       var Y = date.getFullYear() + "-";
-      var M =
-        (date.getMonth() + 1 < 10
-          ? "0" + (date.getMonth() + 1)
-          : date.getMonth() + 1) + "-";
-      var D =
-        (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
+      var M =(date.getMonth() + 1 < 10? "0" + (date.getMonth() + 1): date.getMonth() + 1) + "-";
+      var D =(date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
       var h = date.getHours() + ":";
       var m = date.getMinutes() + ":";
       var s = date.getSeconds();
@@ -532,8 +349,7 @@ export default {
         data: [],
       };
       let this_ = this;
-      const sql =
-        "select * from t_sbdj where she_bei_zhuang_ta ='停用' or she_bei_zhuang_ta ='报废' or she_bei_zhuang_ta ='报废/停用'";
+      const sql ="select * from t_sbdj where she_bei_zhuang_ta ='停用' or she_bei_zhuang_ta ='报废' or she_bei_zhuang_ta ='报废/停用'";
       let data1 = [];
       await curdPost("sql", sql)
         .then((res) => {
@@ -560,21 +376,8 @@ export default {
           mony += filterMony;
         }
       });
-      // console.log(mony.toFixed(2))
-      // return mony.toFixed(2);
       return mony;
     },
-    // async getSheBeiMony (){
-    //   let this_=  this;
-    //   const sql = "select zi_chan_yuan_zhi_ as mony FROM t_sbdj";
-    //   await curdPost("sql",sql).then(res=>{
-    //     let data = res.variables.data;
-    //     this_.zichan=  this_.getAllMonyInt(data);
-    //     console.log(this_.zichan);
-    //   }).catch(err=>{
-    //     console.error(err)
-    //   })
-    // }
   },
 };
 </script>
@@ -598,7 +401,6 @@ export default {
     display: flex;
     flex-direction: column;
   }
-
   .block-left-right-content {
     flex: 1;
     display: flex;
@@ -618,7 +420,6 @@ export default {
     box-sizing: border-box;
     padding-bottom: 0.8%;
   }
-
   .header {
     position: relative;
     width: 100%;
@@ -646,8 +447,7 @@ export default {
       top: 15px;
       transform: translateX(-50%);
     }
-    .time,
-    .back {
+    .time,.back {
       width: 8%;
       cursor: pointer;
       height: 2.825rem;
@@ -688,7 +488,6 @@ export default {
   .bottomCard {
     width: 96%;
     margin-left: 30px;
-    // margin-top: 30px;
     div {
       display: inline-block;
     }
@@ -698,12 +497,6 @@ export default {
       box-sizing: border-box;
       overflow: hidden;
     }
-    // .middleCardCenter{
-    //   width: 25%;
-    //   height: 100%;
-    //   box-sizing: border-box;
-    //   overflow: hidden;
-    // }
     .middleCardRight {
       width: 25%;
       height: 100%;

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

@@ -39,10 +39,10 @@
                     <div>{{ item1.time }}</div>
                   </div>
 
-                  <div class="lh">
+                  <!-- <div class="lh">
                     <div>资产原值：</div>
                     <div>{{ item1.money }}</div>
-                  </div>
+                  </div> -->
                   <div class="lh">
                     <div>使用科室：</div>
                     <div>细胞质量检测实验室</div>

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

@@ -60,12 +60,12 @@
                   width="300"
                 >
                 </el-table-column>
-                <el-table-column
+                <!-- <el-table-column
                   prop="ping_shen_yi_ju_"
                   label="评审依据"
                   width="200"
                 >
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column
                   prop="tiao_kuan_bian_ha"
                   label="条款编号"
@@ -292,24 +292,24 @@ export default {
       }
     },
     partFilter: function (value, arr) {
-      // console.log(value, arr,"12")
-      // return value
+      return value
+      // debugger
       if(value.includes(",")){
         let part = "";
         let parts = []
         parts = value.split(',');
         for(let item of arr){
           for(let j = 0; j < parts.length; j++) {
-            if(item.bu_men_id_ == parts[j]){
-              part = part +","+ item.mian_bu_men;
+            if(item.ID_ == parts[j]){
+              part = part +","+ item.NAME_;
             }
           }
         }
         return part.slice(1,part.length)
       }else{  
-      for (let i = 0; i < arr.length; i++) {
-        if (arr[i].bu_men_id_ == value) {
-          return arr[i].mian_bu_men;
+        for (let i = 0; i < arr.length; i++) {
+        if (arr[i].ID_ == value) {
+          return arr[i].NAME_;
         }
       }
       }
@@ -417,10 +417,9 @@ export default {
       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,
       };
-
       var myChart = echarts.init(chartDom, null, setEchartWH);
       var option;
 
@@ -462,7 +461,7 @@ export default {
               // Map the "product" column to Y axis
               y: "product",
             },
-            barWidth: 30,
+            barWidth: 15,
           },
         ],
       };
@@ -530,8 +529,8 @@ export default {
       var chartDom = document.getElementById("department");
       const setEchartWH = {
         //设置控制图表大小变量
-        width: 400,
-        height: 300,
+        width: 500,
+        height: 400,
       };
       var myChart = echarts.init(chartDom, null, setEchartWH);
       var option;
@@ -539,6 +538,10 @@ export default {
         tooltip: {
           trigger: "item",
         },
+        label: {
+          formatter: '{b}\n({c}项)',
+          edgeDistance: "20%"
+        },
         legend: {
           orient: "vertical",
           left: "left",
@@ -607,12 +610,11 @@ export default {
       });
     },
     async getPart() {
-      
-      let this_ = this;
-      let sql = "select * FROM ibps_main_position";
-      await curdPost("sql", sql).then((res) => {
-        this_.partList = res.variables.data;
-      });
+        let this_ = this;
+        let sql = "select * FROM ibps_party_position";
+        await curdPost("sql", sql).then((res) => {
+          this_.partList = res.variables.data;
+        });
     },
     jieduan(value) {
       if (value.includes("1")) {
@@ -680,17 +682,17 @@ export default {
       let newarr = [];
       let obj = {};
       let str =""
-      let sql = "select * FROM  ibps_main_position";
+      let sql = "select * FROM  ibps_party_position";
       await curdPost("sql", sql).then((res) => {
         let arr1 = res.variables.data;
         arr.forEach((item, index) => {
           str =""
           arr1.forEach((it) => {
-            if (item.ze_ren_shi_ == it.bu_men_id_ && !item.ze_ren_shi_.includes(",")) {
-              arr[index].ze_ren_shi_ = it.mian_bu_men;
+            if (item.ze_ren_shi_ == it.ID_ && !item.ze_ren_shi_.includes(",")) {
+              arr[index].ze_ren_shi_ = it.NAME_;
             }
-            if(item.ze_ren_shi_.includes(",")&& item.ze_ren_shi_.includes(it.bu_men_id_)){
-              str += "," + it.mian_bu_men
+            if(item.ze_ren_shi_.includes(",") && item.ze_ren_shi_.includes(it.ID_)){
+              str += "," + it.NAME_
             }
           });
           if(str){
@@ -723,7 +725,6 @@ 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";
@@ -945,14 +946,14 @@ export default {
       width: 100%;
       height: 100%;
     }
-    .department {
-      width: 400px;
-      height: 300px;
-    }
-    #department {
-      width: 400px;
-      height: 300px;
-    }
+    // .department {
+    //   width: 400px;
+    //   height: 300px;
+    // }
+    // #department {
+    //   width: 400px;
+    //   height: 300px;
+    // }
   }
 }
 </style>