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

src/views/crm/tongji.vue

@@ -21,8 +21,8 @@
                 placeholder="选择月">
               </el-date-picker>
             </div>
-            <div 
-              @click.prevent="goBack()" 
+            <div
+              @click.prevent="goBack()"
               style="width: 12%;
               height:2.825rem;
               line-height: 2.825rem;
@@ -57,7 +57,7 @@
               <div class="nullDate" v-else>暂无数据</div>
             </div>
           </dv-border-box-7> -->
-          
+
         </div>
         <!-- <div class="customerD" v-if="authority"> -->
           <!-- <dv-border-box-7 style="width:49.5%;" backgroundColor="rgba(6, 30, 93, 0.5)">
@@ -77,7 +77,7 @@
               <div class="nullDate" v-else>暂无数据</div>
             </div>
           </dv-border-box-7> -->
-<!--           
+<!--
           <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
             <div class="ttitle">
               <div v-if="teArr.length>0" class="middleFont">年度团队绩效</div>
@@ -108,7 +108,7 @@
               <div class="nullDate" v-else>暂无数据</div>
             </div>
           </dv-border-box-7> -->
-          
+
         </div>
       </div>
     <!-- </el-scrollbar> -->
@@ -215,7 +215,7 @@
           date: nowDate.getDate(),
         };
         const newmonth = date.month > 10 ? date.month : "0" + date.month;
-        this.allDate = date.year + "-" + newmonth 
+        this.allDate = date.year + "-" + newmonth
 
 
         let dateNum = new Date(date.year, date.month, 0).getDate();
