Browse Source

Merge branch 'develop' of http://101.200.220.49:8001/xiuli.gao/playlet into develop

liuxiaona 2 years ago
parent
commit
7849524839
57 changed files with 98 additions and 93 deletions
  1. 1 1
      index.html
  2. 4 2
      project/src/components/warningManage/customerWarning.vue
  3. 13 8
      project/src/components/warningManage/warningListInstall.vue
  4. 12 12
      project/src/router/allRouter.js
  5. 0 1
      static/css/app.3e3313e319733db1e46bcbcff5df0ef3.css
  6. 1 0
      static/css/app.77f01a9df5512f5ce01859304444c8dd.css
  7. 0 1
      static/js/0.d5460ff5d744ebf17807.js
  8. 8 0
      static/js/0.f52f0605ff8e51272624.js
  9. 1 0
      static/js/10.4f54118dc93d2ac72c2b.js
  10. 0 1
      static/js/10.95c06c2e378851f94784.js
  11. 1 1
      static/js/12.4c2bfd64423ae024fb6a.js
  12. 0 1
      static/js/11.e7b302dce86d09eefcd7.js
  13. 1 0
      static/js/12.37d102da7078870852d5.js
  14. 1 1
      static/js/14.297ef3b79e68986e5365.js
  15. 0 1
      static/js/13.e7660ee4d915a5673e37.js
  16. 1 1
      static/js/15.8a26d184f2d55ffc2f20.js
  17. 1 0
      static/js/15.2cc995b8339ffd0c30fb.js
  18. 1 0
      static/js/16.354ca35224b0eaed3de8.js
  19. 0 1
      static/js/16.c2e27ad27feb5df84725.js
  20. 1 0
      static/js/19.26cd6fbdbc6af3338dcb.js
  21. 1 1
      static/js/19.0fe5d251894186be08f0.js
  22. 1 0
      static/js/21.3b04ee96d83094a4fd06.js
  23. 1 1
      static/js/20.6f39e3c5f04b9c5d7764.js
  24. 0 1
      static/js/23.3f3374e8d623265e6583.js
  25. 1 1
      static/js/21.9bae5bf6d5e211ecee98.js
  26. 1 1
      static/js/22.613def8e2492b7ddaf63.js
  27. 0 1
      static/js/25.2d0964bc2cdc43338ae9.js
  28. 1 0
      static/js/25.6039e22794b82ce75cdc.js
  29. 1 0
      static/js/26.7bb2f5a4e989a6dae9a5.js
  30. 1 1
      static/js/24.5a3ae1792d227e0373ee.js
  31. 1 1
      static/js/26.9301a7ccfe88dc8f5e70.js
  32. 1 0
      static/js/29.b0261e2a6fb9268e60c2.js
  33. 1 1
      static/js/27.0e1249ed7e256b5f4ae2.js
  34. 0 1
      static/js/30.43c0157159e09d94300b.js
  35. 1 1
      static/js/28.0088906935751ec6a734.js
  36. 1 0
      static/js/32.997bc2814528f50c0183.js
  37. 1 1
      static/js/29.f9d3db3a93867d532598.js
  38. 1 0
      static/js/34.46d2fe808fedb07a52ee.js
  39. 1 1
      static/js/31.4ce936a0a195779fe52e.js
  40. 1 1
      static/js/32.4eb82423192725c6d442.js
  41. 1 1
      static/js/33.9f425c83b0c9418440dd.js
  42. 1 0
      static/js/38.a6daed74eb4eb96a5759.js
  43. 1 1
      static/js/34.f28fa317d9240a9808df.js
  44. 0 8
      static/js/4.1bbe0705f5358d3c58d0.js
  45. 18 0
      static/js/4.4dfa8ecc35ce4e1f9b09.js
  46. 1 1
      static/js/35.4e487d6d91b40060c9c4.js
  47. 1 1
      static/js/8.757e35b6d762f831c4c5.js
  48. 0 8
      static/js/5.d15c893f4c7bbb47a8c7.js
  49. 1 1
      static/js/9.b3859a83432b28124fbc.js
  50. 0 18
      static/js/6.9d21f20ebe72c707732b.js
  51. 1 0
      static/js/7.118adf4af4b005e778a6.js
  52. 0 1
      static/js/7.29a540ac64e9189bf38b.js
  53. 1 0
      static/js/8.c9a917afc5fa445b0e7a.js
  54. 1 0
      static/js/9.4176edcd5c6d02943945.js
  55. 6 6
      static/js/app.6cc6d5f4c73618a640fc.js
  56. 1 0
      static/js/manifest.0550eda7952b805d7a41.js
  57. 0 1
      static/js/manifest.4130e64d497adf7ea037.js

