unknown 2 years ago
parent
commit
0e50909196

+ 40 - 28
.idea/workspace.xml

@@ -2,7 +2,19 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="ce8c7a71-f4a8-4b87-99a5-ff575adf9383" name="Changes" comment="">
5
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
5
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/agreement.3ed8f786.css" afterPath="" />
6
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/app.ff40a389.css" afterPath="" />
7
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/chunk-vendors.31ed7038.css" afterPath="" />
8
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/userPortrait.64a7f461.css" afterPath="" />
9
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/favicon.ico" afterPath="" />
10
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/img/dpNoData.572b0f6d.png" afterPath="" />
11
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/img/info_err.7976f107.png" afterPath="" />
12
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/index.html" afterPath="" />
13
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/agreement.7b7e6b01.js" afterPath="" />
14
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/app.50ddda66.js" afterPath="" />
15
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/chunk-vendors.30fda4c6.js" afterPath="" />
16
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/demo.5dc75219.js" afterPath="" />
17
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/userPortrait.000aca38.js" afterPath="" />
6 18
       <change beforePath="$PROJECT_DIR$/qwh5/src/views/radar.vue" afterPath="$PROJECT_DIR$/qwh5/src/views/radar.vue" />
7 19
     </list>
8 20
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -22,14 +34,14 @@
22 34
           <file leaf-file-name="radar.vue" pinned="false" current-in-tab="true">
23 35
             <entry file="file://$PROJECT_DIR$/qwh5/src/views/radar.vue">
24 36
               <provider selected="true" editor-type-id="text-editor">
25
-                <state relative-caret-position="81">
26
-                  <caret line="3" column="32" lean-forward="true" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="32" />
37
+                <state relative-caret-position="140">
38
+                  <caret line="133" column="0" lean-forward="true" selection-start-line="133" selection-start-column="0" selection-end-line="133" selection-end-column="0" />
27 39
                   <folding>
28 40
                     <element signature="n#style#0;n#div#0;n#template#0;n#!!top" expanded="true" />
29 41
                     <element signature="n#style#0;n#iframe#0;n#div#0;n#template#0;n#!!top" expanded="true" />
30
-                    <element signature="e#709#834#0" expanded="true" />
31
-                    <element signature="e#1747#2246#0" expanded="false" />
32
-                    <element signature="e#2280#2775#0" expanded="false" />
42
+                    <element signature="n#style#0;n#video#0;n#div#0;n#template#0;n#!!top" expanded="true" />
43
+                    <element signature="e#1045#4278#0" expanded="false" />
44
+                    <element signature="e#2425#2920#0" expanded="false" />
33 45
                   </folding>
34 46
                 </state>
35 47
               </provider>
@@ -43,11 +55,11 @@
43 55
             <entry file="file://$PROJECT_DIR$/qwh5/src/views/radar.vue">
44 56
               <provider selected="true" editor-type-id="text-editor">
45 57
                 <state relative-caret-position="-179">
46
-                  <caret line="93" column="48" lean-forward="false" selection-start-line="93" selection-start-column="48" selection-end-line="93" selection-end-column="48" />
58
+                  <caret line="95" column="48" lean-forward="false" selection-start-line="95" selection-start-column="48" selection-end-line="95" selection-end-column="48" />
47 59
                   <folding>
48
-                    <element signature="e#709#834#0" expanded="true" />
49
-                    <element signature="e#1747#2246#0" expanded="false" />
50
-                    <element signature="e#2280#2775#0" expanded="false" />
60
+                    <element signature="e#697#822#0" expanded="true" />
61
+                    <element signature="e#1905#2391#0" expanded="false" />
62
+                    <element signature="e#2425#2920#0" expanded="false" />
51 63
                   </folding>
52 64
                 </state>
53 65
               </provider>
@@ -66,7 +78,6 @@
66 78
   </component>
67 79
   <component name="FindInProjectRecents">
68 80
     <findStrings>
69
-      <find>Toast</find>
70 81
       <find>dialog</find>
71 82
       <find>order_con</find>
72 83
       <find>&lt;img</find>
@@ -96,6 +107,7 @@
96 107
       <find>1111111</find>
97 108
       <find>111111</find>
98 109
       <find>getCookie</find>
