safecheck-client 3.0.33-16 → 3.0.33-18

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

@@ -84,6 +84,9 @@
               <th>
                 <nobr>计划安检总户数</nobr>
               </th>
+              <th>
+                <nobr>申请安检数</nobr>
+              </th>
               <th>
                 <nobr>未检户数</nobr>
               </th>
@@ -118,6 +121,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>
@@ -131,7 +135,7 @@
           <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>
@@ -165,6 +169,7 @@ export default {
     return {
       model: new PagedList("/rs/sql/safeDetail", 999, {orgid: this.$login.f.orgid}, {
         totalcount: '',
+        sqajcount:'',
         wjcount: '',
         yjcount: '',
         rhcount: '',
@@ -184,6 +189,7 @@ export default {
       excelHeaders: {
         'f_residential_area': '小区名称',
         'totalcount': '计划安检总户数',
+        'sqajcount': '申请安检数',
         'wjcount': '未检户数',
         'yjcount': '已检户数',
         'rhcount': '入户户数',
@@ -195,7 +201,7 @@ export default {
         'check_bv':'安检率'
       },
       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'],
       sumsmodel: {},
     }
   },
@@ -211,6 +217,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,

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/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('fugou')
-// 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('tongchuan');
+// 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 }
+})