safecheck-client 3.0.34-7 → 3.0.34-71

package/src/filiale/yangchunboneng/pc/CheckPlanAreaList.vue

@@ -161,19 +161,22 @@
               <nobr>计划总数</nobr>
             </th>
             <th>
-              <nobr>未检</nobr>
+              <nobr>未上门</nobr>
             </th>
             <th>
-              <nobr>已检</nobr>
+              <nobr>未安检</nobr>
             </th>
             <th>
-              <nobr>入户</nobr>
+              <nobr>已上门</nobr>
             </th>
             <th>
-              <nobr>到访不遇</nobr>
+              <nobr>已安检</nobr>
             </th>
             <th>
-              <nobr>拒检</nobr>
+              <nobr>已完成</nobr>
+            </th>
+            <th>
+              <nobr>入户</nobr>
             </th>
             <th>
               <nobr>拆除</nobr>
@@ -184,9 +187,30 @@
             <th>
               <nobr>未通气</nobr>
             </th>
+            <th>
+              <nobr>拒检</nobr>
+            </th>
+            <th>
+              <nobr>到访不遇1</nobr>
+            </th>
+            <th>
+              <nobr>到访不遇2</nobr>
+            </th>
+            <th>
+              <nobr>到访不遇3</nobr>
+            </th>
+            <th>
+              <nobr>到访不遇3+</nobr>
+            </th>
+            <th>
+              <nobr>上门率</nobr>
+            </th>
             <th>
               <nobr>安检率</nobr>
             </th>
+            <th>
+              <nobr>完成率</nobr>
+            </th>
             <!--<th>-->
             <!--<nobr>查看</nobr>-->
             <!--</th>-->
@@ -209,15 +233,23 @@
             <td style="text-align:center" :class="{'td-0':row && !row.department,'td-1':model.rows && model.rows.length!=($index+1)&&row.department && row.department.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.department &&row.department.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.department &&row.department.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.department &&row.department.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql && $parent.$parent.$parent.nameForSql.includes('department')">{{row.department && row.department.indexOf('*&')!=-1?'':row.department}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
             <td style="text-align:center">{{row.f_plan_total}}</td>
+            <td style="text-align:center">{{row.f_weishangmen}}</td>
             <td style="text-align:center">{{row.f_weijian}}</td>
-            <td style="text-align:center"><nobr>{{row.f_yijian}}</nobr></td>
+            <td style="text-align:center">{{row.f_yishangmen}}</td>
+            <td style="text-align:center">{{row.f_yijian}}</td>
+            <td style="text-align:center"><nobr>{{row.f_yiwancheng}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_ruhu}}</nobr></td>
-            <td style="text-align:center">{{row.f_buyu}}</td>
-            <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_chaichu}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_tingyong}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_weitongqi}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
+            <td style="text-align:center">{{row.f_buyu}}</td>
+            <td style="text-align:center">{{row.f_buyu2}}</td>
+            <td style="text-align:center">{{row.f_buyu3}}</td>
+            <td style="text-align:center">{{row.f_buyu4}}</td>
+            <td style="text-align:center"><nobr>{{row.f_shangmen_bv}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_wangcheng_bv}}</nobr></td>
             <!--<td style="text-align: center;">-->
             <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>-->
             <!--</td>-->
@@ -234,15 +266,23 @@
           <th v-if="$parent.$parent.$parent.nameForSql.includes('department')"></th>
           <th v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')"></th>
           <td style="text-align: center">{{model.sums.f_plan_total}}</td>
+          <td style="text-align: center">{{model.sums.f_weishangmen}}</td>
           <td style="text-align: center">{{model.sums.f_weijian}}</td>
+          <td style="text-align: center">{{model.sums.f_yishangmen}}</td>
           <td style="text-align: center">{{model.sums.f_yijian}}</td>
+          <td style="text-align: center">{{model.sums.f_yiwancheng}}</td>
           <td style="text-align: center">{{model.sums.f_ruhu}}</td>
-          <td style="text-align: center">{{model.sums.f_buyu}}</td>
-          <td style="text-align: center">{{model.sums.f_jujian}}</td>
           <td style="text-align: center">{{model.sums.f_chaichu}}</td>
           <td style="text-align: center">{{model.sums.f_tingyong}}</td>
           <td style="text-align: center">{{model.sums.f_weitongqi}}</td>
-          <td style="text-align: center">{{(parseFloat(model.sums.f_yijian) / parseFloat(model.sums.f_plan_total) * 100).toFixed(2) + '%'}}</td>
+          <td style="text-align: center">{{model.sums.f_tingyong}}</td>
+          <td style="text-align: center">{{model.sums.f_buyu}}</td>
+          <td style="text-align: center">{{model.sums.f_buyu2}}</td>
+          <td style="text-align: center">{{model.sums.f_buyu3}}</td>
+          <td style="text-align: center">{{model.sums.f_buyu4}}</td>
+          <td style="text-align: center">{{(parseFloat(model.sums.f_yishangmen) / parseFloat(model.sums.f_plan_total) * 100).toFixed(2) + '%'}}</td>
+          <td style="text-align: center">{{(parseFloat(model.sums.f_ruhu) / parseFloat(model.sums.f_plan_total) * 100).toFixed(2) + '%'}}</td>
+          <td style="text-align: center">{{(parseFloat(model.sums.f_yiwancheng) / parseFloat(model.sums.f_plan_total) * 100).toFixed(2) + '%'}}</td>
 
         </template>
       </data-grid>
