safecheck-client 3.0.34-1 → 3.0.34-100

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (183) hide show
  1. package/package.json +1 -1
  2. package/src/App-/345/215/225/351/241/265/351/235/242/346/211/223/345/214/205/347/224/250.vue +55 -0
  3. package/src/assets/123.png +0 -0
  4. package/src/assets/f8632d3c8c4c1cb68e99da754cab1a7.png +0 -0
  5. package/src/components/LoadData.vue +62 -0
  6. package/src/components/NewDefectList/DefectListNew.vue +1 -0
  7. package/src/components/android/AddPlanItemYy.vue +451 -0
  8. package/src/components/android/AndroidDefectDeal.vue +1 -0
  9. package/src/components/android/AndroidDefectDealBeforeSafe.vue +502 -0
  10. package/src/components/android/AreaPlan.vue +1 -7
  11. package/src/components/android/AreaSelect.vue +198 -0
  12. package/src/components/android/BuildingSelect.vue +192 -0
  13. package/src/components/android/CheckPlanSelect.vue +229 -0
  14. package/src/components/android/CurrentCreateYy.vue +1051 -0
  15. package/src/components/android/ImgSelfAndroid.vue +181 -181
  16. package/src/components/android/PaperFeedback.vue +34 -1
  17. package/src/components/android/PaperFeedbackTemp.vue +1 -1
  18. package/src/components/android/QRCode/QRCodeBinding.vue +300 -0
  19. package/src/components/android/QRCode/QRCodePage.vue +212 -0
  20. package/src/components/android/SafecheckDevices.vue +4 -4
  21. package/src/components/android/SafecheckDevicesTemp.vue +1 -1
  22. package/src/components/android/SafecheckOrderV.vue +8 -12
  23. package/src/components/android/UserinfoSelect.vue +714 -0
  24. package/src/components/android/examples/410.png +0 -0
  25. package/src/components/android/examples/SafeListExamples.vue +296 -0
  26. package/src/components/android/examples/UserExamples.vue +137 -0
  27. package/src/components/android/examples/ViewDetailsExamples.vue +1235 -0
  28. package/src/components/android/examples/touxiang.png +0 -0
  29. package/src/components/android/userinfo/SafecheckUserInfo.vue +1 -1
  30. package/src/components/pc/SafeVisitInfo.vue +261 -0
  31. package/src/components/rongcheng/AddPlanItem.vue +8 -0
  32. package/src/components/rongcheng/AspiratedAreaPlan.vue +574 -464
  33. package/src/components/rongcheng/AspiratedUserInfo.vue +1 -1
  34. package/src/components/rongcheng/CheckSearchUser.vue +46 -16
  35. package/src/components/rongcheng/PaperStatem.vue +6 -1
  36. package/src/components/rongcheng/PhoneDevicesInfo.vue +16 -1
  37. package/src/components/rongcheng/PhoneUpUserinfo.vue +1236 -1328
  38. package/src/components/rongcheng/SafecheckOrderV.vue +12 -3
  39. package/src/components/rongcheng/SafecheckOrderVCli.vue +9 -0
  40. package/src/filiale/baiyin/android/AndroidDefectDeal.vue +633 -633
  41. package/src/filiale/baiyin/android/SafecheckOrderV.vue +2785 -0
  42. package/src/filiale/baiyin/android.js +11 -10
  43. package/src/filiale/baiyin/pc/CheckPlanAreaList.vue +485 -485
  44. package/src/filiale/baiyin/pc/CheckSearchUser.vue +1067 -1067
  45. package/src/filiale/baiyin/pc/DefectListNew.vue +597 -597
  46. package/src/filiale/baiyin/pc/DefectMainNew.vue +63 -63
  47. package/src/filiale/baiyin/pc/DefectPaperNew.vue +1052 -1052
  48. package/src/filiale/baiyin/pc/PaperList.vue +790 -790
  49. package/src/filiale/baiyin/pc/PlanChooser.vue +167 -167
  50. package/src/filiale/baiyin/pc/PlanManage.vue +834 -834
  51. package/src/filiale/baiyin/pc/RightTreeSafe.vue +348 -348
  52. package/src/filiale/baiyin/pc/RoleSelector.vue +160 -160
  53. package/src/filiale/bayan/android/AddPlanItem.vue +8 -0
  54. package/src/filiale/bayan/android/PaperFeedback.vue +68 -50
  55. package/src/filiale/bayan/android/PhoneUpUserinfo.vue +40 -40
  56. package/src/filiale/bayan/android/SafecheckDevices.vue +1 -1
  57. package/src/filiale/bayan/android/SafecheckOrderV.vue +58 -58
  58. package/src/filiale/bayan/android/SafecheckUserInfo.vue +6 -1
  59. package/src/filiale/bayan/pc/NewCheckpaper.vue +50 -46
  60. package/src/filiale/bayan/pc/PaperList.vue +1 -0
  61. package/src/filiale/dexin/android/SafecheckDevices.vue +1 -1
  62. package/src/filiale/fugou/pc/CheckBookSearchUser.vue +35 -15
  63. package/src/filiale/hanzhong/android/PaperFeedback.vue +1 -1
  64. package/src/filiale/hanzhong/android/SafecheckDevices.vue +1 -1
  65. package/src/filiale/hanzhong/android/SafecheckUserInfo.vue +1 -1
  66. package/src/filiale/huaran/android/SafecheckOrderV.vue +2803 -0
  67. package/src/filiale/huaran/android.js +12 -0
  68. package/src/filiale/huaran/pc/CheckBook.vue +313 -0
  69. package/src/filiale/huaran/pc/CheckBookAll.vue +69 -0
  70. package/src/filiale/huaran/pc/CheckBookArea.vue +170 -0
  71. package/src/filiale/huaran/pc/CheckBookCompany.vue +166 -0
  72. package/src/filiale/huaran/pc/CheckBookDetails.vue +196 -0
  73. package/src/filiale/huaran/pc/CheckBookEntry.vue +61 -0
  74. package/src/filiale/huaran/pc/CheckBookList.vue +386 -0
  75. package/src/filiale/huaran/pc/CheckBookSearchArea.vue +564 -0
  76. package/src/filiale/huaran/pc/CheckBookSearchUnit.vue +229 -0
  77. package/src/filiale/huaran/pc/CheckBookSearchUser.vue +604 -0
  78. package/src/filiale/huaran/pc/CheckBookUser.vue +112 -0
  79. package/src/filiale/huaran/pc/PaperList.vue +822 -0
  80. package/src/filiale/huaran/pc/PlanManage.vue +887 -0
  81. package/src/filiale/huaran/pc/checkPlanList.vue +419 -0
  82. package/src/filiale/huaran/pc/checkUserList.vue +867 -0
  83. package/src/filiale/huaran/pc.js +27 -0
  84. package/src/filiale/jiaxian/android/AddPlanItem.vue +447 -0
  85. package/src/filiale/jiaxian/android/PhoneUpUserinfo.vue +1229 -0
  86. package/src/filiale/jiaxian/android/SafecheckDevices.vue +1298 -1298
  87. package/src/filiale/jiaxian/android/SafecheckOrderV.vue +2807 -0
  88. package/src/filiale/jiaxian/android/SafecheckUserInfo.vue +784 -0
  89. package/src/filiale/jiaxian/android.js +14 -10
  90. package/src/filiale/jiaxian/pc.js +12 -12
  91. package/src/filiale/jingyang/android/PaperFeedback.vue +1 -1
  92. package/src/filiale/jingyang/android/SafecheckUserInfo.vue +1 -1
  93. package/src/filiale/kelai/pc/CheckPlanAreaList.vue +15 -7
  94. package/src/filiale/pingxiang/android/PaperFeedback.vue +1 -1
  95. package/src/filiale/qianneng/android/SafecheckOrderV.vue +1 -1
  96. package/src/filiale/qingjian/android/PhoneUpUserinfo.vue +1270 -1270
  97. package/src/filiale/qingjian/android/SafecheckDevices.vue +1 -1
  98. package/src/filiale/qingjian/android/SafecheckOrderV.vue +2844 -2844
  99. package/src/filiale/qingjian/android/SafecheckUserInfo.vue +1 -1
  100. package/src/filiale/qingtongxia/android/AddPlanItem.vue +450 -0
  101. package/src/filiale/qingtongxia/android/CurrentCreate.vue +1053 -0
  102. package/src/filiale/qingtongxia/android/PhoneUpUserinfo.vue +1230 -0
  103. package/src/filiale/qingtongxia/android/SafecheckUserInfo.vue +782 -0
  104. package/src/filiale/qingtongxia/android.js +4 -0
  105. package/src/filiale/ruihua/android/SafecheckOrderV.vue +2747 -0
  106. package/src/filiale/ruihua/android/SafecheckUserInfo.vue +804 -0
  107. package/src/filiale/ruihua/android.js +11 -0
  108. package/src/filiale/shanxian/android/AddPlanItem.vue +447 -0
  109. package/src/filiale/shanxian/android/SafecheckOrderV.vue +1 -1
  110. package/src/filiale/shanxian/android.js +1 -0
  111. package/src/filiale/shanxian/pc/PaperList.vue +785 -0
  112. package/src/filiale/shanxian/pc/checkUserList.vue +4 -4
  113. package/src/filiale/shanxian/pc.js +2 -2
  114. package/src/filiale/shiquan/android/SafecheckDevices.vue +1 -1
  115. package/src/filiale/siyang/android/AddPlanItem.vue +450 -0
  116. package/src/filiale/siyang/android/AppCheckPlan.vue +246 -0
  117. package/src/filiale/siyang/android/CurrentCreate.vue +1051 -0
  118. package/src/filiale/siyang/android/SafecheckUserInfo.vue +1 -1
  119. package/src/filiale/siyang/android.js +4 -0
  120. package/src/filiale/siyang/pc/CheckBookList.vue +396 -0
  121. package/src/filiale/siyang/pc/CheckBookSearchArea.vue +667 -0
  122. package/src/filiale/siyang/pc/CheckPlanAreaList.vue +512 -0
  123. package/src/filiale/siyang/pc/CheckSearchUser.vue +1035 -0
  124. package/src/filiale/siyang/pc/HiddenSituation.vue +167 -0
  125. package/src/filiale/siyang/pc/checkPlanList.vue +367 -0
  126. package/src/filiale/siyang/pc/checkUserList.vue +22 -18
  127. package/src/filiale/siyang/pc.js +6 -0
  128. package/src/filiale/tongchuan/android/SafecheckDevices.vue +2 -2
  129. package/src/filiale/tongchuan/android/Select.vue +421 -0
  130. package/src/filiale/tongchuan/android.js +1 -0
  131. package/src/filiale/tongchuan/pc/CheckPlanCountChartArea.vue +3 -1
  132. package/src/filiale/tongchuan/pc/DefectPaperWeiXiu.vue +6 -2
  133. package/src/filiale/tongchuan/pc/HiddenSituation.vue +3 -1
  134. package/src/filiale/tongchuan/pc/NewCheckpaper.vue +13 -22
  135. package/src/filiale/tongchuan/pc/PaperDefectMain.vue +1 -1
  136. package/src/filiale/tongchuan/pc/SelectCheckPlan.vue +5 -2
  137. package/src/filiale/tongchuan/pc/checkUserList.vue +30 -0
  138. package/src/filiale/tongchuan/utils/EventListener.js +29 -0
  139. package/src/filiale/tongchuan/utils/coerceBoolean.js +7 -0
  140. package/src/filiale/weinan/android/SafecheckDevices.vue +1 -1
  141. package/src/filiale/weinan/android/SafecheckOrderV.vue +6 -2
  142. package/src/filiale/weinan/pc/CheckBookSearchUserList.vue +75 -62
  143. package/src/filiale/weinan/pc/CheckDetail.vue +11 -11
  144. package/src/filiale/weinan/pc/DefectPaperNew.vue +31 -0
  145. package/src/filiale/weinan/pc/DeviceChange.vue +1088 -0
  146. package/src/filiale/weinan/pc/checkUserList.vue +49 -113
  147. package/src/filiale/weinan/pc.js +1 -0
  148. package/src/filiale/wuan/android/SafecheckOrderV.vue +5 -1
  149. package/src/filiale/wuan/android/SafecheckUserInfo.vue +10 -5
  150. package/src/filiale/xilan/android/AddPlanItem.vue +457 -0
  151. package/src/filiale/xilan/android/CurrentCreate.vue +1063 -0
  152. package/src/filiale/xilan/android.js +11 -0
  153. package/src/filiale/xilan/pc/checkUserList.vue +772 -0
  154. package/src/filiale/xilan/pc.js +12 -0
  155. package/src/filiale/yangchunboneng/android/CurrentCreate.vue +8 -11
  156. package/src/filiale/yangchunboneng/android/DailyworkloadQuery.vue +8 -13
  157. package/src/filiale/yangchunboneng/android/NewCheckpaperAndroid.vue +1362 -1362
  158. package/src/filiale/yangchunboneng/android/PaperFeedback.vue +1731 -1731
  159. package/src/filiale/yangchunboneng/android/PhoneUpUserinfo.vue +1235 -1235
  160. package/src/filiale/yangchunboneng/android/SafecheckDevices.vue +1336 -1332
  161. package/src/filiale/yangchunboneng/android/SafecheckOrderV.vue +2865 -2845
  162. package/src/filiale/yangchunboneng/android/SafecheckUserInfo.vue +887 -887
  163. package/src/filiale/yangchunboneng/android/safeHistoryLook.vue +8 -13
  164. package/src/filiale/yangchunboneng/pc/CheckBookSearchUser.vue +23 -11
  165. package/src/filiale/yangchunboneng/pc/CheckBookUser.vue +9 -9
  166. package/src/filiale/yangchunboneng/pc/CheckPlanAreaList.vue +96 -30
  167. package/src/filiale/yangchunboneng/pc/CheckSearchUser.vue +1192 -1192
  168. package/src/filiale/yangchunboneng/pc/DefectPaperNew.vue +54 -3
  169. package/src/filiale/yangchunboneng/pc/PaperDefectMain.vue +1046 -944
  170. package/src/filiale/yangchunboneng/pc/PaperList.vue +29 -0
  171. package/src/filiale/yongzhou/android/PaperFeedback.vue +1 -1
  172. package/src/filiale/yongzhou/android/SafecheckDevices.vue +1 -1
  173. package/src/filiale/yongzhou/android/SafecheckUserInfo.vue +1 -1
  174. package/src/filiale/yuansheng/android/SafecheckDevices.vue +11 -1
  175. package/src/filiale/yuansheng/pc/NewCheckpaper.vue +10 -2
  176. package/src/filiale/yunchengminsheng/android/PaperFeedback.vue +1 -1
  177. package/src/filiale/yunchengminsheng/android/SafecheckDevices.vue +1 -1
  178. package/src/filiale/yunchengminsheng/android/SafecheckUserInfo.vue +1 -1
  179. package/src/main-/345/215/225/351/241/265/351/235/242/346/211/223/345/214/205/347/224/250.js +24 -0
  180. package/src/main.js +33 -33
  181. package/src/safecheck-android.js +307 -296
  182. package/src/safecheck-page.js +12 -0
  183. package/src/safecheck.js +3 -0
