Explorar el Código

Merge branch 'develop' of http://192.168.1.222:3000/duhongyu/AnYang_UI into develop

weieryang hace 11 meses
padre
commit
3fab0d0ac0
Se han modificado 30 ficheros con 3743 adiciones y 69 borrados
  1. 9 0
      WebChartNewest/.project
  2. 10 1
      WebUI/CallCenterWeb.UI/Appeal/AddAppeal.html
  3. 15 1
      WebUI/CallCenterWeb.UI/CommonHtml/StrongLawsuit.html
  4. 1 0
      WebUI/CallCenterWeb.UI/CommonHtml/WorkDatil.html
  5. 12 1
      WebUI/CallCenterWeb.UI/CommonHtml/auditBack.html
  6. 13 2
      WebUI/CallCenterWeb.UI/CommonHtml/js/orderDetail.js
  7. 1 0
      WebUI/CallCenterWeb.UI/G6igehkzHG.txt
  8. 1 0
      WebUI/CallCenterWeb.UI/MP_verify_dYD9EpCKXkVhwW8z.txt
  9. 42 42
      WebUI/CallCenterWeb.UI/MarketingManagement/LawsuitMarketing.html
  10. 0 0
      WebUI/CallCenterWeb.UI/errorlog.txt
  11. 1512 0
      WebUI/CallCenterWeb.UI/home - 副本.html
  12. 1508 0
      WebUI/CallCenterWeb.UI/home.html
  13. 596 0
      WebUI/CallCenterWeb.UI/login.html
  14. BIN
      WebUI/CallCenterWeb.UI/spManage.7z
  15. 2 2
      anyangWebAPP/pages/myTask - 副本/workOrderList/workOrderDetail/viewWorkOrder/viewWorkOrder.vue
  16. 2 2
      anyangWebAPP/pages/myTask/workOrderList/workOrderDetail/buttons/components/button_1/button_1.vue
  17. 2 2
      anyangWebAPP/pages/myTask/workOrderList/workOrderDetail/viewWorkOrder/viewWorkOrder.vue
  18. 1 1
      anyangWebAPP/unpackage/cache/apk/apkurl
  19. 1 1
      anyangWebAPP/unpackage/cache/apk/cmManifestCache.json
  20. 2 1
      anyangWebAPP/unpackage/cache/certdata
  21. 1 1
      anyangWebAPP/unpackage/dist/build/app-plus/__uniappchooselocation.js
  22. 1 1
      anyangWebAPP/unpackage/dist/build/app-plus/__uniappquill.js
  23. 1 1
      anyangWebAPP/unpackage/dist/build/app-plus/__uniappquillimageresize.js
  24. 1 1
      anyangWebAPP/unpackage/dist/build/app-plus/app-config-service.js
  25. 4 4
      anyangWebAPP/unpackage/dist/build/app-plus/app-service.js
  26. 1 1
      anyangWebAPP/unpackage/dist/build/app-plus/app-view.js
  27. 1 1
      anyangWebAPP/unpackage/dist/build/app-plus/manifest.json
  28. BIN
      anyangWebAPP/unpackage/dist/build/app-plus/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
  29. 1 1
      anyangWebAPP/unpackage/dist/build/app-plus/view.css
  30. 2 2
      anyangWebAPP/unpackage/dist/build/app-plus/view.umd.min.js

+ 9 - 0
WebChartNewest/.project

@@ -42,5 +42,14 @@
42 42
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
43 43
 			</matcher>
44 44
 		</filter>
45
+		<filter>
46
+			<id>1742983521661</id>
47
+			<name></name>
48
+			<type>26</type>
49
+			<matcher>
50
+				<id>org.eclipse.ui.ide.multiFilter</id>
51
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
52
+			</matcher>
53
+		</filter>
45 54
 	</filteredResources>
46 55
 </projectDescription>

+ 10 - 1
WebUI/CallCenterWeb.UI/Appeal/AddAppeal.html

@@ -174,7 +174,15 @@
174 174
                         </td>
175 175
                         
176 176
                     </tr>
177
-                    
177
+                    <tr>
178
+                    	<th>是否营商:</th>
179
+                        <td>
180
+                        	<select name="" id="isbusiness" class="form-control">
181
+								<option value="0" selected="selected">否</option>
182
+								<option value="1">是</option>
183
+							</select>
184
+                        </td>
185
+                    </tr>
178 186
                     <tr class="leaderCharge-wrapper" style="display: none;">
179 187
                         <th class="">分管领导:</th>
180 188
                         <td>
@@ -469,6 +477,7 @@
469 477
                         splituser: $("#leaderCharge").val(), // 分管领导
470 478
                         isresult: $(' input[name="banli"]:checked ').val(), //=(0转办1直办)
471 479
                         business: threeWayCall,
480
+                        isbusiness: $("#isbusiness").val(),
472 481
                         result: $('#result').val(),
473 482
                         keys: $("#PID").val(), //=关键词id(多个用英文逗号,隔开)
474 483
                         type: $("#type").val(), //=类型

+ 15 - 1
WebUI/CallCenterWeb.UI/CommonHtml/StrongLawsuit.html

@@ -86,8 +86,21 @@
86 86
                     </select>
