safecheck-client 3.0.33-2 → 3.0.33-22

package/src/filiale/yongzhou/pc/safeDetail.vue

@@ -84,6 +84,9 @@
               <th>
                 <nobr>计划安检总户数</nobr>
               </th>
+              <th>
+                <nobr>申请安检数</nobr>
+              </th>
               <th>
                 <nobr>未检户数</nobr>
               </th>
@@ -111,6 +114,12 @@
               <th>
                 <nobr>安检率</nobr>
               </th>
+              <th>
+                <nobr>申请安检户数</nobr>
+              </th>
+              <th>
+                <nobr>总入户数</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -118,6 +127,7 @@
             <td style="text-align: center">{{ $index + 1 }}</td>
             <td style="text-align: center">{{ row.f_residential_area }}</td>
             <td style="text-align: center">{{ row.totalcount }}</td>
+            <td style="text-align: center">{{ row.sqajcount }}</td>
             <td style="text-align: center">{{ row.wjcount }}</td>
             <td style="text-align: center">{{ row.yjcount }}</td>
             <td style="text-align: center">{{ row.rhcount }}</td>
@@ -127,11 +137,13 @@
             <td style="text-align: center">{{ row.unique_dfby_count }}</td>
             <td style="text-align: center">{{ row.jjcount }}</td>
             <td style="text-align: center">{{ row.check_bv }}</td>
+            <td style="text-align: center">{{ row.no_plan_num }}</td>
+            <td style="text-align: center">{{ row.total_yjnpm }}</td>
           </template>
           <template partial="foot">
             <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
             <td style="text-align: center">{{ model.sums.totalcount }}</td>
-
+            <td style="text-align: center">{{ model.sums.sqajcount }}</td>
             <td style="text-align: center">{{ model.sums.wjcount }}</td>
 
             <td style="text-align: center">{{ model.sums.yjcount }}</td>
@@ -146,7 +158,8 @@
             <td style="text-align: center">
               {{ ((model.sums.yjcount / model.sums.totalcount)*100.0).toFixed(2) }}%
             </td>
-
+            <td style="text-align: center">{{ model.sums.no_plan_num }}</td>
+            <td style="text-align: center">{{ model.sums.total_yjnpm }}</td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -165,6 +178,7 @@ export default {
     return {
       model: new PagedList("/rs/sql/safeDetail", 999, {orgid: this.$login.f.orgid}, {
         totalcount: '',
+        sqajcount:'',
         wjcount: '',
         yjcount: '',
         rhcount: '',
@@ -172,7 +186,9 @@ export default {
         dfbycount2: '',
         dfbycount3: '',
         unique_dfby_count: '',
-        jjcount: ''
+        jjcount: '',
+        no_plan_num: '',
+        total_yjnpm: '',
       }),
       resids: {},
       searchData: {
@@ -184,6 +200,7 @@ export default {
       excelHeaders: {
         'f_residential_area': '小区名称',
         'totalcount': '计划安检总户数',
+        'sqajcount': '申请安检数',
         'wjcount': '未检户数',
         'yjcount': '已检户数',
         'rhcount': '入户户数',
@@ -192,10 +209,12 @@ export default {
         'dfbycount3': '到访不遇-3次',
         'unique_dfby_count': '到访不遇小计',
         'jjcount': '拒检户数',
-        'check_bv':'安检率'
+        'check_bv':'安检率',
+        'no_plan_num':'申请安检户数',
+        'total_yjnpm':'总入户数'
       },
       printshow: false,
-      defaultPrint: ['f_residential_area', 'totalcount', 'wjcount', 'rhcount','dfbycount1','dfbycount2','dfbycount3','unique_dfby_count','jjcount','check_bv'],
+      defaultPrint: ['f_residential_area', 'totalcount', 'sqajcount','wjcount', 'rhcount','dfbycount1','dfbycount2','dfbycount3','unique_dfby_count','jjcount','check_bv','no_plan_num','total_yjnpm'],
       sumsmodel: {},
     }
   },
@@ -211,6 +230,7 @@ export default {
       this.print_model.rows.push({
         f_residential_area:'合计',
         totalcount: this.sumsmodel.totalcount,
+        sqajcount: this.sumsmodel.sqajcount,
         wjcount: this.sumsmodel.wjcount,
         yjcount: this.sumsmodel.yjcount,
         rhcount: this.sumsmodel.rhcount,
@@ -218,7 +238,8 @@ export default {
         dfbycount2: this.sumsmodel.dfbycount2,
         dfbycount3: this.sumsmodel.dfbycount3,
         unique_dfby_count: this.sumsmodel.unique_dfby_count,
-        check_bv:`${((this.sumsmodel.yjcount / this.sumsmodel.totalcount)*100.0).toFixed(2)}%`
+        no_plan_num:this.sumsmodel.no_plan_num,
+        total_yjnpm:this.sumsmodel.total_yjnpm,
       })
       this.print_model.totalPage = 0
     },

package/src/filiale/yongzhou/pc.js

@@ -9,6 +9,7 @@ let specialComp = {
   'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
   "safe-table":(resolve) => { require(['./pc/safeTable'], resolve) },
   "safe-detail":(resolve) => { require(['./pc/safeDetail'], resolve) },
+  "safe-defect-paper-new":(resolve) => { require(['./pc/DefectPaperNew.vue'], resolve) },
   'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
   "community-detail":(resolve) => { require(['./pc/communityDetail'], resolve) },
   "community-type-detail-g":(resolve) => { require(['./pc/communityTypeDetailG'], resolve) },

package/src/filiale/yunchengminsheng/pc/checkUserList.vue

@@ -81,6 +81,21 @@
                     >
                     </v-select>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">表具状态:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_table_state"
+                      v-model="model.f_table_state"
+                      :options='$parent.$parent.tableStates'
+                      placeholder='请选择'
+                      condition="uf.f_table_state='{}'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">用气性质:</label>
                     <v-select
@@ -402,6 +417,7 @@
         showCondtion:false,
         userTypes:[],//用户类型
         userStates:[],//用户状态
+        tableStates:[],//表具状态
         gasproperties:[],//用气性质
         meter_classifys:[],//气表类型
         hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
@@ -520,7 +536,8 @@
           value: ''
         }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
 
-        this.userStates=this.$appdata.getParam('安检用户状态') ? [...this.$appdata.getParam('安检用户状态')] : []
+        this.userStates=this.$appdata.getParam('安检用户状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('安检用户状态')] : [{label: '全部', value: ''}]
+        this.tableStates=this.$appdata.getParam('安检表具状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('安检表具状态')] : [{label: '全部', value: ''}]
         this.gasproperties=this.$appdata.getParam('用气性质') ? [{
           label: '全部',
           value: ''

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('wensu');
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('yongzhou')
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})