@@ -84,6 +84,13 @@
84
84
  close-on-select>
85
85
  </v-select>
86
86
  </div>
87
+ <div class="row" style="margin-top: 10px">
88
+ <label class="font_normal_body">选择站点</label>
89
+ <right-tree
90
+ islist
91
+ :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
92
+ @re-res="getSiteRes"></right-tree>
93
+ </div>
87
94
  <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType=='派发给维修员'">
88
95
  <label class="font_normal_body">维&ensp;修&ensp;员</label>
89
96
  <v-select
@@ -93,13 +100,6 @@
93
100
  placeholder='请选择维修员'
94
101
  close-on-select></v-select>
95
102
  </div>
96
- <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType=='派发给站点'">
97
- <label class="font_normal_body">站&ensp;&ensp;&ensp;&ensp;点</label>
98
- <right-tree
99
- islist
100
- :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
101
- @re-res="getSiteRes"></right-tree>
102
- </div>
103
103
  <!--<div class="row" style="margin-top: 10px">
104
104
  <label class="font_normal_body">报修类型</label>
105
105
  <v-select :value.sync="selectData.f_repairtype"
@@ -255,7 +255,7 @@
255
255
  "基表编号":{"index":1,"type":"string","readonly":true},
256
256
  "气表型号":{"index":2,"type":"string","readonly":true},