@@ -387,7 +387,7 @@
             var dotIndex = String(num).indexOf('.')
             if (dotIndex === -1) { // 整数
               res = String(num).replace(/(\d)(?=(?:\d{3})+$)/g, `$1${split}`) + '.' + '0'.repeat(decimal)
-            } else { 
+            } else {
               const numStr = String((Math.round(num * Math.pow(10, decimal)) / Math.pow(10, decimal)).toFixed(decimal)) // 四舍五入，然后固定保留2位小数
               const decimals = numStr.slice(dotIndex, dotIndex + decimal + 1) // 截取小数位
               res = String(numStr.slice(0, dotIndex)).replace(/(\d)(?=(?:\d{3})+$)/g, `$1${split}`) + decimals
@@ -403,7 +403,7 @@
 </script>
 <style lang="scss" scoped>
   #dv-full-screen-container {
-    background-image: url('./img/stars.png');
+    background-image: url('~@/assets/images/screen/bg.png');
     background-size: 100% 100%;
     box-shadow: 0 0 3px blue;
     display: flex;
@@ -416,7 +416,7 @@
   .bgAll{
     height: 100%;
   }
-  
+
   .pickDate{
     height:2.825rem;
     line-height: 2.825rem;
@@ -480,4 +480,4 @@
 		  align-items: center;
       justify-content: center;
     }
-</style>
+</style>

src/views/peopleManages/taskStatistics/index.vue

@@ -16,7 +16,7 @@
         <!-- <div class="personNum">员工数量:{{ employeeNum }}</div> -->
         <dv-decoration-11  class="personNum" style="margin-left:10%"><i class="el-icon-user" style="color:#4ea5d6;margin-right: 3px;"></i> 员工数量:{{ employeeNum   }}人</dv-decoration-11>
         <dv-border-box-8 class="date" style="margin-right:10%; display: flex; align-items: center;">
-          <div style="width:25%;display: inline-block;margin-right: 3px;">统计时间:</div>          
+          <div style="width:25%;display: inline-block;margin-right: 3px;">统计时间:</div>
           <el-date-picker style="width:75%;" v-model="monthValues" type="monthrange" align="right" unlink-panels range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" :picker-options="pickerOptions" @change="changeDate">
           </el-date-picker>
         </dv-border-box-8>
@@ -74,7 +74,7 @@
     </dv-border-box-1>
   </div>
 </template>
-  
+
 <script>
 import * as echarts from "echarts";
 import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
@@ -487,7 +487,7 @@ export default {
         this_.optionPerson.series[0].data.push(item.num);
       }
       //超时
-      let cssql = `select  executor_ ,count(executor_) as num ,c.name_,a.create_time_ FROM  IBPS_BPM_TASKS as a join IBPS_BPM_TASK_ASSIGN as b  on a.task_id_ = b.task_id_ join ibps_party_employee as c on b.executor_ = c.id_  
+      let cssql = `select  executor_ ,count(executor_) as num ,c.name_,a.create_time_ FROM  IBPS_BPM_TASKS as a join IBPS_BPM_TASK_ASSIGN as b  on a.task_id_ = b.task_id_ join ibps_party_employee as c on b.executor_ = c.id_
                   where now()> SUBDATE(a.create_time_,interval - 3 day) and  c.STATUS_= 'actived' and c.ID_ != '1' and c.ID_ != '-1' and c.ID_ != '702117247933480960' and c.GROUP_ID_ not like '%1041786072788369408%'  GROUP BY  executor_  order by  c.CREATE_TIME_ asc `;
       await curdPost("sql", cssql).then((res) => {
         csData = res.variables.data;
@@ -577,24 +577,24 @@ export default {
     async chartLoading() {
       // 获取所有检测人员任务统计
       let this_ = this;
-      const sql = `select  *FROM (SELECT ie.ID_ AS jcId,ie.NAME_ AS jcName,COUNT(tj.zhuang_tai_ = '待数据输入' OR NULL) AS jianCeWeiWanCheng,COUNT(tj.zhuang_tai_ = '待数据校验' OR tj.zhuang_tai_ = '已完成' OR NULL) AS jianCeYiWanCheng FROM 
-                          t_lhjczb tj,ibps_party_employee ie 
-                          WHERE ie.positions_ like '%1040709034740547584%' and tj.jian_ce_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY jian_ce_yuan_ 
-                          ) jc  LEFT JOIN 
+      const sql = `select  *FROM (SELECT ie.ID_ AS jcId,ie.NAME_ AS jcName,COUNT(tj.zhuang_tai_ = '待数据输入' OR NULL) AS jianCeWeiWanCheng,COUNT(tj.zhuang_tai_ = '待数据校验' OR tj.zhuang_tai_ = '已完成' OR NULL) AS jianCeYiWanCheng FROM
+                          t_lhjczb tj,ibps_party_employee ie
+                          WHERE ie.positions_ like '%1040709034740547584%' and tj.jian_ce_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY jian_ce_yuan_
+                          ) jc  LEFT JOIN
                           (
-                          SELECT ie.ID_ AS fhId,ie.NAME_ AS fhName,COUNT(tj.zhuang_tai_ = '待数据校验' OR NULL) AS fuHeWeiWanCheng,COUNT(tj.zhuang_tai_ = '已完成' OR NULL) AS fuHeYiWanCheng FROM 
-                          t_lhjczb tj,ibps_party_employee ie 
-                          WHERE ie.positions_ like '%1040709034740547584%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN  '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_ 
+                          SELECT ie.ID_ AS fhId,ie.NAME_ AS fhName,COUNT(tj.zhuang_tai_ = '待数据校验' OR NULL) AS fuHeWeiWanCheng,COUNT(tj.zhuang_tai_ = '已完成' OR NULL) AS fuHeYiWanCheng FROM
+                          t_lhjczb tj,ibps_party_employee ie
+                          WHERE ie.positions_ like '%1040709034740547584%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN  '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_
                           ) fh ON jc.jcName = fh.fhName
                           UNION (
-                          SELECT  *FROM (SELECT ie.ID_ AS jcId, ie.NAME_ AS jcName,COUNT(tj.zhuang_tai_ = '待数据输入' OR NULL) AS jianCeWeiWanCheng,COUNT(tj.zhuang_tai_ = '待数据校验' OR tj.zhuang_tai_ = '已完成' OR NULL) AS jianCeYiWanCheng FROM 
-                          t_lhjczb tj,ibps_party_employee ie 
-                          WHERE tj.jian_ce_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN  '${this.startDate}' AND '${this.endDate}' GROUP BY jian_ce_yuan_ 
-                          ) jc  RIGHT JOIN 
+                          SELECT  *FROM (SELECT ie.ID_ AS jcId, ie.NAME_ AS jcName,COUNT(tj.zhuang_tai_ = '待数据输入' OR NULL) AS jianCeWeiWanCheng,COUNT(tj.zhuang_tai_ = '待数据校验' OR tj.zhuang_tai_ = '已完成' OR NULL) AS jianCeYiWanCheng FROM
+                          t_lhjczb tj,ibps_party_employee ie
+                          WHERE tj.jian_ce_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN  '${this.startDate}' AND '${this.endDate}' GROUP BY jian_ce_yuan_
+                          ) jc  RIGHT JOIN
                           (
-                          SELECT ie.ID_ AS fhId,ie.NAME_ AS fhName,COUNT(tj.zhuang_tai_ = '待数据校验' OR NULL) AS fuHeWeiWanCheng,COUNT(tj.zhuang_tai_ = '已完成' OR NULL) AS fuHeYiWanCheng FROM 
-                          t_lhjczb tj,ibps_party_employee ie 
-                          WHERE ie.positions_ like '%1040709034740547584%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN  '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_ 
+                          SELECT ie.ID_ AS fhId,ie.NAME_ AS fhName,COUNT(tj.zhuang_tai_ = '待数据校验' OR NULL) AS fuHeWeiWanCheng,COUNT(tj.zhuang_tai_ = '已完成' OR NULL) AS fuHeYiWanCheng FROM
+                          t_lhjczb tj,ibps_party_employee ie
+                          WHERE ie.positions_ like '%1040709034740547584%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN  '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_
                           ) fh ON jc.jcName = fh.fhName
                           )`;
       // console.log(sql,"sql")
@@ -793,7 +793,7 @@ export default {
     //饼图 环形图数据
     async degreeGradeInfoData() {
       let data = [];
-      let sql = `select 
+      let sql = `select
                 sum(a.zui_gao_xue_li_x_ = '博士') as doctor,
                 sum(a.zui_gao_xue_li_x_ = '硕士') as Master,
                 sum(a.zui_gao_xue_li_x_ = '本科') as undergraduate,
@@ -877,7 +877,7 @@ export default {
 .personView {
   width: 100%;
   height: calc(100vh - 100px);
-  background-image: url("~@/views/system/jbdHome/board/img/bg.png");
+  background-image: url("~@/assets/images/screen/bg.png");
 }
 .topView {
   overflow: hidden;
@@ -990,4 +990,4 @@ export default {
   //   z-index: 9999;
   // }
 }
-</style>
+</style>

src/views/scientificPayoffs/index.vue

@@ -379,7 +379,7 @@ export default {
     z-index: 999;
 
     #dv-full-screen-container {
-        background-image: url('../../assets/images/screen/bg.png');
+        background-image: url('~@/assets/images/screen/bg.png');
         background-size: 100% 100%;
         box-shadow: 0 0 3px blue;
         display: flex;

src/views/statistics/index.vue

@@ -5,7 +5,7 @@
       <div class="statistics">
         <div class="editDate">
            <!-- 标题装饰组件 -->
-          <header-decoration /> 
+          <header-decoration />
           <!-- <div class="stitle">实验室管理看板</div> -->
           <div class="block" style="display:none">
             <span class="demonstration">开始:</span>
@@ -27,7 +27,7 @@
                 </el-date-picker> -->
             <!-- </el-date-picker> -->
           <!-- </div> -->
-          <div 
+          <div
             style="width: 12%;
             height:2.825rem;
             line-height: 2.825rem;
@@ -50,43 +50,43 @@
               v-model="NowTime1"
               type="month"
               @change="changeTime1"
-              format="yyyy-MM" 
+              format="yyyy-MM"
               value-format="yyyy-MM"
               placeholder="请选择时间">
             </el-date-picker> -->
           </div>
 
           <!-- <div class="block">
-            
+
           </div> -->
 
           <!-- <div class="goBackButton" @click.prevent="goBack()" >
             返回
           </div> -->
-          <div 
-            @click.prevent="rollstop()" 
+          <div
+            @click.prevent="rollstop()"
             style="width: 8%;
             height:2.825rem;
             line-height: 2.825rem;
             text-align:center;
             float: right;
-            margin: -3% 12% 0 0;" 
+            margin: -3% 12% 0 0;"
             v-if="rollup">
             <dv-border-box-8>暂停</dv-border-box-8>
           </div>
-          <div 
-            @click.prevent="rollcontinue()" 
+          <div
+            @click.prevent="rollcontinue()"
             style="width: 8%;
             height:2.825rem;
             line-height: 2.825rem;
             text-align:center;
             float: right;
-            margin: -3% 12% 0 0;" 
+            margin: -3% 12% 0 0;"
             v-else>
             <dv-border-box-8>继续</dv-border-box-8>
           </div>
-          <div 
-            @click.prevent="goBack()" 
+          <div
+            @click.prevent="goBack()"
             style="width: 8%;
             height:2.825rem;
             line-height: 2.825rem;
@@ -95,7 +95,7 @@
             margin: -3% 3% 0 0;" >
             <dv-border-box-8>返回</dv-border-box-8>
           </div>
-          
+
         </div>
         <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" ><div class="ttitle">质量方针：公正、科学、准确、高效</div></dv-border-box-7>
         <div class="congxiebox7" style="display: flex;justify-content: space-between;padding: 1.5% 0.2%;">
@@ -224,7 +224,7 @@
 
           </div>
         </div>
-       
+
 
 
 
@@ -243,7 +243,7 @@
   import s1zhiLiang1 from './item/s1zhiLiang1.vue'
   import s1zhiLiang2 from './item/s1zhiLiang2.vue'
   import s1zhiLiang3 from './item/s1zhiLiang3.vue'
-  
+
   import s1jianCe from './item/s1jianCe.vue'
   import s2manYiDu from './item/s2manYiDu.vue'
   import s3tousu from './item/s3tousu.vue'
@@ -497,14 +497,14 @@ import * as forEach from 'lodash/forEach'
             this.relOf = false
             clearTimeout(this.timer)
           }, 0)
-          
+
           // this.timer = setInterval(() => {
           //   if (!this.relOf) {
           //     this.relOf = true
           //     clearInterval(this.timer)
           //   }
           // }, 100);
-        } 
+        }
         // else if (this.endDate == this.BeginDate) {
         //   this.$message({
         //     showClose: true,
@@ -541,7 +541,7 @@ import * as forEach from 'lodash/forEach'
             message: '年份不得大于当前年份',
             type: 'warning'
           });
