优化

.eslintrc.js

@@ -1,7 +1,8 @@
 module.exports = {
   root: true,
   env: {
-    node: true
+    node: true,
+    "vue/setup-compiler-macros": true
   },
   extends: [
     "plugin:vue/vue3-essential",

src/api/common.ts

@@ -0,0 +1,10 @@
+import request from "@/api";
+
+// 附件下载
+export function downloadAttachment(fileName: string) {
+  return request({
+    url: `/admin/sysFile/${fileName}`,
+    method: "get",
+    responseType: "blob"
+  });
+}

src/components/Pagination/index.vue

@@ -15,7 +15,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, defineProps, defineEmits } from "vue";
+import { computed } from "vue";
 
 const props = defineProps({
   total: {

src/components/uploadFile/filePreview.vue

@@ -0,0 +1,129 @@
+<template>
+  <div class="upload_button">
+    <el-button :loading="preLoading" class="preview" :icon="View" plain @click="handlePreview">预览</el-button>
+    <el-button :loading="downloading" class="download" :icon="Download" @click="handleDownload">下载</el-button>
+    <el-button type="danger" class="delete" :icon="Delete" plain @click="removeAudio">删除</el-button>
+  </div>
+
+  <el-dialog :title="fileShow.fileName" v-model="dialogVisible" width="50%" top="20px" append-to-body destroy-on-close>
+    <div class="mti-file-container">
+      <img :src="fileShow.src" alt="图片加载失败" />
+    </div>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue";
+import { ElMessage } from "element-plus";
+import { View, Download, Delete } from "@element-plus/icons-vue";
+
+import { downloadAttachment } from "@/api/common";
+
+const props = defineProps({
+  file: {
+    type: Object,
+    default() {
+      return {};
+    }
+  }
+});
+
+const emit = defineEmits(["removeFile"]);
+
+const preLoading = ref(false);
+const downloading = ref(false);
+const dialogVisible = ref(false);
+const fileShow = ref({
+  src: "",
+  type: "",
+  fileName: ""
+});
+// 预览
+const handlePreview = () => {
+  preLoading.value = true;
+  downloadAttachment(props.file.fileId).then((res: any) => {
+    console.log(props.file);
+    if (props.file.fileType === "pdf" || props.file.fileType === "PDF") {
+      const blob = new Blob([res], { type: "application/pdf;charset=UTF-8" });
+      const bFile = URL.createObjectURL(blob);
+      preLoading.value = false;
+      window.open(bFile);
+    } else {
+      const bFile = URL.createObjectURL(res);
+      fileShow.value = {
+        src: bFile,
+        type: props.file.type,
+        fileName: props.file.fileName
+      };
+      preLoading.value = false;
+      dialogVisible.value = true;
+    }
+  });
+};
+
+// 下载
+const handleDownload = () => {
+  downloadAttachment(props.file.fileId).then((res) => {
+    downloading.value = true;
+    const blob: any = res;
+    const a = document.createElement("a");
+    a.style.display = "none";
+    a.download = decodeURI(props.file.fileName);
+    try {
+      a.href = window.URL.createObjectURL(blob);
+    } catch (err) {
+      ElMessage.warning("暂无文件信息.请通知开发人员导入文件模版");
+    }
+    a.click();
+    a.remove();
+    downloading.value = false;
+    window.setTimeout(function () {
+      window.URL.revokeObjectURL(blob);
+    }, 0);
+  });
+};
+
+// 删除
+const removeAudio = () => {
+  emit("removeFile", props.file.fileId);
+};
+</script>
+
+<style lang="scss" scoped>
+.mti-file-container {
+  width: 100%;
+  overflow-x: auto;
+  overflow-y: auto;
+  img {
+    width: 100%;
+  }
+}
+
+.upload_button {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  :deep(.el-button) {
+    height: 32px;
+    border-width: 1px;
+    border-style: solid;
+    margin-left: 10px;
+    background: #fff;
+    font-size: 14px;
+    font-family: SourceHanSansCN-Regular, SourceHanSansCN;
+    font-weight: 400;
+  }
+  .delete {
+    color: #dc281e;
+    border-color: #df3d34;
+  }
+  .preview {
+    color: #088a4e;
+    border-color: #088a4e;
+  }
+  .download {
+    color: #4069f2;
+    border-color: #4069f2;
+  }
+}
+</style>

src/components/uploadFile/index.vue

@@ -0,0 +1,161 @@
+<template>
+  <el-form-item :label="title">
+    <el-upload
+      class="upload-demo"
+      action="/admin/sysFile/uploadVoucher"
+      :headers="headers"
+      :data="fileData"
+      :show-file-list="false"
+      :before-upload="beforeUpload"
+      :on-error="handleUploadErr"
+      :on-success="handleAvatarSuccess"
+    >
+      <el-button type="primary" :loading="uploading">上传附件</el-button>
+      <template #tip>
+        <div class="el-upload__tip">只可上传图片，大小不可超过20M</div>
+      </template>
+    </el-upload>
+  </el-form-item>
+
+  <el-row v-for="item in uploadList" :key="item.fileId">
+    <el-col :span="24">
+      <el-form-item label="附件名">
+        <div class="file_item">
+          <div class="file_item_detail">
+            <el-input v-model="item.fileName" readonly placeholder="文件名" />
+            <filePreview :file="item" @removeFile="removeFile" />
+          </div>
+        </div>
+      </el-form-item>
+    </el-col>
+  </el-row>
+</template>
+
+<script setup lang="ts">
+import filePreview from "./filePreview.vue";
+
+import { computed, ref } from "vue";
+import { useStore } from "vuex";
+import { ElMessage } from "element-plus";
+import type { UploadProps } from "element-plus";
+
+const store = useStore();
+const props = defineProps({
+  title: {
+    type: String,
+    default: "附件信息"
+  },
+  maxLength: {
+    type: Number,
+    default: 1
+  },
+  fileList: {
+    // 文件列表
+    type: Array,
+    default() {
+      return [];
+    }
+  }
+});
+const emit = defineEmits(["update:fileList"]);
+
+const uploadList = computed({
+  get() {
+    return props.fileList;
+  },
+  set(val) {
+    emit("update:fileList", val);
+  }
+});
+const headers = {
+  Authorization: "Bearer " + store.getters.access_token
+};
+const fileData = {
+  bucket: "reservoir"
+};
+
+const uploading = ref(false);
+
+// 上传前对附件进行的操作
+const beforeUpload: UploadProps["beforeUpload"] = (file) => {
+  if (props.maxLength > 0 && uploadList.value.length === props.maxLength) {
+    ElMessage.warning(`附件最多上传${props.maxLength}个`);
+    return false;
+  }
+  uploading.value = true;
+  const typeList = ".pdf.jpg.png.gif.jpeg.PDF.JPG.PNG.GIF.JPEG";
+  const { name, type } = fileNameDispose(file.name);
+  if (!typeList.includes(type)) {
+    ElMessage.error("不支持此类型，请重新上传。");
+    uploading.value = false;
+    return false;
+  }
+  if (name.length > 30) {
+    ElMessage.error("文件名不可超30字，请重新命名后再上传。");
+    uploading.value = false;
+    return false;
+  }
+  const isLt20M = file.size / 1024 / 1024 < 20;
+  if (!isLt20M) {
+    ElMessage.error("文件大小不可超过 20MB。");
+    uploading.value = false;
+    return false;
+  }
+  return true;
+};
+
+// 获取上传附件的名字和类型
+const fileNameDispose = (name: string) => {
+  const arr = name.split(".");
+  if (arr.length === 2) {
+    return { name: arr[0], type: arr[1] };
+  } else {
+    const type = arr.splice(arr.length - 1, 1)[0];
+    const name = arr.join(".");
+    return { name, type };
+  }
+};
+
+// 上传失败时的回调
+const handleUploadErr = () => {
+  uploading.value = false;
+  ElMessage.error("文件上传失败，请重新上传。");
+};
+
+// 上传成功后的回调
+const handleAvatarSuccess: UploadProps["onSuccess"] = (res) => {
+  if (res.code === 0) {
+    const data = res.data;
+    const param = {
+      fileType: fileNameDispose(data.fileCustomizeName).type,
+      fileName: data.fileCustomizeName,
+      fileId: data.fileName,
+      bucket: data.bucketName
+    };
+    uploadList.value.push(param);
+    uploading.value = false;
+  }
+};
+
+// 删除附件
+const removeFile = (fileId: string) => {
+  uploadList.value.splice(
+    uploadList.value.findIndex((item: any) => item.fileId === fileId),
+    1
+  );
+};
+</script>
+
+<style lang="scss" scoped>
+.file_item {
+  width: 100%;
+  &_detail {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    :deep(.el-input__inner) {
+      flex: 1;
+    }
+  }
+}
+</style>

src/main.ts

@@ -5,8 +5,8 @@ import router from "./router";
 
 import "./styles/common.scss";
 
-import ElementPlus from 'element-plus'
-import 'element-plus/dist/index.css'
+import ElementPlus from "element-plus";
+import "element-plus/dist/index.css";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 
 import "./permission";
@@ -44,5 +44,4 @@ app.use(router);
 app.use(ElementPlus, {
   locale: zhCn
 });
-app.use(ElementPlus)
 app.mount("#app");

src/router/avue-router copy.ts

@@ -1,184 +0,0 @@
-import { ITagType } from "@/const/interface_type";
-import { RouterOptions } from "vue-router";
-
-export default {
-  install: (router: any, store: any) => {
-    function isURL(s: string) {
-      return /^http[s]?:\/\/.*/.test(s);
-    }
-
-    function objToform(obj: any) {
-      const result: any = [];
-      Object.keys(obj).forEach((ele) => {
-        result.push(`${ele}=${obj[ele]}`);
-      });
-      return result.join("&");
-    }
-    router.$avueRouter = {
-      // 全局配置
-      $website: store.getters.website,
-      $defaultTitle: "中央应急物资储备管理系统",
-      routerList: [],
-      group: "",
-      // 设置标题
-      setTitle: function (title: string) {
-        title = title ? `${title}——${this.$defaultTitle}` : this.$defaultTitle;
-        document.title = title;
-      },
-      closeTag: (value: string) => {
-        const tag = value || store.getters.tag;
-        store.commit("DEL_TAG", tag);
-      },
-      // 关闭当前标签，并打开最后一个tag
-      openLastTag: (value: ITagType) => {
-        const tag = value || store.getters.tag;
-        store.commit("DEL_TAG", tag);
-        const tagList = store.getters.tagList;
-        const lastLen = tagList.length - 1;
-        const last = tagList[lastLen];
-        router.push({
-          path: last.value
-        });
-      },
-      // 处理路由
-      getPath: function (params: any) {
-        const { src } = params;
-        let result = src || "/";
-        if (src.includes("http") || src.includes("https")) {
-          result = `/myiframe/urlPath?${objToform(params)}`;
-        }
-        return result;
-      },
-      // 正则处理路由
-      vaildPath: function (list: any, path: any) {
-        let result = false;
-        list.forEach((ele: any) => {
-          if (new RegExp("^" + ele + ".*", "g").test(path)) {
-            result = true;
-          }
-        });
-        return result;
-      },
-      // 设置路由值
-      getValue: function (route: any) {
-        let value = "";
-        if (route.query.src) {
-          value = route.query.src;
-        } else {
-          value = route.path;
-        }
-        return value;
-      },
-      // 动态路由
-      formatRoutes: function (aMenu = [], first: any) {
-        const aRouter: any = [];
-        const propsConfig = this.$website.menu.props;
-        const propsDefault = {
-          label: propsConfig.label || "label",
-          path: propsConfig.path || "path",
-          icon: propsConfig.icon || "icon",
-          children: propsConfig.children || "children",
-          meta: propsConfig.meta || "meta"
-        };
-        if (aMenu.length === 0) return;
-        for (let i = 0; i < aMenu.length; i++) {
-          const oMenu: any = aMenu[i];
-          if (this.routerList.includes(oMenu[propsDefault.path])) return;
-          const path = (() => {
-            if (!oMenu[propsDefault.path]) {
-              return;
-            } else if (first) {
-              return oMenu[propsDefault.path].replace("/index", "");
-            } else {
-              return oMenu[propsDefault.path];
-            }
-          })();
-
-          // 特殊处理组件
-          const component = "views" + oMenu.path;
-
-          const name = oMenu[propsDefault.label];
-
-          const icon = oMenu[propsDefault.icon];
-
-          const children = oMenu[propsDefault.children];
-
-          const meta = {
-            keepAlive: Number(oMenu["keepAlive"]) === 1
-          };
-          const isChild = children.length !== 0;
-          const oRouter = {
-            path: path,
-            component(resolve: any) {
-              // 判断是否为首路由
-              if (first) {
-                require(["@/layout/index"], resolve);
-                // import("@/layout/index.vue");
-
-                // 判断是否为多层路由
-              } else if (isChild && !first) {
-                require(["@/layout/components/layout.vue"], resolve);
-                // import("@/layout/components/layout.vue");
-
-                // 判断是否为最终的页面视图
-              } else {
-                require([`@/${component}.vue`], resolve);
-                // import(`@/${component}.vue`);
-              }
-            },
-            name: name,
-            icon: icon,
-            meta: meta,
-            redirect: (() => {
-              if (!isChild && first && !isURL(path)) return `${path}/index`;
-              else return "";
-            })(),
-            // 处理是否为一级路由
-            children: !isChild
-              ? (() => {
-                  if (first) {
-                    if (!isURL(path)) oMenu[propsDefault.path] = `${path}/index`;
-                    return [
-                      {
-                        component(resolve: any) {
-                          require([`../${component}.vue`], resolve);
-                        },
-                        icon: icon,
-                        name: name,
-                        meta: meta,
-                        path: "index"
-                      }
-                    ];
-                  }
-                  return [];
-                })()
-              : (() => {
-                  return this.formatRoutes(children, false);
-                })()
-          };
-          aRouter.push(oRouter);
-        }
-        if (first) {
-          if (!this.routerList.includes(aRouter[0][propsDefault.path])) {
-            const addRoutes = (routes: any, parentName?: string) => {
-              routes.forEach((item: any) => {
-                if (parentName) {
-                  router.addRoute(parentName, item);
-                } else {
-                  router.addRoute(item);
-                }
-                if (item.children?.length > 0) {
-                  addRoutes(item.children, item.name);
-                }
-              });
-            };
-            addRoutes(aRouter);
-            this.routerList.push(aRouter[0][propsDefault.path]);
-          }
-        } else {
-          return aRouter;
-        }
-      }
-    };
-  }
-};

src/router/index_静态路由.ts

@@ -1,95 +0,0 @@
-import { createRouter, createWebHashHistory, RouteRecordRaw } from "vue-router";
-const layout = () => import("@/layout/index.vue");
-
-const routes: Array<RouteRecordRaw> = [
-  {
-    path: "/",
-    redirect: "/login"
-  },
-  {
-    path: "/login",
-    name: "login",
-    component: () => import("@/views/login/index.vue")
-  },
-  {
-    path: "/InformationFilling",
-    name: "InformationFilling",
-    redirect: "/InformationFilling/outWarehouseInfo",
-    component: layout,
-    children: [
-      {
-        path: "outWarehouseInfo",
-        name: "outWarehouseInfo",
-        component: () => import("@/views/InformationFilling/outWarehouseInfo/index.vue")
-      },
-      {
-        path: "enterWarehouseInfo",
-        name: "enterWarehouseInfo",
-        component: () => import("@/views/InformationFilling/enterWarehouseInfo/index.vue")
-      }
-    ]
-  },
-  {
-    path: "/InformationAudit",
-    name: "InformationAudit",
-    component: layout,
-    children: [
-      {
-        path: "outWarehouseAudit",
-        name: "outWarehouseAudit",
-        component: () => import("@/views/InformationAudit/outWarehouseAudit/index.vue")
-      },
-      {
-        path: "enterWarehouseAudit",
-        name: "enterWarehouseAudit",
-        component: () => import("@/views/InformationAudit/enterWarehouseAudit/index.vue")
-      }
-    ]
-  },
-  {
-    path: "/dataStatistics",
-    name: "dataStatistics",
-    component: layout,
-    children: [
-      {
-        path: "reliefMaterial",
-        name: "reliefMaterial",
-        component: () => import("@/views/dataStatistics/reliefMaterial/index.vue")
-      },
-      {
-        path: "floodPrevention",
-        name: "floodPrevention",
-        component: () => import("@/views/dataStatistics/floodPrevention/index.vue")
-      },
-      {
-        path: "droughtResistant",
-        name: "droughtResistant",
-        component: () => import("@/views/dataStatistics/droughtResistant/index.vue")
-      },
-      {
-        path: "emergencySupplies",
-        name: "emergencySupplies",
-        component: () => import("@/views/dataStatistics/emergencySupplies/index.vue")
-      }
-    ]
-  },
-  {
-    path: "/admin",
-    name: "权限管理",
-    component: layout,
-    children: [
-      {
-        path: "menu",
-        name: "菜单管理",
-        component: () => import("@/views/admin/menu/index.vue")
-      }
-    ]
-  }
-];
-
-const router = createRouter({
-  history: createWebHashHistory(),
-  routes
-});
-
-export default router;

src/views/DataVisualization/detailPage/components/crkjl.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, onMounted, ref, reactive, toRefs, defineExpose } from "vue";
+import { onMounted, ref, reactive, toRefs } from "vue";
 import { getRecords } from "@/api/keshihua/detail";
 import { useRoute } from "vue-router";
 

src/views/DataVisualization/detailPage/components/shjl.vue

@@ -62,7 +62,7 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, toRefs, defineProps, onMounted, ref } from "vue";
+import { reactive, toRefs, onMounted, ref } from "vue";
 import { useRoute } from "vue-router";
 import { getLossRecord } from "@/api/keshihua/detail";
 
@@ -150,7 +150,7 @@ onMounted(() => {
   color: rgb(255, 255, 255);
 }
 
-::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
+:deep(.el-table--striped .el-table__body tr.el-table__row--striped td) {
   /* background: red; */
   backdrop-filter: blur(10px);
   background: transparent;

src/views/DataVisualization/detailPage/components/wzcb.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, onMounted, ref } from "vue";
+import { onMounted, ref } from "vue";
 
 const props = defineProps({ msg: String });
 const tableData = [

src/views/DataVisualization/detailPage/components/wzcbqk.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, toRefs, defineProps, onMounted, ref } from "vue";
+import { reactive, toRefs, onMounted, ref } from "vue";
 import { getMaterial } from "@/api/keshihua/detail";
 import { useRoute } from "vue-router";
 
@@ -158,7 +158,7 @@ onMounted(() => {
   color: rgb(255, 255, 255);
 }
 
-::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
+:deep(.el-table--striped .el-table__body tr.el-table__row--striped td) {
   /* background: red; */
   backdrop-filter: blur(10px);
   background: transparent;

src/views/DataVisualization/home/components/wzdyqk.vue

@@ -1,220 +1,224 @@
 <!-- 物资调用情况 -->
 
 <template>
-    <div class="box">
-        <div class="table">
-            <el-table highlight-current-row="false" class="eltable" stripe
-                :header-cell-style="{ background: 'transparent' }" :data="tableData"
-                style="width: 100%  ;height: 100%; border: none;  background: transparent;">
-                <el-table-column style="background: transparent; border: none;" fixed prop="date" label="省份名称" />
-                <el-table-column style="background: transparent; border: none;" prop="name" label="数量" />
-                <el-table-column style="background: transparent; border: none;" prop="state" label="价值(万元)" />
-            </el-table>
-        </div>
-        <div class="title">物资调用情况</div>
-        <el-select v-model="selectData" :teleported="false" popper-class="popperClass" class="select" size="small"
-            placeholder="请选择" style="width: 150px ; height: 21px;">
-            <el-option value="1" label="全部" />
-            <el-option value="2" label="被服" />
-            <el-option value="3" label="床具" />
-            <el-option value="4" label="帐篷" />
-            <el-option value="5" label="抢险物料" />
-            <el-option value="6" label="救生器材" />
-        </el-select>
-        <el-button size="small" class="Btnin" style="background: transparent;">调用</el-button>
-        <el-button size="small" class="Btnout" style="background: transparent;">调出</el-button>
+  <div class="box">
+    <div class="table">
+      <el-table
+        highlight-current-row="false"
+        class="eltable"
+        stripe
+        :header-cell-style="{ background: 'transparent' }"
+        :data="tableData"
+        style="width: 100%; height: 100%; border: none; background: transparent"
+      >
+        <el-table-column style="background: transparent; border: none" fixed prop="date" label="省份名称" />
+        <el-table-column style="background: transparent; border: none" prop="name" label="数量" />
+        <el-table-column style="background: transparent; border: none" prop="state" label="价值(万元)" />
+      </el-table>
     </div>
+    <div class="title">物资调用情况</div>
+    <el-select
+      v-model="selectData"
+      :teleported="false"
+      popper-class="popperClass"
+      class="select"
+      size="small"
+      placeholder="请选择"
+      style="width: 150px; height: 21px"
+    >
+      <el-option value="1" label="全部" />
+      <el-option value="2" label="被服" />
+      <el-option value="3" label="床具" />
+      <el-option value="4" label="帐篷" />
+      <el-option value="5" label="抢险物料" />
+      <el-option value="6" label="救生器材" />
+    </el-select>
+    <el-button size="small" class="Btnin" style="background: transparent">调用</el-button>
+    <el-button size="small" class="Btnout" style="background: transparent">调出</el-button>
+  </div>
 </template>
 
 <script setup lang="ts">
 import * as echarts from "echarts";
 import { onMounted, ref } from "vue";
 import header from "./header.vue";
-let selectData = ref('1')
+let selectData = ref("1");
 const tableData = [
-    {
-        date: '河北',
-        name: '4442',
-        state: '2222',
-    },
-    {
-        date: '河北',
-        name: '4442',
-        state: '2222',
-    },
-    {
-        date: '河北',
-        name: '4442',
-        state: '2222',
-    },
-    {
-        date: '河北',
-        name: '4442',
-        state: '2222',
-    },
-    {
-        date: '河北',
-        name: '4442',
-        state: '2222',
-    },
-    {
-        date: '河北',
-        name: '4442',
-        state: '2222',
-    },
-
-]
+  {
+    date: "河北",
+    name: "4442",
+    state: "2222"
+  },
+  {
+    date: "河北",
+    name: "4442",
+    state: "2222"
+  },
+  {
+    date: "河北",
+    name: "4442",
+    state: "2222"
+  },
+  {
+    date: "河北",
+    name: "4442",
+    state: "2222"
+  },
+  {
+    date: "河北",
+    name: "4442",
+    state: "2222"
+  },
+  {
+    date: "河北",
+    name: "4442",
+    state: "2222"
+  }
+];
 function Btnin() {
-    console.log('调用');
-
+  console.log("调用");
 }
 function Btnout() {
-    console.log('调出');
+  console.log("调出");
 }
 
 onMounted(() => {
-    //     window.addEventListener("resize", () => {
-    //     myChart.resize();
-    //   });
-})
+  //     window.addEventListener("resize", () => {
+  //     myChart.resize();
+  //   });
+});
 </script>
 
 <style scoped>
 .btn {
-    width: 10%;
-    height: 10%;
-    /* background: pink; */
-    position: absolute;
-    border: 1px solid rgba(255, 255, 255, 0.2);
-    border-radius: 3px;
-    color: white;
-    text-align: center;
-
-    font-size: 12px;
+  width: 10%;
+  height: 10%;
+  /* background: pink; */
+  position: absolute;
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  border-radius: 3px;
+  color: white;
+  text-align: center;
 
+  font-size: 12px;
 }
 
 .Btnin {
-    position: absolute;
-    right: 40%;
-    top: 20%;
-    color: white;
-    border: 1px solid rgba(255, 255, 255, 0.2);
+  position: absolute;
+  right: 40%;
+  top: 20%;
+  color: white;
+  border: 1px solid rgba(255, 255, 255, 0.2);
 }
 
 .Btnout {
-    position: absolute;
-    right: 28%;
-    top: 20%;
-    color: white;
-    border: 1px solid rgba(255, 255, 255, 0.2);
+  position: absolute;
+  right: 28%;
+  top: 20%;
+  color: white;
+  border: 1px solid rgba(255, 255, 255, 0.2);
 }
 
 :deep(.select .el-select-dropdown) {
-    background: rgba(132, 159, 228, 0.2) !important;
-
+  background: rgba(132, 159, 228, 0.2) !important;
 }
 
 :deep(.select .el-select-dropdown .el-select-dropdown__item) {
-    /* background: rgba(12,21,44,0.2); */
+  /* background: rgba(12,21,44,0.2); */
 }
 
 .el-select-dropdown__item.selected,
 .el-select-dropdown__item:hover,
 .el-select-dropdown__item.hover {
-    color: #fff;
-    background: #409EFF;
+  color: #fff;
+  background: #409eff;
 }
 
 .select {
-    position: absolute;
-    left: 14%;
-    top: 20%;
-    /* height: 10%; */
+  position: absolute;
+  left: 14%;
+  top: 20%;
+  /* height: 10%; */
 }
 
 :deep(.el-popper.is-light) {
-    background: #307cbf;
-    border: 1px solid #273f70;
+  background: #307cbf;
+  border: 1px solid #273f70;
 }
 
 :deep(.el-select-dropdown__item.hover) {
-    background: transparent;
-    border: none;
-    color: #04FAA0;
+  background: transparent;
+  border: none;
+  color: #04faa0;
 }
 
-
 :deep(.el-select-dropdown__item) {
-    background: transparent;
-    border: none;
-    color: #fff;
+  background: transparent;
+  border: none;
+  color: #fff;
 }
 
 :deep(.el-popper.is-light .el-popper__arrow::before) {
-    border: 1px solid #4778d9;
-    background: #4778d9;
-    right: 0;
+  border: 1px solid #4778d9;
+  background: #4778d9;
+  right: 0;
 }
 
 :deep(.el-select__wrapper) {
-    /* position: absolute; */
-    /* width: 50%; */
-    /* height: 4%; */
-    /* left: 20%;
+  /* position: absolute; */
+  /* width: 50%; */
+  /* height: 4%; */
+  /* left: 20%;
     top:; */
-    background: transparent !important;
-    border: rgba(255, 255, 255, 0.2) 1px solid !important;
-    box-shadow: none;
-
+  background: transparent !important;
+  border: rgba(255, 255, 255, 0.2) 1px solid !important;
+  box-shadow: none;
 }
 
 .box {
-    width: 100%;
-    height: 100%;
-    position: relative;
+  width: 100%;
+  height: 100%;
+  position: relative;
 }
 
 .box .table {
-    position: absolute;
-    bottom: 6%;
-    left: 14%;
-    width: 80%;
-    height: 67%;
-    /* background: pink; */
-    z-index: 22;
-    background-color: transparent;
+  position: absolute;
+  bottom: 6%;
+  left: 14%;
+  width: 80%;
+  height: 67%;
+  /* background: pink; */
+  z-index: 22;
+  background-color: transparent;
 }
 
-
 .title {
-    font-size: 20px;
-    color: red;
-    position: absolute;
-    left: 14%;
-    top: 6%;
-    font-weight: 700;
-    background: linear-gradient(to bottom, #ffffff, rgb(29, 233, 234));
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
+  font-size: 20px;
+  color: red;
+  position: absolute;
+  left: 14%;
+  top: 6%;
+  font-weight: 700;
+  background: linear-gradient(to bottom, #ffffff, rgb(29, 233, 234));
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
 }
 
 .el-table {
-    background: transparent;
+  background: transparent;
 }
 
 :deep(.el-table) {
-    background: transparent;
+  background: transparent;
 }
 
 /*最外层透明*/
 :deep(.el-table),
 :deep(.el-table__expanded-cell) {
-    background-color: transparent;
-    color: rgba(255, 255, 255, 0.5);
-    opacity: 0.8;
-    font-size: 12px;
-
+  background-color: transparent;
+  color: rgba(255, 255, 255, 0.5);
+  opacity: 0.8;
+  font-size: 12px;
 }
 
 /* :deep(.el-table__body tr.current-row>td.el-table__cell ){
@@ -227,57 +231,62 @@ onMounted(() => {
 :deep(.el-table th),
 :deep(.el-table tr),
 :deep(.el-table td) {
-    background-color: transparent;
-    color: rgb(255, 255, 255);
+  background-color: transparent;
+  color: rgb(255, 255, 255);
 }
 
-::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
-    /* background: red; */
-    backdrop-filter: blur(10px);
-    background: rgba(34, 62, 165, 0.3);
+:deep(.el-table--striped .el-table__body tr.el-table__row--striped td) {
+  /* background: red; */
+  backdrop-filter: blur(10px);
+  background: rgba(34, 62, 165, 0.3);
 }
 
-:deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf) {
-    border: none !important;
+:deep(
+    .el-table td.el-table__cell,
+    .el-table th.el-table__cell.is-leaf,
+    .el-table td.el-table__cell,
+    .el-table th.el-table__cell.is-leaf
+  ) {
+  border: none !important;
 }
 
 :deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf) {
-    border: none !important;
+  border: none !important;
 }
 
-.el-table tbody tr:hover>td {
-    background-color: transparent !important
+.el-table tbody tr:hover > td {
+  background-color: transparent !important;
 }
 
-.el-table__body tr.hover-row.current-row>td.el-table__cell,
-.el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell,
-.el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell,
-.el-table__body tr.hover-row>td.el-table__cell {
-    background-color: transparent !important;
+.el-table__body tr.hover-row.current-row > td.el-table__cell,
+.el-table__body tr.hover-row.el-table__row--striped.current-row > td.el-table__cell,
+.el-table__body tr.hover-row.el-table__row--striped > td.el-table__cell,
+.el-table__body tr.hover-row > td.el-table__cell {
+  background-color: transparent !important;
 }
 
 :deep(.el-table tbody tr:hover > td) {
-    background-color: transparent !important
+  background-color: transparent !important;
 }
 
 .el-table td.el-table__cell,
 .el-table th.el-table__cell.is-leaf {
-    border-bottom: none;
+  border-bottom: none;
 }
 
 :deep(.el-table_row > td) {
-    border: non;
+  border: non;
 }
 
 :deep(.el-table) {
-    --el-table-border-color: transparent;
+  --el-table-border-color: transparent;
 }
 
 :deep(.el-table--striped .el-table__body tr.el-table__row--striped.current-row td.el-table__cell) {
-    background-color: transparent !important;
+  background-color: transparent !important;
 }
 
 :deep(.el-table__body tr.current-row > td.el-table__cell) {
-    background-color: transparent !important;
+  background-color: transparent !important;
 }
-</style>
+</style>

src/views/InformationAudit/outWarehouseAudit/detail.vue

@@ -105,7 +105,7 @@ import { Search } from "@element-plus/icons-vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { useRouter, useRoute } from "vue-router";
 import { useDict } from "@/hooks/dict";
-// import { closeTagAndOpenLastTag } from '@/router/Routermethods';
+import { closeTagAndOpenLastTag } from "@/router/Routermethods";
 import store from "@/store";
 
 const { outdound_type, is_available, province_ch } = useDict("outdound_type", "is_available", "province_ch");
@@ -209,9 +209,9 @@ const handleReturn = () => {
 };
 // 返回
 const handleBack = () => {
-  store.commit("DEL_TAG", store.getters.tag);
-  router.push("/InformationAudit/outWarehouseAudit");
-  // closeTagAndOpenLastTag()
+  // store.commit("DEL_TAG", store.getters.tag);
+  // router.push("/InformationAudit/outWarehouseAudit");
+  closeTagAndOpenLastTag();
 };
 
 // 附件相关

src/views/admin/dept/index.vue

@@ -58,7 +58,7 @@
       /> -->
 
       <el-dialog v-model="dialogVisible" :title="title" width="50%" :before-close="dialogClose">
-        <el-form :model="form" ref="formRef" :rules="formRules" label-width="80px">
+        <el-form :model="form" ref="formRef" :rules="formRules" label-width="80px" class="whole_form">
           <el-row>
             <el-col :span="8">
               <el-form-item label="上级部门" prop="parentId">
@@ -74,6 +74,18 @@
           </el-row>
           <el-row>
             <el-col :span="12">
+              <el-form-item label="法人信息">
+                <el-input v-model="form.legalPerson" placeholder="请输入负责人" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话">
+                <el-input v-model="form.deptPhone" placeholder="请输入联系电话" clearable />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
               <el-form-item label="部门名称" prop="name">
                 <el-input v-model="form.name" placeholder="请输入部门名称" clearable />
               </el-form-item>
@@ -94,6 +106,26 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="24">
+              <el-form-item label="地址">
+                <el-cascader
+                  clearable
+                  v-model="form.deptMergeAddress"
+                  placeholder="请选择"
+                  :options="addressOption"
+                  :props="{ value: 'code', label: 'name' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="详细地址">
+                <el-input v-model="form.deptAddress" placeholder="请输入详细地址" clearable />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="经度" prop="longitude">
                 <el-input v-model="form.longitude" placeholder="请输入部门经度" clearable />
@@ -114,19 +146,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <!-- <el-row>
-            <el-col :span="8">
-              <el-form-item label="负责人">
-                <el-input v-model="form.roleDesc" placeholder="请输入角色描述" clearable />
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <!--
           <el-row>
-            <el-col :span="24">
-              <el-form-item label="联系电话">
-                <el-input v-model="form.roleDesc" placeholder="请输入角色描述" clearable />
-              </el-form-item>
-            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -149,6 +170,11 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <uploadFile title="库区图" v-model:fileList="form.fileList" />
+            </el-col>
+          </el-row>
         </el-form>
         <template #footer>
           <el-row class="btn_center">
@@ -163,6 +189,8 @@
 </template>
 
 <script setup lang="ts">
+import uploadFile from "@/components/uploadFile/index.vue";
+
 import { nextTick, ref } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import type { FormInstance, FormRules } from "element-plus";
@@ -171,6 +199,7 @@ import { Search, EditPen, Plus, Edit, Delete } from "@element-plus/icons-vue";
 import { useDict } from "@/hooks/dict";
 import { ITablePage } from "@/const/interface_type";
 import { timestampToTime, getValueLabel, getValueListLabel } from "@/utils/util";
+import { getAddress } from "@/api/basicInfo/index";
 import { getDeptList, getDeptObj, addDeptObj, putDeptObj, delDeptObj } from "@/api/admin";
 
 interface ISearchList {
@@ -194,11 +223,12 @@ const form = ref<any>({
   parentId: "",
   name: "",
   abbreviationName: "",
-  sortOrder: "",
+  sortOrder: undefined,
   deptType: "",
   longitude: "",
   dimension: "",
-  warehouseType: []
+  warehouseType: [],
+  fileList: []
 });
 const formRef = ref<FormInstance>();
 const formRules = ref<FormRules>({
@@ -207,10 +237,18 @@ const formRules = ref<FormRules>({
   deptType: [{ required: true, message: "部门类型不能为空", trigger: "change" }],
   sortOrder: [{ required: true, message: "请选择排序", trigger: "blur" }]
 });
+
+const addressOption = ref([]); // 地址
 const deptOptions = ref<any>([]); // 部门目录
 
 const { dept_type, del_type, warehouse_type } = useDict("dept_type", "del_type", "warehouse_type");
 
+getAddress().then((res: any) => {
+  if (res.code === 0) {
+    addressOption.value = res.data;
+  }
+});
+
 // 搜索/获取列表
 const getList = () => {
   tableLoading.value = true;
@@ -285,15 +323,25 @@ const filterList = (arr: any) => {
   return filterData;
 };
 
+// 处理参数
+const trimParam = () => {
+  const data = {
+    ...form.value
+  };
+  data.warehouseType = data.warehouseType ? JSON.stringify(data.warehouseType) : "[]";
+  data.deptProvince = data.deptMergeAddress[0];
+  data.deptCity = data.deptMergeAddress[1];
+  data.deptArea = data.deptMergeAddress[2];
+  data.deptMergeAddress = JSON.stringify(data.deptMergeAddress);
+  data.fileList = JSON.stringify(data.fileList);
+  return data;
+};
+
 // 保存添加
 const addDept = () => {
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      const data = {
-        ...form.value
-      };
-      data.warehouseType = data.warehouseType ? JSON.stringify(data.warehouseType) : "[]";
-      addDeptObj(data).then((res: any) => {
+      addDeptObj(trimParam()).then((res: any) => {
         if (res.code === 0) {
           ElMessage.success("创建成功");
           clearDialogData();
@@ -311,11 +359,7 @@ const addDept = () => {
 const saveDept = () => {
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      const data = {
-        ...form.value
-      };
-      data.warehouseType = data.warehouseType ? JSON.stringify(data.warehouseType) : "[]";
-      putDeptObj(data).then((res: any) => {
+      putDeptObj(trimParam()).then((res: any) => {
         if (res.code === 0) {
           ElMessage.success("编辑成功");
           clearDialogData();
@@ -357,11 +401,12 @@ const clearDialogData = () => {
   form.value = {
     parentId: "",
     name: "",
-    sortOrder: "",
+    sortOrder: undefined,
     deptType: "",
     longitude: "",
     dimension: "",
-    warehouseType: []
+    warehouseType: [],
+    fileList: []
   };
   formRef.value?.clearValidate();
 };

src/views/basic/basicIndex/index.vue

@@ -42,13 +42,14 @@
                 v-model="ruleForm.name"
                 placeholder="请选择"
                 :options="addressOption"
-                :props="{ value: 'code',label: 'name' }"
+                :props="{ value: 'code', label: 'name' }"
                 style="width: 100%"
-                @change="handleChange"></el-cascader>
-              </el-col>
-              <el-col :span="12">
-                <el-input v-model="ruleForm.deptAddress" />
-              </el-col>
+                @change="handleChange"
+              ></el-cascader>
+            </el-col>
+            <el-col :span="12">
+              <el-input v-model="ruleForm.deptAddress" />
+            </el-col>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -87,87 +88,80 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref } from 'vue'
-import type { FormInstance, FormRules } from 'element-plus'
-import { Plus } from '@element-plus/icons-vue'
+import { reactive, ref } from "vue";
+import type { FormInstance, FormRules } from "element-plus";
+import { Plus } from "@element-plus/icons-vue";
 import { getAddress, deptDetail } from "@/api/basicInfo/index";
-import type { UploadProps } from 'element-plus'
-import { useDict } from '@/hooks/dict';
-const { warehouse_type } = useDict('warehouse_type');
+import type { UploadProps } from "element-plus";
+import { useDict } from "@/hooks/dict";
+const { warehouse_type } = useDict("warehouse_type");
 
 //附件部分
-const myHeader = { Authorization: "Bearer " + sessionStorage.getItem("access_token") }
-const fileUrl = "/admin/sysFile/uploadVoucher"
+const myHeader = { Authorization: "Bearer " + sessionStorage.getItem("access_token") };
+const fileUrl = "/admin/sysFile/uploadVoucher";
 let paramsData = reactive({
   bucket: "bound"
 });
-const formSize = ref('default')
-const ruleFormRef = ref<FormInstance>()
-const ruleForm = ref({})
-
+const formSize = ref("default");
+const ruleFormRef = ref<FormInstance>();
+const ruleForm = ref({});
 
 const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
+  if (!formEl) return;
   await formEl.validate((valid, fields) => {
     if (valid) {
-      console.log('submit!')
+      console.log("submit!");
     } else {
-      console.log('error submit!', fields)
+      console.log("error submit!", fields);
     }
-  })
-}
-const addressOption = ref([])
+  });
+};
+const addressOption = ref([]);
 const createdMth = async () => {
   getAddress().then((res: any) => {
     if (res.code === 0) {
-      addressOption.value = res.data
+      addressOption.value = res.data;
     }
   });
-  const deptId = JSON.parse(sessionStorage.getItem("userInfo")).deptId
-  let deptData = await deptDetail(deptId)
-  ruleForm.value = deptData.data
-  if(deptData.data.parentId != '0'){
-    let parentDept = await deptDetail(deptData.data.parentId)
-    ruleForm.value.gljg = parentDept.data.abbreviationName
+  const deptId = JSON.parse(sessionStorage.getItem("userInfo")).deptId;
+  let deptData = await deptDetail(deptId);
+  ruleForm.value = deptData.data;
+  if (deptData.data.parentId != "0") {
+    let parentDept = await deptDetail(deptData.data.parentId);
+    ruleForm.value.gljg = parentDept.data.abbreviationName;
   }
-
-
-}
-createdMth()
+};
+createdMth();
 const handleChange = (value) => {
-  console.log(JSON.stringify(value))
-}
+  console.log(JSON.stringify(value));
+};
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-}
+  if (!formEl) return;
+  formEl.resetFields();
+};
 
 const options = Array.from({ length: 10000 }).map((_, idx) => ({
   value: `${idx + 1}`,
-  label: `${idx + 1}`,
-}))
+  label: `${idx + 1}`
+}));
 
 /*----------------------库区图-----------------*/
-const imageUrl = ref('')
+const imageUrl = ref("");
 
-const handleAvatarSuccess: UploadProps['onSuccess'] = (
-  response,
-  uploadFile
-) => {
-  imageUrl.value = URL.createObjectURL(uploadFile.raw!)
-}
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+  imageUrl.value = URL.createObjectURL(uploadFile.raw!);
+};
 
-const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
-  if (rawFile.type !== 'image/jpeg') {
-    ElMessage.error('Avatar picture must be JPG format!')
-    return false
+const beforeAvatarUpload: UploadProps["beforeUpload"] = (rawFile) => {
+  if (rawFile.type !== "image/jpeg") {
+    ElMessage.error("Avatar picture must be JPG format!");
+    return false;
   } else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error('Avatar picture size can not exceed 2MB!')
-    return false
+    ElMessage.error("Avatar picture size can not exceed 2MB!");
+    return false;
   }
-  return true
-}
-
+  return true;
+};
 </script>
 
 <style lang="scss" scoped>
@@ -203,4 +197,4 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
   height: 178px;
   text-align: center;
 }
-</style>
+</style>

src/views/dataStatistics/floodPrevention/index.vue

@@ -1,142 +0,0 @@
-<!-- 防汛物资储备价值表 -->
-<template>
-  <basic-container>
-    <el-form class="whole_form">
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <el-form-item label="省份">
-            <el-input />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="物资分类">
-            <el-input />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-button type="primary">搜索</el-button>
-          <el-button>清空</el-button>
-        </el-col>
-      </el-row>
-    </el-form>
-
-    <el-table :data="tableData" stripe border :span-method="arraySpanMethod">
-      <el-table-column type="index" label="序号" header-align="center" align="center" />
-      <el-table-column prop="upidName" label="省份" header-align="center" align="center" />
-      <el-table-column prop="username" label="储备仓库" header-align="center" align="center" />
-      <template v-for="item in headerName" :key="item">
-        <el-table-column :label="item.dmUpname" header-align="center" align="center">
-          <template v-for="iten in item.children" :key="iten">
-            <el-table-column :label="iten.dmUpname" header-align="center" align="center">
-              <el-table-column :prop="iten.dmUpcode" :label="iten.units" header-align="center" align="center" />
-            </el-table-column>
-          </template>
-        </el-table-column>
-      </template>
-      <el-table-column prop="" label="汇总" header-align="center" align="center" />
-      <el-table-column prop="" label="实际库存汇总" header-align="center" align="center" />
-    </el-table>
-  </basic-container>
-</template>
-
-<script setup lang="ts">
-import { ref } from "vue";
-
-import { handleTree } from "@/utils/util";
-import { getDroughtResistantList, getDroughtResistantHeader } from "@/api/dataStatistics/index";
-
-const headerName: any = ref([]);
-const headerProps: any = ref([]);
-const tableData: any = ref([]);
-const mergeObj: any = ref({});
-
-// getSpanArr方法
-const getSpanArr = (data: any) => {
-  headerProps.value.forEach((key: any) => {
-    let count = 0; // 用来记录需要合并行的起始位置
-    mergeObj.value[key] = []; // 记录每一列的合并信息
-    data.forEach((item: any, index: number) => {
-      // index == 0表示数据为第一行，直接 push 一个 1
-      if (index === 0) {
-        mergeObj.value[key].push(1);
-      } else {
-        // 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位
-        if (item[key] === data[index - 1][key]) {
-          mergeObj.value[key][count] += 1;
-          mergeObj.value[key].push(0);
-        } else {
-          // 如果当前行和上一行其值不相等
-          count = index; // 记录当前位置
-          mergeObj.value[key].push(1); // 重新push 一个 1
-        }
-      }
-    });
-  });
-};
-
-// 获取表格数据
-const getList = () => {
-  getDroughtResistantList({}).then((res: any) => {
-    if (res.code === 0) {
-      tableData.value = res.data
-        .map((item: any) => {
-          item.map.upidName = item.upidName;
-          item.map.username = item.username;
-          return item.map;
-        })
-        .filter((item: any) => {
-          headerProps.value.filter((ite: any) => {
-            if (!item[ite]) {
-              item[ite] = 0;
-            }
-          });
-          return item;
-        });
-      setTimeout(() => {
-        getSpanArr(tableData.value);
-      }, 300);
-    }
-  });
-};
-
-// 获取表头数据
-getDroughtResistantHeader({
-  dmUpcode0: "100"
-}).then((res: any) => {
-  if (res.code === 0) {
-    res.data
-      .map((item: any) => {
-        const parent = {
-          dmUpcode: item.dmUpcode1,
-          dmUpname: item.dmUpname1
-        };
-        const own = {
-          dmUpcode: item.dmUpcode2,
-          dmUpname: item.dmUpname2,
-          units: item.dmUpname3
-        };
-        return [parent, own];
-      })
-      .forEach((item: any) => {
-        headerName.value.push(...item);
-      });
-    headerName.value = handleTree(headerName.value, "dmUpcode");
-    headerProps.value = res.data.map((item: any) => item.dmUpcode2);
-    headerProps.value.unshift("upidName", "username");
-  }
-  getList();
-});
-
-const arraySpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
-  // 判断列的属性
-  if (headerProps.value.indexOf(column.property) !== -1) {
-    // 判断其值是不是为0
-    if (mergeObj.value[column.property][rowIndex]) {
-      return [mergeObj.value[column.property][rowIndex], 1];
-    } else {
-      // 如果为0则为需要合并的行
-      return [0, 0];
-    }
-  }
-};
-</script>

vue.config.js

@@ -21,7 +21,7 @@ module.exports = defineConfig({
         }
       },
       "/api": {
-        target: 'http://192.168.1.108:8083',
+        target: "http://192.168.1.108:8083",
         ws: true,
         changeOrigin: true,
         pathRewrite: {
@@ -32,5 +32,13 @@ module.exports = defineConfig({
   },
   chainWebpack: (config) => {
     config.resolve.alias.set("@", path.resolve(__dirname, "src"));
+    config.plugin("define").tap((definitions) => {
+      Object.assign(definitions[0], {
+        __VUE_OPTIONS_API__: "true",
+        __VUE_PROD_DEVTOOLS__: false,
+        __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false
+      });
+      return definitions;
+    });
   }
 });