+ 1 - 1
index.html

@@ -7,4 +7,4 @@
7 7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 8
         var s = document.getElementsByTagName("script")[0];
9 9
         s.parentNode.insertBefore(hm, s);
10
-      })();</script><link href=./static/css/app.3e3313e319733db1e46bcbcff5df0ef3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4130e64d497adf7ea037.js></script><script type=text/javascript src=./static/js/app.6cc6d5f4c73618a640fc.js></script></body></html>
10
+      })();</script><link href=./static/css/app.77f01a9df5512f5ce01859304444c8dd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.0550eda7952b805d7a41.js></script><script type=text/javascript src=./static/js/app.5b1ef72dd7bab17d9a0e.js></script></body></html>

+ 4 - 2
project/src/components/warningManage/customerWarning.vue

@@ -20,7 +20,7 @@
20 20
         </template>
21 21
       </el-table-column>
22 22
     </el-table>
23
-    <el-dialog class="dialogCon_permission" title="客服号单天主动添加人数" :visible.sync="dialogTableVisible" :append-to-body="true" width="500px">
23
+    <el-dialog class="dialogCon_permission" :title="ruleTitle" :visible.sync="dialogTableVisible" :append-to-body="true" width="500px">
24 24
       <div class="dialogCon">
25 25
         <div class="itemBox" style="margin-top: 0">
26 26
           <div class="name"><em>*</em>预警人数:</div>
@@ -64,7 +64,8 @@ export default {
64 64
       warningNum: '',
65 65
       warninggroupList: [],
66 66
       rule_id: '',
67
-      warninggroup_val: ''
67
+      warninggroup_val: '',
68
+      ruleTitle: ''
68 69
     }
69 70
   },