-          
+
         }
         this.selectAll()
         // else(
@@ -580,7 +580,7 @@ import * as forEach from 'lodash/forEach'
       // this.currentTime()
       if(screenfull.isEnabled && !screenfull.isFullscreen){
       this.allView()
-        
+
       }
     }
   }
@@ -601,7 +601,7 @@ import * as forEach from 'lodash/forEach'
      }
   }
   #dv-full-screen-container {
-    background-image: url('./img/stars.png');
+    background-image: url('~@/assets/images/screen/bg.png');
     background-size: 100% 100%;
     box-shadow: 0 0 3px blue;
     display: flex;
@@ -610,12 +610,12 @@ import * as forEach from 'lodash/forEach'
     display: flex;
     flex-direction:column;
     align-items: stretch;
-    
+
   //  .headerContent{
   //   flex: 1;
-    
+
   //   // background-color: rgb(99, 12, 41);
-    
+
 
   //  }
   }
@@ -644,7 +644,7 @@ import * as forEach from 'lodash/forEach'
   }
   .screen{
     height: 100%;
-    
+
     margin: 0 0.5%;
   }
   .clear{ clear: both; }
@@ -681,5 +681,5 @@ import * as forEach from 'lodash/forEach'
   color: #606266 !important;
   font-weight: 100 !important;
 }