110
+      <find>getUserInfo</find>
99 111
     </findStrings>
100 112
     <replaceStrings>
101 113
       <replace>authInfo.value</replace>
@@ -277,12 +289,12 @@
277 289
       <workItem from="1654756255993" duration="16970000" />
278 290
       <workItem from="1656510266574" duration="116000" />
279 291
       <workItem from="1656510409485" duration="10340000" />
280
-      <workItem from="1656596681730" duration="10416000" />
292
+      <workItem from="1656596681730" duration="11778000" />
281 293
     </task>
282 294
     <servers />
283 295
   </component>
284 296
   <component name="TimeTrackingManager">
285
-    <option name="totallyTimeSpent" value="23458000" />
297
+    <option name="totallyTimeSpent" value="24820000" />
286 298
   </component>
287 299
   <component name="TodoView">
288 300
     <todo-panel id="selected-file">
@@ -297,7 +309,7 @@
297 309
     <editor active="true" />
298 310
     <layout>
299 311
       <window_info id="TypeScript" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32893157" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
300
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.080063626" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
312
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.06786851" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
301 313
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32544377" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
302 314
       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
303 315
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -507,9 +519,9 @@
507 519
           <folding>
508 520
             <element signature="n#style#0;n#div#0;n#template#0;n#!!top" expanded="true" />
509 521
             <element signature="n#style#0;n#iframe#0;n#div#0;n#template#0;n#!!top" expanded="true" />
510
-            <element signature="e#709#834#0" expanded="true" />
511
-            <element signature="e#1747#2246#0" expanded="false" />
512
-            <element signature="e#2280#2775#0" expanded="false" />
522
+            <element signature="n#style#0;n#video#0;n#div#0;n#template#0;n#!!top" expanded="true" />
523
+            <element signature="e#1045#4278#0" expanded="false" />
524
+            <element signature="e#2425#2920#0" expanded="false" />
513 525
           </folding>
514 526
         </state>
515 527
       </provider>
@@ -521,9 +533,9 @@
521 533
           <folding>
522 534
             <element signature="n#style#0;n#div#0;n#template#0;n#!!top" expanded="true" />
523 535
             <element signature="n#style#0;n#iframe#0;n#div#0;n#template#0;n#!!top" expanded="true" />
524
-            <element signature="e#709#834#0" expanded="true" />
525
-            <element signature="e#1747#2246#0" expanded="false" />
526
-            <element signature="e#2280#2775#0" expanded="false" />
536
+            <element signature="n#style#0;n#video#0;n#div#0;n#template#0;n#!!top" expanded="true" />
537
+            <element signature="e#1045#4278#0" expanded="false" />
538
+            <element signature="e#2425#2920#0" expanded="false" />
527 539
           </folding>
528 540
         </state>
529 541
       </provider>
@@ -565,9 +577,9 @@
565 577
           <folding>
566 578
             <element signature="n#style#0;n#div#0;n#template#0;n#!!top" expanded="true" />
567 579
             <element signature="n#style#0;n#iframe#0;n#div#0;n#template#0;n#!!top" expanded="true" />
568
-            <element signature="e#709#834#0" expanded="true" />
569
-            <element signature="e#1747#2246#0" expanded="false" />
570
-            <element signature="e#2280#2775#0" expanded="false" />
580
+            <element signature="n#style#0;n#video#0;n#div#0;n#template#0;n#!!top" expanded="true" />
581
+            <element signature="e#1045#4278#0" expanded="false" />
582
+            <element signature="e#2425#2920#0" expanded="false" />
571 583
           </folding>
572 584
         </state>
573 585
       </provider>
@@ -812,14 +824,14 @@
812 824
     </entry>
813 825
     <entry file="file://$PROJECT_DIR$/qwh5/src/views/radar.vue">
814 826
       <provider selected="true" editor-type-id="text-editor">
815
-        <state relative-caret-position="81">
816
-          <caret line="3" column="32" lean-forward="true" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="32" />
827
+        <state relative-caret-position="140">
828
+          <caret line="133" column="0" lean-forward="true" selection-start-line="133" selection-start-column="0" selection-end-line="133" selection-end-column="0" />
817 829
           <folding>
