liuzhihui 2 gadi atpakaļ
vecāks
revīzija
01b7d551e5

+ 1 - 0
.gitignore

@@ -2,3 +2,4 @@ node_modules
2 2
 unpackage/
3 3
 CallCenterWeb.UI/nzpA9BA.tmp
4 4
 CallCenterWeb.UI/nzpC369.tmp
5
+CallCenterWeb.UI/rmyyechartsNew/dist/

+ 5 - 4
CallCenterWeb.UI/RMYY/src/views/callScreen/components/hisList.vue

@@ -299,12 +299,13 @@ export default {
299 299
       }
300 300
     });
301 301
     this.$bus.$on("hzname", (params) => {
302
-      console.log(params);
302
+      console.log(params, 'hzname');
303 303
       if (params != "") {
304 304
         this.hzname = params;
305
-        if (this.hzidcard || this.hzphone) {
306
-          this.hzname = "";
307
-        }
305
+        // if (this.hzidcard || this.hzphone) {
306
+        //   this.hzname = "";
307
+        // }
308
+        this.hzname = "";
308 309
         this.getList();
309 310
       }
310 311
     });

+ 1 - 1
CallCenterWeb.UI/RMYY/static/config/serverConfig.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "NODE_ENV": "development",
3
-  "BASE_API": "http://39.164.159.192:8000/",
3
+  "BASE_API": "http://39.164.159.226:8000/",
4 4
   "TTS_API": "http://39.164.159.192:8000/",
5 5
   "IVR_API":"http://172.16.10.21:9000/",
6 6
   "CORP_ID":"dingbb1314af9ad8e421f2c783f7214b6d69",

+ 1 - 1
CallCenterWeb.UI/RMYYAPP/App.vue

@@ -6,7 +6,7 @@
6 6
 		},
7 7
 		onShow: function() {
8 8
 			console.log('App Show')
9
-			this.init()//判断是不是钉钉环境
9
+			// this.init()//判断是不是钉钉环境
10 10
 		},
11 11
 		onHide: function() {
12 12
 			console.log('App Hide')

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

@@ -4,7 +4,7 @@ const CONFIG = {
4 4
         assetsPath: '/static', // 静态资源路径
5 5
 				// baseUrl: 'http://192.168.8.10:8033/',
6 6
 				baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
7
-				// baseUrl: 'http://39.164.159.192:8000/', // 本地外网地址
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地址(前端运行地址)
@@ -15,7 +15,7 @@ const CONFIG = {
15 15
     production: {
16 16
         assetsPath: '/static', // 静态资源路径
17 17
 				// baseUrl: 'http://192.168.8.10:8033/',
18
-				// baseUrl: 'http://39.164.159.192:8000/',
18
+				// baseUrl: 'http://39.164.159.226:8000/',
19 19
 				baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
20 20
 				// baseUrl: 'http://localhost:50973/', // 本地外网地址
21 21
 		// baseUrl: 'http://172.16.10.22:8000/',		

+ 1 - 1
CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -54,7 +54,7 @@
54 54
 			wButton,
55 55
 		},
56 56
 		onLoad() {
57
-			this.init()//判断是不是钉钉环境
57
+			// this.init()//判断是不是钉钉环境
58 58
 		},
59 59
 
60 60
 		methods: {

+ 2 - 2
CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/button/button.vue

@@ -615,8 +615,8 @@
615 615
 				// console.log(this.Maintenancer, 'this.Maintenancer')
616 616
 				// return
617 617
 				// 关闭窗口后,恢复默认内容
618
-				if (this.auditPlaceholder !== 'show_users' && !this.cbreason) {
619
-					this.$mHelper.toast(this.auditPlaceholder)
618
+				if (!['协作'].includes(this.title) && this.auditPlaceholder !== 'show_users' && !this.cbreason) {
619
+					this.$mHelper.toast('请确保填写完整')
620 620
 					return
621 621
 				}
622 622
 				if (this.auditPlaceholder == 'show_xzusers') {

BIN
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/__UNI__5A5207D_cm.apk


+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/apkurl

@@ -1 +1 @@
1
-https://ide.dcloud.net.cn/build/download/78059c40-7399-11ee-91d5-75ed22669617
1
+https://ide.dcloud.net.cn/build/download/845fa820-7dee-11ee-906e-efc0c1b89102

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/cmManifestCache.json


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 7 - 7
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-service.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-view.js


+ 2 - 2
CallCenterWeb.UI/rmyyechartsNew/src/utils/request.js

@@ -10,8 +10,8 @@ const service = axios.create({
10 10
   // axios中请求配置有baseURL选项,表示请求URL公共部分
11 11
 //   baseURL: process.env.VUE_APP_BASE_API,
12 12
     // baseURL:'http://39.164.159.192:8000/',//测试
13
-	// baseURL:'https://zyfb.zzrmyy.com/',//本地正式
14
-	baseURL:'http://172.16.10.22:8000/',//大屏发布正式
13
+	baseURL:'https://zyfb.zzrmyy.com/',//本地正式
14
+	// baseURL:'http://172.16.10.22:8000/',//大屏发布正式
15 15
   // 超时
16 16
   timeout: 10000
17 17
 })