liuxiaona 2 lat temu
rodzic
commit
fe50b1d4c7

+ 0 - 13
.idea/workspace.xml

@@ -3,19 +3,6 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="c03feb23-5590-4b06-ae32-412ba98013a8" name="Default" comment="">
5 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/app.25dbf677.css" beforeDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/chunk-vendors.31ed7038.css" beforeDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/userPortrait.8e0d5f52.css" beforeDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/favicon.ico" beforeDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/img/dpNoData.572b0f6d.png" beforeDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/img/info_err.7976f107.png" beforeDir="false" />
13
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/index.html" beforeDir="false" />
14
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/app.dc26d31d.js" beforeDir="false" />
15
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/chunk-vendors.bf0633c3.js" beforeDir="false" />
16
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/demo.7b3ab333.js" beforeDir="false" />
17
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/userPortrait.8927e58c.js" beforeDir="false" />
18
-      <change beforePath="$PROJECT_DIR$/qwh5/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/public/index.html" afterDir="false" />
19 6
       <change beforePath="$PROJECT_DIR$/qwh5/src/views/quickwordH5.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/quickwordH5.vue" afterDir="false" />
20 7
       <change beforePath="$PROJECT_DIR$/qwh5/src/views/radarH5.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/radarH5.vue" afterDir="false" />
21 8
     </list>

Plik diff jest za duży
+ 1 - 1
qwh5/dist/css/app.98662c37.css


Plik diff jest za duży
+ 1 - 1
qwh5/dist/index.html


Plik diff jest za duży
+ 0 - 1
qwh5/dist/js/app.bc0308bf.js


Plik diff jest za duży
+ 1 - 0
qwh5/dist/js/app.f948580c.js


+ 32 - 32
qwh5/src/views/quickwordH5.vue

@@ -365,47 +365,47 @@ export default {
365 365
       })
366 366
     }
367 367
     const getRadarlist=(group_id)=>{
368
-      if(!group_id){
369
-        Toast.loading({
370
-          duration:2000,
371
-          message: '暂无数据',
372
-          forbidClick: true,
373
-        });
374
-        return
375
-      }
376
-      overshow.value = true;
377
-      (proxy as any).$axios.get("/api/h5/chatMenuPage/list", {
378
-        corpid: configInfo.corpid,
379
-        group_id: group_id,
380
-        title: key_word.value,
381
-        page: 1,
382
-        page_size: 500
383
-      }, true).then((res) => {
384
-        //请求成功
385
-        overshow.value = false;
386
-        if(res&&res.errno==0){
387
-          let data = res.rst;
368
+      if(group_id || group_id==0){
369
+        overshow.value = true;
370
+        (proxy as any).$axios.get("/api/h5/chatMenuPage/list", {
371
+          corpid: configInfo.corpid,
372
+          group_id: group_id,
373
+          title: key_word.value,
374
+          page: 1,
375
+          page_size: 500
376
+        }, true).then((res) => {
377
+          //请求成功
378
+          overshow.value = false;
379
+          if(res&&res.errno==0){
380
+            let data = res.rst;
388 381
             data.data.forEach(item=>{
389
-                item.msg_list.forEach(chart=>{
390
-                    chart.chat_message = JSON.parse(chart.chat_message)
391
-                })
382
+              item.msg_list.forEach(chart=>{
383
+                chart.chat_message = JSON.parse(chart.chat_message)
384
+              })
392 385
             })
393
-          radarlist.value = data.data
394
-        }else{
386
+            radarlist.value = data.data
387
+          }else{
388
+            Toast.loading({
389
+              duration:2000,
390
+              message: res.err,
391
+              forbidClick: true,
392
+            });
393
+          }
394
+        }).catch(err => {
395
+          overshow.value = false;
395 396
           Toast.loading({
396 397
             duration:2000,
397
-            message: res.err,
398
+            message: err,
398 399
             forbidClick: true,
399 400
           });
400
-        }
401
-      }).catch(err => {
402
-        overshow.value = false;
401
+        })
402
+      }else{
403 403
         Toast.loading({
404
-          duration:2000,
405
-          message: err,
404
+          duration:1000,
405
+          message: '暂无数据',
406 406
           forbidClick: true,
407 407
         });
408
-      })
408
+      }
409 409
     }
410 410
 
411 411
     const send=(rule_id,msg_id,editCon)=>{

+ 28 - 28
qwh5/src/views/radarH5.vue

@@ -201,42 +201,42 @@ export default {
201 201
     }
202 202
     const getRadarlist = (group_id) => {
203 203
       // alert(`${'corpid_getRadarlist:'+configInfo.corpid}`);
204
-      if(!group_id){
205
-        Toast.loading({
206
-          duration:2000,
207
-          message: '暂无数据',
208
-          forbidClick: true,
209
-        });
210
-        return
211
-      }
212
-      overshow.value = true;
213
-      (proxy as any).$axios.get("/api/h5/radarPage/list", {
214
-        corpid: configInfo.corpid,
215
-        group_id: group_id,
216
-        name: key_word.value,
217
-        page: 1,
218
-        page_size: 500
219
-      }, true).then((res) => {
220
-        //请求成功
221
-        overshow.value = false;
222
-        if (res && res.errno == 0) {
223
-          let data = res.rst;
224
-          radarlist.value = data.data
225
-        } else {
204
+      if(group_id || group_id==0){
205
+        overshow.value = true;
206
+        (proxy as any).$axios.get("/api/h5/radarPage/list", {
207
+          corpid: configInfo.corpid,
208
+          group_id: group_id,
209
+          name: key_word.value,
210
+          page: 1,
211
+          page_size: 500
212
+        }, true).then((res) => {
213
+          //请求成功
214
+          overshow.value = false;
215
+          if (res && res.errno == 0) {
216
+            let data = res.rst;
217
+            radarlist.value = data.data
218
+          } else {
219
+            Toast.loading({
220
+              duration:2000,
221
+              message: res.err,
222
+              forbidClick: true,
223
+            });
224
+          }
225
+        }).catch(err => {
226
+          overshow.value = false;
226 227
           Toast.loading({
227 228
             duration:2000,
228
-            message: res.err,
229
+            message: err,
229 230
             forbidClick: true,
230 231
           });
231
-        }
232
-      }).catch(err => {
233
-        overshow.value = false;
232
+        })
233
+      }else{
234 234
         Toast.loading({
235 235
           duration:2000,
236
-          message: err,
236
+          message: '暂无数据',
237 237
           forbidClick: true,
238 238
         });
239
-      })
239
+      }
240 240
     }
241 241
 
242 242