safecheck-client 3.0.30-9 → 3.0.30-90

package/src/filiale/liaoyuan/android.js

@@ -6,6 +6,7 @@ let specialComp = {
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
   'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
   'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
+  'current-create' : (resolve) => { require(['./android/CurrentCreate'], resolve) },
   'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) }
 }
 exports.specialComp = specialComp

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

@@ -545,7 +545,7 @@ export default {
       cbcs:[],
       thead: '',
       headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细'],
-      bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_defect_content'],
+      bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','defecttext'],
     }
   },
   props:{

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

@@ -123,6 +123,10 @@
         <input type="checkbox" v-model="paper.f_gas_manual" /><label class="text-left font" >安全用气手册</label>
       </div>
     </div>
+    <div class="row">
+      <label for="readsafe" class="text-left font">蓝牙状态:{{blueState}}</label>
+      <button type="button" @click="initBlueState()">重新连接</button>
+    </div>
     <div class="form-group col-md-12 col-sm-12 col-xs-12"  :class="style__">
       <div  class="form-group col-md-12 col-sm-12 col-xs-12">
         <input type="checkbox" v-model="paper.f_defect_notified" class="showIi" />隐患整改单
@@ -463,6 +467,7 @@
     title: '用户反馈',
     data() {
       return {
+        blueState:'',
         defectImgs: [],
         defectToolTip: [],
         defectReason: [],
@@ -525,6 +530,25 @@
       Radio
     },
     methods: {
+      initBlueState(){
+        let state = HostApp.getBluetoothState()
+        if (state && state.state == 3){
+          this.blueState = '连接完成'
+        }else {
+          if (state && state.state == -1){
+            this.$showMessage('蓝牙连接未打开，打开后重新尝试')
+            return
+          }
+          this.blueState = '连接失败，请重试'
+          this.$androidUtil.print(JSON.stringify([{ type: 4, value: 2, unit: 'line' }]))
+          let state2 = HostApp.getBluetoothState()
+          if (state2 && state2.state == 3){
+            this.blueState = '连接完成'
+          }else {
+            this.blueState = '连接失败，请重试'
+          }
+        }
+      },
       timeSet(val) {
         //////tag
         if (!val) {
@@ -759,6 +783,16 @@
           return hasError
       },
       print() {
+        let state = HostApp.getBluetoothState()
+        if (state && state.state == 3){
+          this.blueState = '连接完成'
+        }else {
+          this.blueState = '连接失败，请重试'
+        }
+        if (state && state.state == -1){
+          this.$showMessage('蓝牙未打开，请确认蓝牙是否打开')
+          return
+        }
       let errString = this.verify()
       if (errString) {
         ////tag
@@ -1193,6 +1227,12 @@
       },
     },
     async ready() {
+      let state = HostApp.getBluetoothState()
+      if (state && state.state == 3){
+        this.blueState = '连接完成'
+      }else {
+        this.blueState = '连接失败，请重试'
+      }
       this.isRecodr = this.$appdata.getSingleValue('无限制录音');
       // await this.isoverDate()
       ////tag

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

@@ -425,6 +425,8 @@
         f_plan_id: 'this.f_plan_id',
         f_approved: 'this.f_approved',
         f_entry_status: 'this.f_entry',
+        f_check_start:'this.f_check_start',
+        f_check_end:'this.f_check_end',
         f_no_checkplan: 'this.f_no_checkplan',
         f_filialeid: 'this.f_filialeid',
         orderitem: "'f_offsite_time desc'"
@@ -432,6 +434,8 @@
       model.f_check_type=''
       model.f_plan_id = ''
       model.f_approved = ''
+      model.f_check_start = ''
+      model.f_check_end = ''
       model.f_entry = ''
       model.f_no_checkplan = ''
       model.f_filialeid = `('${this.$login.f.orgid}')`
@@ -685,6 +689,8 @@
       selfSearch(args) {
         ////tag
         //args.condition+=" and f_check_type='民用'"
+        this.model.f_check_start = args.model.f_check_start
+        this.model.f_check_end = args.model.f_check_end
         this.model.search(args.condition, args.model, args.condValue)
       }
     },

package/src/filiale/qingjian/android/PhoneUpUserinfo.vue

@@ -616,6 +616,9 @@ export default {
       }
       this.$showMessage('确定是否修改上传用户信息？', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
+          this.userinfo.addressinfo.f_residential_area = this.selectArea.f_residential_area ? this.selectArea.f_residential_area : ''
+          this.userinfo.addressinfo.f_residential_area_id = this.selectArea.id ? this.selectArea.id : ''
+          this.userinfo.addressinfo.f_slice_area = this.selectArea.f_slice_area ? this.selectArea.f_slice_area : ''
           this.excessive = true
           let address = {}
           address.f_filialeid = this.userinfo.addressinfo.f_filialeid
@@ -695,6 +698,9 @@ export default {
       }
       this.$showMessage('确定是否修改上传审核用户信息？', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
+          this.userinfo.addressinfo.f_residential_area = this.selectArea.f_residential_area ? this.selectArea.f_residential_area : ''
+          this.userinfo.addressinfo.f_residential_area_id = this.selectArea.id ? this.selectArea.id : ''
+          this.userinfo.addressinfo.f_slice_area = this.selectArea.f_slice_area ? this.selectArea.f_slice_area : ''
           this.excessive = true
           let address = {}
           address.f_filialeid = this.userinfo.addressinfo.f_filialeid

package/src/filiale/tianke/pc/checkScreen.vue

@@ -10,9 +10,9 @@
       <header slot="modal-header" class="modal-header" v-show="false"></header>
       <article slot="modal-body" class="modal-body" style="width: 1200px;">
         <div class="auto">
-          <img style="height:800px;width: 1200px;" src="../../../assets/city_proper.png"
+          <img style="height:800px;width: 1200px;" src="./cq.jpg"
                v-show="city_properEnable" alt="图片加载失败"/>
-          <img style="height:800px;width: 1200px;" src="../../../assets/township.png"
+          <img style="height:800px;width: 1200px;" src="./qy.jpg"
                v-show="townshipEnable" alt="图片加载失败"/>
         </div>
       </article>
@@ -199,7 +199,7 @@
           source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($需要定位人员$) != -1)`,
           userid: this.$login.f.id
         }, {resolveMsg: null, rejectMsg: null})
-        let arr1=await new HttpResetClass().load("GET", `/rs/safePsoition/getPosition`, {},{resolveMsg: null, rejectMsg: null})
+        let arr1=await new HttpResetClass().load("GET", `/rs/safePosition/getPosition`, {},{resolveMsg: null, rejectMsg: null})
         //tag+'---------'+typeof arr1)
         //let d=this.toStandardTimeString()
         this.checkers=[]
@@ -232,7 +232,7 @@
         }
         let td=Util.toStandardDateString()
         //获取今天上传的所有隐患
-        let arr=await new HttpResetClass().load("POST", `rs/sql/defectDetails`, {data:{condition:` f_filialeid in ('${this.$login.f.orgid}') and tdil.f_create_time>'${Util.toStartDateYearString()} 00:00:00' and tdi.F_LONGITUDE is not null`}},
+        let arr=await new HttpResetClass().load("POST", `rs/sql/defectDetails`, {data:{condition:` f_filialeid in ('${this.$login.f.orgid}') and f_upload_date>'${Util.toStartDateYearString()} 00:00:00' and f_longitude is not null`}},
           {resolveMsg: null, rejectMsg: null})
         //tag)
         if(arr.data){

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

@@ -891,6 +891,7 @@
         let it = {
           type: this.config[this.device.device].items[item].type,
           f_item_name: item,
+          f_alias_name: this.config[this.device.device].items[item].alias_name,
           checkmust: this.config[this.device.device].items[item].checkmust,
           f_item_value: f_item_value,
           f_is_defect: '',