seimin 1 year ago
parent
commit
a1754e0df4

+ 1 - 1
config/index.js

@@ -14,7 +14,7 @@ module.exports = {
14 14
     proxyTable: {
15 15
       '/service': {//自定义名字,代表的是以下target中的内容
16 16
         // target: host.host+'/service/',//微信
17
-        target: 'http://192.168.3.111',//微信
17
+        target: 'http://192.168.4.240',//微信
18 18
         changeOrigin: true,//是否允许跨域
19 19
         // pathRewrite: {
20 20
         //   '^/service': ''

+ 2 - 2
src/custom/ShowPicture.vue

@@ -20,7 +20,7 @@ export default {
20 20
       handlerImgs: [], //处理图片
21 21
     }
22 22
   },
23
-  props:['processInstanceId'],
23
+  props:['processInstanceId', 'wxIncidentId'],
24 24
   methods:{
25 25
     // 获取报修图片
26 26
     getRepairImgs() {
@@ -28,7 +28,7 @@ export default {
28 28
       that.$http
29 29
         .get(
30 30
           "service/common/common/listAttachment/wechatRequesterIncident/" +
31
-            that.processInstanceId,
31
+            that.wxIncidentId,
32 32
           {}
33 33
         )
34 34
         .then(function (res) {

+ 3 - 1
src/views/againAssign.vue

@@ -41,7 +41,7 @@
41 41
               >隐藏详情<<</span
42 42
             >
43 43
           </p>
44
-          <ShowPicture :processInstanceId="processInstanceId"></ShowPicture>
44
+          <ShowPicture :processInstanceId="processInstanceId" :wxIncidentId="wxIncidentId"></ShowPicture>
45 45
           <div class="label" id="assignee">重新指派</div>
46 46
           <div class="info">
47 47
             <p>
@@ -147,6 +147,7 @@ export default {
147 147
       item_hides: false,
148 148
       actives: "info",
149 149
       processInstanceId: "",
150
+      wxIncidentId: "",
150 151
       progressInfo: [], //处理进度
151 152
       model: {}, //提交数据
152 153
       handleUserOrGroup: false, //处理人/处理组
@@ -353,6 +354,7 @@ export default {
353 354
   },
354 355
   created() {
355 356
     this.processInstanceId = this.$route.params.data.processInstanceId;
357
+    this.wxIncidentId = this.$route.params.data.wxIncidentId;
356 358
     this.id = this.$route.params.data.id;
357 359
     this.getParamsData();
358 360
     this.getHandlerUser();

+ 3 - 1
src/views/closed.vue

@@ -49,7 +49,7 @@
49 49
               >隐藏详情<<</span
50 50
             >
51 51
           </p>
52
-          <ShowPicture :processInstanceId="processInstanceId"></ShowPicture>
52
+          <ShowPicture :processInstanceId="processInstanceId" :wxIncidentId="wxIncidentId"></ShowPicture>
53 53
 
54 54
           <div class="label" id="handlerInfo">处理信息</div>
55 55
           <!-- <p>
@@ -190,6 +190,7 @@ export default {
190 190
       item_hides1: false,
191 191
       actives: "info",
192 192
       processInstanceId: "",
193
+      wxIncidentId: "",
193 194
       progressInfo: [], //处理进度
194 195
       model: {}, //提交数据
195 196
       pro_hides: false, //展开/收起处理进度
@@ -317,6 +318,7 @@ export default {
317 318
   },
318 319
   created() {
319 320
     // seimin
321
+    this.wxIncidentId = this.$route.params.data.wxIncidentId;
320 322
     this.processInstanceId = this.$route.params.data
321 323
       ? this.$route.params.data.processInstanceId
322 324
       : JSON.parse(localStorage.getItem("modelData")).incident

+ 3 - 1
src/views/grabSheet.vue

@@ -34,7 +34,7 @@
34 34
                 >隐藏详情<<</span
35 35
               >
36 36
             </p>
37
-            <ShowPicture :processInstanceId="processInstanceId"></ShowPicture>
37
+            <ShowPicture :processInstanceId="processInstanceId" :wxIncidentId="wxIncidentId"></ShowPicture>
38 38
 
39 39
             <div class="label" id="progress">处理进度</div>
40 40
             <div
@@ -107,6 +107,7 @@ export default {
107 107
       item_hides: false,
108 108
       actives: "info",
109 109
       processInstanceId: "",
110
+      wxIncidentId: "",
110 111
       progressInfo: [], //处理进度
111 112
       model: {}, //提交数据
112 113
       jurisdiction: false, //是否有抢单权限
@@ -283,6 +284,7 @@ export default {
283 284
       this.qiangdan = this.menu.some(v => v.link == 'shijianliebiao_qiangdan');
284 285
     }
285 286
     // seimin
287
+    this.wxIncidentId = this.$route.params.data.wxIncidentId;
286 288
     this.processInstanceId = this.$route.params.data
287 289
       ? this.$route.params.data.processInstanceId
288 290
       : JSON.parse(localStorage.getItem("modelData")).incident

+ 1 - 1
src/views/newIncident.vue

@@ -275,7 +275,7 @@ export default {
275 275
       valid: undefined,
276 276
       action: {
277 277
         target:
278
-          this.$host + "/service/common/common/uploadAttachment/wechatRequesterIncident/",
278
+          this.$host + "/service/common/common/uploadAttachment/incident/",
279 279
         data: {}
280 280
       },
281 281
       isUploading: false,

+ 3 - 1
src/views/order.vue

@@ -58,7 +58,7 @@
58 58
                 >隐藏详情 <<</span
59 59
               >
60 60
             </p>
61
-            <ShowPicture :processInstanceId="processInstanceId"></ShowPicture>
61
+            <ShowPicture :processInstanceId="processInstanceId" :wxIncidentId="wxIncidentId"></ShowPicture>
62 62
             <!-- <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog> -->
63 63
             <div class="label" id="progress">处理进度</div>
64 64
             <div
@@ -157,6 +157,7 @@ export default {
157 157
       item_hides: false,
158 158
       actives: "info",
159 159
       processInstanceId: "",
160
+      wxIncidentId: "",
160 161
       progressInfo: [], //处理进度
161 162
       model: {}, //提交数据
162 163
       pro_hides: false, //展开/收起处理进度
@@ -324,6 +325,7 @@ export default {
324 325
   },
325 326
   created() {
326 327
     // seimin
328
+    this.wxIncidentId = this.$route.params.data.wxIncidentId;
327 329
     this.processInstanceId = this.$route.params.data
328 330
       ? this.$route.params.data.processInstanceId
329 331
       : JSON.parse(localStorage.getItem("modelData")).incident

+ 3 - 1
src/views/processing.vue

@@ -61,7 +61,7 @@
61 61
               >隐藏详情<<</span
62 62
             >
63 63
           </p>
64
-          <ShowPicture :processInstanceId="processInstanceId"></ShowPicture>
64
+          <ShowPicture :processInstanceId="processInstanceId" :wxIncidentId="wxIncidentId"></ShowPicture>
65 65
           <!-- <HandlerLog :data="modelData.incident.handlerLogs" id="handlerLog"></HandlerLog> -->
66 66
           <div class="label" id="progress">处理进度</div>
67 67
           <div
@@ -434,6 +434,7 @@ export default {
434 434
       item_hides: false,
435 435
       actives: "info",
436 436
       processInstanceId: "",
437
+      wxIncidentId: "",
437 438
       progressInfo: [], //处理进度
438 439
       model: {}, //提交数据
439 440
       validity: {},
@@ -1971,6 +1972,7 @@ export default {
1971 1972
     }
1972 1973
   },
1973 1974
   created() {
1975
+    this.wxIncidentId = this.$route.params.data.wxIncidentId;
1974 1976
     this.processInstanceId = this.$route.params.data
1975 1977
       ? this.$route.params.data.processInstanceId
1976 1978
       : JSON.parse(localStorage.getItem("modelData")).incident

+ 3 - 1
src/views/solved.vue

@@ -49,7 +49,7 @@
49 49
               >隐藏详情<<</span
50 50
             >
51 51
           </p>
52
-          <ShowPicture :processInstanceId="processInstanceId"></ShowPicture>
52
+          <ShowPicture :processInstanceId="processInstanceId" :wxIncidentId="wxIncidentId"></ShowPicture>
53 53
 
54 54
           <div class="label" id="handlerInfo">处理信息</div>
55 55
           <p>
@@ -222,6 +222,7 @@ export default {
222 222
       pro_hides: false, //展开/收起处理进度
223 223
       actives: "info",
224 224
       processInstanceId: "",
225
+      wxIncidentId: "",
225 226
       progressInfo: [], //处理进度
226 227
       model: {}, //提交数据
227 228
     };
@@ -445,6 +446,7 @@ export default {
445 446
   },
446 447
   created() {
447 448
     // seimin
449
+    this.wxIncidentId = this.$route.params.data.wxIncidentId;
448 450
     this.processInstanceId = this.$route.params.data
449 451
       ? this.$route.params.data.processInstanceId
450 452
       : JSON.parse(localStorage.getItem("modelData")).incident

+ 3 - 1
src/views/waitConfirm.vue

@@ -157,7 +157,7 @@
157 157
               >隐藏详情<<</span
158 158
             >
159 159
           </p>
160
-          <ShowPicture :processInstanceId="processInstanceId"></ShowPicture>
160
+          <ShowPicture :processInstanceId="processInstanceId" :wxIncidentId="wxIncidentId"></ShowPicture>
161 161
 
162 162
           <div class="label" id="handlerInfo">处理信息</div>
163 163
           <p>
@@ -250,6 +250,7 @@ export default {
250 250
       item_hides1: false,
251 251
       actives: "info",
252 252
       processInstanceId: "",
253
+      wxIncidentId: "",
253 254
       progressInfo: [], //处理进度
254 255
       model: {} //提交数据
255 256
     };
@@ -310,6 +311,7 @@ export default {
310 311
     }
311 312
   },
312 313
   created() {
314
+    this.wxIncidentId = this.$route.params.data.wxIncidentId;
313 315
     this.processInstanceId = this.$route.params.data.processInstanceId;
314 316
     this.getParamsData();
315 317
     this.getHandlerInfo();