fix

CallCenterWeb.UI/RMYY/package.json

@@ -33,6 +33,7 @@
     "jquery": "^3.4.1",
     "js-md5": "^0.7.3",
     "jsencrypt": "^3.3.1",
+    "jssipmiao": "^1.0.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "qs": "^6.6.0",

CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue

@@ -1,5 +1,7 @@
 <template>
-  <div class="dashboard-editor-container">
+  <div class="dashboard-editor-container">111
+    <!-- <jssipmiao></jssipmiao> -->
+
     <el-row v-show="isDDZX" type="flex" class="row-bg" justify="space-around" style="margin-bottom: 30px">
       <el-col :span="5">
         <el-card shadow="hover" class="topbox">
@@ -110,6 +112,7 @@ import {
   GetFaultRepairTypeByNow,
   GetSchedulingTypeByNow
 } from '@/api/dashboard.js'
+// import jssipmiao from 'jssipmiao'
 import NoticeDetail from '../AnnounceManagement/Notice/components/detail.vue'
 import {
   GetListTop
@@ -133,6 +136,7 @@ const lineChartData = {
 export default {
   name: 'Dashboard',
   components: {
+    jssipmiao,
     LineChart,
     RaddarChart,
     PieChart,

CallCenterWeb.UI/RMYY/src/views/telCall/seatMonitor/index.vue

@@ -375,7 +375,9 @@ export default {
                 call_num: null, // 通话号码
                 visible: false // 是否可以操作
               })
+              
             })
+            console.log(JSON.stringify(this.seatCardLists))
           }
         }
       })

CallCenterWeb.UI/RMYY/src/views/testing/reportTesting/index.vue

@@ -143,6 +143,7 @@ export default {
           if (response.state.toLowerCase() === 'success') {
             // this.columnData = response.data
             this.columnData = this.filterColumnList(response.data, 0)
+            console.log(this.columnData)
           }
         })
         resolve()

CallCenterWeb.UI/RMYY/static/config/serverConfig.json

