fix:人员管理看板，设备管理看板，内审归档调整

src/components/ibps-crud/index.vue

@@ -6,7 +6,7 @@
         <!-- 工具栏 -->
         <!-- 标题栏-->
         <div v-if="displayField && displayField!='N'&& displayField!='true'&& displayField!='Y'" class="jbd-title-cont">
-           {{displayField}}
+           {{displayField !="8.8.内部审核"?displayField:"内审"}}
         </div>
         <div
           v-if="toolbars || $slots.header"

src/views/peopleManages/taskStatistics/index.vue

@@ -777,7 +777,7 @@ export default {
       let data = [];
       let personInfo = [];
       // let ranksObj = {};
-      let sql = `select a.id_,a.parent_id_,b.name_,a.zui_gao_xue_li_x_,a.zhi_cheng_deng_ji,b.jian_ding_zi_ge_z,a.ru_zhi_shi_jian_ from  t_ryjbqk as a join  ibps_party_employee as b on a.parent_id_= b.id_ where a.id_ !='861622496187645952' AND b.status_ = 'actived'`;
+      let sql = `select a.id_,a.parent_id_,b.name_,a.zui_gao_xue_li_x_,a.zhi_cheng_deng_ji,b.jian_ding_zi_ge_z,a.ru_zhi_shi_jian_ from  t_ryjbqk as a join  ibps_party_employee as b on a.parent_id_= b.id_ where a.id_ !='861622496187645952' AND b.status_ = 'actived' and  b.group_id_ != ""`;
       await curdPost("sql", sql).then((res) => {
         data = res.variables.data;
       });
@@ -804,7 +804,7 @@ export default {
                 sum(a.zhi_cheng_deng_ji = '中级') as middleRank,
                 sum(a.zhi_cheng_deng_ji = '高级') as senior,
                 sum(a.zhi_cheng_deng_ji = ''||a.zhi_cheng_deng_ji is null) as other
-                from t_ryjbqk as a join  ibps_party_employee as b on a.parent_id_= b.id_ where b.id_ != '702117247933480960' AND b.status_ = 'actived'`;
+                from t_ryjbqk as a join  ibps_party_employee as b on a.parent_id_= b.id_ where b.id_ != '702117247933480960' AND b.status_ = 'actived' and b.group_id_ != ""`;
       await curdPost("sql", sql).then((res) => {
         data = res.variables.data;
       });

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -306,6 +306,9 @@
                             item.tDept = temp[1]
                             item.tUser = temp[2]
                         }
+                        if((item.formKey =="nsssjhbfj" || item.formKey =="nsssjhx") &&item.updateTime == item.endTime){
+                            item.endTime = "";
+                        }
                     })
                     ActionUtils.handleListData(this, response.data)
                     this.loading = false

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

@@ -37,11 +37,7 @@ export default {
   methods:{
     getMiddleLeft(){ 
       let chartDom = document.getElementById(this.info.config.idSelector);
-      // const setEchartWH = {
-      //   //设置控制图表大小变量
-      //   width: 350,
-      //   height: 320,
-      // };
+      const radius = window.innerWidth > 1600 ? '55%' : '45%';
       var myChart = echarts.init(chartDom);
       var option;
       option = {
@@ -76,7 +72,7 @@ export default {
         },
         series: [{
           type: 'pie',
-          radius: '60%',
+          radius,
           center: ['50%', '50%'],
           data:this.info.data,
           emphasis: {

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

@@ -30,9 +30,6 @@
             <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="设备报废列表" />
@@ -49,17 +46,9 @@
             <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 class="bottomCardright">
               <middleCard v-if="jianDingjiaoZhunSheBeiData.data.length" :info="jianDingjiaoZhunSheBeiData" ref="jiandingRef" />
             </div>
@@ -69,12 +58,7 @@
             <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>
@@ -84,9 +68,6 @@
 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: {
@@ -180,16 +161,16 @@ export default {
       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 addEquipments  from t_sbdj where gou_jin_ri_qi_ LIKE '%${this_.month}%') as b,
+      (select count(*) as testEquipments FROM t_sbjdxzzx WHERE parent_id_ IN (select  id_ FROM t_sbjdxzqr WHERE  shi_fou_guo_shen_ ='1' AND bian_zhi_shi_jian LIKE '%${this_.month}%')) as c,
+      (select count(*) as testNoEquipments FROM t_mjsbjdxzjhzb WHERE parent_id_ IN (select  id_ FROM t_mjsbjdxzjh WHERE  shi_fou_guo_shen_ ='1' AND bian_zhi_shi_jian	LIKE '%${this_.month}%')) as c1,
+      (select count(*) as checkEquipments from t_sbqjhcjlb WHERE shi_fou_guo_shen_ ='1' AND bian_zhi_shi_jian LIKE '%${this_.month}%') as d,
+      (select count(*) as checkNoEquipments from t_yqsbhcjh WHERE parent_id_ IN (select  id_ FROM t_sbhcjh WHERE  shi_fou_guo_shen_ ='1' AND bian_zhi_shi_jian 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`;
+      (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`;
       await curdPost("sql", sql)
         .then((res) => {
           const data = res.variables.data;
@@ -308,12 +289,12 @@ export default {
               title: "",
               children: [
                 {
-                  label: "本月计划核查数",
+                  label: "计划核查数",
                   value: data[0].checkNoEquipments,
                   danwei: "",
                 },
                 {
-                  label: "本月已核查数",
+                  label: "已核查数",
                   value: data[0].checkEquipments,
                   danwei: "",
                 },
@@ -437,13 +418,6 @@ export default {
           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)
-          });
           objRate = {};
           this_.topBarData = result;
         })
@@ -453,7 +427,6 @@ export default {
     },
     getMiddleLeftPieView() {
       // [ { value: 1048, name: 'Search Engine' },]
-      console.log();
     },
     async getCarouselShiYonglvTable() { //设备建档信息
       let this_ = this;