- 
+
 </style>

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

@@ -146,7 +146,7 @@
                 curdPost('sql', sql).then(res => {
                     const data = res.variables.data
                     // console.log(data)
-                    
+
                     if ( data && data.length ) {
                         const { month, accepted, approval, jcFinish, jcTotal, process, report, rwFinish, task, today, week, quarter, bgFinish } = data[0]
                         this.middleCardData.taskData = [month, jcTotal, task, report]
@@ -232,7 +232,7 @@
                                 ]
                             }
                         ]
-                        
+
                         this.topBarData = result
                     }
                 }).catch(error => {
@@ -253,7 +253,7 @@
                 const sql2 = `select ${sqlStr} from t_lhjczb tj, t_mjjcnlfw tm where tj.jian_ce_xiang_mu_ = tm.id_ and tj.create_time_ like '${this.month}%'`
                 // console.log(sqlStr, sql2)
 
-                Promise.all([ 
+                Promise.all([
                     curdPost('sql', sql1),
                     curdPost('sql', sql2)
                 ]).then(([res1, res2]) => {
@@ -401,7 +401,7 @@
         z-index: 999;
         :global {
             #dv-full-screen-container {
-                background-image: url('./img/bg.png');
+                background-image: url('~@/assets/images/screen/bg.png');
                 background-size: 100% 100%;
                 box-shadow: 0 0 3px blue;
                 display: flex;

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

@@ -51,7 +51,7 @@
             </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"/>          
+              <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;" />
@@ -177,7 +177,7 @@ export default {
       };
       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  
+      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,
@@ -348,7 +348,7 @@ export default {
             "受限数",
             "报废停用数",
           ];
-          
+
           this_.sheBeiData.data.push(data[0].Equipments);
           this_.sheBeiData.data.push(data[0].addEquipments);
           this_.sheBeiData.data.push(data[0].goodEquipments);
@@ -587,7 +587,7 @@ export default {
   color: #fff;
   z-index: 999;
   #dv-full-screen-container {
-    background-image: url("./img/bg.png");
+    background-image: url("~@/assets/images/screen/bg.png");
     background-size: 100% 100%;
     box-shadow: 0 0 3px blue;
     display: flex;

src/views/system/jbdHome/yangPinShuJu/index.vue

@@ -5,9 +5,9 @@
         <!-- 头部内容部分 -->
         <div class="headerContent">
            <!-- 标题装饰组件 -->
-          <header-decoration :titleName="outputData.headerName"/> 
-          <div 
-            class="goBackButton" 
+          <header-decoration :titleName="outputData.headerName"/>
+          <div
+            class="goBackButton"
             style="width: 12%;
             height:2.825rem;
             line-height: 2.825rem;
@@ -20,16 +20,16 @@
               v-model="NowTime1"
               type="month"
               @change="changeTime1"
-              format="yyyy-MM" 
+              format="yyyy-MM"
               value-format="yyyy-MM"
               placeholder="请选择时间">
             </el-date-picker>
           </div>
           <!-- 返回按钮 -->
 
-          <div 
-            class="goBackButton" 
-            @click.prevent="goBack()" 
+          <div
+            class="goBackButton"
+            @click.prevent="goBack()"
             style="width: 12%;
             height:2.825rem;
             line-height: 2.825rem;
@@ -57,10 +57,10 @@
           <div class="overView">
             <headerContent  @getUpdateTime="getTime" :NowTime1="NowTime1+'-01'"></headerContent>
             <dv-decoration-10 style="width:100%;height:5px;" />
-          </div> 
+          </div>
 
         </div>
-       
+
 
         <!-- 主体内容(图表部分) -->
         <div class="mainContent">
@@ -76,7 +76,7 @@
             <!-- <div class="monthlyN" ref="MonthlyNumber_refs"><monthlyNumber  :NowTime1="NowTime1"/></div> -->
           </div>
         </div>
-        
+
       </dv-full-screen-container>
    </div>
 </template>
@@ -91,7 +91,7 @@ import headerContent from './headerContent'
 //委托样品条目情况组件
 import entrustNumber from './EntrustNumber'
 //委托样品类型组件
-import entrustType from './EntrustType'  
+import entrustType from './EntrustType'
 // 月度检测完成情况(环形图)
 import monthlyStatus from './MonthlyStatus'
 //年度检测完成情况(环形图)
@@ -125,7 +125,7 @@ export default {
       NowTime1:'',
       value1:[]
     }
-    
+
   },
   mounted() {
     this.getNowTime()
@@ -133,7 +133,7 @@ export default {
   created() {
     if(screenfull.isEnabled && !screenfull.isFullscreen){
      this.allView()
-      
+
     }
   },
   beforeDestroy() {
@@ -167,13 +167,13 @@ export default {
       let year = e.slice(0,4)
       let month = e.slice(5,7)
       this.NowTime1 = year + '-' + month
-  
+
       this.days=[]
 
     },
     // getDaysInMonth(year,month){
     //   let temp = new Date(year,month,0);
-    //   this.day = temp.getDate(); 
+    //   this.day = temp.getDate();
     //   // console.log('处理好的年 月 月份天数',year,month,this.day);   //2022 11 30
     //   //把月份对应天数转化为数组
     //   for( let i=1;i <= this.day ;i++){
@@ -199,7 +199,7 @@ export default {
   color: #fff;
   z-index: 9999;
   #dv-full-screen-container {
-    background-image: url('./img/stars.png');
+    background-image: url('~@/assets/images/screen/bg.png');
     background-size: 100% 100%;
     display: flex;
     flex-direction:column;
@@ -213,7 +213,7 @@ export default {
         height: 80px;
       }
     }
-    
+
     .mainContent{
       width: 100%;
       height:80%;
@@ -239,7 +239,7 @@ export default {
             height: 100%;
             margin-left: 10px;
             // background-color: rgb(12, 103, 131);
-          
+
           }
         }
 
@@ -268,10 +268,10 @@ export default {
             margin-left: 10px;
             // background-color: rgb(12, 103, 131);
           }
-        
+
         }
-    } 
-  } 
+    }
+  }
 }
 
-</style>
+</style>