safecheck-client 3.0.34-6 → 3.0.34-61

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

@@ -68,10 +68,11 @@
             </div>
             <div class="row">
               <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">通气开始</label>
+                <label class="font_normal_body">首次通气开始</label>
                 <datepicker
                   :value.sync="model.f_gas_date_str"
                   style="width: 60%"
+                  placeholder='首次通气开始日期'
                   :format="'yyyy-MM-dd 00:00:00'"
                   v-model="model.f_gas_date_str"
                   condition="f_uservent_date > '{}'"
@@ -79,38 +80,39 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">通气结束</label>
+                <label class="font_normal_body">首次通气结束</label>
                 <datepicker
                   :value.sync="model.f_gas_date_end"
                   style="width: 60%"
+                  placeholder='首次通气结束日期'
                   :format="'yyyy-MM-dd 23:59:59'"
                   v-model="model.f_gas_date_end"
                   condition="f_uservent_date < '{}'"
                 >
                 </datepicker>
               </div>
-              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">开始时间</label>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">表具通气开始</label>
                 <datepicker
                   :value.sync="model.f_check_start"
-                  placeholder='首次通气时间' style="width: 60%"
+                  placeholder='表具通气开始时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_start"
-                  condition="f_uservent_date > ='{} 00:00:00'">
+                  condition="f_gas_date > ='{} 00:00:00'">
                 </datepicker>
               </div>
-              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">结束时间</label>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">表具通气结束</label>
                 <datepicker
                   :value.sync="model.f_check_end"
-                  placeholder='首次通气时间' style="width: 60%"
+                  placeholder='表具通气结束时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_end"
-                  condition="f_uservent_date <=  '{} 23:59:59'">
+                  condition="f_gas_date <=  '{} 23:59:59'">
                 </datepicker>
               </div>
             </div>
@@ -635,7 +637,7 @@ export default {
     // this.$refs.paged.$refs.criteria.model.f_is_checkbook = 'f_check_book_name is null'
     // //tag
     // // this.init=true
-    // this.freshCheckBook()
+    this.freshCheckBook()
   }
 }
 </script>

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

@@ -36,10 +36,10 @@
                         condition="tuf.f_user_type ='{}'"></v-select>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">通气开始</label>
+              <label class="font_normal_body">首次通气开始</label>
               <datepicker
                 :value.sync="model.f_gas_start"
-                placeholder='开始时间' style="width: 60%"
+                placeholder='首次通气开始' style="width: 60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -48,10 +48,10 @@
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">通气结束</label>
+              <label class="font_normal_body">首次通气结束</label>
               <datepicker
                 :value.sync="model.f_gas_end"
-                placeholder='结束时间' style="width: 60%"
+                placeholder='首次通气结束' style="width: 60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -83,7 +83,7 @@
             <th><nobr>用户姓名</nobr></th>
             <th><nobr>用户电话</nobr></th>
             <th><nobr>用户地址</nobr></th>
-            <th><nobr>通气日期</nobr></th>
+            <th><nobr>首次通气日期</nobr></th>
             <th><nobr>操作</nobr></th>
           </tr>
         </template>
