ソースを参照

禅道bug修改

liuzhen 5 年 前
コミット
2578040777

+ 2 - 2
fuwaiCallCenterWeb.UI/src/utils/telWebsocket.js

@@ -123,10 +123,10 @@ function reconnect() {
123 123
  * @ socketDatas 发送的数据 type {}
124 124
  */
125 125
 export function Send(scoketDatas) {
126
-  if (ws.readyState !== ws.OPEN) {
126
+  if (ws && ws.readyState !== ws.OPEN) {
127 127
     reconnect()
128 128
   }
129
-  if (ws.readyState === ws.OPEN) {
129
+  if (ws && ws.readyState === ws.OPEN) {
130 130
     console.log('%c' + new Date() + '%c  send %c telWebsocket  ' + JSON.stringify(scoketDatas), 'color: #111', 'color: #409EFF', 'color: #111')
131 131
     ws.send(JSON.stringify(scoketDatas))
132 132
     scoketDatas.operationType = '发送'

+ 1 - 0
fuwaiCallCenterWeb.UI/src/views/systemSetup/roleSetting/menuSetup/components/addOrEditMenu.vue

@@ -6,6 +6,7 @@
6 6
           v-model="parentids"
7 7
           :options="menuDropDatas"
8 8
           :props="props"
9
+          :disabled='ruleForm.url == "#"?true:false'
9 10
           placeholder="请选择父级分类,默认是顶级分类"
10 11
           clearable
11 12
           filterable

+ 1 - 1
fuwaiCallCenterWeb.UI/src/views/systemSetup/roleSetting/roleSetup/index.vue

@@ -110,7 +110,7 @@ export default {
110 110
         const params = {
111 111
           pageindex: this.pageParams.pageindex, // 第几页
112 112
           pagesize: this.pageParams.pagesize, // 每页几条信息
113
-          keyword: this.keyword, //	项目名称,项目类型,项目负责人
113
+          keyword: this.keyword.trim(), //	项目名称,项目类型,项目负责人
114 114
           stime: this.searchDate && this.searchDate[0],
115 115
           etime: this.searchDate && this.searchDate[1]
116 116
         }

+ 1 - 1
fuwaiCallCenterWeb.UI/src/views/systemSetup/roleSetting/seatGroup/index.vue

@@ -74,7 +74,7 @@ export default {
74 74
         const params = {
75 75
           pageindex: this.pageParams.pageindex, // 第几页
76 76
           pagesize: this.pageParams.pagesize, // 每页几条信息
77
-          key: this.keyword
77
+          key: this.keyword.trim()
78 78
         }
79 79
         getSeatGroupLists(params).then(response => {
80 80
           this.loading = false

+ 1 - 1
fuwaiCallCenterWeb.UI/src/views/systemSetup/roleSetting/userManage/index.vue

@@ -106,7 +106,7 @@ export default {
106 106
         const params = {
107 107
           pageindex: this.pageParams.pageindex, // 第几页
108 108
           pagesize: this.pageParams.pagesize, // 每页几条信息
109
-          keyword: this.keyword, // 否	string	模糊查询
109
+          keyword: this.keyword.trim(), // 否	string	模糊查询
110 110
           roleid: this.roleId // 否	string	角色id
111 111
         }
112 112
         getUserAccountLists(params).then(response => {

+ 2 - 2
fuwaiCallCenterWeb.UI/src/views/systemSetup/sysSetting/basicData/index.vue

@@ -73,8 +73,8 @@ export default {
73 73
         const params = {
74 74
           pageindex: this.pageParams.pageindex, // 第几页
75 75
           pagesize: this.pageParams.pagesize, // 每页几条信息
76
-          code: this.keycode,
77
-          value: this.keyword
76
+          code: this.keycode.trim(),
77
+          value: this.keyword.trim()
78 78
         }
79 79
         getBasicDataLists(params).then(response => {
80 80
           this.loading = false

+ 1 - 1
fuwaiCallCenterWeb.UI/src/views/systemSetup/sysSetting/dataDictionary/index.vue

@@ -185,7 +185,7 @@ export default {
185 185
         const params = {
186 186
           pageindex: this.pageParamsR.pageindex, // 第几页
187 187
           pagesize: this.pageParamsR.pagesize, // 每页几条信息
188
-          keyword: this.keyword,
188
+          keyword: this.keyword.trim(),
189 189
           dictionarycode: this.dic_id
190 190
         }
191 191
         getDicRLists(params).then(response => {