257
257
  "气表品牌":{"index":3,"type":"string","readonly":true},
258
- "进气方向":{"index":4,"type":"string","readonly":true},
258
+ "进气方向":{"index":4,"type":"string","readonly":true,isshow:false},
259
259
  "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
260
260
  "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
261
261
  "累购气量":{"index":7,"type":"number","readonly":true},
@@ -279,7 +279,7 @@
279
279
  "基表编号":{"index":1,"type":"string","readonly":true},
280
280
  "气表型号":{"index":2,"type":"string","readonly":true},
281
281
  "气表品牌":{"index":3,"type":"string","readonly":true},
282
- "进气方向":{"index":4,"type":"string","readonly":true},
282
+ "进气方向":{"index":4,"type":"string","readonly":true,isshow:false},
283
283
  "初始表底":{"index":5,"type":"string","isshow":false,"readonly":true},
284
284
  "累购金额":{"index":6,"type":"string","readonly":true},
285
285
  "表累购金额":{"index":7,"type":"string","readonly":false},
@@ -362,7 +362,7 @@
362
362
  }
363
363
  console.log("准备保存!")
364
364
  this.disableTimer()
365
- this.getEmp()
365
+ // this.getEmp()
366
366
  this.showModal2=true
367
367
  },
368
368
  cancel1(){
@@ -377,14 +377,37 @@
377
377
  getSiteRes(obj) {
378
378
  console.log('siteRes ---> ')
379
379
  console.log(obj)
380
- if(obj.resids[0]){
381
- this.selectData.f_meetunit = obj.res.join('.')
382
- this.selectData.f_reciever = obj.resids.join('.')
383
- this.selectData.f_outlets = obj.res[obj.res.length - 1]
380
+ if(this.selectData.dispatchType=='派发给站点'){
381
+ if(obj.resids[0]){
382
+ this.selectData.f_meetunit = obj.res.join('.')
383
+ this.selectData.f_reciever = obj.resids.join('.')
384
+ this.selectData.f_outlets = obj.res[obj.res.length - 1]
385
+ }else {
386
+ this.selectData.f_meetunit = ''
387
+ this.selectData.f_reciever = ''
388
+ this.selectData.f_outlets = ''
389
+ }
384
390
  }else {
385
- this.selectData.f_meetunit = ''
386
- this.selectData.f_reciever = ''
387
- this.selectData.f_outlets = ''
391
+ if(obj.resids[0]){
392
+ this.selectData.f_meetunit = obj.res.join('.')
393
+ }else {
394
+ this.selectData.f_meetunit = ''
395
+ this.selectData.f_reciever = ''
396
+ this.selectData.f_outlets = ''
397
+ }
398
+ this.repairers = []
399
+ let vali = {
400
+ source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)`,
401
+ userid: `${obj.resids[0]}`
402
+ }
403
+ let http = new HttpResetClass()
404
+ http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: vali}, {resolveMsg: null, rejectMsg: null}).then((res) => {
405
+ res.data.forEach((item) => {
406
+ if (item.state == '在职'){
407
+ this.repairers.push({label: `${item.name}`, value: item.name})
408
+ }
409
+ })
410
+ })
388
411
  }
389
412
  },
390
413
  rectification(){
@@ -417,7 +440,7 @@
417
440
  toRepair=null
418
441
  }else{
419
442
  console.log('派发给维修员---------'+this.selectData.f_repairman)
420
- act={f_meetunit:'',f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
443
+ act={f_meetunit:this.selectData.f_meetunit,f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
421
444
  toRepair='一级派单'
422
445
  }
423
446
  let repData={
@@ -438,16 +461,16 @@
438
461
  this.save()
439
462
  },
440
463
  // 获取维修员
441
- getEmp() {
442
- this.repairers=[]
443
- let per = {source: 'this.getRights().where(row.getType()==$user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${Vue.user.id}`}
444
- let http = new HttpResetClass()
445
- http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: per}, {resolveMsg: null, rejectMsg: null}).then((res) => {
446
- res.data.forEach((user)=>{
447
- this.repairers.push({label:user.name, value: user.name})
448
- })
449
- })
450
- },
464
+ // getEmp() {
465
+ // this.repairers=[]
466
+ // let per = {source: 'this.getRights().where(row.getType()==$user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${Vue.user.id}`}
467
+ // let http = new HttpResetClass()
468
+ // http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: per}, {resolveMsg: null, rejectMsg: null}).then((res) => {
469
+ // res.data.forEach((user)=>{
470
+ // this.repairers.push({label:user.name, value: user.name})
471
+ // })
472
+ // })
473
+ // },
451
474
  closely(isdelete){
452
475
  try {
453
476
  var startOrStopAudioClipStr;
@@ -1308,6 +1331,9 @@
1308
1331
  } else {
1309
1332
  this.rowCodata = codata
1310
1333
  }
1334
+ if (this.rowCodata.f_deputy_director){
1335
+ HostApp.setPreference('f_deputy_director',this.rowCodata.f_deputy_director)
1336
+ }
1311
1337
  let param = {
1312
1338
  f_check_item_id: this.data.f_check_item_id,
1313
1339
  f_checker_id: this.data.f_checker_id,
@@ -1924,6 +1950,7 @@
1924
1950
  this.data.isupdateplanitem = this.$appdata.getSingleValue('在线安检回更有计划') ? this.$appdata.getSingleValue('在线安检回更有计划') : 'false'
1925
1951
  // 预约安检单工单编号
1926
1952
  this.data.f_SafeToRepair_id = this.item.f_service_id
1953
+ this.data.f_deputy_director = HostApp.getPreference('f_deputy_director').data || ''
1927
1954
  this.data.ename = Vue.user.ename
1928
1955
  this.data.f_outlets = Vue.user.f_parentname
1929
1956
  this.data.f_meetunit = Vue.user.orgpathnames
@@ -2042,15 +2069,6 @@
2042
2069
  f_path: "",
2043
2070
  type: "string"
2044
2071
  },
2045
- {
2046
- f_defect_level: null,
2047
- f_device_id: "",
2048
- f_is_defect: "",
2049
- f_item_name: "进气方向",
2050
- f_item_value: this.item.f_plan_meters[i].f_flow_direction,
2051
- f_path: "",
2052
- type: "string"
2053
- },
2054
2072
  {
2055
2073
  f_defect_level: null,
2056
2074
  f_device_id: "",
@@ -2104,15 +2122,6 @@
2104
2122
  f_path: "",
2105
2123
  type: "string"
2106
2124
  },
2107
- {
2108
- f_defect_level: null,
2109
- f_device_id: "",
2110
- f_is_defect: "",
2111
- f_item_name: "进气方向",
2112
- f_item_value: this.item.f_plan_meters[i].f_flow_direction,
2113
- f_path: "",
2114
- type: "string"
2115
- },
2116
2125
  {
2117
2126
  f_defect_level: null,
2118
2127
  f_device_id: "",
@@ -2372,15 +2381,6 @@
2372
2381
  f_path: "",
2373
2382
  type: "string"
2374
2383
  },
2375
- {
2376
- f_defect_level: null,
2377
- f_device_id: "",
2378
- f_is_defect: "",
2379
- f_item_name: "进气方向",
2380
- f_item_value: this.item.f_plan_meters[i].f_flow_direction,
2381
- f_path: "",
2382
- type: "string"
2383
- },
2384
2384
  {
2385
2385
  f_defect_level: null,
2386
2386
  f_device_id: "",
@@ -2547,9 +2547,9 @@
2547
2547
  delete this.config['燃气表']['items']['气量异常差值']
2548
2548
  }
2549
2549
 
2550
- if (this.data.f_user_type == '非民用' || this.data.f_check_type == '非民用'){
2551
- that.config = that.config2
2552
- }
2550
+ // if (this.data.f_user_type == '非民用' || this.data.f_check_type == '非民用'){
2551
+ // that.config.燃气表 = that.config2.燃气表
2552
+ // }
2553
2553
 
2554
2554
  //tag)
2555
2555
  if (value.data[0].f_devices) {
@@ -243,6 +243,11 @@
243
243
  this.$parent.$parent.item.f_plan_meters[0].f_metergasnums || this.$parent.$parent.item.f_plan_meters[0].f_initial_base
244
244
  }}</p>
