Merge branch 'main' of http://183.222.39.242:3000/zy_oyj/sgxt_web

src/assets/css/homeScreen.scss

@@ -156,6 +156,7 @@
         right: 20px;
         top: 22px;
         font-size: 17px;
+        z-index: 9;
         span {
           color: #0bb7ff;
           cursor: pointer;

src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue

@@ -203,8 +203,6 @@ import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
 import * as rule from "@/utils/rules.js";
 import TagSelectorDialog from "@/components/aboutTable/TagSelectorDialog.vue";
 import DialogList from "./dialogList.vue";
-import "@wangeditor/editor/dist/css/style.css"; // 引入 css
-import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 import { selectUserDeptPage } from "@/api/user-manage";
 import {
   ref,

src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlArea.vue

@@ -160,7 +160,6 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { qcckPost, qcckPut } from "@/api/qcckApi.js";
 import DialogList from "@/views/backOfficeSystem/IntelligentControl/myControl/components/ui/dialogList.vue";
-import moment from "moment";
 const { D_GS_BK_CZYQ, D_GS_BK_CZJSDWLX, D_GS_BK_DJ, D_GS_BK_YZ, D_GS_BK_SJLX } =
   proxy.$dict(
     "D_GS_BK_CZYQ",

src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue

@@ -26,7 +26,6 @@
         :key="pageData.keyCount"
         :tableConfiger="pageData.tableConfiger"
         :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData"
       >
         <template #bqYs="{ row }">
           <DictTag :value="row.bqYs" :tag="false" :options="D_GS_SSYJ" />

src/views/home/layout/head.vue

@@ -80,7 +80,6 @@
               <el-icon color="#fff" style="top:2px;"><Notification/></el-icon><i class="ml10" style="color: #fff;">{{iv}}</i>
             </div>
           </el-popover>
-
           <span class="ml10 mr10"><img @click.stop="handleBtns('后台')" src="@/assets/images/meun.png" alt=""></span>
         </div>
       </ul>

src/views/login/index.vue

@@ -128,18 +128,14 @@ const loginRules = ref({
 
 const handleClose = () => {};
 const refreshToken = (e) => {
-  store
+  store.dispatch("user/refreshToken", { deptId: e, jwtToken: authorization.value}).then((res) => {
-    .dispatch("user/refreshToken", { deptId: e, jwtToken: authorization.value })
+    loading.value = false;
-    .then((res) => {
+    store.commit("user/setDeptId", e);
-      loading.value = false;
+    window.location.href = '/'// 登录后操作
-      store.commit("user/setDeptId", e);
+    router.push("/");
-
+  }).catch(() => {
-      // window.location.href = '/'// 登录后操作
+    loading.value = false;
-      router.push("/");
+  });
-    })
-    .catch(() => {
-      loading.value = false;
-    });
 };
 // 处理密码框文本显示状态
 const passwordType = ref("password");