@@ -131,7 +131,7 @@ export default {
         'f_user_name': '客户姓名',
         'f_user_phone':'客户电话',
         'f_address': '客户地址',
-        'f_uservent_date': '通气日期'
+        'f_uservent_date': '首次通气日期'
       },
       userTypes: [{label: '全部', value: ''},{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
       model: new PagedList('rs/sql/getUserByCheckBook', 50)

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'",

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

@@ -159,10 +159,10 @@
                      style="width: 60%" placeholder="用户名称">
             </div>
             <div :class="$parent.$parent.style"  >
-              <label class="font_normal_body">通气开始</label>
+              <label class="font_normal_body">首次通气开始</label>
               <datepicker
                 :value.sync="model.f_gas_start"
-                placeholder='首次通气时间' style="width: 60%"
+                placeholder='首次通气开始时间' style="width: 60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -171,10 +171,10 @@
               </datepicker>
             </div>
             <div :class="$parent.$parent.style" >
-              <label class="font_normal_body">通气结束</label>
+              <label class="font_normal_body">首次通气结束</label>
               <datepicker
                 :value.sync="model.f_gas_end"
-                placeholder='首次通气时间' style="width: 60%"
+                placeholder='首次通气结束时间' style="width: 60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -335,10 +335,10 @@
                      style="width: 60%" placeholder="用户名称">
             </div>
             <div :class="$parent.$parent.style"  >
-              <label class="font_normal_body">通气开始</label>
+              <label class="font_normal_body">首次通气开始</label>
               <datepicker
                 :value.sync="model.f_gas_start"
-                placeholder='首次通气时间' style="width: 60%"
+                placeholder='首次通气开始时间' style="width: 60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -347,10 +347,10 @@
               </datepicker>
             </div>
             <div :class="$parent.$parent.style" >
-              <label class="font_normal_body">通气结束</label>
+              <label class="font_normal_body">首次通气结束</label>
               <datepicker
                 :value.sync="model.f_gas_end"
-                placeholder='首次通气时间' style="width: 60%"
+                placeholder='首次通气结束时间' style="width: 60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -372,7 +372,7 @@
             <th><nobr>用户小区</nobr></th>
             <th><nobr>用户地址</nobr></th>
             <th>
-              <nobr>通气时间</nobr>
+              <nobr>首次通气时间</nobr>
             </th>
             <th><nobr>安检时间</nobr></th>
             <th><nobr>安检员</nobr></th>
@@ -574,7 +574,7 @@ export default {
       repairers:[],
       cbcs:[],
       thead: '',
-      headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','通气时间','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细','处理数','完成数','处理情况','完成情况','维修员'],
+      headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','首次通气时间','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细','处理数','完成数','处理情况','完成情况','维修员'],
       bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_uservent_date','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_defect_content','f_deal_count','f_repair_count','f_is_deal','f_is_repair','f_repairman'],
     }
   },

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

@@ -170,10 +170,10 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-2" 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='首次通气时间' style="width: 60%"
+                  placeholder='首次通气开始时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
@@ -182,10 +182,10 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-2" 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='首次通气时间' style="width: 60%"
+                  placeholder='首次通气结束时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
@@ -239,7 +239,7 @@
                 <data-order field="f_address" name="客户地址"></data-order>
               </th>
               <th>
-                <nobr>通气时间</nobr>
+                <nobr>首次通气时间</nobr>
               </th>
               <th>
                 <data-order field="f_offsite_time" name="安检时间"></data-order>
@@ -501,7 +501,7 @@
           'f_user_phone': '客户电话',
           'f_residential_area': '小区',
           'f_address': '客户地址',
-          'f_uservent_date': '通气时间',
+          'f_uservent_date': '首次通气时间',
           'f_offsite_time': '安检时间',
           'f_checker_name': '安检员',
           'f_deal_dispose': '处理方式',

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

@@ -242,10 +242,10 @@
                 </v-select>
               </div>
               <div class="form-group col-sm-2"  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='首次通气时间' style="width: 60%"
+                  placeholder='首次通气开始时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
@@ -254,10 +254,10 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-2"  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='首次通气时间' style="width: 60%"
+                  placeholder='首次通气结束时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
@@ -304,7 +304,7 @@
                 <nobr>客户地址</nobr>
               </th>
               <th>
-                <nobr>通气时间</nobr>
+                <nobr>首次通气时间</nobr>
               </th>
               <th>
                 <nobr>安检状态</nobr>
@@ -476,7 +476,7 @@ export default {
         'f_check_type': '客户类型',
         'f_residential_area': '小区',
         'f_address': '客户地址',
-        'f_uservent_date': '通气时间',
+        'f_uservent_date': '首次通气时间',
         'f_entry_status': '安检状态',
         'f_offsite_time': '安检时间',
         'f_checker_name': '安检员',

package/src/filiale/yuansheng/android/SafecheckDevices.vue

@@ -713,7 +713,6 @@ export default {
       //tag ===> ' + Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value))
       //tag ===> ' + JSON.stringify(Number(this.gasDeviation)))
       // 计算差值是否在范围内
-
       if (Math.abs(this.f_items[this.f_meter_aberrant_number2.index].f_item_value) > Number(this.gasDeviation)) {
         this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true
         this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = '未处理'
@@ -721,6 +720,17 @@ export default {
         this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = null
         this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = null
       }
+      if( this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true){
+        this.$showMessage(`表底数异常差值为:${this.f_items[this.f_meter_aberrant_number2.index].f_item_value},是否为隐患？`, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true
+            this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = '未处理'
+          }else{
+            this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = null
+            this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = null
+          }
+        })
+      }
     },
 
     getGasAberrantNumber(val) {

package/src/filiale/yuansheng/pc/NewCheckpaper.vue

@@ -689,8 +689,16 @@ export default {
                     deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
                   }
                 }
+              } else if (items.f_item_name === '表底数异常差值') {
+                var deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
+                if (parseFloat(items.f_item_value[0]).toString() != "NaN" && parseFloat(deviation).toString() != "NaN") {
+                  if (parseFloat(items.f_item_value[0]) > parseFloat(deviation) || parseFloat(items.f_item_value[0]) < parseFloat(deviation) * -1) {
+                    checkResult = '有隐患'
+                    this.result = '有隐患'
+                    deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+                  }
+                }
               }