245
245
  </div>
246
+ <div class="row">
247
+ <p class="panel-title col-xs-4 text-left font">上次隐患</p>
248
+ <p class="panel-title col-xs-8 text-left input-font">
249
+ {{ this.$parent.$parent.item.f_plan_meters[0].f_defect_text || '无' }}</p>
250
+ </div>
246
251
  </div>
247
252
  </div>
248
253
  </div>
@@ -500,7 +505,6 @@ export default {
500
505
  HostApp.__this__ = null
501
506
  },
502
507
  takePic(type, prop, title) {
503
- const obj = HostApp.getGpsDetailAddress()
504
508
  HostApp.__callback__ = this.cameraCallBack
505
509
  HostApp.__this__ = this
506
510
  //tag
@@ -526,6 +530,7 @@ export default {
526
530
  }
527
531
  let jingweidu = ''
528
532
  if (this.$parent.$parent.is_has_jingweidu == 'true') {
533
+ const obj = HostApp.getGpsDetailAddress()
529
534
  jingweidu = '\t经度:' + obj.longitude + '\t纬度:' + obj.latitude
530
535
  }
531
536
  let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'
@@ -97,19 +97,19 @@ div {
97
97
  <tr>
98
98
  <td style="text-align: center;border: #E9E9E9 solid 1px">街 道:</td>
99
99
  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_street }}</td>
