lijunjie il y a 2 ans
Parent
commit
3f70d607fb

+ 2 - 2
CallCenterWeb.UI/RMYYAPP/config/index.config.js

@@ -3,8 +3,8 @@ const CONFIG = {
3 3
     development: {
4 4
         assetsPath: '/static', // 静态资源路径
5 5
 				// baseUrl: 'http://192.168.8.10:8033/',
6
-				baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
7
-				// baseUrl: 'http://39.164.159.226:8000/', // 本地外网地址
6
+				// baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
7
+				baseUrl: 'http://39.164.159.226:8000/', // 本地外网地址
8 8
 				// baseUrl: 'http://localhost:50973/', // 本地外网地址
9 9
 		// baseUrl: 'http://172.16.10.22:8000/',	
10 10
         hostUrl: '', // H5地址(前端运行地址)

+ 27 - 5
CallCenterWeb.UI/RMYYAPP/pages/myTask/myTask.vue

@@ -11,18 +11,32 @@
11 11
 		</view>
12 12
 
13 13
 		<view class="orderManage">
14
-			<view class="orderTit" style="padding-left: 15px;color: rgb(126, 131, 125);">
15
-				<text
16
-					style="width: 4px;background-color: rgb(26, 188, 156);height: 20px;margin-top: 10px;margin-right: 5px;"></text>
17
-				<text>工单模块</text>
14
+			<view  v-show="orderListData.filter(val=>val.type === 1).length !== 0" class="orderTit" style="padding-left: 15px;color: rgb(126, 131, 125);">
15
+				<text style="width: 4px;background-color: rgb(26, 188, 156);height: 20px;margin-top: 10px;margin-right: 5px;"></text>
16
+				<text>报工模块</text>
18 17
 			</view>
19 18
 
20 19
 			<view class="orderCon">
21
-				<view class="orderList" v-for="item in orderListData" :key="item.id" @click="workOrderListClick(item)">
20
+				<view class="orderList" v-show="item.type === 1" v-for="item in orderListData" :key="item.id" @click="workOrderListClick(item)">
22 21
 					<image :style="{ background: item.imageBg }" :src="item.imagePath" mode=""></image>
23 22
 					<text>{{ item.text }}</text>
24 23
 				</view>
25 24
 			</view>
25
+			
26
+			<view  v-show="orderListData.filter(val=>val.type === 2).length !== 0" class="orderTit" style="padding-left: 15px;color: rgb(126, 131, 125);">
27
+				<text style="width: 4px;background-color: rgb(255, 170, 0);height: 20px;margin-top: 10px;margin-right: 5px;"></text>
28
+				<text>接单模块</text>
29
+			</view>
30
+
31
+			<view class="orderCon">
32
+				<view class="orderList" v-show="item.type === 2" v-for="item in orderListData" :key="item.id" @click="workOrderListClick(item)">
33
+					<image :style="{ background: item.imageBg }" :src="item.imagePath" mode=""></image>
34
+					<text>{{ item.text }}</text>
35
+				</view>
36
+			</view>
37
+			
38
+			
39
+
26 40
 
27 41
 			<view v-if="isgly==1" class="orderTit" style="padding-left: 15px;color: rgb(126, 131, 125);">
28 42
 				<text
@@ -30,10 +44,17 @@
30 44
 				<text>报表模块</text>
31 45
 			</view>
32 46
 			<view v-if="isgly==1" class="orderCon">
47
+				
33 48
 				<view class="orderList" v-for="item in reportListData" :key="item.id" @click="workOrderListClick(item)">
34 49
 					<image :style="{ background: item.imageBg }" :src="item.imagePath" mode=""></image>
35 50
 					<text>{{ item.text }}</text>
36 51
 				</view>
52
+				
53
+				<view class="orderList" v-show="item.type === 3" v-for="item in orderListData" :key="item.id" @click="workOrderListClick(item)">
54
+					<image :style="{ background: item.imageBg }" :src="item.imagePath" mode=""></image>
55
+					<text>{{ item.text }}</text>
56
+				</view>
57
+				
37 58
 			</view>
38 59
 
39 60
 			<view class="orderTit" @click="changeStore" v-if="noticState">
@@ -440,6 +461,7 @@
440 461
 								console.log(this.orderListData)
441 462
 								if (uni.getStorageSync("roleCode") === "GLY" || uni.getStorageSync("roleCode") === "DDBZ" || uni.getStorageSync("roleCode") === "BMZG") {
442 463
 									this.orderListData.push({
464
+										type : 3,
443 465
 										id: "18",
444 466
 										imagePath: "../../static/data1.png",
445 467
 										imageBg: "#62c7f5",

+ 15 - 0
CallCenterWeb.UI/RMYYAPP/utils/listUrl.js

@@ -2,8 +2,15 @@
2 2
 const dataMenu = ["orderManage", "faultRepairManagement", "comDispatch", "SJGD"]
3 3
 
4 4
 const urlData = {
5
+	/*
6
+		type : 
7
+			1 : 报工模块
8
+			2 : 接单模块
9
+			3 : 报表模块
10
+	*/
5 11
 	'orderManage': [
6 12
 		{
13
+			type : 1,
7 14
 			id: "12",
8 15
 			imagePath: "../../static/consult.png",
9 16
 			imageBg: "#1ccd8d",
@@ -11,6 +18,7 @@ const urlData = {
11 18
 			navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
12 19
 		},
13 20
 		{
21
+			type : 1,
14 22
 			id: "13",
15 23
 			imagePath: "../../static/consult.png",
16 24
 			imageBg: "#1ccd8d",
@@ -18,6 +26,7 @@ const urlData = {
18 26
 			navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=0",
19 27
 		},
20 28
 		{
29
+			type : 1,
21 30
 			id: "11",
22 31
 			imagePath: "../../static/reppair.png",
23 32
 			imageBg: "#1ccd8d",
@@ -25,6 +34,7 @@ const urlData = {
25 34
 			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=1",
26 35
 		},
27 36
 		{
37
+			type : 1,
28 38
 			id: "14",
29 39
 			imagePath: "../../static/icon_vehicleScheduling.png",
30 40
 			imageBg: "#1ccd8d",
@@ -32,6 +42,7 @@ const urlData = {
32 42
 			navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=1",
33 43
 		},
34 44
 		// {
45
+		// 	type : 3,
35 46
 		// 	id: "15",
36 47
 		// 	imagePath: "../../static/icon_vehicleScheduling.png",
37 48
 		// 	imageBg: "#aaffff",
@@ -39,6 +50,7 @@ const urlData = {
39 50
 		// 	navigateToUrl: "/pages/myTask/reportForm/reportForm?reportType=0",
40 51
 		// },
41 52
 		// {
53
+		// 	type : 3,
42 54
 		// 	id: "16",
43 55
 		// 	imagePath: "../../static/icon_vehicleScheduling.png",
44 56
 		// 	imageBg: "#aaffff",
@@ -47,6 +59,7 @@ const urlData = {
47 59
 		// }
48 60
 	],
49 61
 	'faultRepairManagement': [{
62
+		type : 2,
50 63
 		id: "2",
51 64
 		imagePath: "../../static/icon_repair.png",
52 65
 		imageBg: "#fe940a",
@@ -54,6 +67,7 @@ const urlData = {
54 67
 		navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0",
55 68
 	}],
56 69
 	"comDispatch": [{
70
+		type : 2,
57 71
 		id: "3",
58 72
 		imagePath: "../../static/consult.png",
59 73
 		imageBg: "#fe940a",
@@ -61,6 +75,7 @@ const urlData = {
61 75
 		navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=1",
62 76
 	}],
63 77
 	"SJGD": [{
78
+		type : 2,
64 79
 		id: "4",
65 80
 		imagePath: "../../static/icon_vehicleScheduling.png",
66 81
 		imageBg: "#fe940a",