From a99f2c9f7b81586894d19abeebc21a356fad5a05 Mon Sep 17 00:00:00 2001
From: xuhuihui <3548508071@qq.com>
Date: Mon, 17 Jan 2022 09:32:32 +0800
Subject: [PATCH] modify some codes

---
 .idea/workspace.xml                           | 20 ++++++++++++--
 04.系统编码/Frontend/.idea/workspace.xml  | 27 +++++++++++++++++++
 04.系统编码/Frontend/src/App.vue          |  3 ---
 .../Frontend/src/components/Shared/Header.vue |  5 +++-
 04.系统编码/Frontend/src/router/index.ts  |  5 ++++
 04.系统编码/Frontend/src/uilts/axios.ts   |  6 +++--
 6 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index eb02ee7..22e96cb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="ab2b8b9a-75bc-4b53-ba9c-6ce3e5bcc7ca" name="默认变更列表" comment="" />
+    <list default="true" id="ab2b8b9a-75bc-4b53-ba9c-6ce3e5bcc7ca" name="默认变更列表" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/04.系统编码/Frontend/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/04.系统编码/Frontend/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/04.系统编码/Frontend/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/04.系统编码/Frontend/src/App.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue" beforeDir="false" afterPath="$PROJECT_DIR$/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/04.系统编码/Frontend/src/components/Shared/Header.vue" beforeDir="false" afterPath="$PROJECT_DIR$/04.系统编码/Frontend/src/components/Shared/Header.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/04.系统编码/Frontend/src/router/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/04.系统编码/Frontend/src/router/index.ts" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -22,7 +29,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="settings.editor.selected.configurable" value="vcs.Git" />
-    <property name="ts.external.directory.path" value="D:\软件\webstrom\WebStorm 2021.1\plugins\JavaScriptLanguage\jsLanguageServicesImpl\external" />
+    <property name="ts.external.directory.path" value="D:\project\NanJingLamanRadarProject\04.系统编码\Frontend\node_modules\typescript\lib" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
@@ -34,6 +41,15 @@
       <option name="presentableId" value="Default" />
       <updated>1638166349353</updated>
       <workItem from="1638166352914" duration="181000" />
+<<<<<<< HEAD
+      <workItem from="1642382395876" duration="4000" />
+=======
+      <workItem from="1638942076781" duration="2324000" />
+      <workItem from="1639012588456" duration="11000" />
+      <workItem from="1639124658580" duration="607000" />
+      <workItem from="1640675899051" duration="36000" />
+      <workItem from="1640763730360" duration="69000" />
+>>>>>>> 61550fcdeafa5385cd1de921cd261a78e1470c1d
     </task>
     <servers />
   </component>
diff --git a/04.系统编码/Frontend/.idea/workspace.xml b/04.系统编码/Frontend/.idea/workspace.xml
index 0cbcbc5..c59ffd6 100644
--- a/04.系统编码/Frontend/.idea/workspace.xml
+++ b/04.系统编码/Frontend/.idea/workspace.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4b7d7b72-f5b8-41e4-85d5-6267bdc12fc5" name="默认变更列表" comment="">
+      <change beforePath="$PROJECT_DIR$/../../.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
@@ -12,6 +14,12 @@
       <change beforePath="$PROJECT_DIR$/src/components/SynergyEvaluation.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/SynergyEvaluation.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.less" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/uilts/Config.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/uilts/Config.ts" afterDir="false" />
+=======
+      <change beforePath="$PROJECT_DIR$/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/App.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/MicrowaveRadiation.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/MicrowaveRadiation.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/Shared/Header.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Shared/Header.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/router/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/router/index.ts" afterDir="false" />
+>>>>>>> 61550fcdeafa5385cd1de921cd261a78e1470c1d
       <change beforePath="$PROJECT_DIR$/src/uilts/axios.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/uilts/axios.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -119,9 +127,28 @@
       <workItem from="1638752962691" duration="9088000" />
       <workItem from="1638768088746" duration="2255000" />
       <workItem from="1638770403708" duration="11594000" />
+<<<<<<< HEAD
       <workItem from="1642053713517" duration="5420000" />
       <workItem from="1642059535467" duration="7663000" />
       <workItem from="1642121983769" duration="25342000" />
+=======
+      <workItem from="1638839004895" duration="826000" />
+      <workItem from="1638843188929" duration="208000" />
+      <workItem from="1638858161171" duration="29000" />
+      <workItem from="1638927040509" duration="943000" />
+      <workItem from="1638928305571" duration="88000" />
+      <workItem from="1638928458726" duration="265000" />
+      <workItem from="1639011901004" duration="445000" />
+      <workItem from="1639012598863" duration="2307000" />
+      <workItem from="1639033152975" duration="361000" />
+      <workItem from="1639035371735" duration="107000" />
+      <workItem from="1639103345281" duration="414000" />
+      <workItem from="1639104715696" duration="249000" />
+      <workItem from="1639374913408" duration="628000" />
+      <workItem from="1639711696617" duration="417000" />
+      <workItem from="1642052240050" duration="1247000" />
+      <workItem from="1642380630446" duration="1257000" />
+>>>>>>> 61550fcdeafa5385cd1de921cd261a78e1470c1d
     </task>
     <task id="LOCAL-00001" summary="2021 12 01">
       <created>1638357539757</created>
diff --git a/04.系统编码/Frontend/src/App.vue b/04.系统编码/Frontend/src/App.vue
index eb092ca..f23b45a 100644
--- a/04.系统编码/Frontend/src/App.vue
+++ b/04.系统编码/Frontend/src/App.vue
@@ -19,9 +19,6 @@
             onMounted(() => {
                 getRem(1920, 100);
                 window.onresize = () => getRem(1920, 100);
-                // window.onbeforeunload = () => {
-                //   clear()
-                // }
             })
 
 
diff --git a/04.系统编码/Frontend/src/components/Shared/Header.vue b/04.系统编码/Frontend/src/components/Shared/Header.vue
index 2e24f94..a90042d 100644
--- a/04.系统编码/Frontend/src/components/Shared/Header.vue
+++ b/04.系统编码/Frontend/src/components/Shared/Header.vue
@@ -21,7 +21,10 @@
                 <router-link to="/SystemManagement">系统管理</router-link>
             </div>
         </div>
-        <span @click="Logout">退出登录</span>
+          <span @click="Logout">退出登录</span>
+
+
+
     </div>
 </template>
 
diff --git a/04.系统编码/Frontend/src/router/index.ts b/04.系统编码/Frontend/src/router/index.ts
index e1815b7..08773e8 100644
--- a/04.系统编码/Frontend/src/router/index.ts
+++ b/04.系统编码/Frontend/src/router/index.ts
@@ -28,4 +28,9 @@ router.beforeEach((to,form,next)=>{
     }
 
 })
+
+router.afterEach((to,form,next)=>{
+    
+})
+
 export default router;
\ No newline at end of file
diff --git a/04.系统编码/Frontend/src/uilts/axios.ts b/04.系统编码/Frontend/src/uilts/axios.ts
index f3c7cbe..7e7e95b 100644
--- a/04.系统编码/Frontend/src/uilts/axios.ts
+++ b/04.系统编码/Frontend/src/uilts/axios.ts
@@ -6,8 +6,10 @@ import { ElLoading } from 'element-plus'
 let loading = null;
 const service = axios.create({
     // baseURL:"http://112.124.40.88:8002",
-    // baseURL: '',
-    baseURL: 'http://localhost:8002',
+
+    baseURL:"http://localhost:8002",
+
+    // baseURL: 'http://localhost:8002',
     timeout: 500000
 })