100
- <td style="text-align: center;border: #E9E9E9 solid 1px">楼 号:</td>
101
- <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_building }}</td>
100
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 号:</td>
101
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_building }}</td>
102
102
  </tr>
103
103
  <tr>
104
- <td style="text-align: center;border: #E9E9E9 solid 1px">单 元:</td>
105
- <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_unit }}</td>
106
- <td style="text-align: center;border: #E9E9E9 solid 1px">楼 层:</td>
107
- <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_floor }}</td>
104
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">单 元:</td>
105
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_unit }}</td>
106
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 层:</td>
107
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_floor }}</td>
108
108
  </tr>
109
109
  <tr>
110
- <td style="text-align: center;border: #E9E9E9 solid 1px">门 牌 号 :</td>
111
- <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_room }}</td>
112
- <td style="text-align: center;border: #E9E9E9 solid 1px">用户性质:</td>
110
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">门 牌 号 :</td>
111
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_room }}</td>
112
+ <td style="text-align: center;border: #E9E9E9 solid 1px" >用户性质:</td>
113
113
  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_userproperties }}</td>
114
114
  </tr>
115
115
  <tr>
@@ -163,24 +163,26 @@ div {
163
163
  </td>
164
164
  </tr>
165
165
  <tr>
166
- <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
166
+ <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患通知单单号:</td>
167
167
  <td colspan="3"
168
168
  style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
169
- <span v-for="deviceCollect in deviceCollects">
169
+ {{ paperdata.f_repairorder_id }}
170
+ </td>
171
+ </tr>
172
+ <tr>
173
+ <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
174
+ <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
175
+ <span v-for="deviceCollect in deviceCollects">
170
176
  <span class="li-font">
171
177
  {{ deviceCollect.name }}:{{ deviceCollect.value }}&nbsp;&nbsp;&nbsp;
172
178
  </span>
173
- <br>
174
- <span v-if="deviceCollect.value == '有隐患'">
175
- <lable>
176
- 隐患:
177
- </lable>
178
- <span v-for="val in deviceCollect.devices">
179
- {{ val }}
180
- </span><br>
181
- </span>
182
-
183
- </span>
179
+ <br>
180
+ <span v-if="deviceCollect.value == '有隐患'">
181
+ <lable>隐患:</lable>
182
+ <span v-for="val in deviceCollect.devices">{{ val }}</span>
183
+ <br>
184
+ </span>
185
+ </span>
184
186
  </td>
185
187
  </tr>
186
188
 
@@ -485,18 +487,18 @@ div {
485
487
  <tr>
486
488
  <td style="text-align: center;border: #E9E9E9 solid 1px">街 道:</td>
487
489
  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_street }}</td>