-
               //tag)
               //tag
               //tag
@@ -839,7 +847,7 @@ export default {
     },
     isred(val1, val2) {
       //tag
-      if (val2 == '气量异常差值' || val2 == '金额异常差值') {
+      if (val2 === '气量异常差值' || val2 === '金额异常差值') {
         return
       }
       for (let i = 0; i < this.devicesAll.length; i++) {

package/src/main-/345/215/225/351/241/265/351/235/242/346/211/223/345/214/205/347/224/250.js

@@ -0,0 +1,24 @@
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+// import { system } from 'system-clients'
+import safecheckAndroid from './safecheck-page'
+// import VueClipboard from 'vue-clipboard2'
+// Vue.use(VueClipboard)
+Vue.config.silent = true
+/** **************************通用组件******************************/
+all()
+// system(false,'shiquan')
+safecheckAndroid()
+// 打开热力系统登陆
+Vue.$heatCompatibility = false
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('system-clients/src/styles/less/aofeng/expandcss.less')
+Vue.component('load-data', (resolve) => { require(['./components/LoadData'], resolve) })
+// 测试
+// Vue.component('test', (resolve) => { require(['./components/Test'], resolve) });
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/safecheck-android.js

@@ -5,11 +5,18 @@ export default function (filiale) {
   // register check-paper asynchronosly
 // 登录
   Vue.component('android_login', (resolve) => { require(['./components/android/Login'], resolve) })
+  Vue.component('check-plan-select', (resolve) => { require(['./components/android/CheckPlanSelect'], resolve) })
+  Vue.component('area-select', (resolve) => { require(['./components/android/AreaSelect'], resolve) })
+  Vue.component('building-select', (resolve) => { require(['./components/android/BuildingSelect'], resolve) })
+  Vue.component('user-examples', (resolve) => { require(['./components/android/examples/UserExamples'], resolve) })
+  Vue.component('safe-list-examples', (resolve) => { require(['./components/android/examples/SafeListExamples'], resolve) })
   Vue.component('img-self-android', (resolve) => {
     require(['./components/android/ImgSelfAndroid'], resolve)
   })
 // 安检员导航
   Vue.component('checker', (resolve) => { require(['./components/android/Checker'], resolve) })
+  Vue.component('qr-code-page', (resolve) => { require(['./components/android/QRCode/QRCodePage'], resolve) })
+  Vue.component('qr-code-binding', (resolve) => { require(['./components/android/QRCode/QRCodeBinding'], resolve) })
 // 维修员
   Vue.component('repairman', (resolve) => { require(['./components/android/Repairman'], resolve) })
 // 所长

package/src/safecheck-page.js

@@ -0,0 +1,10 @@
+import Vue from 'vue'
+import { all } from 'vue-client'
+
+export default function (filiale) {
+  // register check-paper asynchronosly
+  Vue.component('user-examples', (resolve) => { require(['./components/android/examples/UserExamples'], resolve) })
+  Vue.component('safe-list-examples', (resolve) => { require(['./components/android/examples/SafeListExamples'], resolve) })
+
+}
+