liuxiaona 2 vuotta sitten
vanhempi
commit
d8cd9055ad

+ 9 - 121
.idea/workspace.xml

@@ -2,103 +2,15 @@
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" />
6
-      <change beforePath="$PROJECT_DIR$/qwh5/src/views/radar.vue" afterPath="$PROJECT_DIR$/qwh5/src/views/radar.vue" />
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/assembly/conTwo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/conTwo.vue" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/qwh5/src/views/radar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/radar.vue" afterDir="false" />
7 8
     </list>
8
-    <ignored path="$PROJECT_DIR$/.tmp/" />
9
-    <ignored path="$PROJECT_DIR$/temp/" />
10
-    <ignored path="$PROJECT_DIR$/tmp/" />
11
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12
-    <option name="TRACKING_ENABLED" value="true" />
13 9
     <option name="SHOW_DIALOG" value="false" />
14 10
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
15 11
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
16 12
     <option name="LAST_RESOLUTION" value="IGNORE" />
17 13
   </component>
18
-  <component name="FileEditorManager">
19
-    <splitter split-orientation="vertical" split-proportion="0.9">
20
-      <split-first>
21
-        <splitter split-orientation="horizontal" split-proportion="0.7491731">
22
-          <split-first>
23
-            <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
24
-              <file leaf-file-name="radar.vue" pinned="false" current-in-tab="true">
25
-                <entry file="file://$PROJECT_DIR$/qwh5/src/views/radar.vue">
26
-                  <provider selected="true" editor-type-id="text-editor">
27
-                    <state relative-caret-position="216">
28
-                      <caret line="203" column="26" lean-forward="true" selection-start-line="203" selection-start-column="26" selection-end-line="203" selection-end-column="26" />
29
-                      <folding>
30
-                        <element signature="n#style#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
31
-                        <element signature="n#style#0;n#iframe#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
32
-                        <element signature="e#717#842#0" expanded="true" />
33
-                        <element signature="e#1925#2411#0" expanded="false" />
34
-                        <element signature="e#2445#2940#0" expanded="false" />
35
-                        <element signature="e#2989#4221#0" expanded="false" />
36
-                        <element signature="e#5517#5975#0" expanded="false" />
37
-                        <element signature="e#6166#6730#0" expanded="false" />
38
-                      </folding>
39
-                    </state>
40
-                  </provider>
41
-                </entry>
42
-              </file>
43
-              <file leaf-file-name="test.html" pinned="false" current-in-tab="false">
44
-                <entry file="file://$USER_HOME$/Desktop/test.html">
45
-                  <provider selected="true" editor-type-id="text-editor">
46
-                    <state relative-caret-position="378">
47
-                      <caret line="14" column="2" lean-forward="false" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="20" />
48
-                      <folding />
49
-                    </state>
50
-                  </provider>
51
-                </entry>
52
-              </file>
53
-            </leaf>
54
-          </split-first>
55
-          <split-second>
56
-            <leaf>
57
-              <file leaf-file-name="radar.vue" pinned="false" current-in-tab="true">
58
-                <entry file="file://$PROJECT_DIR$/qwh5/src/views/radar.vue">
59
-                  <provider selected="true" editor-type-id="text-editor">
60
-                    <state relative-caret-position="365">
61
-                      <caret line="151" column="13" lean-forward="false" selection-start-line="151" selection-start-column="6" selection-end-line="151" selection-end-column="13" />
62
-                      <folding>
63
-                        <element signature="n#style#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
64
-                        <element signature="n#style#0;n#iframe#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
65
-                        <element signature="e#717#842#0" expanded="true" />
66
-                        <element signature="e#1925#2411#0" expanded="false" />
67
-                        <element signature="e#2445#2940#0" expanded="false" />
68
-                        <element signature="e#2989#4221#0" expanded="false" />
69
-                        <element signature="e#5517#5975#0" expanded="false" />
70
-                        <element signature="e#6166#6730#0" expanded="false" />
71
-                      </folding>
72
-                    </state>
73
-                  </provider>
74
-                </entry>
75
-              </file>
76
-            </leaf>
77
-          </split-second>
78
-        </splitter>
79
-      </split-first>
80
-      <split-second>
81
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
82
-          <file leaf-file-name="radar.vue" pinned="false" current-in-tab="true">
83
-            <entry file="file://$PROJECT_DIR$/qwh5/src/views/radar.vue">
84
-              <provider selected="true" editor-type-id="text-editor">
85
-                <state relative-caret-position="0">
86
-                  <caret line="97" column="48" lean-forward="false" selection-start-line="97" selection-start-column="48" selection-end-line="97" selection-end-column="48" />
87
-                  <folding>
88
-                    <element signature="n#style#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
89
-                    <element signature="n#style#0;n#iframe#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
90
-                    <element signature="e#717#842#0" expanded="true" />
91
-                    <element signature="e#1925#2411#0" expanded="false" />
92
-                    <element signature="e#2445#2940#0" expanded="false" />
93
-                  </folding>
94
-                </state>
95
-              </provider>
96
-            </entry>
97
-          </file>
98
-        </leaf>
99
-      </split-second>
100
-    </splitter>
101
-  </component>
102 14
   <component name="FileTemplateManagerImpl">
