safecheck-client 3.0.34-1 → 3.0.34-100

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

@@ -241,6 +241,30 @@
                           :value-single="true">
                 </v-select>
               </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">首次通气开始</label>
+                <datepicker
+                  :value.sync="model.f_gas_start"
+                  placeholder='首次通气开始时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_gas_start"
+                  condition="f_uservent_date >='{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">首次通气结束</label>
+                <datepicker
+                  :value.sync="model.f_gas_end"
+                  placeholder='首次通气结束时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_gas_end"
+                  condition="f_uservent_date <=  '{} 23:59:59'">
+                </datepicker>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -279,6 +303,9 @@
               <th>
                 <nobr>客户地址</nobr>
               </th>
+              <th>
+                <nobr>首次通气时间</nobr>
+              </th>
               <th>
                 <nobr>安检状态</nobr>
               </th>
@@ -329,6 +356,7 @@
             <td style="text-align: center">{{row.f_check_type}}</td>
 
             <td style="text-align: center">{{row.f_address}}</td>
+            <td style="text-align: center">{{row.f_uservent_date}}</td>
             <td style="text-align: center">{{row.f_entry_status}}</td>
             <td style="text-align: center">{{row.f_offsite_time}}</td>
             <td style="text-align: center">{{row.f_checker_name}}</td>
@@ -448,6 +476,7 @@ export default {
         'f_check_type': '客户类型',
         'f_residential_area': '小区',
         'f_address': '客户地址',
+        'f_uservent_date': '首次通气时间',
         'f_entry_status': '安检状态',
         'f_offsite_time': '安检时间',
         'f_checker_name': '安检员',

package/src/filiale/yongzhou/android/PaperFeedback.vue

@@ -634,7 +634,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -661,6 +660,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

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

@@ -435,7 +435,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -455,6 +454,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag

package/src/filiale/yongzhou/android/SafecheckUserInfo.vue

@@ -412,7 +412,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -438,6 +437,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

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/filiale/yunchengminsheng/android/PaperFeedback.vue

@@ -626,7 +626,6 @@
         HostApp.__this__ = null
       },
       takePic(prop, title, index) {
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         ////tag
@@ -647,6 +646,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         HostApp._open_a_page({

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

@@ -435,7 +435,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -455,6 +454,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag

package/src/filiale/yunchengminsheng/android/SafecheckUserInfo.vue

@@ -420,7 +420,6 @@
         HostApp.__this__ = null
       },
       takePic (type ,prop, title) {
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -450,6 +449,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         HostApp._open_a_page({

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/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('baiyin')
-// 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('siyang')
+// 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 }
+})