safecheck-client 4.0.2-7 → 4.0.2-70
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.
- package/build/reports/problems/problems-report.html +663 -0
- package/package.json +132 -132
- package/src/components/NewDefectList/DefectPaperNew.vue +1184 -1184
- package/src/components/android/AndroidNotifiedDeal.vue +417 -0
- package/src/components/android/PhoneUpUserinfo.vue +1249 -1249
- package/src/components/android/SafeRightTree.vue +218 -218
- package/src/components/android/SafecheckDevices.vue +1340 -1340
- package/src/components/android/week/CheckResultSimple.vue +258 -0
- package/src/components/android/week/FirstWeekCheck.vue +301 -0
- package/src/components/android/week/StepHeaderBar.vue +485 -0
- package/src/components/android/week/WeekCheck.vue +267 -0
- package/src/components/android/week/WeekCheckPaper.vue +274 -0
- package/src/components/android/week/WeekCheckPlan.vue +145 -0
- package/src/components/android/week/WeekCheckUserInfo.vue +99 -0
- package/src/components/checkplan/CheckDetail.vue +1 -1
- package/src/components/checkplan/SelectCheckPlan.vue +39 -0
- package/src/components/paper/safetyledger.vue +198 -0
- package/src/components/pc/CheckBook.vue +303 -303
- package/src/components/pc/CheckBookArea.vue +146 -146
- package/src/components/pc/CheckBookCompany.vue +144 -144
- package/src/components/pc/CheckBookDetails.vue +161 -161
- package/src/components/pc/CheckBookEntry.vue +60 -60
- package/src/components/pc/CheckBookSearchArea.vue +560 -560
- package/src/components/pc/CheckBookSearchUnit.vue +229 -229
- package/src/components/pc/CheckBookSearchUser.vue +659 -659
- package/src/components/pc/CheckBookSearchUserList.vue +674 -674
- package/src/components/pc/DefectDeal.vue +22 -7
- package/src/components/pc/PaperDefectMain.vue +22 -0
- package/src/components/planmanage/checkUserList.vue +1 -1
- package/src/components/querycheckpaper/CheckSearchUser.vue +2 -1
- package/src/components/report/CheckPlanAreaList.vue +53 -7
- package/src/components/report/CheckPlanUserList.vue +12 -2
- package/src/filiale/jinhong/android/AddPlanItem.vue +481 -0
- package/src/filiale/jinhong/android/AndroidDefectDeal.vue +748 -0
- package/src/filiale/jinhong/android/AndroidNotifiedDeal.vue +569 -0
- package/src/filiale/jinhong/android/CurrentCreate.vue +63 -21
- package/src/filiale/jinhong/android/PhoneInsurancePurchaseDetail.vue +28 -3
- package/src/filiale/jinhong/android/SafecheckOrderV.vue +2300 -0
- package/src/filiale/jinhong/android.js +5 -1
- package/src/filiale/jinhong/pc/CheckBookList.vue +28 -18
- package/src/filiale/jinhong/pc/CheckSearchUser.vue +45 -2
- package/src/filiale/jinhong/pc/NewCheckpaper.vue +1958 -0
- package/src/filiale/jinhong/pc/PaperList.vue +8 -1
- package/src/filiale/jinhong/pc/PlanManage.vue +9 -3
- package/src/filiale/jinhong/pc/checkPlanList.vue +73 -24
- package/src/filiale/jinhong/pc/checkUserList.vue +36 -0
- package/src/filiale/jinhong/pc.js +1 -0
- package/src/filiale/meihekou/android/CheckPlanList.vue +198 -198
- package/src/filiale/meihekou/android/CheckPlanListArea.vue +190 -190
- package/src/filiale/meihekou/android/CurrentCreate.vue +16 -0
- package/src/filiale/meihekou/android/PaperFeedback.vue +1545 -1542
- package/src/filiale/meihekou/android/SafecheckDevices.vue +1343 -1340
- package/src/filiale/meihekou/android/SafecheckOrderV.vue +70 -54
- package/src/filiale/meihekou/android.js +22 -22
- package/src/filiale/meihekou/pc/CheckDetail.vue +217 -0
- package/src/filiale/meihekou/pc/CheckPlan.vue +52 -0
- package/src/filiale/meihekou/pc/CheckPlanAreaList.vue +505 -0
- package/src/filiale/meihekou/pc/NewCheckpaper.vue +249 -280
- package/src/filiale/meihekou/pc/NewCheckpaperNew.vue +2051 -2050
- package/src/filiale/meihekou/pc/NewCheckpaperTemp.vue +1 -0
- package/src/filiale/meihekou/pc/PaperList.vue +9 -23
- package/src/filiale/meihekou/pc/SelectCheckPlan.vue +262 -0
- package/src/filiale/meihekou/pc/checkUserList.vue +790 -0
- package/src/filiale/meihekou/pc.js +19 -15
- package/src/filiale/qingjian/pc/SecurityCheckCoordinates.vue +2 -2
- package/src/filiale/taiyuan/android/AddPlanItem.vue +1 -0
- package/src/filiale/taiyuan/android/SafecheckDevices.vue +1343 -0
- package/src/filiale/taiyuan/android/SafecheckOrderV.vue +17 -17
- package/src/filiale/taiyuan/android.js +1 -0
- package/src/filiale/taiyuan/pc/NewCheckpaper.vue +22 -0
- package/src/filiale/xinkang/android/SafecheckDevices.vue +2 -2
- package/src/filiale/xinkang/android/SafecheckOrderV.vue +9 -2
- package/src/filiale/xinkang/pc/NewCheckpaper.vue +17 -46
- package/src/filiale/xinliansihui/pc/PaperList.vue +814 -0
- package/src/filiale/xinliansihui/pc/PaperVisitMain.vue +206 -0
- package/src/filiale/xinliansihui/pc.js +13 -0
- package/src/safecheck-android.js +12 -0
- package/src/safecheck.js +3 -0
|
@@ -55,13 +55,13 @@ div {
|
|
|
55
55
|
<div class="basic-main" style="height: 100%">
|
|
56
56
|
<div class="page-header app-header auto" style="padding: 15px;margin-right: 10px;right: 0%;height: 7%">
|
|
57
57
|
<div @click="back()">
|
|
58
|
-
<img src="../../../assets/back.png" style="margin: 0px"/>
|
|
58
|
+
<img src="../../../assets/back.png" style="margin: 0px" />
|
|
59
59
|
</div>
|
|
60
60
|
</div>
|
|
61
61
|
<div v-show="showPdfDownload" class="page-header app-header auto"
|
|
62
62
|
style="padding: 15px;margin-right: 3.7%;right: 0%;height: 7%">
|
|
63
63
|
<div @click="exportToPDF()">
|
|
64
|
-
<img src="../../../assets/下载_.png" style="margin: 0px;width: 30px"/>
|
|
64
|
+
<img src="../../../assets/下载_.png" style="margin: 0px;width: 30px" />
|
|
65
65
|
</div>
|
|
66
66
|
</div>
|
|
67
67
|
<work-busy :is-busy="loading"></work-busy>
|
|
@@ -78,7 +78,8 @@ div {
|
|
|
78
78
|
<tbody>
|
|
79
79
|
<tr>
|
|
80
80
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">用户编号:</td>
|
|
81
|
-
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_userinfo_code }}
|
|
81
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_userinfo_code }}
|
|
82
|
+
</td>
|
|
82
83
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">用户名称:</td>
|
|
83
84
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_user_name }}</td>
|
|
84
85
|
</tr>
|
|
@@ -131,28 +132,28 @@ div {
|
|
|
131
132
|
</tr>
|
|
132
133
|
</thead>
|
|
133
134
|
<tbody>
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
135
|
+
<template v-for="item in userdevice">
|
|
136
|
+
<tr>
|
|
137
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">设备名称:</td>
|
|
138
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">{{ item.f_devices_type }}</td>
|
|
139
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">设备型号:</td>
|
|
140
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">{{ item.f_brand }}</td>
|
|
141
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">生产日期:</td>
|
|
142
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">{{ item.f_make_date }}</td>
|
|
143
|
+
</tr>
|
|
144
|
+
<tr>
|
|
145
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">到期时间:</td>
|
|
146
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">{{ item.f_expire_date }}</td>
|
|
147
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">购买方式:</td>
|
|
148
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">{{ item.WatchPurchase }}</td>
|
|
149
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">安装方式:</td>
|
|
150
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">{{ item.f_install_type }}</td>
|
|
151
|
+
</tr>
|
|
152
|
+
</template>
|
|
152
153
|
</tbody>
|
|
153
154
|
</table>
|
|
154
155
|
<table class="table table-striped table-bordered" style="margin-top: 40px"
|
|
155
|
-
v-show="paperdata.f_entry_status=='入户'">
|
|
156
|
+
v-show="paperdata.f_entry_status == '入户'">
|
|
156
157
|
<thead>
|
|
157
158
|
<tr>
|
|
158
159
|
<th colspan="4" style="text-align: center">用户安检概况</th>
|
|
@@ -163,11 +164,13 @@ div {
|
|
|
163
164
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
|
|
164
165
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_onsite_time }}</td>
|
|
165
166
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
|
|
166
|
-
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_offsite_time }}
|
|
167
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_offsite_time }}
|
|
168
|
+
</td>
|
|
167
169
|
</tr>
|
|
168
170
|
<tr>
|
|
169
171
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
|
|
170
|
-
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_entry_status }}
|
|
172
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_entry_status }}
|
|
173
|
+
</td>
|
|
171
174
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">燃气使用:</td>
|
|
172
175
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_usegas }}</td>
|
|
173
176
|
</tr>
|
|
@@ -179,7 +182,8 @@ div {
|
|
|
179
182
|
</td>
|
|
180
183
|
<td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">安检结果:</td>
|
|
181
184
|
<td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;"
|
|
182
|
-
:style="{'color':ajresult=='有隐患'?'red':''}">
|
|
185
|
+
:style="{ 'color': ajresult == '有隐患' ? 'red' : '' }">
|
|
186
|
+
{{ ajresult }}
|
|
183
187
|
</td>
|
|
184
188
|
</tr>
|
|
185
189
|
<tr>
|
|
@@ -193,28 +197,16 @@ div {
|
|
|
193
197
|
<td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
|
|
194
198
|
<td colspan="3"
|
|
195
199
|
style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
</span>
|
|
200
|
-
<br>
|
|
201
|
-
<span v-if="deviceCollect.value == '有隐患'">
|
|
202
|
-
<lable>
|
|
203
|
-
隐患:
|
|
204
|
-
</lable>
|
|
205
|
-
<span v-for="val in deviceCollect.devices">
|
|
206
|
-
{{ val }}
|
|
207
|
-
</span><br>
|
|
208
|
-
</span>
|
|
209
|
-
|
|
210
|
-
</span>
|
|
200
|
+
<span class="li-font">
|
|
201
|
+
{{ paperdata.f_defect_text }}
|
|
202
|
+
</span>
|
|
211
203
|
</td>
|
|
212
204
|
</tr>
|
|
213
205
|
|
|
214
206
|
</tbody>
|
|
215
207
|
</table>
|
|
216
208
|
<table class="table table-striped table-bordered" style="margin-top: 40px"
|
|
217
|
-
v-show="paperdata.f_entry_status!='入户'">
|
|
209
|
+
v-show="paperdata.f_entry_status != '入户'">
|
|
218
210
|
<thead>
|
|
219
211
|
<tr>
|
|
220
212
|
<th colspan="4" style="text-align: center">用户安检概况</th>
|
|
@@ -225,7 +217,8 @@ div {
|
|
|
225
217
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
|
|
226
218
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_onsite_time }}</td>
|
|
227
219
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
|
|
228
|
-
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_offsite_time }}
|
|
220
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_offsite_time }}
|
|
221
|
+
</td>
|
|
229
222
|
</tr>
|
|
230
223
|
<tr>
|
|
231
224
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
|
|
@@ -278,7 +271,7 @@ div {
|
|
|
278
271
|
</tbody>
|
|
279
272
|
</table>
|
|
280
273
|
<table class="table table-striped table-bordered" style="margin-top: 35px"
|
|
281
|
-
v-show="paperdata.f_entry_status=='入户' && paperdata.f_usegas == '未用气'">
|
|
274
|
+
v-show="paperdata.f_entry_status == '入户' && paperdata.f_usegas == '未用气'">
|
|
282
275
|
<thead>
|
|
283
276
|
<tr>
|
|
284
277
|
<th style="text-align: center">未用气照片</th>
|
|
@@ -298,7 +291,7 @@ div {
|
|
|
298
291
|
</tbody>
|
|
299
292
|
</table>
|
|
300
293
|
<table class="table table-striped table-bordered" style="margin-top: 35px"
|
|
301
|
-
v-show="showPdfImg && paperdata.f_entry_status=='入户' && ajresult=='有隐患'">
|
|
294
|
+
v-show="showPdfImg && paperdata.f_entry_status == '入户' && ajresult == '有隐患'">
|
|
302
295
|
<thead>
|
|
303
296
|
<tr>
|
|
304
297
|
<th style="text-align: center">隐患照片</th>
|
|
@@ -309,9 +302,8 @@ div {
|
|
|
309
302
|
<td style="margin: auto;text-align: center">
|
|
310
303
|
<div class="container" style="max-width: 550px;background: #FFFFFF">
|
|
311
304
|
<div class="img" v-for="img in deviceImgs">
|
|
312
|
-
<img-self-plus :list="deviceCollect.imgs
|
|
313
|
-
width="150"
|
|
314
|
-
height="200"></img-self-plus>
|
|
305
|
+
<img-self-plus :list="deviceCollect.imgs" :src="img.f_overall_path" style="float: left"
|
|
306
|
+
width="150" height="200"></img-self-plus>
|
|
315
307
|
</div>
|
|
316
308
|
</div>
|
|
317
309
|
|
|
@@ -322,7 +314,7 @@ div {
|
|
|
322
314
|
</tbody>
|
|
323
315
|
</table>
|
|
324
316
|
<table class="table table-striped table-bordered" style="margin-top: 35px"
|
|
325
|
-
v-show="paperdata.f_entry_status=='入户'">
|
|
317
|
+
v-show="paperdata.f_entry_status == '入户'">
|
|
326
318
|
<thead>
|
|
327
319
|
<tr>
|
|
328
320
|
<th style="text-align: center">总体安检照片</th>
|
|
@@ -333,9 +325,8 @@ div {
|
|
|
333
325
|
<td style="margin: auto;text-align: center">
|
|
334
326
|
<div class="container" style="max-width: 550px;background: #FFFFFF">
|
|
335
327
|
<div class="img" v-for="img in paperdata.f_overall_imgs">
|
|
336
|
-
<img-self-plus :list="paperdata.f_overall_imgs
|
|
337
|
-
width="150"
|
|
338
|
-
height="200"></img-self-plus>
|
|
328
|
+
<img-self-plus :list="paperdata.f_overall_imgs" :src="img.f_overall_path" style="float: left"
|
|
329
|
+
width="150" height="200"></img-self-plus>
|
|
339
330
|
</div>
|
|
340
331
|
</div>
|
|
341
332
|
|
|
@@ -346,7 +337,7 @@ div {
|
|
|
346
337
|
</tbody>
|
|
347
338
|
</table>
|
|
348
339
|
<table class="table table-striped table-bordered" style="width: 100%"
|
|
349
|
-
v-show="paperdata.f_entry_status=='入户' && (paperdata.f_sign_path || f_user_path)
|
|
340
|
+
v-show="paperdata.f_entry_status == '入户' && (paperdata.f_sign_path || f_user_path)">
|
|
350
341
|
<thead>
|
|
351
342
|
<tr>
|
|
352
343
|
<th style="text-align: center">用户签名照片</th>
|
|
@@ -355,26 +346,24 @@ div {
|
|
|
355
346
|
<tbody>
|
|
356
347
|
<tr>
|
|
357
348
|
<td style="margin: auto;text-align: center" v-if="paperdata.f_sign_path">
|
|
358
|
-
<div class="container" style="max-width: 500px;background: #FFFFFF"
|
|
349
|
+
<div class="container" style="max-width: 500px;background: #FFFFFF">
|
|
359
350
|
<div class="img" style="float: none">
|
|
360
351
|
<img-self-plus :src="paperdata.f_sign_path" width="200" height="200"></img-self-plus>
|
|
361
352
|
</div>
|
|
362
353
|
</div>
|
|
363
354
|
</td>
|
|
364
355
|
<td style="margin: auto;text-align: center" v-if="f_user_path">
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
</div>
|
|
372
|
-
</td>
|
|
356
|
+
<div class="container" style="max-width: 550px;background: #FFFFFF">
|
|
357
|
+
<div class="img" style="float: none">
|
|
358
|
+
<img-self-plus :src="'rs/image/file/' + f_user_path" width="200" height="200"></img-self-plus>
|
|
359
|
+
</div>
|
|
360
|
+
</div>
|
|
361
|
+
</td>
|
|
373
362
|
</tr>
|
|
374
363
|
</tbody>
|
|
375
364
|
</table>
|
|
376
365
|
<table class="table table-striped table-bordered"
|
|
377
|
-
v-show="paperdata.f_entry_status=='入户' && paperdata.f_defect_notified">
|
|
366
|
+
v-show="paperdata.f_entry_status == '入户' && paperdata.f_defect_notified">
|
|
378
367
|
<thead>
|
|
379
368
|
<tr>
|
|
380
369
|
<th style="text-align: center">安检通知书/隐患整改通知书</th>
|
|
@@ -393,7 +382,7 @@ div {
|
|
|
393
382
|
</tbody>
|
|
394
383
|
</table>
|
|
395
384
|
<table class="table table-striped table-bordered"
|
|
396
|
-
v-show="paperdata.f_entry_status=='入户'&& paperdata.f_video_path">
|
|
385
|
+
v-show="paperdata.f_entry_status == '入户' && paperdata.f_video_path">
|
|
397
386
|
<thead>
|
|
398
387
|
<tr>
|
|
399
388
|
<th style="text-align: center">安检视频</th>
|
|
@@ -411,8 +400,7 @@ div {
|
|
|
411
400
|
</tr>
|
|
412
401
|
</tbody>
|
|
413
402
|
</table>
|
|
414
|
-
<table class="table table-striped table-bordered"
|
|
415
|
-
v-show="item.f_recording1_path">
|
|
403
|
+
<table class="table table-striped table-bordered" v-show="item.f_recording1_path">
|
|
416
404
|
<thead>
|
|
417
405
|
<tr>
|
|
418
406
|
<th style="text-align: center">录音文件</th>
|
|
@@ -423,8 +411,8 @@ div {
|
|
|
423
411
|
<td style="margin: auto;text-align: center">
|
|
424
412
|
<div class="container" style="max-width: 500px;background: #FFFFFF">
|
|
425
413
|
<a class="button_spacing button_search-1"
|
|
426
|
-
:download="item.f_user_name+'-'+item.f_check_type+'-'+'录音文件.arm'"
|
|
427
|
-
:href="'rs/image/file/'+item.f_recording1_path">录音下载</a>
|
|
414
|
+
:download="item.f_user_name + '-' + item.f_check_type + '-' + '录音文件.arm'"
|
|
415
|
+
:href="'rs/image/file/' + item.f_recording1_path">录音下载</a>
|
|
428
416
|
</div>
|
|
429
417
|
</td>
|
|
430
418
|
</tr>
|
|
@@ -436,40 +424,41 @@ div {
|
|
|
436
424
|
<div class="col-md-6" style="height: 100%;overflow: scroll">
|
|
437
425
|
<div style="width: 95%;margin-left: 5%">
|
|
438
426
|
<table class="table table-striped table-bordered" v-for="config in deviceconfig2" style="margin-top: 35px">
|
|
439
|
-
<thead v-show="!(config.checkname!='燃气表'&&paperdata.f_entry_status!='入户')">
|
|
427
|
+
<thead v-show="!(config.checkname != '燃气表' && paperdata.f_entry_status != '入户')">
|
|
440
428
|
<tr>
|
|
441
429
|
<th style="text-align: center">{{ config.checkname }}</th>
|
|
442
430
|
</tr>
|
|
443
431
|
</thead>
|
|
444
|
-
<tbody v-show="!(config.checkname!='燃气表'&&paperdata.f_entry_status!='入户')">
|
|
432
|
+
<tbody v-show="!(config.checkname != '燃气表' && paperdata.f_entry_status != '入户')">
|
|
445
433
|
<tr v-for="dev in config.items">
|
|
446
|
-
<td v-if="dev.type!='text' && dev.isshow != false">
|
|
434
|
+
<td v-if="dev.type != 'text' && dev.isshow != false">
|
|
447
435
|
<div class="row">
|
|
448
436
|
<div class="col-md-8" style="text-align: center;">
|
|
449
437
|
<label>
|
|
450
|
-
<button-link type="button" class="btn btn-link"
|
|
451
|
-
|
|
438
|
+
<button-link type="button" class="btn btn-link"
|
|
439
|
+
@click="showpicture(config.checkname, dev.lname)"
|
|
440
|
+
:style="isred(config.checkname, dev.lname) ? 'color:red' : 'color:black'">
|
|
452
441
|
{{ dev.lname }}
|
|
453
442
|
</button-link>
|
|
454
443
|
</label>
|
|
455
444
|
</div>
|
|
456
445
|
<div class="col-md-4" style="text-align: center">
|
|
457
|
-
<label style="font-weight: normal"
|
|
458
|
-
|
|
459
|
-
|
|
446
|
+
<label style="font-weight: normal" v-if="dev.type != 'picture'">{{
|
|
447
|
+
getDeviceValue(config.checkname, dev.lname) ? getDeviceValue(config.checkname, dev.lname) :
|
|
448
|
+
'无'
|
|
460
449
|
}}</label>
|
|
461
|
-
<label style="font-weight: normal" v-if="dev.type=='picture'">
|
|
462
|
-
<div v-show="getDevicePath(config.checkname,dev.lname)">
|
|
450
|
+
<label style="font-weight: normal" v-if="dev.type == 'picture'">
|
|
451
|
+
<div v-show="getDevicePath(config.checkname, dev.lname)">
|
|
463
452
|
<button-link style="color: black" type="button" class="btn btn-link"
|
|
464
|
-
@click="showpath(getDevicePath(config.checkname,dev.lname),dev.lname)">查看照片
|
|
453
|
+
@click="showpath(getDevicePath(config.checkname, dev.lname), dev.lname)">查看照片
|
|
465
454
|
</button-link>
|
|
466
455
|
</div>
|
|
467
|
-
<div v-show="!getDevicePath(config.checkname,dev.lname)">无照片</div>
|
|
456
|
+
<div v-show="!getDevicePath(config.checkname, dev.lname)">无照片</div>
|
|
468
457
|
</label>
|
|
469
458
|
</div>
|
|
470
459
|
</div>
|
|
471
460
|
</td>
|
|
472
|
-
<td v-if="dev.type==='text' && dev.isshow != false">
|
|
461
|
+
<td v-if="dev.type === 'text' && dev.isshow != false">
|
|
473
462
|
<label style="width: 100%;text-align: center">{{ dev.lname }}</label>
|
|
474
463
|
</td>
|
|
475
464
|
</tr>
|
|
@@ -554,8 +543,8 @@ div {
|
|
|
554
543
|
</tr>
|
|
555
544
|
</thead>
|
|
556
545
|
<tbody>
|
|
557
|
-
<template v-for="
|
|
558
|
-
<tr
|
|
546
|
+
<template v-for="item in userdevice">
|
|
547
|
+
<tr>
|
|
559
548
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">设备名称:</td>
|
|
560
549
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">{{ item.f_devices_type }}</td>
|
|
561
550
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">设备型号:</td>
|
|
@@ -563,7 +552,7 @@ div {
|
|
|
563
552
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">生产日期:</td>
|
|
564
553
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">{{ item.f_make_date }}</td>
|
|
565
554
|
</tr>
|
|
566
|
-
<tr
|
|
555
|
+
<tr>
|
|
567
556
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">到期时间:</td>
|
|
568
557
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">{{ item.f_expire_date }}</td>
|
|
569
558
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 15%">购买方式:</td>
|
|
@@ -575,7 +564,7 @@ div {
|
|
|
575
564
|
</tbody>
|
|
576
565
|
</table>
|
|
577
566
|
<table class="table table-striped table-bordered" style="margin-top: 40px"
|
|
578
|
-
v-show="paperdata.f_entry_status=='入户'">
|
|
567
|
+
v-show="paperdata.f_entry_status == '入户'">
|
|
579
568
|
<thead>
|
|
580
569
|
<tr>
|
|
581
570
|
<th colspan="4" style="text-align: center">用户安检概况</th>
|
|
@@ -584,7 +573,8 @@ div {
|
|
|
584
573
|
<tbody>
|
|
585
574
|
<tr>
|
|
586
575
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
|
|
587
|
-
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_onsite_time }}
|
|
576
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_onsite_time }}
|
|
577
|
+
</td>
|
|
588
578
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
|
|
589
579
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{
|
|
590
580
|
paperdata.f_offsite_time
|
|
@@ -608,7 +598,7 @@ div {
|
|
|
608
598
|
</td>
|
|
609
599
|
<td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">安检结果:</td>
|
|
610
600
|
<td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;"
|
|
611
|
-
:style="{'color':ajresult=='有隐患'?'red':''}">{{ ajresult }}
|
|
601
|
+
:style="{ 'color': ajresult == '有隐患' ? 'red' : '' }">{{ ajresult }}
|
|
612
602
|
</td>
|
|
613
603
|
</tr>
|
|
614
604
|
<tr>
|
|
@@ -622,28 +612,16 @@ div {
|
|
|
622
612
|
<td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
|
|
623
613
|
<td colspan="3"
|
|
624
614
|
style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
|
|
625
|
-
<span v-for="deviceCollect in deviceCollects">
|
|
626
615
|
<span class="li-font">
|
|
627
|
-
{{
|
|
616
|
+
{{ paperdata.f_defect_text }}
|
|
628
617
|
</span>
|
|
629
|
-
<br>
|
|
630
|
-
<span v-if="deviceCollect.value == '有隐患'">
|
|
631
|
-
<lable>
|
|
632
|
-
隐患:
|
|
633
|
-
</lable>
|
|
634
|
-
<span v-for="val in deviceCollect.devices">
|
|
635
|
-
{{ val }}
|
|
636
|
-
</span><br>
|
|
637
|
-
</span>
|
|
638
|
-
|
|
639
|
-
</span>
|
|
640
618
|
</td>
|
|
641
619
|
</tr>
|
|
642
620
|
|
|
643
621
|
</tbody>
|
|
644
622
|
</table>
|
|
645
623
|
<table class="table table-striped table-bordered" style="margin-top: 40px"
|
|
646
|
-
v-show="paperdata.f_entry_status!='入户'">
|
|
624
|
+
v-show="paperdata.f_entry_status != '入户'">
|
|
647
625
|
<thead>
|
|
648
626
|
<tr>
|
|
649
627
|
<th colspan="4" style="text-align: center">用户安检概况</th>
|
|
@@ -652,7 +630,8 @@ div {
|
|
|
652
630
|
<tbody>
|
|
653
631
|
<tr>
|
|
654
632
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
|
|
655
|
-
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_onsite_time }}
|
|
633
|
+
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_onsite_time }}
|
|
634
|
+
</td>
|
|
656
635
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
|
|
657
636
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{
|
|
658
637
|
paperdata.f_offsite_time
|
|
@@ -710,7 +689,7 @@ div {
|
|
|
710
689
|
</tbody>
|
|
711
690
|
</table>
|
|
712
691
|
<table class="table table-striped table-bordered" style="margin-top: 35px"
|
|
713
|
-
v-show="showPdfImg && paperdata.f_entry_status=='入户' && ajresult=='有隐患'">
|
|
692
|
+
v-show="showPdfImg && paperdata.f_entry_status == '入户' && ajresult == '有隐患'">
|
|
714
693
|
<thead>
|
|
715
694
|
<tr>
|
|
716
695
|
<th style="text-align: center">隐患照片</th>
|
|
@@ -721,9 +700,8 @@ div {
|
|
|
721
700
|
<td style="margin: auto;text-align: center">
|
|
722
701
|
<div class="container" style="max-width: 550px;background: #FFFFFF">
|
|
723
702
|
<div class="img" v-for="img in deviceImgs">
|
|
724
|
-
<img-self-plus :list="deviceCollect.imgs
|
|
725
|
-
width="150"
|
|
726
|
-
height="200"></img-self-plus>
|
|
703
|
+
<img-self-plus :list="deviceCollect.imgs" :src="img.f_overall_path" style="float: left"
|
|
704
|
+
width="150" height="200"></img-self-plus>
|
|
727
705
|
</div>
|
|
728
706
|
</div>
|
|
729
707
|
|
|
@@ -734,7 +712,7 @@ div {
|
|
|
734
712
|
</tbody>
|
|
735
713
|
</table>
|
|
736
714
|
<table class="table table-striped table-bordered" style="margin-top: 35px"
|
|
737
|
-
v-show="paperdata.f_entry_status=='入户'">
|
|
715
|
+
v-show="paperdata.f_entry_status == '入户'">
|
|
738
716
|
<thead>
|
|
739
717
|
<tr>
|
|
740
718
|
<th style="text-align: center">总体安检照片</th>
|
|
@@ -745,9 +723,8 @@ div {
|
|
|
745
723
|
<td style="margin: auto;text-align: center">
|
|
746
724
|
<div class="container" style="max-width: 550px;background: #FFFFFF">
|
|
747
725
|
<div class="img" v-for="img in paperdata.f_overall_imgs">
|
|
748
|
-
<img-self-plus :list="paperdata.f_overall_imgs
|
|
749
|
-
width="150"
|
|
750
|
-
height="200"></img-self-plus>
|
|
726
|
+
<img-self-plus :list="paperdata.f_overall_imgs" :src="img.f_overall_path" style="float: left"
|
|
727
|
+
width="150" height="200"></img-self-plus>
|
|
751
728
|
</div>
|
|
752
729
|
</div>
|
|
753
730
|
|
|
@@ -758,7 +735,7 @@ div {
|
|
|
758
735
|
</tbody>
|
|
759
736
|
</table>
|
|
760
737
|
<table class="table table-striped table-bordered" style="width: 100%"
|
|
761
|
-
v-show="paperdata.f_entry_status=='入户'">
|
|
738
|
+
v-show="paperdata.f_entry_status == '入户'">
|
|
762
739
|
<thead>
|
|
763
740
|
<tr>
|
|
764
741
|
<th style="text-align: center">用户签名照片</th>
|
|
@@ -774,19 +751,17 @@ div {
|
|
|
774
751
|
</div>
|
|
775
752
|
</td>
|
|
776
753
|
<td style="margin: auto;text-align: center">
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
width="200"
|
|
781
|
-
height="200"></img-self-plus>
|
|
782
|
-
</div>
|
|
754
|
+
<div class="container" style="max-width: 550px;background: #FFFFFF" v-if="f_user_path">
|
|
755
|
+
<div class="img" style="float: none">
|
|
756
|
+
<img-self-plus :src="'rs/image/file/' + f_user_path" width="200" height="200"></img-self-plus>
|
|
783
757
|
</div>
|
|
758
|
+
</div>
|
|
784
759
|
</td>
|
|
785
760
|
</tr>
|
|
786
761
|
</tbody>
|
|
787
762
|
</table>
|
|
788
763
|
<table class="table table-striped table-bordered"
|
|
789
|
-
v-show="paperdata.f_entry_status=='入户' && paperdata.f_defect_notified">
|
|
764
|
+
v-show="paperdata.f_entry_status == '入户' && paperdata.f_defect_notified">
|
|
790
765
|
<thead>
|
|
791
766
|
<tr>
|
|
792
767
|
<th style="text-align: center">安检通知书/隐患整改通知书</th>
|
|
@@ -805,7 +780,7 @@ div {
|
|
|
805
780
|
</tbody>
|
|
806
781
|
</table>
|
|
807
782
|
<table class="table table-striped table-bordered"
|
|
808
|
-
v-show="paperdata.f_entry_status=='入户'&& paperdata.f_video_path">
|
|
783
|
+
v-show="paperdata.f_entry_status == '入户' && paperdata.f_video_path">
|
|
809
784
|
<thead>
|
|
810
785
|
<tr>
|
|
811
786
|
<th style="text-align: center">安检视频</th>
|
|
@@ -823,8 +798,7 @@ div {
|
|
|
823
798
|
</tr>
|
|
824
799
|
</tbody>
|
|
825
800
|
</table>
|
|
826
|
-
<table class="table table-striped table-bordered"
|
|
827
|
-
v-show="item.f_recording1_path">
|
|
801
|
+
<table class="table table-striped table-bordered" v-show="item.f_recording1_path">
|
|
828
802
|
<thead>
|
|
829
803
|
<tr>
|
|
830
804
|
<th style="text-align: center">录音文件</th>
|
|
@@ -835,8 +809,8 @@ div {
|
|
|
835
809
|
<td style="margin: auto;text-align: center">
|
|
836
810
|
<div class="container" style="max-width: 500px;background: #FFFFFF">
|
|
837
811
|
<a class="button_spacing button_search-1"
|
|
838
|
-
:download="item.f_user_name+'-'+item.f_check_type+'-'+'录音文件.arm'"
|
|
839
|
-
:href="'rs/image/file/'+item.f_recording1_path">录音下载</a>
|
|
812
|
+
:download="item.f_user_name + '-' + item.f_check_type + '-' + '录音文件.arm'"
|
|
813
|
+
:href="'rs/image/file/' + item.f_recording1_path">录音下载</a>
|
|
840
814
|
</div>
|
|
841
815
|
</td>
|
|
842
816
|
</tr>
|
|
@@ -848,41 +822,41 @@ div {
|
|
|
848
822
|
<div style="width: 95%;margin-left: 5%">
|
|
849
823
|
<table class="table table-striped table-bordered" v-for="config in deviceconfig2"
|
|
850
824
|
style="margin-top: 35px">
|
|
851
|
-
<thead v-show="!(config.checkname!='燃气表'&&paperdata.f_entry_status!='入户')">
|
|
825
|
+
<thead v-show="!(config.checkname != '燃气表' && paperdata.f_entry_status != '入户')">
|
|
852
826
|
<tr>
|
|
853
827
|
<th style="text-align: center">{{ config.checkname }}</th>
|
|
854
828
|
</tr>
|
|
855
829
|
</thead>
|
|
856
|
-
<tbody v-show="!(config.checkname!='燃气表'&&paperdata.f_entry_status!='入户')">
|
|
830
|
+
<tbody v-show="!(config.checkname != '燃气表' && paperdata.f_entry_status != '入户')">
|
|
857
831
|
<tr v-for="dev in config.items">
|
|
858
|
-
<td v-if="dev.type!='text' && dev.isshow != false">
|
|
832
|
+
<td v-if="dev.type != 'text' && dev.isshow != false">
|
|
859
833
|
<div class="row">
|
|
860
834
|
<div class="col-md-8" style="text-align: center;">
|
|
861
835
|
<label>
|
|
862
836
|
<button-link type="button" class="btn btn-link"
|
|
863
|
-
@click="showpicture(config.checkname,dev.lname)"
|
|
864
|
-
:style="isred(config.checkname,dev.lname)?'color:red':'color:black'">
|
|
837
|
+
@click="showpicture(config.checkname, dev.lname)"
|
|
838
|
+
:style="isred(config.checkname, dev.lname) ? 'color:red' : 'color:black'">
|
|
865
839
|
{{ dev.lname }}
|
|
866
840
|
</button-link>
|
|
867
841
|
</label>
|
|
868
842
|
</div>
|
|
869
843
|
<div class="col-md-4" style="text-align: center">
|
|
870
|
-
<label style="font-weight: normal"
|
|
871
|
-
|
|
872
|
-
|
|
844
|
+
<label style="font-weight: normal" v-if="dev.type != 'picture'">{{
|
|
845
|
+
getDeviceValue(config.checkname, dev.lname) ? getDeviceValue(config.checkname, dev.lname) :
|
|
846
|
+
'无'
|
|
873
847
|
}}</label>
|
|
874
|
-
<label style="font-weight: normal" v-if="dev.type=='picture'">
|
|
875
|
-
<div v-show="getDevicePath(config.checkname,dev.lname)">
|
|
848
|
+
<label style="font-weight: normal" v-if="dev.type == 'picture'">
|
|
849
|
+
<div v-show="getDevicePath(config.checkname, dev.lname)">
|
|
876
850
|
<button-link style="color: black" type="button" class="btn btn-link"
|
|
877
|
-
@click="showpath(getDevicePath(config.checkname,dev.lname),dev.lname)">查看照片
|
|
851
|
+
@click="showpath(getDevicePath(config.checkname, dev.lname), dev.lname)">查看照片
|
|
878
852
|
</button-link>
|
|
879
853
|
</div>
|
|
880
|
-
<div v-show="!getDevicePath(config.checkname,dev.lname)">无照片</div>
|
|
854
|
+
<div v-show="!getDevicePath(config.checkname, dev.lname)">无照片</div>
|
|
881
855
|
</label>
|
|
882
856
|
</div>
|
|
883
857
|
</div>
|
|
884
858
|
</td>
|
|
885
|
-
<td v-if="dev.type==='text' && dev.isshow != false">
|
|
859
|
+
<td v-if="dev.type === 'text' && dev.isshow != false">
|
|
886
860
|
<label style="width: 100%;text-align: center">{{ dev.lname }}</label>
|
|
887
861
|
</td>
|
|
888
862
|
</tr>
|
|
@@ -926,34 +900,28 @@ div {
|
|
|
926
900
|
<div class="from-group">
|
|
927
901
|
<div class="row">
|
|
928
902
|
<div class="col-md-6">
|
|
929
|
-
<img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer_path" :src="showimg3"
|
|
930
|
-
width="282"
|
|
931
|
-
height="400"></img-self-plus>
|
|
903
|
+
<img-self-plus v-if="this.paperdata.f_entry_status == '到访不遇' && this.paperdata.f_noanswer_path" :src="showimg3"
|
|
904
|
+
width="282" height="400"></img-self-plus>
|
|
932
905
|
</div>
|
|
933
906
|
<div class="col-md-6">
|
|
934
|
-
<img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path"
|
|
935
|
-
:src="showimg5" width="282"
|
|
936
|
-
height="400"></img-self-plus>
|
|
907
|
+
<img-self-plus v-if="this.paperdata.f_entry_status == '到访不遇' && this.paperdata.f_noanswer1_path"
|
|
908
|
+
:src="showimg5" width="282" height="400"></img-self-plus>
|
|
937
909
|
</div>
|
|
938
910
|
<div class="col-md-6">
|
|
939
|
-
<img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path"
|
|
940
|
-
:src="showimg6" width="282"
|
|
941
|
-
height="400"></img-self-plus>
|
|
911
|
+
<img-self-plus v-if="this.paperdata.f_entry_status == '到访不遇' && this.paperdata.f_noanswer2_path"
|
|
912
|
+
:src="showimg6" width="282" height="400"></img-self-plus>
|
|
942
913
|
</div>
|
|
943
914
|
<div class="col-md-6">
|
|
944
|
-
<img-self-plus v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck_path"
|
|
945
|
-
:src="showimg4" width="282"
|
|
946
|
-
height="400"></img-self-plus>
|
|
915
|
+
<img-self-plus v-if="this.paperdata.f_entry_status == '拒检' && this.paperdata.f_rejectcheck_path"
|
|
916
|
+
:src="showimg4" width="282" height="400"></img-self-plus>
|
|
947
917
|
</div>
|
|
948
918
|
<div class="col-md-6">
|
|
949
|
-
<img-self-plus v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck1_path"
|
|
950
|
-
:src="showimg7" width="282"
|
|
951
|
-
height="400"></img-self-plus>
|
|
919
|
+
<img-self-plus v-if="this.paperdata.f_entry_status == '拒检' && this.paperdata.f_rejectcheck1_path"
|
|
920
|
+
:src="showimg7" width="282" height="400"></img-self-plus>
|
|
952
921
|
</div>
|
|
953
922
|
<div class="col-md-6">
|
|
954
|
-
<img-self-plus v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck2_path"
|
|
955
|
-
:src="showimg8" width="282"
|
|
956
|
-
height="400"></img-self-plus>
|
|
923
|
+
<img-self-plus v-if="this.paperdata.f_entry_status == '拒检' && this.paperdata.f_rejectcheck2_path"
|
|
924
|
+
:src="showimg8" width="282" height="400"></img-self-plus>
|
|
957
925
|
</div>
|
|
958
926
|
</div>
|
|
959
927
|
</div>
|
|
@@ -990,14 +958,14 @@ import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
|
|
|
990
958
|
import Radio from 'vue-client/src/vue-strap/src/radioBtn'
|
|
991
959
|
import Vue from 'vue'
|
|
992
960
|
import * as Util from '../../Util'
|
|
993
|
-
import {jsonSort} from '../../../utils/LdapHelper'
|
|
994
|
-
import {HttpResetClass} from "vue-client";
|
|
961
|
+
import { jsonSort } from '../../../utils/LdapHelper'
|
|
962
|
+
import { HttpResetClass } from "vue-client";
|
|
995
963
|
let asyncReady = async function (self) {
|
|
996
964
|
// 获取配置信息
|
|
997
965
|
try {
|
|
998
|
-
let res = await new HttpResetClass().load('get','/api/af-safecheck/vue',null, {resolveMsg: null, rejectMsg: null})
|
|
966
|
+
let res = await new HttpResetClass().load('get', '/api/af-safecheck/vue', null, { resolveMsg: null, rejectMsg: null })
|
|
999
967
|
self.delConfigKey(res.data)
|
|
1000
|
-
Vue.config.safecheck=res.data
|
|
968
|
+
Vue.config.safecheck = res.data
|
|
1001
969
|
console.log('获取配置结果===', res.data)
|
|
1002
970
|
} catch (error) {
|
|
1003
971
|
// 忽略704,文件找不到异常R
|
|
@@ -1008,10 +976,10 @@ let asyncReady = async function (self) {
|
|
|
1008
976
|
}
|
|
1009
977
|
export default {
|
|
1010
978
|
title: '安检单',
|
|
1011
|
-
props: ['f_plan_id', 'item', 'role','gotoitem'],
|
|
979
|
+
props: ['f_plan_id', 'item', 'role', 'gotoitem'],
|
|
1012
980
|
data() {
|
|
1013
981
|
return {
|
|
1014
|
-
f_user_path:'',
|
|
982
|
+
f_user_path: '',
|
|
1015
983
|
message: '',
|
|
1016
984
|
showButton: false,
|
|
1017
985
|
showModel: false,
|
|
@@ -1028,7 +996,7 @@ export default {
|
|
|
1028
996
|
hasDevice: false,
|
|
1029
997
|
deviceCollect: {},
|
|
1030
998
|
deviceCollects: [],
|
|
1031
|
-
deviceImgs:[],
|
|
999
|
+
deviceImgs: [],
|
|
1032
1000
|
isshow: false,
|
|
1033
1001
|
ajresult: '',
|
|
1034
1002
|
loading: true,
|
|
@@ -1067,19 +1035,19 @@ export default {
|
|
|
1067
1035
|
"checkmust": true,
|
|
1068
1036
|
"index": 1,
|
|
1069
1037
|
"items": {
|
|
1070
|
-
"基表编号": {"index": 1, "type": "string", "readonly": true},
|
|
1071
|
-
"气表型号": {"index": 2, "type": "string", "readonly": true},
|
|
1072
|
-
"气表品牌": {"index": 3, "type": "string", "readonly": true},
|
|
1073
|
-
"表向": {"index": 4, "type": "string", "readonly": true},
|
|
1074
|
-
"初始表底": {"index": 5, "type": "number", "isshow": false, "readonly": true},
|
|
1075
|
-
"上期表读数": {"index": 6, "type": "number", "readonly": true, isshow: false},
|
|
1076
|
-
"累购气量": {"index": 7, "type": "number", "readonly": true},
|
|
1077
|
-
"已用气量": {"index": 8, "type": "number", "checkmust": false},//基表数
|
|
1078
|
-
"剩余气量": {"index": 9, "type": "number", "checkmust": false},//累购-已用
|
|
1038
|
+
"基表编号": { "index": 1, "type": "string", "readonly": true },
|
|
1039
|
+
"气表型号": { "index": 2, "type": "string", "readonly": true },
|
|
1040
|
+
"气表品牌": { "index": 3, "type": "string", "readonly": true },
|
|
1041
|
+
"表向": { "index": 4, "type": "string", "readonly": true },
|
|
1042
|
+
"初始表底": { "index": 5, "type": "number", "isshow": false, "readonly": true },
|
|
1043
|
+
"上期表读数": { "index": 6, "type": "number", "readonly": true, isshow: false },
|
|
1044
|
+
"累购气量": { "index": 7, "type": "number", "readonly": true },
|
|
1045
|
+
"已用气量": { "index": 8, "type": "number", "checkmust": false },//基表数
|
|
1046
|
+
"剩余气量": { "index": 9, "type": "number", "checkmust": false },//累购-已用
|
|
1079
1047
|
//显示屏数 --实际剩余气量
|
|
1080
|
-
"气量异常差值": {"index": 10, "type": "number", "readonly": true},
|
|
1081
|
-
"表箱号": {"index": 11, "type": "string", "readonly": true},
|
|
1082
|
-
"燃气表照片": {"index": 12, "type": "picture", "checkmust": false},
|
|
1048
|
+
"气量异常差值": { "index": 10, "type": "number", "readonly": true },
|
|
1049
|
+
"表箱号": { "index": 11, "type": "string", "readonly": true },
|
|
1050
|
+
"燃气表照片": { "index": 12, "type": "picture", "checkmust": false },
|
|
1083
1051
|
}
|
|
1084
1052
|
// 注意,配置项的index必须与上面的固定配置保持'顺序'
|
|
1085
1053
|
}
|
|
@@ -1090,23 +1058,23 @@ export default {
|
|
|
1090
1058
|
"checkmust": true,
|
|
1091
1059
|
"index": 1,
|
|
1092
1060
|
"items": {
|
|
1093
|
-
"基表编号": {"index": 1, "type": "string", "readonly": true},
|
|
1094
|
-
"气表型号": {"index": 2, "type": "string", "readonly": true},
|
|
1095
|
-
"气表品牌": {"index": 3, "type": "string", "readonly": true},
|
|
1096
|
-
"表向": {"index": 4, "type": "string", "readonly": true},
|
|
1097
|
-
"初始表底": {"index": 5, "type": "number", "isshow": false, "readonly": true},
|
|
1098
|
-
"上期表读数": {"index": 6, "type": "number", "readonly": true, isshow: false},
|
|
1099
|
-
"累购金额": {"index": 7, "type": "number", "readonly": true},
|
|
1100
|
-
"已用金额": {"index": 8, "type": "number", "checkmust": false},
|
|
1061
|
+
"基表编号": { "index": 1, "type": "string", "readonly": true },
|
|
1062
|
+
"气表型号": { "index": 2, "type": "string", "readonly": true },
|
|
1063
|
+
"气表品牌": { "index": 3, "type": "string", "readonly": true },
|
|
1064
|
+
"表向": { "index": 4, "type": "string", "readonly": true },
|
|
1065
|
+
"初始表底": { "index": 5, "type": "number", "isshow": false, "readonly": true },
|
|
1066
|
+
"上期表读数": { "index": 6, "type": "number", "readonly": true, isshow: false },
|
|
1067
|
+
"累购金额": { "index": 7, "type": "number", "readonly": true },
|
|
1068
|
+
"已用金额": { "index": 8, "type": "number", "checkmust": false },
|
|
1101
1069
|
//显示屏数 --实际剩余气量
|
|
1102
|
-
"剩余金额": {"index": 9, "type": "number", "checkmust": false},
|
|
1103
|
-
"金额异常差值": {"index": 10, "type": "number", "readonly": true},
|
|
1104
|
-
"表箱号": {"index": 11, "type": "string", "readonly": true},
|
|
1105
|
-
"燃气表照片": {"index": 12, "type": "picture", "checkmust": false},
|
|
1070
|
+
"剩余金额": { "index": 9, "type": "number", "checkmust": false },
|
|
1071
|
+
"金额异常差值": { "index": 10, "type": "number", "readonly": true },
|
|
1072
|
+
"表箱号": { "index": 11, "type": "string", "readonly": true },
|
|
1073
|
+
"燃气表照片": { "index": 12, "type": "picture", "checkmust": false },
|
|
1106
1074
|
}
|
|
1107
1075
|
}
|
|
1108
1076
|
},
|
|
1109
|
-
userdevice:[]
|
|
1077
|
+
userdevice: []
|
|
1110
1078
|
}
|
|
1111
1079
|
},
|
|
1112
1080
|
components: {
|
|
@@ -1129,7 +1097,7 @@ export default {
|
|
|
1129
1097
|
},
|
|
1130
1098
|
set(val) {
|
|
1131
1099
|
if (this.isStrat) {
|
|
1132
|
-
this.$goto(val, {userinfo: this.data}, 'paper-router')
|
|
1100
|
+
this.$goto(val, { userinfo: this.data }, 'paper-router')
|
|
1133
1101
|
} else {
|
|
1134
1102
|
this.$showMessage('未开始安检!')
|
|
1135
1103
|
}
|
|
@@ -1142,21 +1110,21 @@ export default {
|
|
|
1142
1110
|
}
|
|
1143
1111
|
},
|
|
1144
1112
|
methods: {
|
|
1145
|
-
getuserinfodevice(){
|
|
1113
|
+
getuserinfodevice() {
|
|
1146
1114
|
new HttpResetClass().load('POST', `/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
|
|
1147
1115
|
data: {
|
|
1148
1116
|
items: '*',
|
|
1149
|
-
|
|
1150
|
-
|
|
1151
|
-
|
|
1117
|
+
tablename: 't_devices',
|
|
1118
|
+
condition: `f_userinfo_id = '${this.item.f_userinfoid}'`,
|
|
1119
|
+
orderitem: 'id'
|
|
1152
1120
|
}
|
|
1153
|
-
}, {resolveMsg: null, rejectMsg:null}).then((res) => {
|
|
1154
|
-
|
|
1121
|
+
}, { resolveMsg: null, rejectMsg: null }).then((res) => {
|
|
1122
|
+
this.userdevice = res.data
|
|
1155
1123
|
})
|
|
1156
1124
|
},
|
|
1157
|
-
delConfigKey(obj){
|
|
1125
|
+
delConfigKey(obj) {
|
|
1158
1126
|
// 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
|
|
1159
|
-
Object.keys(obj).forEach(key =>{
|
|
1127
|
+
Object.keys(obj).forEach(key => {
|
|
1160
1128
|
Object.keys(obj[key]).forEach(col => {
|
|
1161
1129
|
// 检查键是否以$开头
|
|
1162
1130
|
if (col.startsWith('$')) {
|
|
@@ -1184,10 +1152,11 @@ export default {
|
|
|
1184
1152
|
operator: "success",
|
|
1185
1153
|
audit_time: Util.getNowDate(),
|
|
1186
1154
|
user_name: this.$login.f.name,
|
|
1155
|
+
ename: this.$login.f.ename,
|
|
1187
1156
|
id: this.item.id,
|
|
1188
1157
|
f_check_item_id: this.item.f_check_item_id
|
|
1189
1158
|
}
|
|
1190
|
-
new HttpResetClass().load('POST', '/api/af-safecheck/logic/updateAafeAudit', {data: reqdata}, {
|
|
1159
|
+
new HttpResetClass().load('POST', '/api/af-safecheck/logic/updateAafeAudit', { data: reqdata }, {
|
|
1191
1160
|
resolveMsg: '安检审核成功!',
|
|
1192
1161
|
rejectMsg: '安检审核出错!'
|
|
1193
1162
|
}).then((res) => {
|
|
@@ -1201,7 +1170,6 @@ export default {
|
|
|
1201
1170
|
this.showModel = true;
|
|
1202
1171
|
},
|
|
1203
1172
|
auditFailOK() {
|
|
1204
|
-
|
|
1205
1173
|
this.loading = true;
|
|
1206
1174
|
var reqdata = {
|
|
1207
1175
|
message: this.message,
|
|
@@ -1209,10 +1177,11 @@ export default {
|
|
|
1209
1177
|
operator: "fail",
|
|
1210
1178
|
audit_time: Util.getNowDate(),
|
|
1211
1179
|
user_name: this.$login.f.name,
|
|
1180
|
+
ename: this.$login.f.ename,
|
|
1212
1181
|
id: this.item.id,
|
|
1213
1182
|
f_check_item_id: this.item.f_check_item_id
|
|
1214
1183
|
}
|
|
1215
|
-
new HttpResetClass().load('POST', '/api/af-safecheck/logic/updateAafeAudit', {data: reqdata}, {
|
|
1184
|
+
new HttpResetClass().load('POST', '/api/af-safecheck/logic/updateAafeAudit', { data: reqdata }, {
|
|
1216
1185
|
resolveMsg: '安检审核成功!',
|
|
1217
1186
|
rejectMsg: '安检审核出错!'
|
|
1218
1187
|
}).then((res) => {
|
|
@@ -1296,13 +1265,13 @@ export default {
|
|
|
1296
1265
|
if (defects != '') {
|
|
1297
1266
|
console.log('有隐患items', items)
|
|
1298
1267
|
deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}${items.f_else ? items.f_else : ''}`)
|
|
1299
|
-
this.deviceImgs.push({f_overall_path:items.f_path})
|
|
1268
|
+
this.deviceImgs.push({ f_overall_path: items.f_path })
|
|
1300
1269
|
}
|
|
1301
1270
|
} else if ((items.type === 'string' || items.type === 'number') && items.f_is_defect && items.f_item_value[0]) {
|
|
1302
1271
|
checkResult = '有隐患'
|
|
1303
1272
|
this.result = '有隐患'
|
|
1304
1273
|
deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
|
|
1305
|
-
this.deviceImgs.push({f_overall_path:items.f_path})
|
|
1274
|
+
this.deviceImgs.push({ f_overall_path: items.f_path })
|
|
1306
1275
|
|
|
1307
1276
|
} else if (items.f_item_name == '金额异常差值') {
|
|
1308
1277
|
var deviation = this.$appdata.getSingleValue('金额异常差值允许误差')
|
|
@@ -1358,7 +1327,7 @@ export default {
|
|
|
1358
1327
|
//tag)
|
|
1359
1328
|
if (this.deviceCollect.name) {
|
|
1360
1329
|
//tag
|
|
1361
|
-
if(this.deviceCollect.value != '正常'){
|
|
1330
|
+
if (this.deviceCollect.value != '正常') {
|
|
1362
1331
|
this.deviceCollects.push(JSON.parse(JSON.stringify(this.deviceCollect)))
|
|
1363
1332
|
}
|
|
1364
1333
|
}
|
|
@@ -1414,14 +1383,14 @@ export default {
|
|
|
1414
1383
|
//tag)
|
|
1415
1384
|
if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度普检']) {
|
|
1416
1385
|
this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度普检'][this.item.f_check_type]])
|
|
1417
|
-
}else if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度安检']){
|
|
1386
|
+
} else if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度安检']) {
|
|
1418
1387
|
this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度安检'][this.item.f_check_type]])
|
|
1419
|
-
}else if (Vue.config.safecheck.SafecheckType && Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]){
|
|
1388
|
+
} else if (Vue.config.safecheck.SafecheckType && Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
|
|
1420
1389
|
this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_check_type]])
|
|
1421
|
-
}else {
|
|
1422
|
-
if(this.item.f_check_type == '民用'){
|
|
1390
|
+
} else {
|
|
1391
|
+
if (this.item.f_check_type == '民用') {
|
|
1423
1392
|
this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
|
|
1424
|
-
}else {
|
|
1393
|
+
} else {
|
|
1425
1394
|
this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
|
|
1426
1395
|
}
|
|
1427
1396
|
}
|
|
@@ -1429,7 +1398,7 @@ export default {
|
|
|
1429
1398
|
for (let i in this.config) {
|
|
1430
1399
|
//取得安检项索引值
|
|
1431
1400
|
let n = this.config[i].index
|
|
1432
|
-
this.devices[n - 1] = {device: i, n: n, checkmust: this.config[i].checkmust}
|
|
1401
|
+
this.devices[n - 1] = { device: i, n: n, checkmust: this.config[i].checkmust }
|
|
1433
1402
|
this.$set('data.' + 'device' + n, [])
|
|
1434
1403
|
let items = []
|
|
1435
1404
|
for (let it in this.config[i].items) {
|
|
@@ -1478,7 +1447,7 @@ export default {
|
|
|
1478
1447
|
this.showimg2 = this.devicesAll[i][j].f_items[k].f_second_path
|
|
1479
1448
|
this.otherDarginShowImgs = []
|
|
1480
1449
|
for (let l = 0; l < this.hiddenDangerImgNumber; l++) {
|
|
1481
|
-
let img = {path: ''}
|
|
1450
|
+
let img = { path: '' }
|
|
1482
1451
|
if (this.devicesAll[i][j].f_items[k]['f_p' + (l + 1) + '_path']) {
|
|
1483
1452
|
img.path = this.devicesAll[i][j].f_items[k]['f_p' + (l + 1) + '_path'] + '?' + Math.random()
|
|
1484
1453
|
this.otherDarginShowImgs.push(img)
|
|
@@ -1584,7 +1553,7 @@ export default {
|
|
|
1584
1553
|
})
|
|
1585
1554
|
}
|
|
1586
1555
|
} else {
|
|
1587
|
-
if(this.gotoitem){
|
|
1556
|
+
if (this.gotoitem) {
|
|
1588
1557
|
this.$back()
|
|
1589
1558
|
return
|
|
1590
1559
|
}
|
|
@@ -1897,67 +1866,67 @@ export default {
|
|
|
1897
1866
|
},
|
|
1898
1867
|
ready() {
|
|
1899
1868
|
asyncReady(this).then(() => {
|
|
1900
|
-
|
|
1901
|
-
|
|
1902
|
-
|
|
1903
|
-
|
|
1904
|
-
|
|
1905
|
-
|
|
1906
|
-
|
|
1907
|
-
|
|
1908
|
-
|
|
1909
|
-
|
|
1910
|
-
|
|
1911
|
-
|
|
1912
|
-
|
|
1913
|
-
|
|
1914
|
-
|
|
1915
|
-
|
|
1916
|
-
|
|
1917
|
-
|
|
1918
|
-
|
|
1919
|
-
|
|
1920
|
-
|
|
1921
|
-
|
|
1922
|
-
|
|
1923
|
-
|
|
1924
|
-
|
|
1925
|
-
|
|
1926
|
-
|
|
1927
|
-
|
|
1928
|
-
|
|
1929
|
-
|
|
1930
|
-
|
|
1931
|
-
//tag
|
|
1932
|
-
let itemValues = []
|
|
1933
|
-
f_item.f_item_lists.forEach((tempItem) => {
|
|
1869
|
+
setTimeout(() => {
|
|
1870
|
+
this.loading = false;
|
|
1871
|
+
}, 10000)
|
|
1872
|
+
this.getuserinfodevice()
|
|
1873
|
+
this.putDevices()
|
|
1874
|
+
this.showAudit()
|
|
1875
|
+
this.newConfig = this.$appdata.getSingleValue('配置中心获取文件') ? this.$appdata.getSingleValue('配置中心获取文件') : '否';
|
|
1876
|
+
if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {
|
|
1877
|
+
if (this.role != 'inspect') {
|
|
1878
|
+
let that = this
|
|
1879
|
+
let id
|
|
1880
|
+
if (this.role == 'view') {
|
|
1881
|
+
id = this.item.id
|
|
1882
|
+
} else if (this.role == 'androidview') {
|
|
1883
|
+
id = this.item.f_paper_id
|
|
1884
|
+
}
|
|
1885
|
+
this.$resetpost(`api/af-safecheck/logic/path_getCheckPaper`, { data: { id: id } }).then((respanse) => {
|
|
1886
|
+
//tag
|
|
1887
|
+
if (respanse.data.length != 0) {
|
|
1888
|
+
// 包含 其它 特殊处理的数组
|
|
1889
|
+
// 对应位置
|
|
1890
|
+
that.data = Object.assign(that.data, respanse.data[0])
|
|
1891
|
+
if (respanse.data[0].f_devices) {
|
|
1892
|
+
for (let da in that.devices) {
|
|
1893
|
+
that.$set('data.device' + that.devices[da].n, [])
|
|
1894
|
+
}
|
|
1895
|
+
respanse.data[0].f_devices.forEach((item) => {
|
|
1896
|
+
for (let de in that.devices) {
|
|
1897
|
+
if (that.devices[de].device == item.f_device_type) {
|
|
1898
|
+
item.f_items.forEach((f_item) => {
|
|
1899
|
+
//tag
|
|
1934
1900
|
//tag
|
|
1935
|
-
|
|
1936
|
-
|
|
1937
|
-
|
|
1901
|
+
let itemValues = []
|
|
1902
|
+
f_item.f_item_lists.forEach((tempItem) => {
|
|
1903
|
+
//tag
|
|
1904
|
+
if (tempItem.f_item_value !== 'null') {
|
|
1905
|
+
itemValues.push(tempItem.f_item_value)
|
|
1906
|
+
}
|
|
1907
|
+
})
|
|
1908
|
+
f_item.f_item_value = itemValues
|
|
1938
1909
|
})
|
|
1939
|
-
|
|
1940
|
-
|
|
1941
|
-
|
|
1942
|
-
|
|
1943
|
-
|
|
1944
|
-
})
|
|
1910
|
+
that.data['device' + that.devices[de].n].push({
|
|
1911
|
+
f_device_type: item.f_device_type,
|
|
1912
|
+
f_items: item.f_items
|
|
1913
|
+
})
|
|
1914
|
+
}
|
|
1945
1915
|
}
|
|
1946
|
-
}
|
|
1947
|
-
}
|
|
1948
|
-
|
|
1949
|
-
|
|
1950
|
-
|
|
1951
|
-
|
|
1952
|
-
|
|
1953
|
-
|
|
1954
|
-
|
|
1955
|
-
|
|
1916
|
+
})
|
|
1917
|
+
}
|
|
1918
|
+
Util.replaceFalse(that.data)
|
|
1919
|
+
Util.booleanFilter(that.data)
|
|
1920
|
+
if (this.role == 'view') {
|
|
1921
|
+
Util.ratifyPics(that.data)
|
|
1922
|
+
Util.ratifyPics(that.picture)
|
|
1923
|
+
} else {
|
|
1924
|
+
Util.androidRatifyPics(that.data, this.$androidUtil.getProxyUrl())
|
|
1925
|
+
}
|
|
1926
|
+
//tag
|
|
1956
1927
|
}
|
|
1957
|
-
//
|
|
1958
|
-
|
|
1959
|
-
// this.$goto('paper-message-blank', {userinfo:this.data,devices:this.devices,config:this.config,role:this.role}, 'self')
|
|
1960
|
-
this.isshow = true
|
|
1928
|
+
// this.$goto('paper-message-blank', {userinfo:this.data,devices:this.devices,config:this.config,role:this.role}, 'self')
|
|
1929
|
+
this.isshow = true
|
|
1961
1930
|
//tag
|
|
1962
1931
|
//tag)
|
|
1963
1932
|
console.log('Vue.config.safecheck.DevicesConfig', Vue.config.safecheck.DevicesConfig)
|
|
@@ -1967,19 +1936,19 @@ export default {
|
|
|
1967
1936
|
if (typeof this.deviceconfig === 'string') {
|
|
1968
1937
|
this.deviceconfig = JSON.parse(this.deviceconfig)
|
|
1969
1938
|
}
|
|
1970
|
-
}else{
|
|
1971
|
-
|
|
1972
|
-
|
|
1973
|
-
|
|
1974
|
-
|
|
1939
|
+
} else {
|
|
1940
|
+
this.deviceconfig = JSON.parse(JSON.stringify(Vue.config.safecheck.DevicesConfig))
|
|
1941
|
+
if (typeof this.deviceconfig === 'string') {
|
|
1942
|
+
this.deviceconfig = JSON.parse(this.deviceconfig)
|
|
1943
|
+
}
|
|
1975
1944
|
}
|
|
1976
1945
|
if (this.data.f_collection_type == '按金额') {
|
|
1977
|
-
if (this.deviceconfig["燃气表"]){
|
|
1946
|
+
if (this.deviceconfig["燃气表"]) {
|
|
1978
1947
|
let aaa = Object.assign({}, this.config2["燃气表"].items, this.deviceconfig["燃气表"].items)
|
|
1979
1948
|
this.deviceconfig["燃气表"].items = aaa
|
|
1980
1949
|
}
|
|
1981
1950
|
} else {
|
|
1982
|
-
if (this.deviceconfig["燃气表"]){
|
|
1951
|
+
if (this.deviceconfig["燃气表"]) {
|
|
1983
1952
|
let aaa = Object.assign({}, this.config["燃气表"].items, this.deviceconfig["燃气表"].items)
|
|
1984
1953
|
this.deviceconfig["燃气表"].items = aaa
|
|
1985
1954
|
}
|
|
@@ -1990,15 +1959,15 @@ export default {
|
|
|
1990
1959
|
this.deviceconfig2 = jsonSort(this.deviceconfig2, "index")
|
|
1991
1960
|
this.getDeviceAll()
|
|
1992
1961
|
|
|
1993
|
-
|
|
1994
|
-
|
|
1995
|
-
|
|
1996
|
-
|
|
1997
|
-
|
|
1998
|
-
|
|
1999
|
-
|
|
1962
|
+
}
|
|
1963
|
+
).catch(
|
|
1964
|
+
(respanse) => {
|
|
1965
|
+
//tag
|
|
1966
|
+
alert('查找安检单失败')
|
|
1967
|
+
this.loading = false
|
|
1968
|
+
})
|
|
1969
|
+
}
|
|
2000
1970
|
}
|
|
2001
|
-
}
|
|
2002
1971
|
})
|
|
2003
1972
|
},
|
|
2004
1973
|
watch: {
|