seimin hace 1 año
padre
commit
a1754e0df4

+ 1 - 1
config/index.js

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

+ 2 - 2
src/custom/ShowPicture.vue

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

+ 3 - 1
src/views/againAssign.vue

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

+ 3 - 1
src/views/closed.vue

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

+ 3 - 1
src/views/grabSheet.vue

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

+ 1 - 1
src/views/newIncident.vue

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

+ 3 - 1
src/views/order.vue

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

+ 3 - 1
src/views/processing.vue

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

+ 3 - 1
src/views/solved.vue

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

+ 3 - 1
src/views/waitConfirm.vue

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