87 87
                 </td>
88 88
             </tr>
89
+            
89 90
             <tr>
90
-                <th class="Importent">结案意见:</th>
91
+                <th>
92
+                    事件解决结果:
93
+                </th>
94
+                <td>
95
+                    <select class="select_" id="isResolved">
96
+                    	<option value="1">已解决</option>
97
+                        <option value="0">未解决</option>
98
+                    </select>
99
+                </td>
100
+            </tr>
101
+            
102
+            <tr>
103
+                <th>结案意见:</th>
91 104
                 <td><textarea name="" rows="4" cols="" id="finalopinion"></textarea></td>
92 105
             </tr>
93 106
             <tr>
@@ -146,6 +159,7 @@
146 159
                 finalopinion: $("#finalopinion").val(),
147 160
                 issms : $('input[name="issms"]:checked ').val(),
148 161
                 issatisfie: $('input[name="huifang"]:checked ').val(),
162
+                isResolved:$("#isResolved").val(),
149 163
                 token: $.cookie("token")
150 164
             }, function (result) {
151 165
                 result = JSON.parse(result);

+ 1 - 0
WebUI/CallCenterWeb.UI/CommonHtml/WorkDatil.html

@@ -826,6 +826,7 @@
826 826
 									<td class="text-center" style="min-width:100px;">回访结果</td>
827 827
 									<td class="text-center" style="min-width:100px;">操作时间</td>
828 828
 									<td class="text-center" style="min-width:100px;">回访号码</td>
829
+									<td class="text-center resolvedEle" style="min-width:100px; display: none;">事件解决结果</td>
829 830
 									<td class="text-center" style="min-width:100px;">录音</td>
830 831
 									<td class="text-center visitLimit" style="min-width:100px;  display: none">操作</td> 
831 832
 								</tr>

+ 12 - 1
WebUI/CallCenterWeb.UI/CommonHtml/auditBack.html

@@ -95,7 +95,17 @@
95 95
                     </select>
96 96
                 </td>
97 97
             </tr>
98
-            
98
+            <tr>
99
+                <th>
100
+                    事件解决结果:
101
+                </th>
102
+                <td>
103
+                    <select class="select_" id="isResolved">
104
+                    	<option value="1">已解决</option>
105
+                        <option value="0">未解决</option>
106
+                    </select>
107
+                </td>
108
+            </tr>
99 109
             <tr>
100 110
                 <th class="Importent">审核结果:</th>
101 111
                 <td>
@@ -395,6 +405,7 @@
395 405
             $.post(huayi.config.callcenter_url + 'WorkOrder/VisitWorkOrder', {
396 406
                 workorderid: wid,
397 407
                 completionStatus: $("#completionStatus").val(), 
408
+                 isResolved:$("#isResolved").val(),
398 409
                 visituser: $("#visituser").val(), //审核人
399 410
                 result: $("#result").val(), //审核内容
400 411
                 type: $("#type").val(),

+ 13 - 2
WebUI/CallCenterWeb.UI/CommonHtml/js/orderDetail.js

@@ -891,7 +891,15 @@ function detialVisit(result,type) {
891 891
 			} else if(n.F_Type == 5) {
892 892
 				b = "信箱";
893 893
 			}
894
-
894
+			var textIsResolved = ''
895
+			if (n.F_IsResolved == 0) {
896
+				textIsResolved = '未解决'
897
+				$('.resolvedEle').show()
898
+			} else if (n.F_IsResolved == 1) {
899
+				textIsResolved = '已解决'
900
+				$('.resolvedEle').show()
901
+			}
902
+			
895 903
 			html += '<tr>' +
896 904
 				'<td class="text-center">' + (i + 1) +
897 905
 				'</td>' +
@@ -905,7 +913,10 @@ function detialVisit(result,type) {
905 913
 				'</td>' +
906 914
 				'<td class="text-center phoneTitle3"><a href="#">' + encryptPhoneNumber +
907 915
 				'</a></td>'
908
-
916
+			
917
+			if (textIsResolved) {
918
+				html += '<td class="text-center phoneTitle3">' + textIsResolved +'</td>'
919
+			}
909 920
 			html += '<td class="text-center">'
910 921
 			var audioFile = '';
911 922
 

+ 1 - 0
WebUI/CallCenterWeb.UI/G6igehkzHG.txt

@@ -0,0 +1 @@
1
+2d977a4130837def1f7960b92476f22c

+ 1 - 0
WebUI/CallCenterWeb.UI/MP_verify_dYD9EpCKXkVhwW8z.txt

@@ -0,0 +1 @@
1
+dYD9EpCKXkVhwW8z

+ 42 - 42
WebUI/CallCenterWeb.UI/MarketingManagement/LawsuitMarketing.html

@@ -625,7 +625,42 @@
625 625
             $(".lyxz").removeClass("cx");
626 626
             $("audio")[0].pause();
627 627
         });
628
-        
628
+        function getParams(){
629
+			var resultParams = {}
630
+			resultParams = {
631
+                workid: $("#wids").val().replace(/\s+/g, ""),
632
+                state: $("#state").val(), //=工单状态
633
+                type: $("#type").val(), //=工单类型
634
+                key: $("#key").val(), //=关键字
635
+                tel: $("#tel").val().replace(/\s+/g, ""), //=客户电话
636
+                name: $("#name").val().replace(/\s+/g, ""), //=客户名称
637
+                usercode: selectMultiple($("#ZX")), //=坐席工号
638
+                ddusercode: selectMultiple($("#yardman")),
639
+                closeuser:$("#closeuser").val(),
640
+                keyid: $("#keyid").val(), //=关键词id
641
+                source: $("#source").val(), //=来源&
642
+                starttime: $("#starttime").val(), //=开始时间
643
+                endtime: $("#endtime").val(), //=结束时间
644
+                deptid: $("#PID").val(),
645
+                type: $("#type").val(),
646
+                dealtype: $("#dealtype").val(),
647
+                business: threeWayCall,
648
+                sourcearea: $("#sourceAreas").val(), // 区域
649
+                ComTitle: $("#workOrderTitle").val().replace(/\s+/g, ""), // 工单标题
650
+                ComContent: $("#workOrderContent").val().replace(/\s+/g, ""), // 工单内容
651
+                Result: $("#workOrderProcessingResult").val().replace(/\s+/g, ""), // 办理结果
652
+                dealstarttime: $("#dealstarttime").val(), //办理开始时间
653
+                dealstrendtime: $("#dealstrendtime").val(), //办理结束时间
654
+                isopen: $("#isopen").val(), // 是否公开
655
+                business: $("#threeWayCall").val(), // 三方通话
656
+                splituser: $("#leaderCharge").val(), // 分管领导
657
+                islike: $("#islike").val(), // 查询类型
658
+                dbgd: $("#whetherSupervisor").val(), // 是否督办
659
+                jianhang: 3, // 多媒体
660
+                token: $.cookie("token"),
661
+            };
662
+            return resultParams
663
+		}
629 664
         //获取查询信息
630 665
         function load() {
631 666
 
@@ -636,7 +671,7 @@
636 671
             } else {
637 672
                 threeWayCall = 0
638 673
             }
639
-
674
+			
640 675
             //先销毁表格
641 676
             $("#orderlist").bootstrapTable("destroy");
642 677
             //初始化表格,动态从服务器加载数据
@@ -658,46 +693,10 @@
658 693
                 queryParamsType: "undefined",
659 694
                 queryParams: function queryParams(params) {
660 695
                     //设置查询参数
661
-                    //alert(params.pageNumber)
662
-                    var param = {
663
-                        page: params.pageNumber,
664
-                        pagesize: params.pageSize,
665
-                        workid: $("#wids").val().replace(/\s+/g, ""),
666
-                        state: $("#state").val(), //=工单状态
667
-                        type: $("#type").val(), //=工单类型
668
-                        //bigtype: $("#bigtype").val(), //=大类别
669
-                        //smalltype: $("#smalltype").val(), //=小类别
670
-                        key: $("#key").val(), //=关键字
671
-                        tel: $("#tel").val().replace(/\s+/g, ""), //=客户电话
672
-                        name: $("#name").val().replace(/\s+/g, ""), //=客户名称
673
-                        usercode: selectMultiple($("#ZX")), //=坐席工号
674
-                        ddusercode: selectMultiple($("#yardman")),
675
-                        closeuser:$("#closeuser").val(),
676
-                        keyid: $("#keyid").val(), //=关键词id
677
-                        source: $("#source").val(), //=来源&
678
-                        starttime: $("#starttime").val(), //=开始时间
679
-                        endtime: $("#endtime").val(), //=结束时间
680
-                        deptid: $("#PID").val(),
681
-                        type: $("#type").val(),
682
-                        dealtype: $("#dealtype").val(),
683
-                        business: threeWayCall,
684
-                        sourcearea: $("#sourceAreas").val(), // 区域
685
-                        ComTitle: $("#workOrderTitle").val().replace(/\s+/g, ""), // 工单标题
686
-                        ComContent: $("#workOrderContent").val().replace(/\s+/g, ""), // 工单内容
687
-                        Result: $("#workOrderProcessingResult").val().replace(/\s+/g, ""), // 办理结果
688
-                        dealstarttime: $("#dealstarttime").val(), //办理开始时间
689
-                        dealstrendtime: $("#dealstrendtime").val(), //办理结束时间
690
-                        isopen: $("#isopen").val(), // 是否公开
691
-                        business: $("#threeWayCall").val(), // 三方通话
692
-                        splituser: $("#leaderCharge").val(), // 分管领导
693
-                        islike: $("#islike").val(), // 查询类型
694
-                        dbgd: $("#whetherSupervisor").val(), // 是否督办
695
-                        jianhang: 3, // 多媒体
696
-                        token: $.cookie("token"),
697
-                    };
698
-                    // 导出参数
699
-                    exportParams = param;
700
-                    return param;
696
+					var resultParam = getParams()
697
+					resultParam.pageNumber = params.pageNumber
698
+					resultParam.pageSize = params.pageSize
699
+                    return resultParam;
701 700
                 },
702 701
                 onLoadSuccess: function (data) {
703 702
                     //加载成功时执行
@@ -1411,6 +1410,7 @@
1411 1410
 
1412 1411
         // 导出文件
1413 1412
         $(".exportFile").click(function() {
1413
+        	exportParams = getParams()
1414 1414
             exportParams.isdc = 1;
1415 1415
             exportFileFun("WorkOrder/GetList", exportParams)
1416 1416
         })

+ 0 - 0
WebUI/CallCenterWeb.UI/errorlog.txt


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1512 - 0
WebUI/CallCenterWeb.UI/home - 副本.html


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1508 - 0
WebUI/CallCenterWeb.UI/home.html


+ 596 - 0
WebUI/CallCenterWeb.UI/login.html

@@ -0,0 +1,596 @@
1
+<!DOCTYPE html>
2
+<html lang="en">
3
+
4
+	<head>
5
+		<meta charset="utf-8">
6
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
7
+		<title>登录</title>
8
+		<meta name="keywords">
9
+		<meta name="description">
10
+		<meta name="renderer" content="webkit">
11
+		<!--<link rel="shortcut icon" href="./img/32.ico" />-->
12
+		<link rel="stylesheet" href="./css/init.css" />
13
+		<script src="./Script/Common/huayi.load.js"></script>
14
+		<script src="./Script/Common/huayi.config.js"></script>
15
+		<script src="./js/jquery.md5.js"></script>
16
+		<script src="./js/purify.min.js"></script>
17
+		<script src="./js/aes/crypto-js.js"></script>
18
+		<script src="./js/sm2/sm2.js"></script>
19
+		<script src="./js/sm2/decrypt.js"></script>
20
+		<style>
21
+			html {
22
+				margin: 0 auto;
23
+				padding: 0;
24
+				height: 100%;
25
+			}
26
+			
27
+			body {
28
+				height: 100%;
29
+				background: #fff;
30
+			}
31
+			
32
+			.wrap {
33
+				width: 100%;
34
+				height: 100%;
35
+			}
36
+			
37
+			.wrap_right {
38
+				float: left;
39
+				width: 50%;
40
+				height: 100%;
41
+			}
42
+			
43
+			.wrap_left {
44
+				float: left;
45
+				width: 50%;
46
+				height: 100%;
47
+			}
48
+			
49
+			.wrap_right {
50
+				position: relative;
51
+			}
52
+			
53
+			.wrap_bj {
54
+				width: 100%;
55
+				height: 100%;
56
+				background: url(img/left_amg_01.jpg) no-repeat;
57
+				background-size: 100% 100%;
58
+			}
59
+			
60
+			.tab_box {
61
+				border: 1px solid #41caf2;
62
+				border-top-right-radius: 15px;
63
+				border-bottom-left-radius: 15px;
64
+				margin: 50px auto 65px;
65
+				padding: 0;
66
+				overflow: hidden;
67
+				width: 410px;
68
+			}
69
+			
70
+			.tab_box ul {
71
+				list-style: none;
72
+				margin: 0;
73
+				padding: 0;
74
+				width: 100%;
75
+				height: 50px;
76
+				line-height: 50px;
77
+				font-size: 16px;
78
+				color: #41caf2;
79
+				border-bottom: 1px solid #41caf2;
80
+				text-align: center;
81
+			}
82
+			
83
+			.tab_box ul li {
84
+				width: 50%;
85
+				float: left;
86
+			}
87
+			
88
+			.active {
89
+				background: #41caf2;
90
+				color: #fff;
91
+			}
92
+			
93
+			.tab_content {
94
+				margin: 57px 0 35px 0;
95
+			}
96
+			
97
+			.tab_content div p {
98
+				width: 80%;
99
+				margin: 0 auto;
100
+				height: 35px;
101
+				border: 1px solid #41caf2;
102
+				border-radius: 15px;
103
+				margin-bottom: 25px;
104
+				line-height: 30px;
105
+				padding-left: 20px;
106
+			}
107
+			
108
+			.tab_content div p input {
109
+				width: 75%;
110
+				border: 0;
111
+				font-size: 16px;
112
+				outline: none;
113
+				font-family: "仿宋", "宋体";
114
+			}
115
+			
116
+			.login_icon {
117
+				display: inline-block;
118
+				width: 17px;
119
+				height: 19px;
120
+				vertical-align: middle;
121
+				margin-right: 15px;
122
+			}
123
+			
124
+			.login_icon_user {
125
+				background: url(img/login_user.png) no-repeat;
126
+			}
127
+			
128
+			.login_icon_lock {
129
+				background: url(img/login_lock.png) no-repeat;
130
+			}
131
+			
132
+			.login_icon_hua {
133
+				background: url(img/login_hua.png) no-repeat;
134
+			}
135
+			
136
+			.login_go {
137
+				text-align: center;
138
+				padding: 0 !important;
139
+				font-size: 16px;
140
+				letter-spacing: 16px;
141
+				font-family: "仿宋", "宋体";
142
+				color: #fff;
143
+				filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#1f90ec, endcolorstr=#1cb5ef, gradientType=1);
144
+				background: -webkit-gradient(li near, 0 0, 100% 0, from(#1f90ec), to(#1cb5ef));
145
+				background: -webkit-linear-gradient(left, #1f90ec, #1cb5ef);
146
+				background: -moz-linear-gradient(left, #1f90ec, #1cb5ef);
147
+				background: -o-linear-gradient(left, #1f90ec, #1cb5ef);
148
+				background: linear-gradient(left, #1f90ec, #1cb5ef);
149
+				cursor: pointer;
150
+			}
151
+			
152
+			.error {
153
+				height: 13px;
154
+				background: url(img/yz.png) no-repeat 0 -8px;
155
+				display: none;
156
+			}
157
+			
158
+			.errorShow {
159
+				display: inline-block;
160
+			}
161
+			
162
+			.rightCon {
163
+				width: 100%;
164
+				position: absolute;
165
+				top: 0;
166
+				bottom: 0;
167
+				right: 0;
168
+				left: 0;
169
+				margin: auto;
170
+				height: 580px;
171
+			}
172
+			
173
+			.leftCon {
174
+				width: 30%;
175
+				position: absolute;
176
+				top: 41%;
177
+				bottom: 0;
178
+				right: 0;
179
+				left: 50%;
180
+				margin: auto;
181
+			}
182
+			
183
+			.leftCon img {
184
+				width: 100%;
185
+			}
186
+			
187
+			.leftCon p {
188
+				font-size: 28px;
189
+				letter-spacing: 10px;
190
+				color: #e60111;
191
+				line-height: 80px;
192
+			}
193
+			
194
+			.service {
195
+				width: 100%;
196
+				position: absolute;
197
+				bottom: 30px;
198
+			}
199
+			
200
+			.tab_content div p {
201
+				width: 80%;
202
+				margin: 0 auto;
203
+				height: 35px;
204
+				border: 1px solid #41caf2;
205
+				border-radius: 15px;
206
+				margin-bottom: 20px;
207
+				line-height: 30px;
208
+				padding-left: 20px;
209
+			}
210
+			
211
+			.tab_content div p .verification,
212
+			.tab_content div p .verification_user {
213
+				width: 50%;
214
+			}
215
+			
216
+			.tab_content div p .btnVerifi,
217
+			.tab_content div p .btnVerifi_user {
218
+				width: 36.7%;
219
+				border: 0;
220
+				height: 33px;
221
+				border-radius: 0px 15px 15px 0px;
222
+				font-size: 16px;
223
+				outline: none;
224
+				font-family: "仿宋", "宋体";
225
+				background: #41caf2;
226
+				color: #FFFFFF;
227
+			}
228
+			
229
+			input::-webkit-outer-spin-button,
230
+			input::-webkit-inner-spin-button {
231
+				-webkit-appearance: none;
232
+			}
233
+			
234
+			input[type="number"] {
235
+				-moz-appearance: textfield;
236
+			}
237
+			
238
+			.SMSreminder {
239
+				color: #C4C4C5;
240
+				/*font-family: "仿宋", "宋体";*/
241
+				font-size: 12px;
242
+				padding: 0 37px;
243
+			}
244
+		</style>
245
+	</head>
246
+
247
+	<body class="signin">
248
+		<div class="wrap clearfix">
249
+			<div class="wrap_left" style="position: relative;">
250
+				<div class="wrap_bj"></div>
251
+				<div class="leftCon">
252
+					<img src="img/logintext.png" />
253
+				</div>
254
+			</div>
255
+			<div class="wrap_right">
256
+				<div class="rightCon">
257
+					<div class="logo" style="width: 100%;text-align: center;"></div>
258
+					<div class="tab_box">
259
+						<ul class="clearfix tab_ul">
260
+							<li class="active">坐席登录</li>
261
+							<li>用户登录</li>
262
+						</ul>
263
+						<div class="tab_content">
264
+							<div class="tab_one">
265
+								<p>
266
+									<i class="login_icon login_icon_user "></i>
267
+									<input class="zx_user" type="text" placeholder="请输入您的管理账号" />
268
+									<i class="login_icon error error_zx error_zx_user"></i>
269
+								</p>
270
+								<p>
271
+									<i class="login_icon login_icon_hua "></i>
272
+									<input class="zx_fj" type="text" placeholder="请输入分机号" />
273
+									<i class="login_icon error error_zx error_zx_fj"></i>
274
+								</p>
275
+								<p>
276
+									<i class="login_icon login_icon_lock "></i>
277
+									<input class="zx_psw" type="password" placeholder="请输入您的密码" />
278
+									<i class="login_icon error error_zx error_zx_psw"></i>
279
+								</p>
280
+								<p>
281
+									<i class="login_icon login_icon_hua "></i>
282
+									<input class="verification" type="number" placeholder="请输入验证码" />
283
+									<button class="btnVerifi" type="button">获取验证码</button>
284
+								</p>
285
+								<p class="login_go login_zx">登录</p>
286
+								<div class="SMSreminder">出于12345平台数据安全的考虑,现需要在账号登录环节增加手机短信验证。如果账号未关联手机号,请致电联系5116015。密码或者短信验证码连续输入错5次就锁定账号,需要管理员角色来解锁。</div>
287
+
288
+							</div>
289
+							<div class="tab_two" style="display: none;">
290
+								<p>
291
+									<i class="login_icon login_icon_user "></i>
292
+									<input class="gl_user" type="text" placeholder="请输入您的管理账号" />
293
+									<i class="login_icon error error_gl error_gl_user"></i>
294
+								</p>
295
+								<p>
296
+									<i class="login_icon login_icon_lock"></i>
297
+									<input class="gl_psw" type="password" placeholder="请输入您的密码" />
298
+									<i class="login_icon error error_gl error_gl_psw"></i>
299
+								</p>
300
+								<p>
301
+									<i class="login_icon login_icon_hua "></i>
302
+									<input class="verification_user" type="text" placeholder="请输入验证码" />
303
+									<button class="btnVerifi_user" type="button">获取验证码</button>
304
+								</p>
305
+								<p class="login_go login_gl">登录</p>
306
+								<div class="SMSreminder">出于12345平台数据安全的考虑,现需要在账号登录环节增加手机短信验证。如果账号未关联手机号,请致电联系5116015。密码或者短信验证码连续输入错5次就锁定账号,需要管理员角色来解锁。</div>
307
+							</div>
308
+						</div>
309
+					</div>
310
+					<div class="service">
311
+						<p style="color: #313c58; font-size: 12px;text-align: center;"></p>
312
+					</div>
313
+				</div>
314
+			</div>
315
+		</div>
316
+		<script>
317
+			$(function() {
318
+				var a = 0;
319
+				$('.tab_ul li').click(function() {
320
+					$(this).addClass("active").siblings().removeClass("active");
321
+					var index = $(this).index();
322
+					a = index;
323
+					$('.tab_content').children('div').eq(index).show().siblings().hide();
324
+				})
325
+				/*cook存储数据*/
326
+				if($.cookie("username")) {
327
+					//取值如果存在则赋值
328
+					$(".gl_user").val($.cookie("user")); //用户名
329
+					$("zx_fj").val($.cookie("fj"));
330
+					$(".zx_user").val($.cookie("user"));
331
+				}
332
+
333
+				//键盘登录事件
334
+				$('input').bind('keypress', function(event) {
335
+					if(event.keyCode == "13") {
336
+						if(a == 0) {
337
+							$('.login_zx').trigger("click");
338
+						} else {
339
+							$(".login_gl").trigger("click");
340
+						}
341
+					}
342
+				});
343
+				
344
+				$(".btnVerifi").click(function() {
345
+					if(!$(".zx_user").val()) {
346
+						layer.msg('请输入账号')
347
+						return false;
348
+					}
349
+					var mobile = $(".zx_user").val();
350
+					var zx_psw = DOMPurify.sanitize($(".zx_psw").val());
351
+					var currenttime = CurentTime();					
352
+					var datatime = currenttime.split(' ')[1].split(':').join('')
353
+					var pass = encryptFn($.md5(zx_psw))
354
+					sendMsg(mobile, pass);
355
+
356
+				})
357
+				
358
+				$(".btnVerifi_user").click(function() {
359
+					if(!$(".gl_user").val()) {
360
+						layer.msg('请输入账号')
361
+						return false;
362
+					}
363
+					var mobile = $(".gl_user").val();
364
+					var user_psw = DOMPurify.sanitize($(".gl_psw").val());
365
+					var currenttime = CurentTime();					
366
+					var datatime = currenttime.split(' ')[1].split(':').join('')	
367
+					var pass = encryptFn($.md5(user_psw))
368
+					sendMsg(mobile, pass);
369
+
370
+				})
371
+
372
+				//坐席登录
373
+				$('.login_zx').click(function() {
374
+					localStorage.setItem('loginPassword', $('.zx_psw').val())
375
+					var zx_user = DOMPurify.sanitize($(".zx_user").val());
376
+					var zx_fj = DOMPurify.sanitize($(".zx_fj").val());
377
+					var zx_psw = DOMPurify.sanitize($(".zx_psw").val());
378
+					if(zx_user == "" || zx_fj == "" || zx_psw == "") {
379
+						$(".error_zx").addClass('errorShow');
380
+						if(zx_user == "") {
381
+							$(".zx_user").focus(function() {
382
+								$(".error_zx").removeClass('errorShow');
383
+							});
384
+						} else {
385
+							$(".error_zx_user").removeClass('errorShow');
386
+						}
387
+					} else {
388
+						var currenttime = CurentTime();
389
+						var datatime = currenttime.split(' ')[1].split(':').join('')
390
+						var encrypted = encryptFn($.md5(zx_psw))
391
+						/*请求后台*/
392
+						$.cookie("extno", zx_fj);
393
+						$.cookie("zx_user", zx_user);
394
+
395
+						$.ajax({
396
+							type: "post",
397
+							url: huayi.config.callcenter_url + "/Login/login",
398
+							dataType: 'json',
399
+							async: true,
400
+							data: {
401
+								username: zx_user,
402
+								extensionphone: zx_fj,
403
+								LoginTime: currenttime,
404
+								password: encrypted.toString(),
405
+								Code: $(".verification").val()
406
+							},
407
+							success: function(data) {
408
+								/*验证请求*/
409
+								if(data.state == "success") {
410
+									$.cookie("token", data.data.token, {
411
+										expires: 7
412
+									});
413
+									$.cookie("extno", zx_fj, {
414
+										expires: 7
415
+									});
416
+									$.cookie("zx_user", zx_user, {
417
+										expires: 7
418
+									});
419
+									loginHref()
420
+									
421
+								}
422
+
423
+							}
424
+						});
425
+					}
426
+
427
+				})
428
+
429
+				//用户登录
430
+				$('.login_gl').click(function() {
431
+					localStorage.setItem('loginPassword', $('.gl_psw').val())
432
+					var gl_user = DOMPurify.sanitize($(".gl_user").val());
433
+					var gl_psw = DOMPurify.sanitize($(".gl_psw").val());
434
+					if(gl_user == "" || gl_psw == "") {
435
+						$(".error_gl").addClass('errorShow');
436
+						if(gl_user == "") {
437
+							$(".gl_user").focus(function() {
438
+								$(".error_gl").removeClass('errorShow');
439
+							});
440
+						} else {
441
+							$(".error_gl_user").removeClass('errorShow');
442
+						}
443
+					} else {
444
+						var currenttime = CurentTime();
445
+						var datatime = currenttime.split(' ')[1].split(':').join('')
446
+						var encrypted = encryptFn($.md5(gl_psw))
447
+						/*请求后台*/
448
+						$.ajax({
449
+							type: "post",
450
+							url: huayi.config.callcenter_url + "/Login/login",
451
+							dataType: 'json',
452
+							async: true,
453
+							data: {
454
+								username: gl_user,
455
+								password: encrypted.toString(),
456
+								LoginTime: currenttime,
457
+								Code: $(".verification_user").val()
458
+							},
459
+							success: function(data) {
460
+								/*验证请求*/
461
+								if(data.state == "success") {
462
+									$.cookie("token", data.data.token, {
463
+										expires: 7
464
+									});
465
+									$.cookie("zx_user", gl_user, {
466
+										expires: 7
467
+									});
468
+									loginHref()
469
+									
470
+								}
471
+								//else{
472
+								//	$(".gl_user").val('');
473
+								//	$(".gl_psw").val('');
474
+								//}
475
+							}
476
+						});
477
+					}
478
+
479
+				})
480
+				
481
+				function sendMsg(mobile, pass) {
482
+					var currenttime = CurentTime();
483
+					$.ajax({
484
+						type: "post",
485
+						url: huayi.config.callcenter_url + "Login/SendCode",
486
+						async: true,
487
+						dataType: 'json',
488
+						data: {
489
+							usercode: mobile,
490
+							Password: pass,
491
+							LoginTime:currenttime
492
+						},
493
+						success: function(data) {
494
+							if(data.state == "success") {
495
+								layer.msg('发送成功')
496
+								verifi();
497
+							}
498
+						}
499
+					});
500
+				}
501
+
502
+				function verifi() {
503
+					var time = 60;
504
+					var timer = null;
505
+					$('.btnVerifi').text(time + '秒后重新发送');
506
+					$('.btnVerifi').attr('disabled', 'disabled'); // 禁用按钮
507
+					$('.btnVerifi_user').text(time + '秒后重新发送');
508
+					$('.btnVerifi_user').attr('disabled', 'disabled'); // 禁用按钮
509
+					timer = setInterval(function() {
510
+						// 定时器到底了 兄弟们回家啦
511
+						if(time == 1) {
512
+							clearInterval(timer);
513
+							$('.btnVerifi').text("获取验证码")
514
+							$('.btnVerifi_user').text('获取验证码')
515
+							$('.btnVerifi').removeAttr('disabled')
516
+							$('.btnVerifi_user').removeAttr('disabled')
517
+
518
+						} else {
519
+
520
+							time--;
521
+							$('.btnVerifi').text(time + '秒后重新发送');
522
+							$('.btnVerifi_user').text(time + '秒后重新发送');
523
+
524
+						}
525
+					}, 1000)
526
+				}
527
+				
528
+				function CurentTime() {
529
+					var now = new Date();
530
+
531
+					var year = now.getFullYear(); //年
532
+					var month = now.getMonth() + 1; //月
533
+					var day = now.getDate(); //日
534
+
535
+					var hh = now.getHours(); //时
536
+					var mm = now.getMinutes(); //分
537
+					var ss = now.getSeconds(); //秒
538
+
539
+					var clock = year + "-";
540
+
541
+					if(month < 10)
542
+						clock += "0";
543
+
544
+					clock += month + "-";
545
+
546
+					if(day < 10)
547
+						clock += "0";
548
+
549
+					clock += day + " ";
550
+
551
+					if(hh < 10)
552
+						clock += "0";
553
+
554
+					clock += hh + ":";
555
+					if(mm < 10) clock += '0';
556
+					clock += mm + ":";
557
+					if(ss < 10) clock += '0';
558
+					clock += ss;
559
+					return(clock);
560
+				}
561
+				
562
+				function  loginHref(){
563
+					var thisUrl = window.document.location.href
564
+					var toHrefUrl =""
565
+					
566
+					if (thisUrl.indexOf("127.0.0.1") >0) {
567
+						toHrefUrl = "home.html"
568
+					} else{
569
+						toHrefUrl = thisUrl.split('/')
570
+						toHrefUrl.pop();
571
+						toHrefUrl = toHrefUrl.join("/")+ "/home.html"
572
+					}
573
+					if (huayi.config.callcenter_url.indexOf("https") !==-1) {
574
+						$.getJSON(
575
+							huayi.config.callcenter_url + "UserAccount/GetNowUser", {
576
+								token: $.cookie("token"),
577
+							},
578
+							function(result) {
579
+								if(result.state.toLowerCase() == "success") {
580
+									if (result.data.role.F_RoleCode ==="spdbzy") {
581
+										toHrefUrl = "https://12345rx.zwfw.anyang.gov.cn/home.html"
582
+									}else{
583
+										toHrefUrl = "http://12345rx.zwfw.anyang.gov.cn/home.html"
584
+									}
585
+									window.location.href = toHrefUrl;
586
+								}
587
+						})
588
+					}else{
589
+						window.location.href = toHrefUrl;
590
+					}
591
+				}
592
+			})
593
+		</script>
594
+	</body>
595
+
596
+</html>

BIN
WebUI/CallCenterWeb.UI/spManage.7z


+ 2 - 2
anyangWebAPP/pages/myTask - 副本/workOrderList/workOrderDetail/viewWorkOrder/viewWorkOrder.vue

@@ -867,12 +867,12 @@
867 867
 			width: 100%;
868 868
 			overflow: auto;
869 869
 
870
-			/deep/ .segmented-control__item {
870
+			::v-deep .segmented-control__item {
871 871
 				white-space: nowrap;
872 872
 				margin-right: 8px;
873 873
 			}
874 874
 
875
-			/deep/ .segmented-control__item:last-child {
875
+			::v-deep .segmented-control__item:last-child {
876 876
 				margin-right: 0px;
877 877
 			}
878 878
 		}

+ 2 - 2
anyangWebAPP/pages/myTask/workOrderList/workOrderDetail/buttons/components/button_1/button_1.vue

@@ -867,12 +867,12 @@
867 867
 			width: 100%;
868 868
 			overflow: auto;
869 869
 
870
-			/deep/ .segmented-control__item {
870
+			::v-deep .segmented-control__item {
871 871
 				white-space: nowrap;
872 872
 				margin-right: 8px;
873 873
 			}
874 874
 
875
-			/deep/ .segmented-control__item:last-child {
875
+			::v-deep .segmented-control__item:last-child {
876 876
 				margin-right: 0px;
877 877
 			}
878 878
 		}

+ 2 - 2
anyangWebAPP/pages/myTask/workOrderList/workOrderDetail/viewWorkOrder/viewWorkOrder.vue

@@ -864,12 +864,12 @@
864 864
 			width: 100%;
865 865
 			overflow: auto;
866 866
 
867
-			/deep/ .segmented-control__item {
867
+			::v-deep .segmented-control__item {
868 868
 				white-space: nowrap;
869 869
 				margin-right: 8px;
870 870
 			}
871 871
 
872
-			/deep/ .segmented-control__item:last-child {
872
+			::v-deep .segmented-control__item:last-child {
873 873
 				margin-right: 0px;
874 874
 			}
875 875
 		}

+ 1 - 1
anyangWebAPP/unpackage/cache/apk/apkurl

@@ -1 +1 @@
1
-https://ide.dcloud.net.cn/build/download/7b9f3e70-9807-11ee-963c-b7664db9b742
1
+https://app.liuyingyong.cn/build/download/726bf3c0-0b76-11f0-a809-9dc53e895e2e

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
anyangWebAPP/unpackage/cache/apk/cmManifestCache.json


+ 2 - 1
anyangWebAPP/unpackage/cache/certdata

@@ -1,3 +1,4 @@
1
-andrCertfile=E:/desktopFile/证书/安阳证书/android/9f9362f165873dd82d770c5e2ee9c96a.keystore
1
+andrCertfile=D:/证书/9f9362f165873dd82d770c5e2ee9c96a.keystore
2 2
 andrCertAlias=__uni__505bb27
3 3
 andrCertPass=koDl16duKJbL2FkNvW/Z9Q==
4
+storePassword=koDl16duKJbL2FkNvW/Z9Q==

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
anyangWebAPP/unpackage/dist/build/app-plus/__uniappchooselocation.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
anyangWebAPP/unpackage/dist/build/app-plus/__uniappquill.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
anyangWebAPP/unpackage/dist/build/app-plus/__uniappquillimageresize.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
anyangWebAPP/unpackage/dist/build/app-plus/app-config-service.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 4 - 4
anyangWebAPP/unpackage/dist/build/app-plus/app-service.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
anyangWebAPP/unpackage/dist/build/app-plus/app-view.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
anyangWebAPP/unpackage/dist/build/app-plus/manifest.json


BIN
anyangWebAPP/unpackage/dist/build/app-plus/uni_modules/uni-icons/components/uni-icons/uniicons.ttf


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
anyangWebAPP/unpackage/dist/build/app-plus/view.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 2
anyangWebAPP/unpackage/dist/build/app-plus/view.umd.min.js