@@ -262,14 +302,20 @@
       return {
         model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{
           f_plan_total:'',
+          f_weishangmen:'',
           f_weijian:'',
+          f_yishangmen:'',
           f_yijian:'',
+          f_yiwancheng:'',
           f_ruhu:'',
-          f_buyu:'',
-          f_jujian:'',
           f_chaichu:'',
           f_tingyong:'',
-          f_weitongqi:''
+          f_weitongqi:'',
+          f_jujian:'',
+          f_buyu:'',
+          f_buyu2:'',
+          f_buyu3:'',
+          f_buyu4:'',
         }),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
@@ -286,15 +332,24 @@
         f_safe_end:'',
         planName:[{label: '全部', value: ''}],
         exportExcelField: {
-          'f_weijian':'未检',
-          'f_yijian':'已检',
-          'f_ruhu':'入户',
-          'f_buyu':'到访不遇',
-          'f_jujian':'拒检',
-          'f_chaichu':'拆除',
-          'f_tingyong':'停用',
-          'f_weitongqi':'未通气',
-          'f_check_bv':'安检率'
+          f_plan_total:'计划总数',
+          f_weishangmen:'未上门',
+          f_weijian:'未安检',
+          f_yishangmen:'已上门',
+          f_yijian:'已安检',
+          f_yiwancheng:'已完成',
+          f_ruhu:'入户',
+          f_chaichu:'拆除',
+          f_tingyong:'停用',
+          f_weitongqi:'未通气',
+          f_jujian:'拒检',
+          f_buyu:'到访不遇1',
+          f_buyu2:'到访不遇2',
+          f_buyu3:'到访不遇3',
+          f_buyu4:'到访不遇3+',
+          f_shangmen_bv:'上门率',
+          f_check_bv:'安检率',
+          f_wangcheng_bv:'完成率'
         }
       }
     },
@@ -329,13 +384,24 @@
       // 获取导出列
       getexportExcelField(){
         this.exportExcelField = {
-          'f_weijian':'未检',
-          'f_yijian':'已检',
-          'f_ruhu':'入户',
-          'f_buyu':'到访不遇',
-          'f_jujian':'拒检',
-          'f_check_bv':'安检率',
-          'f_plan_total':'计划总数'
+          f_plan_total:'计划总数',
+          f_weishangmen:'未上门',
+          f_weijian:'未安检',
+          f_yishangmen:'已上门',
+          f_yijian:'已安检',
+          f_yiwancheng:'已完成',
+          f_ruhu:'入户',
+          f_chaichu:'拆除',
+          f_tingyong:'停用',
+          f_weitongqi:'未通气',
+          f_jujian:'拒检',
+          f_buyu:'到访不遇1',
+          f_buyu2:'到访不遇2',
+          f_buyu3:'到访不遇3',
+          f_buyu4:'到访不遇3+',
+          f_shangmen_bv:'上门率',
+          f_check_bv:'安检率',
+          f_wangcheng_bv:'完成率'
         }
         let forName = this.groupNameForSql.split(",")
         for (let i = 0; i < forName.length; i++) {

package/src/filiale/yangchunboneng/pc/CheckSearchUser.vue

@@ -193,10 +193,10 @@
               </v-select>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">通气起始</label>
+              <label class="font_normal_body">首次通气开始</label>
               <datepicker
                 :value.sync="model.f_gas_start"
-                placeholder='通气时间起始'
+                placeholder='首次通气开始'
                 :disabled-days-of-week="[]"
                 style="width: 60%"
                 :format="'yyyy-MM-dd'"
@@ -207,10 +207,10 @@
               </datepicker>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">通气结束</label>
+              <label class="font_normal_body">首次通气结束</label>
               <datepicker
                 :value.sync="model.f_gas_end"
-                placeholder='通气时间结束'
+                placeholder='首次通气结束'
                 style="width: 60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
@@ -374,10 +374,10 @@
                 close-on-select clear-button></v-select>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">通气起始</label>
+              <label class="font_normal_body">首次通气开始</label>
               <datepicker
                 :value.sync="model.f_gas_start"
-                placeholder='通气时间起始'
+                placeholder='首次通气开始'
                 :disabled-days-of-week="[]"
                 style="width: 60%"
                 :format="'yyyy-MM-dd'"
@@ -388,10 +388,10 @@
               </datepicker>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">通气结束</label>
+              <label class="font_normal_body">首次通气结束</label>
               <datepicker
                 :value.sync="model.f_gas_end"
-                placeholder='通气时间结束'
+                placeholder='首次通气结束'
                 style="width: 60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
@@ -496,7 +496,7 @@
               <nobr>建档日期</nobr>
             </th>
             <th>
-              <nobr>通气日期</nobr>
+              <nobr>首次通气日期</nobr>
             </th>
             <th v-show="$parent.$parent.$parent.showcode">
               <nobr>二维码</nobr>
@@ -605,7 +605,7 @@ export default {
         'f_last_check_state': '安检状态',
         'f_last_check_result': '安检结果',
         'f_createfile_date': '建档日期',
-        'f_uservent_date': '通气日期'
+        'f_uservent_date': '首次通气日期'
       },
       model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",