liuxiaona 2 years ago
parent
commit
f69949ecc9

+ 3 - 3
.idea/workspace.xml

@@ -3,9 +3,9 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="ce8c7a71-f4a8-4b87-99a5-ff575adf9383" name="Changes" 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$/project/src/components/customOperate/sideTool/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/index.vue" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/smartRadar/index.vue" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/radarList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/smartRadar/radarList.vue" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/project/src/components/detials/customerStatus.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/detials/customerStatus.vue" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/project/src/router/allRouter.js" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/router/allRouter.js" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/qwh5/src/views/userPortrait.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/userPortrait.vue" afterDir="false" />
9 9
     </list>
10 10
     <option name="SHOW_DIALOG" value="false" />
11 11
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

+ 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.81ac88cf20d53307b84de155bdece752.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.ad2f85570b29768dee8e.js></script><script type=text/javascript src=./static/js/app.dd6bbe2f0233b1578b9b.js></script></body></html>
10
+      })();</script><link href=./static/css/app.c6f23f883244324f1ac7b205add1088a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f2f5ce0ed1933b26e9e7.js></script><script type=text/javascript src=./static/js/app.f0c186e47048eeb76c0f.js></script></body></html>

+ 1 - 0
project/src/components/detials/customerStatus.vue

@@ -21,6 +21,7 @@
21 21
                 <span v-else-if="s.type == 6">加入黑名单</span>
22 22
                 <span v-else-if="s.type == 7">移出黑名单</span>
23 23
                 <span v-else-if="s.type == 8">聊天</span>
24
+                <span v-else-if="s.type == 9">智能雷达</span>
24 25
                 <span v-else>未知</span>
25 26
               </div>
26 27
               <div class="behavior_detial">{{s.content}}</div>

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

@@ -106,7 +106,7 @@ export var allRouter = [
106 106
       },
107 107
       {
108 108
         path: 'codeIndex_radar',
109
-        name: 'codeIndex_radar',
109
+        name: 'sideTool',
110 110
         component: codeIndex_radar,
111 111
         meta: {
112 112
           keepAlive: false,
@@ -116,7 +116,7 @@ export var allRouter = [
116 116
       },
117 117
       {
118 118
         path: 'radar_dataAnalyse/:id',
119
-        name: 'codeIndex_radar',
119
+        name: 'sideTool',
120 120
         component: radar_dataAnalyse,
121 121
         meta: {
122 122
           keepAlive: false,

+ 5 - 4
qwh5/src/views/userPortrait.vue

@@ -82,6 +82,7 @@
82 82
                       <span v-else-if="s.type == 6">加入黑名单</span>
83 83
                       <span v-else-if="s.type == 7">移出黑名单</span>
84 84
                       <span v-else-if="s.type == 8">聊天</span>
85
+                      <span v-else-if="s.type == 9">智能雷达</span>
85 86
                       <span v-else>未知</span>
86 87
                     </div>
87 88
                     <div class="behavior_detial">{{s.content}}</div>
@@ -165,7 +166,7 @@ export default {
165 166
     const updataTag = ref([])
166 167
     const h5CustomerDynamicList = ref([])
167 168
     const h5CustomerOrderList = ref([])
168
-    const pageLoading = ref(false)  
169
+    const pageLoading = ref(false)
169 170
     const showPopover = ref(false)
170 171
     const getUserInfoFlag = ref(true)//获取企微用户授权,是否被允许
171 172
     const order_loading = ref(false)
@@ -348,7 +349,7 @@ export default {
348 349
           console.log(err,'err')
349 350
           reject()
350 351
         })
351
-      }) 
352
+      })
352 353
 
353 354
     }
354 355
     function getCurExternalContact(){//获取当前外部联系人userid
@@ -372,7 +373,7 @@ export default {
372 373
       })
373 374
     }
374 375
     function get_data_init(){
375
-      async function interfaceEvent () { 
376
+      async function interfaceEvent () {
376 377
         Toast.loading({
377 378
           duration:0,
378 379
           message: '加载中...',
@@ -748,4 +749,4 @@ export default {
748 749
   padding:20px 10px;
749 750
   overflow-y: auto;
750 751
 }
751
-</style>
752
+</style>

File diff suppressed because it is too large
+ 1 - 1
static/css/app.81ac88cf20d53307b84de155bdece752.css


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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/app.dd6bbe2f0233b1578b9b.js


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