488
- <td style="text-align: center;border: #E9E9E9 solid 1px">楼 号:</td>
489
- <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_building }}</td>
490
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 号:</td>
491
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_building }}</td>
490
492
  </tr>
491
493
  <tr>
492
- <td style="text-align: center;border: #E9E9E9 solid 1px">单 元:</td>
493
- <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_unit }}</td>
494
- <td style="text-align: center;border: #E9E9E9 solid 1px">楼 层:</td>
495
- <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_floor }}</td>
494
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">单 元:</td>
495
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_unit }}</td>
496
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 层:</td>
497
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_floor }}</td>
496
498
  </tr>
497
499
  <tr>
498
- <td style="text-align: center;border: #E9E9E9 solid 1px">门 牌 号 :</td>
499
- <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_room }}</td>
500
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">门 牌 号 :</td>
501
+ <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_room }}</td>
500
502
  <td style="text-align: center;border: #E9E9E9 solid 1px">用户性质:</td>
501
503
  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_userproperties }}</td>
502
504
  </tr>
@@ -557,27 +559,28 @@ div {
557
559
  </td>
558
560
  </tr>
559
561
  <tr>
560
- <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
562
+ <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患通知单单号:</td>
561
563
  <td colspan="3"
562
564
  style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
563
- <span v-for="deviceCollect in deviceCollects">
565
+ {{ paperdata.f_repairorder_id }}
566
+ </td>
567
+ </tr>
568
+ <tr>
569
+ <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
570
+ <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
571
+ <span v-for="deviceCollect in deviceCollects">
564
572
  <span class="li-font">
565
573
  {{ deviceCollect.name }}:{{ deviceCollect.value }}&nbsp;&nbsp;&nbsp;
566
574
  </span>
567
- <br>
568
- <span v-if="deviceCollect.value == '有隐患'">
569
- <lable>
570
- 隐患:
571
- </lable>
572
- <span v-for="val in deviceCollect.devices">
573
- {{ val }}
574
- </span><br>
575
- </span>
576
-
577
- </span>
575
+ <br>
576
+ <span v-if="deviceCollect.value == '有隐患'">
577
+ <lable>隐患:</lable>
578
+ <span v-for="val in deviceCollect.devices">{{ val }}</span>
579
+ <br>
580
+ </span>
581
+ </span>
578
582
  </td>
579
583
  </tr>
580
-
581
584
  </tbody>
582
585
  </table>
583
586
  <table class="table table-striped table-bordered" style="margin-top: 40px"
@@ -1338,7 +1341,8 @@ export default {
1338
1341
  if (this.deviceCollects.length > 0) {
1339
1342
  this.hasDevice = true
1340
1343
  }
1341
- this.ajresult = JSON.parse(this.data.f_defect_content).result
1344
+ this.data.f_userproperties = this.item.f_gasproperties
1345
+ this.ajresult = JSON.parse(this.item.f_defect_content).result
1342
1346
  this.showimg3 = this.data.f_noanswer_path
1343
1347
  this.showimg5 = this.data.f_noanswer1_path
1344
1348
  this.showimg6 = this.data.f_noanswer2_path
@@ -1860,7 +1864,7 @@ export default {
1860
1864
  setTimeout(() => {
1861
1865
  this.loading = false;
1862
1866
  }, 10000)
1863
- // this.putDevices()
1867
+ this.putDevices()
1864
1868
  this.showAudit()
1865
1869
  this.newConfig = this.$appdata.getSingleValue('配置中心获取文件') ? this.$appdata.getSingleValue('配置中心获取文件') : '否';
1866
1870
  if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {
@@ -856,6 +856,7 @@ export default {
856
856
  ////tag
857
857
  //获取气表品牌
858
858
  this.getTableBrands()
859
+ this.getAllMeterBook()
859
860
  let gen = select(this)
860
861
  //this.pianqu()
861
862
  this.Mreadibook(`('${this.$login.f.orgid}')`)
@@ -430,7 +430,6 @@ export default {
430
430
  if (this.role == 'androidview') {
431
431
  return
432
432
  }
433
- const obj = HostApp.getGpsDetailAddress()
434
433
  HostApp.__callback__ = this.cameraCallBack
435
434
  HostApp.__this__ = this
436
435
  //tag
@@ -450,6 +449,7 @@ export default {
450
449
  }
451
450
  let jingweidu = ''
452
451
  if (this.$parent.$parent.is_has_jingweidu == 'true'){
452
+ const obj = HostApp.getGpsDetailAddress()
453
453
  jingweidu = '\t经度:' + obj.longitude+ '\t纬度:' + obj.latitude
454
454
  }
455
455
  //tag
@@ -170,30 +170,35 @@
170
170
 
171
171
  <div class="col-sm-3 form-group">
172
172
  <label class="font_normal_body">街道/乡镇</label>
173
- <v-select :value.sync="model.f_street_id" :value-single="true"
173
+ <v-select :value.sync="model.f_street_id"
174
+ :multiple="true"
174
175
  :options='$parent.$parent.streetslist' placeholder='请选择'
175
- condition="f_street_id = '{}'"
176
+ condition="f_street_id in {}"
176
177
  v-model='model.f_street_id'
177
178
  @change="$parent.$parent.streetChange"
178
- close-on-select :search="true" >
179
+ :search="true" >
179
180
  </v-select>
180
181
  </div>
181
182
  <div class="col-sm-3 form-group">
182
183
  <label class="font_normal_body">片区/行政村</label>
183
- <v-select :value.sync="model.f_community_id" v-model='model.f_community_id'
184
- :options='$parent.$parent.communitylist' placeholder='片区/管理站' filer-key="name"
185
- condition="f_community_id = '{}'"
184
+ <v-select :value.sync="model.f_community_id"
185
+ :multiple="true"
186
+ v-model='model.f_community_id'
187
+ :options='$parent.$parent.communitylist'
188
+ placeholder='片区/管理站' filer-key="name"
189
+ condition="f_community_id in {}"
186
190
  @change="$parent.$parent.communityChange"
187
- close-on-select v-ref:slice>
191
+ v-ref:slice>
188
192
  </v-select>
189
193
  </div>
190
194
  <div class="col-sm-3 form-group">
191
195
  <label class="font_normal_body">小区/自然村</label>
192
- <v-select :value.sync="model.f_residential_area_id" :value-single="true"
196
+ <v-select :value.sync="model.f_residential_area_id"
197
+ :multiple="true"
193
198
  :options='$parent.$parent.areaslist' placeholder='请选择'
194
- condition="f_residential_area_id = '{}'"
199
+ condition="f_residential_area_id in {}"
195
200
  v-model='model.f_residential_area_id'
196
- close-on-select>
201
+ >
197
202
  </v-select>
198
203
  </div>
199
204
  <div class="col-sm-3 form-group">
@@ -712,15 +717,30 @@ export default {
712
717
  })
713
718
  this.communitylist=redata
714
719
  },
715
- async streetChange(val){
716
- if(val){
717
- await this.initcommunity(` f_filialeid = '${this.f_filialeids}' and f_street_id ='${val}' `)
720
+ async streetChange(val) {
721
+ if (val.length > 0) {
722
+ // 使用数组来收集值
723
+ const ids = [];
724
+ for (let i = 0; i < val.length; i++) {
725
+ ids.push(val[i]);
726
+ }
727
+ // 将数组转换为逗号分隔的字符串
728
+ const strs = ids.join(',');
729
+ // 调用 initcommunity 方法时确保 SQL 语法正确
730
+ await this.initcommunity(`f_filialeid = '${this.f_filialeids}' and f_street_id in (${strs})`);
718
731
  }
719
732
  },
720
733
  async communityChange(val){
721
734
  console.log(val)
722
- if(val){
723
- await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
735
+ if(val.length > 0){
736
+ // 使用数组来收集值
737
+ const ids = [];
738
+ for (let i = 0; i < val.length; i++) {
739
+ ids.push(val[i]);
740
+ }
741
+ // 将数组转换为逗号分隔的字符串
742
+ const strs = ids.join(',');
743
+ await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id in (${strs}) `)
724
744
  }
725
745
  }
726
746
  },
@@ -608,7 +608,6 @@ export default {
608
608
  HostApp.__this__ = null
609
609
  },
610
610
  takePic(prop, title, index) {
611
- const obj = HostApp.getGpsDetailAddress()
612
611
  HostApp.__callback__ = this.cameraCallBack
613
612
  HostApp.__this__ = this
614
613
  ////tag
@@ -629,6 +628,7 @@ export default {
629
628
  }
630
629
  let jingweidu = ''
631
630
  if (this.$parent.$parent.is_has_jingweidu == 'true'){
631
+ const obj = HostApp.getGpsDetailAddress()
632
632
  jingweidu = '\t经度:' + obj.longitude+ '\t纬度:' + obj.latitude
633
633
  }
634
634
  HostApp._open_a_page({
@@ -435,7 +435,6 @@
435
435
  if (this.role == 'androidview') {
436
436
  return
437
437
  }
438
- const obj = HostApp.getGpsDetailAddress()
439
438
  HostApp.__callback__ = this.cameraCallBack
440
439
  HostApp.__this__ = this
441
440
  //tag
@@ -455,6 +454,7 @@
455
454
  }
456
455
  let jingweidu = ''
457
456
  if (this.$parent.$parent.is_has_jingweidu == 'true'){
457
+ const obj = HostApp.getGpsDetailAddress()
458
458
  jingweidu = '\t经度:' + obj.longitude+ '\t纬度:' + obj.latitude
459
459
  }
460
460
  //tag
@@ -422,7 +422,6 @@ export default {
422
422
  HostApp.__this__ = null
423
423
  },
424
424
  takePic (type ,prop, title) {
425
- const obj = HostApp.getGpsDetailAddress()
426
425
  HostApp.__callback__ = this.cameraCallBack
427
426
  HostApp.__this__ = this
428
427
  //tag
@@ -448,6 +447,7 @@ export default {
448
447
  }
449
448
  let jingweidu = ''
450
449
  if (this.$parent.$parent.is_has_jingweidu == 'true'){
450
+ const obj = HostApp.getGpsDetailAddress()
451
451
  jingweidu = '\t经度:' + obj.longitude+ '\t纬度:' + obj.latitude
452
452
  }
453
453
  let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'