818 830
             <element signature="n#style#0;n#div#0;n#template#0;n#!!top" expanded="true" />
819 831
             <element signature="n#style#0;n#iframe#0;n#div#0;n#template#0;n#!!top" expanded="true" />
820
-            <element signature="e#709#834#0" expanded="true" />
821
-            <element signature="e#1747#2246#0" expanded="false" />
822
-            <element signature="e#2280#2775#0" expanded="false" />
832
+            <element signature="n#style#0;n#video#0;n#div#0;n#template#0;n#!!top" expanded="true" />
833
+            <element signature="e#1045#4278#0" expanded="false" />
834
+            <element signature="e#2425#2920#0" expanded="false" />
823 835
           </folding>
824 836
         </state>
825 837
       </provider>

File diff suppressed because it is too large
+ 1 - 1
qwh5/dist/css/app.ff40a389.css


File diff suppressed because it is too large
+ 1 - 1
qwh5/dist/index.html


File diff suppressed because it is too large
+ 0 - 1
qwh5/dist/js/app.50ddda66.js


File diff suppressed because it is too large
+ 1 - 0
qwh5/dist/js/app.93afbadc.js


+ 11 - 9
qwh5/src/views/radar.vue

@@ -1,5 +1,5 @@
1 1
 <template>
2
-  <div class="about" style="-webkit-overflow-scrolling: touch;-webkit-overflow:auto;height:1000px;width:100%;">
2
+  <div class="about" style="overflow-scrolling: touch;overflow:auto;min-height:1000px;width:100%;">
3 3
     <iframe :src="detialURL[0]" frameborder="0" v-if="detialType==2 || detialType==1" style="width: 100%;height:100%;"></iframe>
4 4
     <div v-show="detialType==3">
5 5
       <img style="width: 100%;height:auto;" :src="item" alt="" v-for="item in detialURL" :key="item">
@@ -43,20 +43,24 @@ export default defineComponent(
43 43
     const router = useRouter();
44 44
     const query_Obj = router.currentRoute.value.query
45 45
     const now_res = reactive({external_userid:'',openid:'',device_id:''})
46
-
46
+    const setStorage = (key: string, value: any) => {
47
+        sessionStorage.setItem(key, value);
48
+    }
47 49
     onBeforeMount(()=>{
48 50
       overshow.value = true;
49 51
       getRadarDetial()
50 52
     })
51 53
     onMounted(()=>{
52
-      if (window.performance.navigation.type == 1) {//页面被刷新
54
+      let isReload:any = sessionStorage.getItem('isReload')
55
+      if (isReload) {//页面被刷新
56
+
53 57
       } else  {//页面首次被加载
58
+        setStorage('isReload',true);
54 59
         getUserInfo()
55 60
       }
56 61
     })
57 62
 
58 63
     const getUserInfo = () => {
59
-
60 64
       (proxy as any).$axios.get('/api/oauth2/userInfo', {
61 65
         corpid: query_Obj.corpid,
62 66
         code: getQueryString('code'),
@@ -66,7 +70,7 @@ export default defineComponent(
66 70
           now_res.external_userid = res.rst.external_userid
67 71
           now_res.openid = res.rst.openid
68 72
           now_res.device_id = res.rst.device_id
69
-          behaviorReport(1,$store.state.enterUUID)
73
+          behaviorReport(1,UUID.value)
70 74
         }
71 75
       }).catch((err) => {
72 76
         console.log(err)
@@ -88,9 +92,7 @@ export default defineComponent(
88 92
         console.log(err)
89 93
       })
90 94
     }
91
-    const setStorage = (key: string, value: any) => {
92
-         sessionStorage.setItem(key, value);
93
-    }
95
+
94 96
     const behaviorReport = (type,enterUUID) => {
95 97
       (proxy as any).$axios.get('/api/radarPage/report', {
96 98
         corpid: query_Obj.corpid,
@@ -106,7 +108,7 @@ export default defineComponent(
106 108
         openid:now_res.openid,
107 109
         device_id:now_res.device_id,
108 110
 
109
-        request_id:enterUUID ? enterUUID : UUID.value,
111
+        request_id:enterUUID,
110 112
         type:type
111 113
       },true).then((res) => {
112 114
           setStorage('corpid', query_Obj.corpid);