@@ -1,6 +1,6 @@
 {
   "NODE_ENV": "development",
-  "BASE_API": "http://39.164.159.226:8000/",
+  "BASE_API": "https://zyfb.zzrmyy.com/", 
   "TTS_API": "http://39.164.159.192:8000/",
   "IVR_API":"http://172.16.10.21:9000/",
   "CORP_ID":"dingbb1314af9ad8e421f2c783f7214b6d69",

CallCenterWeb.UI/RMYY/static/config/serverConfig.txt

@@ -2,7 +2,7 @@
 {
   "_hash": "ec3d8ec345a97ed52a66",
   "NODE_ENV": "production",
-  "BASE_API": "http://192.168.5.42:28000/", // API地址
+  "BASE_API": "https://zyfb.zzrmyy.com/", // API地址
   "SOCKET_IP": "192.168.5.41", // WebSocket通讯ip
   "SOCKET_PORT": "28822", // WebSocket通讯端口
   "PAGESIZES": "[10, 20, 50, 100]", // number[] 表格每页显示个数选择器的选项设置

CallCenterWeb.UI/RMYYAPP/config/index.config.js

@@ -2,11 +2,8 @@ const CONFIG = {
     // 开发环境配置
     development: {
         assetsPath: '/static', // 静态资源路径
-				// baseUrl: 'http://192.168.8.10:8033/',
-				baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址/
-				// baseUrl: 'http://39.164.159.226:8000/', // 本地外网地址
-				// baseUrl: 'http://localhost:50973/', // 本地外网地址
-		// baseUrl: 'http://172.16.10.22:8000/',	
+		baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址/
+		// baseUrl: 'http://192.168.1.37:8000/', // 本地外网地址
         hostUrl: '', // H5地址(前端运行地址)
         weixinAppId: '' // 微信公众号appid
 
@@ -14,11 +11,8 @@ const CONFIG = {
     // 生产环境配置
     production: {
         assetsPath: '/static', // 静态资源路径
-				// baseUrl: 'http://192.168.8.10:8033/',
-				// baseUrl: 'http://39.164.159.226:8000/',
-				baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
-				// baseUrl: 'http://localhost:50973/', // 本地外网地址
-		// baseUrl: 'http://172.16.10.22:8000/',		
+		baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
+		// baseUrl: 'http://192.168.1.37:8000/', // 本地外网地址
         hostUrl: '', // H5地址(前端运行地址)
         weixinAppId: '' // 微信公众号appid
 

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,7 +2,7 @@
     "name" : "郑州人民医院综合服务保障调度平台",
     "appid" : "__UNI__5A5207D",
     "description" : "",
-    "versionName" : "1.2.91",
+    "versionName" : "1.2.93",
     "versionCode" : 180,
     "transformPx" : false,
     /* 5+App特有相关 */

CallCenterWeb.UI/RMYYAPP/package-lock.json

@@ -8,7 +8,7 @@
       "name": "ヾ(✿ﾟ▽ﾟ)ノ圆形进度条",
       "version": "1.2",
       "dependencies": {
-        "dingtalk-jsapi": "^3.0.25",
+        "dingtalk-jsapi": "^3.0.36",
         "echarts": "^5.4.2",
         "jsencrypt": "^3.3.2",
         "sm-crypto": "^0.3.12",
@@ -41,9 +41,9 @@
       "hasInstallScript": true
     },
     "node_modules/dingtalk-jsapi": {
-      "version": "3.0.25",
-      "resolved": "https://registry.npmjs.org/dingtalk-jsapi/-/dingtalk-jsapi-3.0.25.tgz",
-      "integrity": "sha512-l+q2lRzTCH/00DM2EZ+GKFiP/3TZHOupCM7rpG/hgrNpYkexGvF/O6yDI0XNqSMs8iFqWv9haCLOPf1nvCqB/w==",
+      "version": "3.0.36",
+      "resolved": "https://registry.npmmirror.com/dingtalk-jsapi/-/dingtalk-jsapi-3.0.36.tgz",
+      "integrity": "sha512-oGDNwqpOzRtMifY/POqPvsLRUYpt/csw7mBfczFzRaPHYyezj7JPGkBybCNW/PA/4DvVIAe+RJEkM3cdtVHFtA==",
       "dependencies": {
         "promise-polyfill": "^7.1.0"
       }
@@ -64,7 +64,7 @@
     },
     "node_modules/jsencrypt": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/jsencrypt/-/jsencrypt-3.3.2.tgz",
+      "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
       "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
     },
     "node_modules/mutation-observer": {

CallCenterWeb.UI/RMYYAPP/package.json

@@ -13,7 +13,7 @@
     ]
   },
   "dependencies": {
-    "dingtalk-jsapi": "^3.0.25",
+    "dingtalk-jsapi": "^3.0.36",
     "echarts": "^5.4.2",
     "jsencrypt": "^3.3.2",
     "sm-crypto": "^0.3.12",

CallCenterWeb.UI/RMYYAPP/pages/index/index.vue

@@ -49,8 +49,9 @@
 		methods: {
 			init() {  
 				// 钉钉免登录
+				
 				getCode((type,code) => {
-					// console.log(type , code)
+					console.log(type , code)
 					if(type == 'app') {
 						setTimeout(() =>{
 							this.$mStore.dispatch("GetInfo").then((e) => {

CallCenterWeb.UI/RMYYAPP/pages/myTask/myTask.vue

@@ -316,6 +316,7 @@
 						let cid = info["clientid"];
 						if (cid) {
 							clearInterval(timer)
+							
 							this.clienGet(cid) //获取cid 
 						}
 					});
@@ -365,6 +366,7 @@
 				}
 				this.$http.get("PushMessage/PutAppClientIdAsync", params).then((response) => {
 						if (response.state.toLowerCase() === "success") {
+							console.log(cid)
 							let data = response.message
 						}