103 15
     <option name="RECENT_TEMPLATES">
104 16
       <list>
@@ -266,6 +178,7 @@
266 178
     <option name="showLibraryContents" value="true" />
267 179
   </component>
268 180
   <component name="PropertiesComponent">
181
+    <property name="HbShouldOpenHtmlAsHb" value="" />
269 182
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
270 183
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
271 184
     <property name="WebServerToolWindowFactoryState" value="false" />
@@ -274,27 +187,14 @@
274 187
     <property name="settings.editor.selected.configurable" value="editor.reader.mode" />
275 188
     <property name="ts.external.directory.path" value="C:\projectCode\playlet\qwh5\node_modules\typescript\lib" />
276 189
     <property name="vue.rearranger.settings.migration" value="true" />
277
-    <property name="HbShouldOpenHtmlAsHb" value="" />
278 190
   </component>
279 191
   <component name="RecentsManager">
280 192
     <key name="CopyFile.RECENT_KEYS">
281 193
       <recent name="C:\projectCode\playlet\qwh5\src\views" />
282 194
     </key>
283 195
   </component>
284
-  <component name="RunDashboard">
285
-    <option name="ruleStates">
286
-      <list>
287
-        <RuleState>
288
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
289
-        </RuleState>
290
-        <RuleState>
291
-          <option name="name" value="StatusDashboardGroupingRule" />
292
-        </RuleState>
293
-      </list>
294
-    </option>
295
-  </component>
296 196
   <component name="RunManager">
297
-    <configuration name="serve" type="js.build_tools.npm" factoryName="npm" nameIsGenerated="true">
197
+    <configuration name="serve" type="js.build_tools.npm" nameIsGenerated="true">
298 198
       <package-json value="$PROJECT_DIR$/qwh5/package.json" />
299 199
       <command value="run" />
300 200
       <scripts>
@@ -302,11 +202,9 @@
302 202
       </scripts>
303 203
       <node-interpreter value="project" />
304 204
       <envs />
205
+      <method v="2" />
305 206
     </configuration>
306 207
   </component>
307
-  <component name="ShelveChangesManager" show_recycled="false">
308
-    <option name="remove_strategy" value="false" />
309
-  </component>
310 208
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
311 209
   <component name="SvnConfiguration">
312 210
     <configuration />
@@ -366,33 +264,23 @@
366 264
     </layout>
367 265
   </component>
368 266
   <component name="TypeScriptGeneratedFilesManager">
369
-    <option name="version" value="1" />
267
+    <option name="version" value="3" />
370 268
   </component>
371 269
   <component name="Vcs.Log.Tabs.Properties">
372 270
     <option name="TAB_STATES">
373 271
       <map>
374 272
         <entry key="MAIN">
375 273
           <value>
376
-            <State>
377
-              <option name="RECENTLY_FILTERED_USER_GROUPS">
378
-                <collection />
379
-              </option>
380
-              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
381
-                <collection />
382
-              </option>
383
-            </State>
274
+            <State />
384 275
           </value>
385 276
         </entry>
386 277
       </map>
387 278
     </option>
279
+    <option name="oldMeFiltersMigrated" value="true" />
388 280
   </component>
389 281
   <component name="VcsContentAnnotationSettings">
390 282
     <option name="myLimit" value="2678400000" />
391 283
   </component>
392
-  <component name="XDebuggerManager">
393
-    <breakpoint-manager />
394
-    <watches-manager />
395
-  </component>
396 284
   <component name="editorHistoryManager">
397 285
     <entry file="file://$PROJECT_DIR$/qwh5/src/views/radarH5.vue">
398 286
       <provider selected="true" editor-type-id="text-editor">

+ 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.57eaefbd3c5da4710e85880aca27c2ac.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.2a01e33126b49011e998.js></script><script type=text/javascript src=./static/js/app.4cb6aabc6deefd275e53.js></script></body></html>
10
+      })();</script><link href=./static/css/app.a2e4ef3e532c4b1d3927673f0963620f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.1434b9b8991b60170377.js></script><script type=text/javascript src=./static/js/app.4cb6aabc6deefd275e53.js></script></body></html>

+ 1 - 1
project/src/components/assembly/conTwo.vue

