From 70990463f9d6d8b3d727c687b8f22cf8bcadebf5 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 25 Jul 2024 11:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                      | 74 +++++++-----------------
 src/main/resources/static/js/publicJs.js |  4 +-
 2 files changed, 24 insertions(+), 54 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fd5f79a..4aaf902 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,47 +5,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aca359d4-ea8f-485c-82d3-203e6f883afb" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/shelf/_2024_7_22_10_06____.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/shelf/_2024_7_22_8_58____.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/shelf/_2024_7_22_9_08____.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/shelf/_2024_7_22_9_50____.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2024_7_22_上午10_06_取消提交了更改_[更改]/shelved.patch" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2024_7_22_上午8_58_取消提交了更改_[更改]/shelved.patch" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2024_7_22_上午9_08_取消提交了更改_[更改]/shelved.patch" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2024_7_22_上午9_50_取消提交了更改_[更改]/shelved.patch" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/logs/sys-back.log.2024-07-18.0" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/logs/sys-back.log.error.2024-07-18.0" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/logs/sys-back.log.sql.2024-07-18.0" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/logs/sys-back.log.sql.2024-07-19.0" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/exper/entity/dto/ExperimentStandardDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/exper/entity/dto/ParamsDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/exper/entity/dto/ToolsManageDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/primaryData/entity/dto/ExperimentStandardDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/primaryData/entity/dto/ParamsDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/primaryData/entity/dto/ToolsManageDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/primaryData/entity/vo/ExperDevice.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/controller/CustomController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/controller/CustomController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/controller/TeamConfigController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/controller/TeamConfigController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/dao/CustomDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/dao/CustomDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/dao/TeamConfigDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/dao/TeamConfigDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/entity/vo/BaseCustom.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/entity/vo/BaseCustom.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/entity/vo/BaseTeamConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/entity/vo/BaseTeamConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/entity/vo/BaseTeamConfigDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/entity/vo/BaseTeamConfigDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperimentalVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperimentalVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/service/CustomService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/service/CustomService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/service/TeamConfigService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/service/TeamConfigService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/service/impl/CustomServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/service/impl/CustomServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/service/impl/TeamConfigServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bonus/aqgqj/basis/service/impl/TeamConfigServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mappers/basis/CustomMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/basis/CustomMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mappers/basis/TeamConfigMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/basis/TeamConfigMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/basis/custom.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/basis/custom.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/basis/teamConfig.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/basis/teamConfig.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/pages/basis/roleList.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/pages/basis/customList.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/pages/basis/teamAddForm.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/pages/basis/teamAddForm.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/pages/basis/teamConfig.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/pages/basis/teamConfig.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/basis/child/teamConfigDataFormTable.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/basis/customAddDeptForm.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/basis/teamConfigAjax.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/basis/teamConfigTable.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/basis/teamConfig_new.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/exper/device.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/exper/deviceAddForm.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/primaryData/child/primaryDataList.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/primaryData/primary.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/publicJs.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/publicJs.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/tools/toolsMge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/tools/toolsMge.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -61,18 +31,18 @@
       </MavenGeneralSettings>
     </option>
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "Spring Boot.SzgqjServiceApplication.executor": "Debug",
-    "Spring Boot.ZhlyServiceApplication.executor": "Debug",
-    "git-widget-placeholder": "master",
-    "node.js.selected.package.tslint": "(autodetect)"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;Spring Boot.SzgqjServiceApplication.executor&quot;: &quot;Debug&quot;,
+    &quot;Spring Boot.ZhlyServiceApplication.executor&quot;: &quot;Debug&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;
   }
-}]]></component>
+}</component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
diff --git a/src/main/resources/static/js/publicJs.js b/src/main/resources/static/js/publicJs.js
index 9022693..d33b005 100644
--- a/src/main/resources/static/js/publicJs.js
+++ b/src/main/resources/static/js/publicJs.js
@@ -35,10 +35,10 @@ function error(xhr) {
             icon: 5,
             move: false,
             cancel: function (index, layero) {
-                location.href = '/szgqj/login.html';
+                location.href = '/zhly/login.html';
             }
         }, function () {
-            location.href = '/szgqj/login.html';
+            location.href = '/zhly/login.html';
         })
     } else if (code == 403) {
         console.log("未授权:" + message);