代码逻辑完善

.env.development

@@ -1,7 +1,7 @@
 # 若依管理系统/开发环境
 # VUE_APP_BASE_URL = 'http://192.168.50.205:9999'
-VUE_APP_BASE_URL = 'http://172.16.6.217:9999'
-# VUE_APP_BASE_URL = 'http://121.36.17.6:9098'
+# VUE_APP_BASE_URL = 'http://172.16.6.217:9999'
+VUE_APP_BASE_URL = 'http://121.36.17.6:9098'
 
 # 页面标题
 VUE_APP_TITLE = "应急物资系统"

src/api/index.ts

@@ -33,6 +33,8 @@ import axios from "axios";
 import cache from "@/utils/cache";
 import errorCode from "@/utils/errorCode";
 import store from "@/store";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css";
 import { serialize } from "@/utils/util";
 import { ElNotification, ElMessageBox, ElMessage } from "element-plus";
 
@@ -47,10 +49,15 @@ const request = axios.create({
   timeout: 10000
 });
 
+// NProgress Configuration
+NProgress.configure({
+  showSpinner: false
+});
 // request拦截器
 request.interceptors.request.use(
   (config) => {
     // 是否需要设置 token
+    NProgress.start(); // start progress bar
     const isToken = (config.headers || {}).isToken === false;
     // 是否需要防止数据重复提交
     const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
@@ -102,6 +109,7 @@ request.interceptors.request.use(
 // 响应拦截器
 request.interceptors.response.use(
   (res: any) => {
+    NProgress.done();
     // 未设置状态码则默认成功状态
     const code = res.code || 200;
     // 获取错误信息
@@ -133,6 +141,7 @@ request.interceptors.response.use(
   },
   (error) => {
     console.log("err" + error);
+    NProgress.done();
     let { message } = error;
     if (message === "Network Error") {
       message = "后端接口连接异常";

src/permission.ts

@@ -20,8 +20,7 @@ router.beforeEach(async (to, from, next) => {
         formatRoutes(res);
         next(to.path);
       });
-    } 
-    else {
+    } else {
       const meta = to.meta || {};
       if (to.path === "/login" || to.path === "/shuju") {
         next({ path: "/" });

src/utils/util.ts

@@ -1,4 +1,4 @@
-import { ref } from "vue";
+import { ref, toRef } from "vue";
 import CryptoJS from "crypto-js";
 
 // 构造树型结构数据
@@ -171,11 +171,12 @@ export function getValueLabel(arr: any, value: string, valueName?: string, label
   return arr.find((item: any) => item[valName] === value)[label];
 }
 
+// 从字典中获取多选value的label
 export function getValueListLabel(arr: any, value: string[], valueName?: string, labelName?: string) {
   const valName = valueName ?? "value";
   const label = labelName ?? "label";
-  if (!value || value?.length === 0) return;
   const showBackList = typeof value === "string" ? JSON.parse(value) : value;
+  if (!value || value?.length === 0) return;
   const result: string[] = [];
   showBackList.forEach((item: any) => {
     result.push(arr.find((ite: any) => ite[valName] === item)[label] || "");

src/views/admin/dept/index.vue

@@ -83,7 +83,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="部门类型" prop="deptType">
-                <el-select v-model="form.deptType" clearable>
+                <el-select v-model="form.deptType" clearable @change="deptTypeChange">
                   <el-option v-for="item in dept_type" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
@@ -159,7 +159,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
+import { nextTick, ref } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import type { FormInstance, FormRules } from "element-plus";
 import { Search, EditPen, Plus, Edit, Delete } from "@element-plus/icons-vue";
@@ -200,7 +200,6 @@ const formRules = ref<FormRules>({
   parentId: [{ required: true, message: "上级部门不能为空", trigger: "change" }],
   name: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
   deptType: [{ required: true, message: "部门类型不能为空", trigger: "change" }],
-  warehouseType: [{ required: true, message: "仓库类型不能为空", trigger: "change" }],
   sortOrder: [{ required: true, message: "请选择排序", trigger: "blur" }]
 });
 const deptOptions = ref<any>([]); // 部门目录
@@ -226,6 +225,22 @@ const getList = () => {
 
 getList();
 
+//
+const deptTypeChange = (val: string) => {
+  if (val === "3") {
+    formRules.value.warehouseType = [{ required: true, message: "仓库类型不能为空", trigger: "change" }];
+    formRules.value.longitude = [{ required: true, message: "经度不能为空", trigger: "blur" }];
+    formRules.value.dimension = [{ required: true, message: "维度不能为空", trigger: "blur" }];
+  } else {
+    formRules.value.warehouseType = [];
+    formRules.value.longitude = [];
+    formRules.value.dimension = [];
+  }
+  nextTick(() => {
+    formRef.value?.clearValidate();
+  });
+};
+
 // 添加/查看/编辑 列表数据
 const addOrUpdateHandle = (isEdit: boolean, id?: string) => {
   // 获取菜单信息
@@ -238,7 +253,6 @@ const addOrUpdateHandle = (isEdit: boolean, id?: string) => {
     getDeptObj(id).then((res: any) => {
       if (res.code === 0) {
         form.value = res.data;
-        form.value.parentId = Number(form.value.parentId);
         form.value.warehouseType = JSON.parse(form.value.warehouseType);
       }
     });
@@ -340,7 +354,7 @@ const clearDialogData = () => {
     dimension: "",
     warehouseType: []
   };
-  formRef.value?.resetFields();
+  formRef.value?.clearValidate();
 };
 </script>
 

src/views/admin/dict/index.vue

@@ -391,7 +391,7 @@ const clearDialogData = () => {
     createTime: ""
   };
   roleFormDisabled.value = false;
-  dictRef.value?.resetFields();
+  dictRef.value?.clearValidate();
 };
 
 // 打开字典项弹窗
@@ -492,7 +492,7 @@ const clearItemDialog = () => {
     sortOrder: 1,
     remarks: ""
   };
-  dictItemRef.value?.resetFields;
+  dictItemRef.value?.clearValidate;
   dictItemCreate.value = false;
   getDictItem();
 };

src/views/admin/menu/index.vue

@@ -281,7 +281,7 @@ const clearDialogData = () => {
     sortOrder: 999,
     keepAlive: "1"
   };
-  formRef.value?.resetFields();
+  formRef.value?.clearValidate();
   dialogVisible.value = false;
   getList();
 };

src/views/admin/role/index.vue

@@ -359,7 +359,7 @@ const clearDialogData = () => {
     createTime: ""
   };
   roleFormDisabled.value = false;
-  roleRef.value?.resetFields();
+  roleRef.value?.clearValidate();
 };
 
 // 遍历取出数组ID

src/views/admin/user/index.vue

@@ -441,7 +441,7 @@ const clearDialogForm = () => {
     lockFlag: "",
     role: []
   };
-  dialogFormRef.value?.resetFields();
+  dialogFormRef.value?.clearValidate();
   dialogVisible.value = false;
   getList();
 };