@@ -72,7 +72,7 @@
72 72
             <i class="el-icon-link"></i>
73 73
           </div>
74 74
           <div>
75
-            <div class="phoneLinkTitle" style="font-size: 13px">{{radar_attach[0].radar.title}}</div>
75
+            <div class="phoneLinkTitle" style="font-size: 13px">{{radar_attach[0].radar.name}}</div>
76 76
             <div class="phoneLinkDesc clampTwo" style="font-size: 11px">{{radar_attach[0].radar.description}}</div>
77 77
           </div>
78 78
         </div>

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


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


File diff suppressed because it is too large
+ 1 - 1
qwh5/dist/js/agreement.7b7e6b01.js


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


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


File diff suppressed because it is too large
+ 1 - 1
qwh5/dist/js/chunk-vendors.30fda4c6.js


File diff suppressed because it is too large
+ 1 - 1
qwh5/dist/js/demo.5dc75219.js


File diff suppressed because it is too large
+ 0 - 1
qwh5/dist/js/userPortrait.000aca38.js


File diff suppressed because it is too large
+ 1 - 0
qwh5/dist/js/userPortrait.5bb9c35e.js


+ 30 - 19
qwh5/src/views/radar.vue

@@ -153,6 +153,7 @@ const formurl =  `${'http://duanju.wenxingshuju.com/api/radarPage/report?corpid=
153 153
 +'&radar_id='+radar_id+'&timestamp='+timestamp+'&token='+token+'&user_id='+user_id
154 154
 +'&rule_id='+rule_id+'&channel='+channel+'&state='+state+'&external_userid='+external_userid+'&openid='+openid+'&device_id='+device_id+'&request_id='+request_id+'&type=2'
155 155
     }`
156
+
156 157
 const set = (key: string, value: any) => {
157 158
     return sessionStorage.setItem(key, value ? JSON.stringify(value) : value);
158 159
 }
@@ -182,7 +183,6 @@ if (isAndroid) { //安卓
182 183
         document.addEventListener("visibilitychange", function () { //部分手机可以获取到
183 184
             // do something
184 185
             if (document.hidden) {
185
-                console.log(localStorage.getItem('isOut6'));
186 186
                 getRES()
187 187
             }
188 188
         })
@@ -190,32 +190,43 @@ if (isAndroid) { //安卓
190 190
         // 主要是为了兼容老的IE
191 191
         window.attachEvent('onpagehide', function () {
192 192
             set('isOut5', false)
193
+          getRES()
193 194
         })
194 195
     } else {
195 196
         window.onbeforeunload = function () {
196 197
             set('isOut5', false)
198
+          getRES()
197 199
         }
198 200
     }
199 201
 }
200 202
 else { //苹果
201
-    window.addEventListener("pagehide", function (e) {
202
-        var ajax = new XMLHttpRequest();
203
-        // ajax.async=false
204
-        var formData2 = new FormData();
205
-        formData2.append("corpid", corpid);
206
-        formData2.append("radar_id", radar_id);
207
-        formData2.append("user_id", user_id);
208
-        formData2.append("token", token);
209
-        formData2.append("timestamp", timestamp);
210
-        formData2.append("rule_id", rule_id);
211
-        formData2.append("channel", channel);
212
-        formData2.append("state", state);
213
-        formData2.append("external_userid", external_userid);
214
-        formData2.append("device_id", device_id);
215
-        formData2.append("request_id", request_id);
216
-        formData2.append("type", '2');
217
-        navigator.sendBeacon(formurl, formData2);//formurl写后台接受数据地址
218
-    }, false);
203
+  window.addEventListener(
204
+      "popstate",
205
+      () => {
206
+        getRES()
207
+      },
208
+      false
209
+  );
210
+
211
+
212
+    // window.addEventListener("pagehide", function (e) {
213
+    //     var ajax = new XMLHttpRequest();
214
+    //     ajax.open('','',false)
215
+    //     var formData2 = new FormData();
216
+    //     formData2.append("corpid", corpid);
217
+    //     formData2.append("radar_id", radar_id);
218
+    //     formData2.append("user_id", user_id);
219
+    //     formData2.append("token", token);
220
+    //     formData2.append("timestamp", timestamp);
221
+    //     formData2.append("rule_id", rule_id);
222
+    //     formData2.append("channel", channel);
223
+    //     formData2.append("state", state);
224
+    //     formData2.append("external_userid", external_userid);
225
+    //     formData2.append("device_id", device_id);
226
+    //     formData2.append("request_id", request_id);
227
+    //     formData2.append("type", '2');
228
+    //     navigator.sendBeacon(formurl, formData2);
229
+    // }, false);
219 230
 }
220 231
 
221 232
 window.onbeforeunload = function (e) {

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


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


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


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