70 71
   created () {
@@ -73,6 +74,7 @@ export default {
73 74
   },
74 75
   methods: {
75 76
     edit (data) {
77
+      this.ruleTitle = data.rule;
76 78
       this.rule_id = data.id;
77 79
       this.warningNum = data.setval;
78 80
       this.warninggroup_val = data.group_id;

+ 13 - 8
project/src/components/warningManage/warningListInstall.vue

@@ -10,7 +10,7 @@
10 10
       </div>
11 11
     </div>
12 12
     <el-table ref="multipleTable" height="calc(100vh - 130px)" :data="tableData" tooltip-effect="dark" style="width: 100%">
13
-      <el-table-column show-overflow-tooltip align="left">
13
+      <el-table-column show-overflow-tooltip align="center">
14 14
         <template slot="header">
15 15
           <div style="margin-left:60px">预警组</div>
16 16
         </template>
@@ -18,9 +18,9 @@
18 18
           <div style="margin-left:60px">{{scope.row.name}}</div>
19 19
         </template>
20 20
       </el-table-column>
21
-      <el-table-column label="预警人" align="left">
21
+      <el-table-column label="预警人" align="center">
22 22
         <template slot-scope="scope">
23
-          <div class="customerServiceTagBox" style="justify-content: space-between;display:inline-block" v-if="scope.row.users">
23
+          <div class="customerServiceTagBox biaoqian" style="justify-content: space-between;display:inline-block" v-if="scope.row.users">
24 24
             <div class="customerServiceTag" v-for="(item,index) in scope.row.users" :key="index+'user'" style="justify-content:flex-start;">
25 25
               <i class="el-icon-user-solid"></i> {{ item.name }}
26 26
               <i class="el-icon-phone" style="margin-left:8px"></i>{{item.phone}}
@@ -28,7 +28,7 @@
28 28
           </div>
29 29
         </template>
30 30
       </el-table-column>
31
-      <el-table-column label="操作" width="150px" align="center">
31
+      <el-table-column label="操作" align="center">
32 32
         <template slot-scope="scope">
33 33
           <div class="flex" style="justify-content:center">
34 34
             <div class="c-00B38A pointer" style="margin:0 6px" @click="getGroupDetail(scope.row.id)">编辑</div>
@@ -220,11 +220,16 @@ export default {
220 220
         if (res && res.errno == 0) {
221 221
           this.dialogTableVisible = false
222 222
           this.init()
223
+          this.$message({
224
+            message: '成功!',
225
+            type: "success"
226
+          })
227
+        } else {
228
+          this.$message({
229
+            message: res.err,
230
+            type: "warning"
231
+          })
223 232
         }
224
-        this.$message({
225
-          message: res.err,
226
-          type: "warning"
227
-        })
228 233
       }).catch(() => {
229 234
         this.dialogLoading = false
230 235
       })

+ 12 - 12
project/src/router/allRouter.js

@@ -33,7 +33,7 @@ const charge = () => import(/* webpackChunkName: 'charge' */ '@/components/order
33 33
 const wxAccountList = () => import(/* webpackChunkName: 'wxAccountList' */ '@/components/dataBoard/wxAccount/list.vue')
34 34
 const thePublicTrend = () => import(/* webpackChunkName: 'thePublicTrend' */ '@/components/dataBoard/thePublicTrend.vue')
35 35
 const playletFansActTrend = () => import(/* webpackChunkName: 'playletFansActTrend' */ '@/components/dataBoard/playletFansActTrend.vue')
36
-const putOnwarning = () => import(/* webpackChunkName: 'putOnwarning' */ '@/components/dataBoard/putOnwarning/warningManage.vue')
36
+// const putOnwarning = () => import(/* webpackChunkName: 'putOnwarning' */ '@/components/dataBoard/putOnwarning/warningManage.vue')
37 37
 
38 38
 // name与菜单配置的页面路由一致
39 39
 // meta下isData:true为数据看板,否则为助手
@@ -320,17 +320,17 @@ export var allRouter = [
320 320
           isData: true
321 321
         }
322 322
       },
323
-      {
324
-        path: 'putOnwarning',
325
-        name: 'putOnwarning',
326
-        component: putOnwarning,
327
-        meta: {
328
-          keepAlive: false,
329
-          isLogin: true,
330
-          title: '预警设置',
331
-          isData: true
332
-        }
333
-      },
323
+      // {
324
+      //   path: 'putOnwarning',
325
+      //   name: 'putOnwarning',
326
+      //   component: putOnwarning,
327
+      //   meta: {
328
+      //     keepAlive: false,
329
+      //     isLogin: true,
330
+      //     title: '预警设置',
331
+      //     isData: true
332
+      //   }
333
+      // },
334 334
       {
335 335
         path: 'playletData',
336 336
         name: 'playletData',

File diff suppressed because it is too large
+ 0 - 1
static/css/app.3e3313e319733db1e46bcbcff5df0ef3.css


File diff suppressed because it is too large
+ 1 - 0
static/css/app.77f01a9df5512f5ce01859304444c8dd.css


File diff suppressed because it is too large
+ 0 - 1
static/js/0.d5460ff5d744ebf17807.js


File diff suppressed because it is too large
+ 8 - 0
static/js/0.f52f0605ff8e51272624.js


File diff suppressed because it is too large
+ 1 - 0
static/js/10.4f54118dc93d2ac72c2b.js


File diff suppressed because it is too large
+ 0 - 1
static/js/10.95c06c2e378851f94784.js


File diff suppressed because it is too large
+ 1 - 1
static/js/12.4c2bfd64423ae024fb6a.js


File diff suppressed because it is too large
+ 0 - 1
static/js/11.e7b302dce86d09eefcd7.js


File diff suppressed because it is too large
+ 1 - 0
static/js/12.37d102da7078870852d5.js


File diff suppressed because it is too large
+ 1 - 1
static/js/14.297ef3b79e68986e5365.js


File diff suppressed because it is too large
+ 0 - 1
static/js/13.e7660ee4d915a5673e37.js


File diff suppressed because it is too large
+ 1 - 1
static/js/15.8a26d184f2d55ffc2f20.js


File diff suppressed because it is too large
+ 1 - 0
static/js/15.2cc995b8339ffd0c30fb.js


File diff suppressed because it is too large
+ 1 - 0
static/js/16.354ca35224b0eaed3de8.js


File diff suppressed because it is too large
+ 0 - 1
static/js/16.c2e27ad27feb5df84725.js


File diff suppressed because it is too large
+ 1 - 0
static/js/19.26cd6fbdbc6af3338dcb.js


File diff suppressed because it is too large
+ 1 - 1
static/js/19.0fe5d251894186be08f0.js


File diff suppressed because it is too large
+ 1 - 0
static/js/21.3b04ee96d83094a4fd06.js


File diff suppressed because it is too large
+ 1 - 1
static/js/20.6f39e3c5f04b9c5d7764.js


File diff suppressed because it is too large
+ 0 - 1
static/js/23.3f3374e8d623265e6583.js


File diff suppressed because it is too large
+ 1 - 1
static/js/21.9bae5bf6d5e211ecee98.js


File diff suppressed because it is too large
+ 1 - 1
static/js/22.613def8e2492b7ddaf63.js


File diff suppressed because it is too large
+ 0 - 1
static/js/25.2d0964bc2cdc43338ae9.js


File diff suppressed because it is too large
+ 1 - 0
static/js/25.6039e22794b82ce75cdc.js


File diff suppressed because it is too large
+ 1 - 0
static/js/26.7bb2f5a4e989a6dae9a5.js


File diff suppressed because it is too large
+ 1 - 1
static/js/24.5a3ae1792d227e0373ee.js


File diff suppressed because it is too large
+ 1 - 1
static/js/26.9301a7ccfe88dc8f5e70.js


File diff suppressed because it is too large
+ 1 - 0
static/js/29.b0261e2a6fb9268e60c2.js


File diff suppressed because it is too large
+ 1 - 1
static/js/27.0e1249ed7e256b5f4ae2.js


File diff suppressed because it is too large
+ 0 - 1
static/js/30.43c0157159e09d94300b.js


File diff suppressed because it is too large
+ 1 - 1
static/js/28.0088906935751ec6a734.js


File diff suppressed because it is too large
+ 1 - 0
static/js/32.997bc2814528f50c0183.js


File diff suppressed because it is too large
+ 1 - 1
static/js/29.f9d3db3a93867d532598.js


File diff suppressed because it is too large
+ 1 - 0
static/js/34.46d2fe808fedb07a52ee.js


File diff suppressed because it is too large
+ 1 - 1
static/js/31.4ce936a0a195779fe52e.js


File diff suppressed because it is too large
+ 1 - 1
static/js/32.4eb82423192725c6d442.js


File diff suppressed because it is too large
+ 1 - 1
static/js/33.9f425c83b0c9418440dd.js


File diff suppressed because it is too large
+ 1 - 0
static/js/38.a6daed74eb4eb96a5759.js


File diff suppressed because it is too large
+ 1 - 1
static/js/34.f28fa317d9240a9808df.js


File diff suppressed because it is too large
+ 0 - 8
static/js/4.1bbe0705f5358d3c58d0.js


File diff suppressed because it is too large
+ 18 - 0
static/js/4.4dfa8ecc35ce4e1f9b09.js


File diff suppressed because it is too large
+ 1 - 1
static/js/35.4e487d6d91b40060c9c4.js


File diff suppressed because it is too large
+ 1 - 1
static/js/8.757e35b6d762f831c4c5.js


File diff suppressed because it is too large
+ 0 - 8
static/js/5.d15c893f4c7bbb47a8c7.js


File diff suppressed because it is too large
+ 1 - 1
static/js/9.b3859a83432b28124fbc.js


File diff suppressed because it is too large
+ 0 - 18
static/js/6.9d21f20ebe72c707732b.js


File diff suppressed because it is too large
+ 1 - 0
static/js/7.118adf4af4b005e778a6.js


File diff suppressed because it is too large
+ 0 - 1
static/js/7.29a540ac64e9189bf38b.js


File diff suppressed because it is too large
+ 1 - 0
static/js/8.c9a917afc5fa445b0e7a.js


File diff suppressed because it is too large
+ 1 - 0
static/js/9.4176edcd5c6d02943945.js


File diff suppressed because it is too large
+ 6 - 6
static/js/app.6cc6d5f4c73618a640fc.js


File diff suppressed because it is too large
+ 1 - 0
static/js/manifest.0550eda7952b805d7a41.js


File diff suppressed because it is too large
+ 0 - 1
static/js/manifest.4130e64d497adf7ea037.js