diff --git a/.env.development b/.env.development
index 1db4544..eb8185a 100644
--- a/.env.development
+++ b/.env.development
@@ -6,13 +6,15 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 # 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+VITE_APP_BASE_API = 'http://192.168.110.188:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
-# VITE_APP_BASE_API = 'http://192.168.110.213:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.188:8899'
 # 朱银
-# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+#曾涛
+# VITE_APP_BASE_API = 'http://192.168.110.171:8899'
 
 # 无人机接口地址
 
diff --git a/package.json b/package.json
index 67291cb..58746c4 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "await-to-js": "3.0.0",
     "axios": "1.7.8",
     "crypto-js": "4.2.0",
+    "date-fns": "^4.1.0",
     "diagram-js": "12.3.0",
     "didi": "9.0.2",
     "echarts": "5.5.0",
diff --git a/public/assets/demo/Sunny.png b/public/assets/demo/Sunny.png
new file mode 100644
index 0000000..14c94d4
Binary files /dev/null and b/public/assets/demo/Sunny.png differ
diff --git a/public/assets/demo/avatar.png b/public/assets/demo/avatar.png
new file mode 100644
index 0000000..68ae32a
Binary files /dev/null and b/public/assets/demo/avatar.png differ
diff --git a/public/assets/demo/back.png b/public/assets/demo/back.png
new file mode 100644
index 0000000..6b6a2ac
Binary files /dev/null and b/public/assets/demo/back.png differ
diff --git a/public/assets/demo/back2.png b/public/assets/demo/back2.png
new file mode 100644
index 0000000..19253bd
Binary files /dev/null and b/public/assets/demo/back2.png differ
diff --git a/public/assets/demo/back3.png b/public/assets/demo/back3.png
new file mode 100644
index 0000000..538a083
Binary files /dev/null and b/public/assets/demo/back3.png differ
diff --git a/public/assets/demo/back4.png b/public/assets/demo/back4.png
new file mode 100644
index 0000000..c296fae
Binary files /dev/null and b/public/assets/demo/back4.png differ
diff --git a/public/assets/demo/fengshu.png b/public/assets/demo/fengshu.png
new file mode 100644
index 0000000..23ea230
Binary files /dev/null and b/public/assets/demo/fengshu.png differ
diff --git a/public/assets/demo/qiangdu.png b/public/assets/demo/qiangdu.png
new file mode 100644
index 0000000..75c64f6
Binary files /dev/null and b/public/assets/demo/qiangdu.png differ
diff --git a/public/assets/demo/rain.png b/public/assets/demo/rain.png
new file mode 100644
index 0000000..e9263d6
Binary files /dev/null and b/public/assets/demo/rain.png differ
diff --git a/public/assets/demo/rain1.png b/public/assets/demo/rain1.png
new file mode 100644
index 0000000..592efea
Binary files /dev/null and b/public/assets/demo/rain1.png differ
diff --git a/public/assets/demo/rain_show.png b/public/assets/demo/rain_show.png
new file mode 100644
index 0000000..4974324
Binary files /dev/null and b/public/assets/demo/rain_show.png differ
diff --git a/public/assets/demo/riluo.png b/public/assets/demo/riluo.png
new file mode 100644
index 0000000..401a9cf
Binary files /dev/null and b/public/assets/demo/riluo.png differ
diff --git a/public/assets/demo/sb1.png b/public/assets/demo/sb1.png
new file mode 100644
index 0000000..33d2fc7
Binary files /dev/null and b/public/assets/demo/sb1.png differ
diff --git a/public/assets/demo/sb2.png b/public/assets/demo/sb2.png
new file mode 100644
index 0000000..965bc01
Binary files /dev/null and b/public/assets/demo/sb2.png differ
diff --git a/public/assets/demo/sb3.png b/public/assets/demo/sb3.png
new file mode 100644
index 0000000..9dd844f
Binary files /dev/null and b/public/assets/demo/sb3.png differ
diff --git a/public/assets/demo/sb4.png b/public/assets/demo/sb4.png
new file mode 100644
index 0000000..c4e2ee1
Binary files /dev/null and b/public/assets/demo/sb4.png differ
diff --git a/public/assets/demo/sbi1.png b/public/assets/demo/sbi1.png
new file mode 100644
index 0000000..638af49
Binary files /dev/null and b/public/assets/demo/sbi1.png differ
diff --git a/public/assets/demo/sbi2.png b/public/assets/demo/sbi2.png
new file mode 100644
index 0000000..ef1af9c
Binary files /dev/null and b/public/assets/demo/sbi2.png differ
diff --git a/public/assets/demo/shidu.png b/public/assets/demo/shidu.png
new file mode 100644
index 0000000..d318124
Binary files /dev/null and b/public/assets/demo/shidu.png differ
diff --git a/public/assets/demo/sunny_s.png b/public/assets/demo/sunny_s.png
new file mode 100644
index 0000000..f051d50
Binary files /dev/null and b/public/assets/demo/sunny_s.png differ
diff --git a/public/assets/demo/wcl.png b/public/assets/demo/wcl.png
new file mode 100644
index 0000000..7dd4161
Binary files /dev/null and b/public/assets/demo/wcl.png differ
diff --git a/public/assets/demo/ycl.png b/public/assets/demo/ycl.png
new file mode 100644
index 0000000..1808905
Binary files /dev/null and b/public/assets/demo/ycl.png differ
diff --git a/public/assets/demo/yin.png b/public/assets/demo/yin.png
new file mode 100644
index 0000000..afe131f
Binary files /dev/null and b/public/assets/demo/yin.png differ
diff --git a/public/assets/demo/zgjxx.png b/public/assets/demo/zgjxx.png
new file mode 100644
index 0000000..019151e
Binary files /dev/null and b/public/assets/demo/zgjxx.png differ
diff --git a/public/assets/demo/zzcl.png b/public/assets/demo/zzcl.png
new file mode 100644
index 0000000..ad406d9
Binary files /dev/null and b/public/assets/demo/zzcl.png differ
diff --git a/public/billOfQuantities.xlsx b/public/billOfQuantities.xlsx
new file mode 100644
index 0000000..0437516
Binary files /dev/null and b/public/billOfQuantities.xlsx differ
diff --git a/public/daolu.xlsx b/public/daolu.xlsx
new file mode 100644
index 0000000..b7f00ac
Binary files /dev/null and b/public/daolu.xlsx differ
diff --git a/public/dikuai.xlsx b/public/dikuai.xlsx
new file mode 100644
index 0000000..25d39e0
Binary files /dev/null and b/public/dikuai.xlsx differ
diff --git a/public/materialsEquipment.xlsx b/public/materialsEquipment.xlsx
new file mode 100644
index 0000000..eaa0762
Binary files /dev/null and b/public/materialsEquipment.xlsx differ
diff --git a/src/App.vue b/src/App.vue
index a0780e4..8621d55 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,14 +8,12 @@
 import useSettingsStore from '@/store/modules/settings';
 import { handleThemeStyle } from '@/utils/theme';
 import useAppStore from '@/store/modules/app';
-import { getProjectTeam } from './utils/projectTeam';
 const appStore = useAppStore();
 
 onMounted(() => {
   nextTick(() => {
     // 初始化主题样式
     handleThemeStyle(useSettingsStore().theme);
-    getProjectTeam();
   });
 });
 </script>
diff --git a/src/api/bidding/appointment/index.ts b/src/api/bidding/appointment/index.ts
index 8f58106..4db7a6e 100644
--- a/src/api/bidding/appointment/index.ts
+++ b/src/api/bidding/appointment/index.ts
@@ -21,7 +21,7 @@ export const AddbiddingUser = (data) => {
     data
   });
 };
-// 新增招投标人员
+// 查询招投标人员
 export const biddingUserList = (projectId) => {
   return request({
     url: '/bidding/biddingUser/list',
diff --git a/src/api/design/volumeCatalog/index.ts b/src/api/design/volumeCatalog/index.ts
index c7c3a01..be533ae 100644
--- a/src/api/design/volumeCatalog/index.ts
+++ b/src/api/design/volumeCatalog/index.ts
@@ -116,6 +116,17 @@ export const getileDetail = (id) => {
     method: 'get'
   });
 };
+/**
+ * 获取专业列表
+ * @param query
+ */
+export const majorList = (params) => {
+  return request({
+    url: '/design/volumeCatalog/majorList',
+    method: 'get',
+    params: params
+  });
+};
 /**
  * 获取二维码信息
  * @param query
diff --git a/src/api/materials/overallPlanMaterialSupply/index.ts b/src/api/materials/overallPlanMaterialSupply/index.ts
index ae73e0b..f28216e 100644
--- a/src/api/materials/overallPlanMaterialSupply/index.ts
+++ b/src/api/materials/overallPlanMaterialSupply/index.ts
@@ -21,7 +21,7 @@ export const totalsupplyplan = (params: any): AxiosPromise => {
 export const totalSupplyplanDetails = (id: any): AxiosPromise => {
   return request({
     url: '/design/totalsupplyplan/' + id,
-    method: 'get',
+    method: 'get'
   });
 };
 // 修改物资-总供应计划
@@ -33,4 +33,11 @@ export const materialChangeSupplyplan = (data: any): AxiosPromise => {
   });
 };
 
-
+// 总供应计划-批量编辑
+export const totalSupplyplanBatchEdit = (data: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/batchEdit',
+    method: 'put',
+    data
+  });
+};
diff --git a/src/api/project/project/index.ts b/src/api/project/project/index.ts
index 04d5b65..cd3d1d7 100644
--- a/src/api/project/project/index.ts
+++ b/src/api/project/project/index.ts
@@ -96,8 +96,6 @@ export const addProjectFacilities = (data: any) => {
  * @param data
  */
 export const addProjectPilePoint = (data: any) => {
-  console.log('🚀 ~ addProjectPilePoint ~ data:', data);
-
   return request({
     url: '/facility/photovoltaicPanelPoint/parts/geoJson',
     method: 'post',
diff --git a/src/api/system/post/index.ts b/src/api/system/post/index.ts
index 54a64b2..9f028ab 100644
--- a/src/api/system/post/index.ts
+++ b/src/api/system/post/index.ts
@@ -12,9 +12,9 @@ export function listPost(query: { pageNum: number; pageSize: number }): AxiosPro
 }
 
 // 查询岗位列表
-export function listTreeByProject(projectId: string): AxiosPromise<PostVO[]> {
+export function listTreeByProject(): AxiosPromise<PostVO[]> {
   return request({
-    url: '/system/dept/list/treeByProjectId/' + projectId,
+    url: '/system/dept/list/tree',
     method: 'get'
   });
 }
diff --git a/src/assets/demo/avatar.png b/src/assets/demo/avatar.png
new file mode 100644
index 0000000..68ae32a
Binary files /dev/null and b/src/assets/demo/avatar.png differ
diff --git a/src/assets/demo/back.png b/src/assets/demo/back.png
new file mode 100644
index 0000000..6b6a2ac
Binary files /dev/null and b/src/assets/demo/back.png differ
diff --git a/src/assets/demo/gaojing.png b/src/assets/demo/gaojing.png
new file mode 100644
index 0000000..019151e
Binary files /dev/null and b/src/assets/demo/gaojing.png differ
diff --git a/src/assets/demo/rain.png b/src/assets/demo/rain.png
new file mode 100644
index 0000000..592efea
Binary files /dev/null and b/src/assets/demo/rain.png differ
diff --git a/src/assets/demo/wcl.png b/src/assets/demo/wcl.png
new file mode 100644
index 0000000..7dd4161
Binary files /dev/null and b/src/assets/demo/wcl.png differ
diff --git a/src/assets/demo/yichuli.png b/src/assets/demo/yichuli.png
new file mode 100644
index 0000000..1808905
Binary files /dev/null and b/src/assets/demo/yichuli.png differ
diff --git a/src/assets/demo/zzcl.png b/src/assets/demo/zzcl.png
new file mode 100644
index 0000000..ad406d9
Binary files /dev/null and b/src/assets/demo/zzcl.png differ
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index f678b11..3fefa25 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -546,7 +546,7 @@ const handleTerminationTask = async () => {
   if (isDrawing.value) {
     isShowTermination.value = true;
     nextTick(() => {
-      detailFormTeRef.value.getInfo(props.businessId);
+      detailFormTeRef.value.getInfo(props.businessId1);
     });
     return;
   }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 086d45c..e04a9f5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -134,6 +134,7 @@ export const useUserStore = defineStore('user', () => {
     roles.value = projectRole;
     const projectPermissions = permissionList.value.find((item) => item.projectId == selectedProject.value?.id)?.projectPermissions || [];
     permissions.value = projectPermissions;
+    getProjectTeam();
   };
 
   // 注销
diff --git a/src/utils/projectTeam.ts b/src/utils/projectTeam.ts
index 1134b68..23f482d 100644
--- a/src/utils/projectTeam.ts
+++ b/src/utils/projectTeam.ts
@@ -2,7 +2,13 @@ import $cache from '@/plugins/cache';
 //获取班组列表
 import { listProjectTeam } from '@/api/project/projectTeam';
 import { ProjectTeamVO } from '@/api/project/projectTeam/types';
+import useUserStore from '@/store/modules/user';
 export const getProjectTeam = async () => {
+  const isPermission = useUserStore().permissions.some((item) => item == 'project:team:list');
+  console.log(useUserStore().permissions);
+
+  if (!isPermission && useUserStore().permissions[0] != '*:*:*') return;
+
   const { id } = $cache.local.getJSON('selectedProject');
   const res = await listProjectTeam({
     pageNum: 1,
diff --git a/src/views/ProjectScreen/index.vue b/src/views/ProjectScreen/index.vue
index 306c494..612dd7d 100644
--- a/src/views/ProjectScreen/index.vue
+++ b/src/views/ProjectScreen/index.vue
@@ -14,7 +14,6 @@ import Header from './components/header.vue';
 import leftPage from './components/leftPage.vue';
 import centerPage from './components/centerPage.vue';
 import rightPage from './components/rightPage.vue';
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/biddingManagemen/appointment/index.vue b/src/views/biddingManagemen/appointment/index.vue
index c71349c..a76ea00 100644
--- a/src/views/biddingManagemen/appointment/index.vue
+++ b/src/views/biddingManagemen/appointment/index.vue
@@ -21,11 +21,11 @@
         <div class="fonts w60% ma">
           <el-form-item label="招投标专员" prop="userId" class="mb-4">
             <el-select
-              v-model="form.userId"
+              v-model="form.userId" filterable
               placeholder="请选择招投标专员"
               class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
             >
-              <el-option v-for="item in userList" :key="item.userId" :label="item.userName" :value="item.userId" />
+              <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
             </el-select>
           </el-form-item>
         </div>
diff --git a/src/views/biddingManagemen/biddingLimit/index.vue b/src/views/biddingManagemen/biddingLimit/index.vue
index eca3c03..4c508ad 100644
--- a/src/views/biddingManagemen/biddingLimit/index.vue
+++ b/src/views/biddingManagemen/biddingLimit/index.vue
@@ -165,7 +165,8 @@ const getTableData = async () => {
   loading.value = true;
   const params = {
     projectId: currentProject.value?.id,
-    sheet: queryForm.value.sheet
+    sheet: queryForm.value.sheet,
+    versions: queryForm.value.versions
   };
   const res = await getTreeLimit(params);
   loading.value = false;
diff --git a/src/views/contract/division/index.vue b/src/views/contract/division/index.vue
index 3f80b55..0c7675d 100644
--- a/src/views/contract/division/index.vue
+++ b/src/views/contract/division/index.vue
@@ -96,10 +96,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" @click="toggleExpandAll(true)">一键展开</el-button>
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
+                <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
               </el-form-item>
             </el-form>
           </el-card>
@@ -168,7 +165,7 @@
       </el-row>
       <template #footer>
         <el-button @click="closeDialog">取消</el-button>
-        <el-button type="primary" @click="submitForm(formRef)">确定</el-button>
+        <el-button type="primary" @click="submitForm(formRef)" :loading="loadingBtn">确定</el-button>
       </template>
     </el-dialog>
     <el-dialog title="详情" v-model="detailDialog" width="75%" draggable>
@@ -231,7 +228,7 @@ const rules = ref({
   content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
 });
 const loading = ref(false);
-
+const loadingBtn = ref();
 //字典获取数据
 const getTabsList = async () => {
   const res = await getDicts('subcontracting_type');
@@ -413,11 +410,12 @@ const changeSheet = () => {
   getTreeList();
 };
 
-const toggleExpandAll = (isExpand: boolean) => {
+const toggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  console.log(isExpandAll.value);
   treeData.value.forEach((row) => {
-    treeTableRef.value.toggleRowExpansion(row, isExpand);
+    treeTableRef.value.toggleRowExpansion(row, isExpandAll.value);
   });
-  isExpandAll.value = isExpand;
 };
 //打开获取表数据
 const getTreeList = async () => {
@@ -459,6 +457,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
           });
           return;
         }
+        loadingBtn.value = true;
         const newSelectionData = selectionData.value.filter((item) => item.quantity != '' && item.quantity != null);
         if (newSelectionData.some((item) => item.selectNum == '' || item.selectNum == null)) {
           ElMessage.error('存在未填写数量的工程或费用名称，请检查');
@@ -490,6 +489,8 @@ const submitForm = async (formEl: FormInstance | undefined) => {
         }
       } catch (error) {
         console.log(error);
+      } finally {
+        loadingBtn.value = false;
       }
     } else {
       console.log('error submit!', fields);
@@ -546,7 +547,7 @@ const handleDetail = (row: any) => {
   getDetails(row);
 };
 const getDetails = (row: any) => {
-  getDetailsList({ id: row.id, type: '1' }).then((res) => {
+  getDetailsList({ id: row.id, type: '1', projectId: currentProject.value?.id }).then((res) => {
     if (res.code == 200) {
       detailData.value = res.data;
     }
diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue
index c38b70b..69d7e05 100644
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@@ -14,11 +14,9 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="toggleExpandAll(true)">一键展开</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
+            <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
           </el-form-item>
+
           <el-form-item>
             <el-upload
               ref="uploadRef"
@@ -37,7 +35,13 @@
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" v-if="reviewStatus && reviewStatus == 'draft'" @click="clickApprovalSheet()">审核</el-button>
+            <el-button
+              type="primary"
+              v-if="reviewStatus && reviewStatus == 'draft'"
+              @click="clickApprovalSheet()"
+              v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
+              >审核</el-button
+            >
           </el-form-item>
           <el-form-item>
             <el-button
@@ -274,11 +278,12 @@ const handleSave = (row?: any, type?: any) => {
 };
 const tableRef = ref<any>();
 
-const toggleExpandAll = (isExpand: boolean) => {
+const toggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  console.log(isExpandAll.value);
   tableData.value.forEach((row) => {
-    tableRef.value.toggleRowExpansion(row, isExpand);
+    tableRef.value.toggleRowExpansion(row, isExpandAll.value);
   });
-  isExpandAll.value = isExpand;
 };
 //导入
 const importExcel = (options: any): any => {
diff --git a/src/views/cory/template/components/contactform.vue b/src/views/cory/template/components/contactform.vue
index d280eb9..6949f1b 100644
--- a/src/views/cory/template/components/contactform.vue
+++ b/src/views/cory/template/components/contactform.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="content-box">
     <el-table :data="data" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column align="center" prop="projectName" label="工程名称" />
       <el-table-column align="center" prop="serialNumber" label="编号" />
       <el-table-column align="center" prop="to" label="致" />
diff --git a/src/views/cory/template/components/engineeringChangeApplicationForm.vue b/src/views/cory/template/components/engineeringChangeApplicationForm.vue
index 123467c..d7e9e0c 100644
--- a/src/views/cory/template/components/engineeringChangeApplicationForm.vue
+++ b/src/views/cory/template/components/engineeringChangeApplicationForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="content-box">
     <el-table :data="data" style="width: 100%" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" width="55" label="序号" align="center" />
       <el-table-column align="center" prop="projectName" label="工程名称" />
       <el-table-column align="center" prop="submitUnit" label="提出单位" />
       <el-table-column align="center" prop="specialty" label="专业">
@@ -30,7 +30,7 @@
           </el-button>
           <el-button link type="primary" icon="View" @click="handleViewInfo(scope.row)" class="ml-3"> 查看流程 </el-button>
           <el-button link type="success" icon="View" @click="handleDetail(scope.row)" class="ml-3"> 详情 </el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
+          <!-- <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/cory/template/indexEdit.vue b/src/views/cory/template/indexEdit.vue
index 91e3fe6..3f75ed3 100644
--- a/src/views/cory/template/indexEdit.vue
+++ b/src/views/cory/template/indexEdit.vue
@@ -36,12 +36,42 @@
                   <el-row :gutter="20">
                     <el-col :span="12">
                       <el-form-item label="工程名称">
-                        <el-input v-model="form.projectName" />
+                        <el-input disabled v-model="form.projectName" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
                       <el-form-item label="提出单位">
-                        <el-input v-model="form.submitUnit" />
+                        <el-input v-model="form.submitUnit" placeholder="请输入提出单位" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <!-- 卷册名称 & 附图 -->
+                  <el-row :gutter="20">
+                    <el-col :span="12">
+                      <el-form-item label="卷册号">
+                        <!-- <el-input v-model="form.volumeName" /> -->
+                        <el-select
+                          id="projectSelect"
+                          v-model="form.volumeNumber"
+                          placeholder="请选择原卷册号"
+                          clearable
+                          filterable
+                          @change="handleSelect"
+                          style="width: 150px; margin-right: 20px"
+                        >
+                          <el-option
+                            v-for="project in volumeCatalogList"
+                            :key="project.volumeNumber"
+                            :label="project.volumeNumber"
+                            :value="project.volumeNumber"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <!-- 卷册号 -->
+                      <el-form-item label="卷册名称">
+                        <el-input disabled v-model="form.volumeName" />
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -50,7 +80,7 @@
                   <el-row :gutter="20">
                     <el-col :span="12">
                       <el-form-item label="专业">
-                        <el-select v-model="form.specialty" placeholder="">
+                        <el-select disabled v-model="form.specialty" placeholder="请选择专业">
                           <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
                         </el-select>
                       </el-form-item>
@@ -62,27 +92,11 @@
                     </el-col>
                   </el-row>
 
-                  <!-- 卷册名称 & 附图 -->
-                  <el-row :gutter="20">
-                    <el-col :span="12">
-                      <el-form-item label="卷册名称">
-                        <el-input v-model="form.volumeName" />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="附图">
-                        <file-Upload v-model="form.attachmentsImg" :file-type="['pdf', 'png', 'jpg', 'jpeg', 'gif', 'bmp']">
-                          <el-button type="primary">上传附件</el-button>
-                        </file-Upload>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-
-                  <!-- 卷册号 -->
-                  <el-form-item label="卷册号">
-                    <el-input v-model="form.volumeNumber" />
+                  <el-form-item label="附图">
+                    <file-Upload v-model="form.attachmentsImg" :file-type="['pdf', 'png', 'jpg', 'jpeg', 'gif', 'bmp']">
+                      <el-button type="primary">上传附件</el-button>
+                    </file-Upload>
                   </el-form-item>
-
                   <!-- 变更原因 -->
                   <el-form-item label="变更原因">
                     <el-checkbox-group v-model="form.changeReasons">
@@ -103,7 +117,7 @@
                     <file-upload v-model="form.attachments" :limit="1" :file-type="['pdf']"></file-upload>
                   </el-form-item>
                   <el-form-item label="变更费用估算" prop="costEstimation">
-                    <el-input v-model="form.costEstimation" :rows="6" placeholder="请输入变更费用估算" />
+                    <el-input v-model="form.costEstimation" :rows="6" type="number" placeholder="请输入变更费用估算" />
                   </el-form-item>
                   <el-divider class="mb-10! mt-10!">施工项目部</el-divider>
                   <el-form-item label="项目负责人" prop="contractorLeader">
@@ -177,6 +191,7 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { listByIds } from '@/api/system/oss';
 import { addContactnotice, getContactnotice, updateContactnotice } from '@/api/cory/contactnotice';
 const { des_user_major } = toRefs(proxy?.useDict('des_user_major'));
+import { catalogList } from '@/api/design/designChange';
 
 // 获取用户 store
 const userStore = useUserStoreHook();
@@ -221,11 +236,11 @@ const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
   projectType: '',
-  projectName: '',
+  projectName: currentProject.value?.name,
   serialNumber: '',
   to: '',
   subject: '',
-  costEstimation: '',
+  costEstimation: 0,
   content: '',
   attachments: '',
   contractorLeader: '',
@@ -275,13 +290,27 @@ const handleClose = () => {
   buttonLoading.value = false;
 };
 const { form, rules } = toRefs(data);
-
+const volumeCatalogList = ref([]);
+let volumeMap = new Map();
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
   leaveFormRef.value?.resetFields();
 };
-
+// 获取卷册号列表
+const getJuance = async () => {
+  const res = await catalogList(currentProject.value?.id);
+  volumeCatalogList.value = res.data;
+  volumeCatalogList.value.forEach((e) => {
+    volumeMap.set(e.volumeNumber, e);
+  });
+};
+const handleSelect = (val) => {
+  let obj = volumeMap.get(val);
+  console.log(obj);
+  form.value.volumeName = obj.documentName;
+  form.value.specialty = obj.specialty;
+};
 /** 获取详情 */
 const getInfo = () => {
   loading.value = true;
@@ -345,7 +374,8 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
     //流程变量
     taskVariables.value = {
       // leave4/5 使用的流程变量
-      userList: ['1', '3', '4']
+      userList: ['1', '3', '4'],
+      costEstimation: form.value.costEstimation
     };
     submitFormData.value.variables = taskVariables.value;
     const resp = await startWorkFlow(submitFormData.value);
@@ -402,6 +432,7 @@ onMounted(() => {
     routeParams.value = proxy.$route.query;
     thumbnailUrl.value = proxy.$route.query.thumbnailUrl;
     reset();
+    getJuance();
     loading.value = false;
     if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
       getInfo();
diff --git a/src/views/cory/workMessage/components/notice.vue b/src/views/cory/workMessage/components/notice.vue
index 08c25c1..8ab8df5 100644
--- a/src/views/cory/workMessage/components/notice.vue
+++ b/src/views/cory/workMessage/components/notice.vue
@@ -5,7 +5,7 @@
       <el-table-column label="序号" type="index" width="60" align="center" />
       <el-table-column label="处理状态" align="center" prop="status">
         <template #default="scope">
-          <dict-tag :options="safety_inspection_type" :value="scope.row.status" />
+          <dict-tag :options="wf_business_status" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="检查人" align="center" prop="correctorName" />
@@ -46,13 +46,16 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">
         <template #default="scope">
           <el-space>
-            <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['safety:safetyInspection:query']">
-              详情
+            <el-button link type="primary" icon="View" @click="handleDetail(scope.row)"> 详情 </el-button>
+            <el-button link type="primary" icon="Edit" @click="handleAddApp(scope.row)" v-if="scope.row.status && scope.row.status == 'draft'"
+              >审批
             </el-button>
-            <!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:safetyInspection:edit']">修改 </el-button> -->
-            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyInspection:remove']">
+            <el-button link type="primary" icon="View" @click="handleAddApp(scope.row)" v-if="scope.row.status && scope.row.status != 'draft'"
+              >查看流程
+            </el-button>
+            <!-- <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyInspection:remove']">
               删除
-            </el-button>
+            </el-button> -->
           </el-space>
         </template>
       </el-table-column>
@@ -191,9 +194,10 @@ const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 
-const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type } = toRefs<any>(
-  useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type')
+const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type, wf_business_status } = toRefs<any>(
+  useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type', 'wf_business_status')
 );
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const safetyInspectionDetail = ref<SafetyInspectionVO>();
 
 const form = reactive({
@@ -236,6 +240,18 @@ const handleDetail = async (row) => {
     rectificationFileList.value = rectificationFileRes.data;
   }
 };
+const handleAddApp = (row) => {
+  // 添加审批
+  proxy.$tab.closePage(proxy.$route);
+  proxy.$router.push({
+    path: `/approval/workMessage/indexEdit`,
+    query: {
+      id: row.id,
+
+      type: 'update'
+    }
+  });
+};
 const getList = (row) => {};
 const handleDelete = (row) => {};
 </script>
diff --git a/src/views/cory/workMessage/index.vue b/src/views/cory/workMessage/index.vue
index 27204d5..805cdc0 100644
--- a/src/views/cory/workMessage/index.vue
+++ b/src/views/cory/workMessage/index.vue
@@ -21,7 +21,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" :disabled="addSingle" @click="handleAdd" v-hasPermi="['quality:qualityInspection:add']"
+            <el-button type="primary" plain icon="Plus" :disabled="addSingle" @click="handleAdd" v-hasPermi="['cory:contactnotice:add']"
               >新增</el-button
             >
           </el-col>
@@ -31,13 +31,7 @@
             >
           </el-col> -->
           <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['quality:qualityInspection:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['cory:contactnotice:remove']"
               >删除</el-button
             >
           </el-col>
@@ -306,6 +300,7 @@ const selectType = (value: string) => {
 const resetForm = () => {
   formRef.value?.resetFields();
 };
+
 //监听项目id刷新数据
 const listeningProject = watch(
   () => currentProject.value?.id,
diff --git a/src/views/cory/workMessage/indexEdit.vue b/src/views/cory/workMessage/indexEdit.vue
new file mode 100644
index 0000000..c04c34b
--- /dev/null
+++ b/src/views/cory/workMessage/indexEdit.vue
@@ -0,0 +1,482 @@
+<template>
+  <div class="p-4 bg-gray-50">
+    <div class="max-w-4xl mx-auto">
+      <!-- 顶部按钮区域 -->
+      <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+        <approvalButton
+          @submitForm="submitForm"
+          @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord"
+          :buttonLoading="buttonLoading"
+          :id="form.id"
+          :status="form.status"
+          :pageType="routeParams.type"
+        />
+      </el-card>
+
+      <!-- 表单区域 -->
+      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+        <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+          <h3 class="text-lg font-semibold text-gray-800">工作联系单审批</h3>
+        </div>
+        <div class="p-6">
+          <div class="w80% ma">
+            <h2 style="text-align: center; margin-top: 5px; font-weight: bold">通知单</h2>
+            <el-row>
+              <el-col :span="12" style="text-align: left">填报人：{{ safetyInspectionDetail?.creatorName }}</el-col>
+              <el-col :span="12" style="text-align: right">填报时间：{{ safetyInspectionDetail?.createTime }}</el-col>
+            </el-row>
+            <el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
+              <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra"
+                >{{ currentProject?.name }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="检查类型" label-class-name="white">
+                <dict-tag :options="safety_inspection_check_type" :value="safetyInspectionDetail?.checkType" />
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="违章类型" label-class-name="white">
+                <dict-tag :options="safety_inspection_violation_type" :value="safetyInspectionDetail?.violationType" />
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="检查时间" class-name="zebra"
+                >{{ safetyInspectionDetail?.checkTime }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="检查人" class-name="zebra"
+                >{{ safetyInspectionDetail?.creatorName }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="整改人" label-class-name="white"
+                >{{ safetyInspectionDetail?.correctorName }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
+                {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}
+              </el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions border direction="vertical" size="large">
+              <el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="2" border label-width="160px" size="large">
+              <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
+                >{{ safetyInspectionDetail?.hiddenDanger }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
+                <el-space wrap>
+                  <div v-for="item in checkFileList" :key="item.ossId">
+                    <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                      <image-preview :src="item.url" width="200px" />
+                    </span>
+                    <span v-else>
+                      <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
+                        <span> {{ item.originalName }} </span>
+                      </el-link>
+                    </span>
+                  </div>
+                </el-space>
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="检查状态" :span="2" label-class-name="white">
+                <el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.status)" finish-status="finish">
+                  <el-step v-for="item in safety_inspection_type" :key="item.value" :title="item.label" />
+                </el-steps>
+              </el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions border direction="vertical" size="large">
+              <el-descriptions-item label-align="center" label="整改情况" class-name="none"></el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="2" border label-width="160px" size="large">
+              <el-descriptions-item label-align="center" label="班组" label-class-name="white"
+                >{{ safetyInspectionDetail?.teamName }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="整改日期" label-class-name="white"
+                >{{ safetyInspectionDetail?.rectificationTime }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="整改措施及完成情况" :span="2" label-class-name="white">
+                {{ safetyInspectionDetail?.measure }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="整改附件" :span="2" label-class-name="white">
+                <el-space wrap>
+                  <div v-for="item in rectificationFileList" :key="item.ossId">
+                    <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                      <image-preview :src="item.url" width="200px" />
+                    </span>
+                    <span v-else>
+                      <el-link :href="`${item.url}`" :underline="false" target="_blank">
+                        <span> {{ item.originalName }} </span>
+                      </el-link>
+                    </span>
+                  </div>
+                </el-space>
+              </el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions border direction="vertical" size="large">
+              <el-descriptions-item label-align="center" label="复查结果" class-name="none"></el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="2" border label-width="160px" size="large">
+              <el-descriptions-item label-align="center" label="复查人" label-class-name="white"
+                >{{ safetyInspectionDetail?.creatorName }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="复查日期" label-class-name="white"
+                >{{ safetyInspectionDetail?.reviewTime }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white"
+                >{{ safetyInspectionDetail?.review }}
+              </el-descriptions-item>
+            </el-descriptions>
+          </div>
+        </div>
+      </el-card>
+      <!-- 提交组件 -->
+      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <approvalRecord ref="approvalRecordRef"></approvalRecord>
+      <!-- 流程选择对话框 -->
+      <el-dialog
+        draggable
+        v-model="dialogVisible.visible"
+        :title="dialogVisible.title"
+        :before-close="handleClose"
+        width="500"
+        class="rounded-lg shadow-lg"
+      >
+        <div class="p-4">
+          <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+          <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+            <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <template #footer>
+          <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+            <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+              >取消</el-button
+            >
+            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+              >确认</el-button
+            >
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { useUserStoreHook } from '@/store/modules/user';
+import { listByIds } from '@/api/system/oss';
+import { dayjs } from 'element-plus';
+import { useDict } from '@/utils/dict';
+import { SafetyInspectionVO } from '@/api/safety/safetyInspection/types';
+// const { des_user_major } = toRefs(proxy?.useDict('des_user_major'));
+import { getContactnotice } from '@/api/cory/contactnotice';
+const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type, wf_business_status } = toRefs<any>(
+  useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type', 'wf_business_status')
+);
+
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const thumbnailUrl = ref('');
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_contactForm',
+    label: '工作联系单审批'
+  }
+];
+
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+  visible: false,
+  title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  projectType: '',
+  projectName: '',
+  serialNumber: '',
+  to: '',
+  subject: '',
+  costEstimation: '',
+  content: '',
+  attachments: '',
+  contractorLeader: '',
+  contractorDate: '',
+  supervisorLeader: '',
+  supervisorDate: '',
+  ownerRep: '',
+  ownerDate: '',
+  unitName: '',
+  profession: '',
+  applyDate: '',
+  bookName: '',
+  bookNo: '',
+  hasAttachment: '',
+  changeReasons: [],
+  changeContent: '',
+  costEstimate: '',
+  status: ''
+};
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: currentProject.value?.id,
+    fileName: undefined,
+    fileType: undefined,
+    fileSuffix: undefined,
+    fileStatus: undefined,
+    originalName: undefined,
+    newest: undefined,
+    params: {}
+  }
+});
+const safetyInspectionDetail = ref<SafetyInspectionVO>();
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
+const { form } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
+};
+
+const checkFileList: any = ref([]);
+const rectificationFileList: any = ref([]);
+/** 获取详情 */
+const getInfo = () => {
+  loading.value = true;
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const res = await getContactnotice(routeParams.value.id);
+    console.log(res.data);
+    const detail = res.data.detail ? JSON.parse(res.data.detail) : {};
+    safetyInspectionDetail.value = { ...res.data, ...detail };
+    if (safetyInspectionDetail.value.checkFile) {
+      const checkFileRes = await listByIds(safetyInspectionDetail.value.checkFile.split(','));
+      checkFileList.value = checkFileRes.data;
+    }
+    if (safetyInspectionDetail.value.rectificationFile) {
+      const rectificationFileRes = await listByIds(safetyInspectionDetail.value.rectificationFile.split(','));
+      rectificationFileList.value = rectificationFileRes.data;
+    }
+
+    Object.assign(form.value, safetyInspectionDetail.value);
+    loading.value = false;
+    buttonLoading.value = false;
+  });
+};
+
+const submitFlow = async () => {
+  console.log('form.value', form.value);
+
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: LeaveForm) => {
+  console.log('data', data);
+
+  try {
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.id;
+    //流程变量
+    taskVariables.value = {
+      // leave4/5 使用的流程变量
+      userList: ['1', '3', '4']
+    };
+    submitFormData.value.variables = taskVariables.value;
+    const resp = await startWorkFlow(submitFormData.value);
+    if (submitVerifyRef.value) {
+      buttonLoading.value = false;
+      submitVerifyRef.value.openDialog(resp.data.taskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  submit(status.value, form.value);
+};
+//审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+};
+
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+  form.value = data;
+  if (status === 'draft') {
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('暂存成功');
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.go(-1);
+  } else {
+    if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+      flowCode.value = flowCodeOptions[0].value;
+      dialogVisible.visible = true;
+      return;
+    }
+    //说明启动过先随意穿个参数
+    if (flowCode.value === '' || flowCode.value === null) {
+      flowCode.value = 'xx';
+    }
+    console.log('data', data);
+    await handleStartWorkFlow(data);
+  }
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    routeParams.value = proxy.$route.query;
+    reset();
+    loading.value = false;
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+      getInfo();
+    }
+  });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+  --primary: #409eff;
+  --primary-light: #66b1ff;
+  --primary-dark: #3a8ee6;
+  --success: #67c23a;
+  --warning: #e6a23c;
+  --danger: #f56c6c;
+  --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+  .el-form-item__label {
+    color: #606266;
+    font-weight: 500;
+  }
+
+  .el-input__inner,
+  .el-select .el-input__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+
+  .el-textarea__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+}
+
+/* 按钮样式优化 */
+.el-button {
+  border-radius: 4px;
+  transition: all 0.2s;
+
+  &.is-primary {
+    background-color: var(--primary);
+    border-color: var(--primary);
+
+    &:hover {
+      background-color: var(--primary-light);
+      border-color: var(--primary-light);
+    }
+
+    &:active {
+      background-color: var(--primary-dark);
+      border-color: var(--primary-dark);
+    }
+  }
+
+  &.is-text {
+    color: var(--primary);
+
+    &:hover {
+      color: var(--primary-light);
+      background-color: rgba(64, 158, 255, 0.05);
+    }
+  }
+}
+
+/* 卡片样式优化 */
+.el-card {
+  transition: all 0.3s ease;
+
+  &:hover {
+    /* transform: translateY(-2px); */
+  }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+  .el-dialog__header {
+    background-color: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+    padding: 15px 20px;
+  }
+
+  .el-dialog__title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  .el-dialog__footer {
+    padding: 15px 20px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+</style>
diff --git a/src/views/ctr/index.vue b/src/views/ctr/index.vue
index c46404a..96f5c49 100644
--- a/src/views/ctr/index.vue
+++ b/src/views/ctr/index.vue
@@ -1,440 +1,439 @@
 <template>
-    <div class="container">
-        <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
-            <el-step title="选择合同类型" />
-            <el-step title="录入合同内容" />
-            <el-step title="录入收款方式" />
-        </el-steps>
-        <div class="content">
-            <template v-if="active == 0">
-                <div>
-                    <el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button>
-                    <el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button>
-                </div>
-
-            </template>
-            <template v-else-if="active == 1">
-                <h1>{{ contract_type == "income" ? "收入合同" : "支出合同" }}</h1>
-                <template v-if="contract_type == 'income'">
-                    <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules"
-                        label-width="80px">
-                        <!-- <el-form-item label="项目名称">
+  <div class="container">
+    <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
+      <el-step title="选择合同类型" />
+      <el-step title="录入合同内容" />
+      <el-step title="录入收款方式" />
+    </el-steps>
+    <div class="content">
+      <template v-if="active == 0">
+        <div>
+          <el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button>
+          <el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button>
+        </div>
+      </template>
+      <template v-else-if="active == 1">
+        <h1>{{ contract_type == 'income' ? '收入合同' : '支出合同' }}</h1>
+        <template v-if="contract_type == 'income'">
+          <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules" label-width="80px">
+            <!-- <el-form-item label="项目名称">
                             <el-input :model-value="project.name" disabled />
                         </el-form-item> -->
-                        <el-form-item label="合同编号" prop="contractCode">
-                            <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
-                        </el-form-item>
-                        <el-form-item label="合同类型" prop="contractType">
-                            <el-select v-model="form.contractType" placeholder="请选择合同类型">
-                                <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label"
-                                    :value="item.value" />
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="业主单位" prop="contractOwner">
-                            <el-input disabled v-model="form.contractOwner" placeholder="请输入业主单位" />
-                        </el-form-item>
-                        <el-form-item label="承包内容" v-if="contract_type !== 'income'">
-                            <editor v-model="form.contractedContent" :min-height="192" />
-                        </el-form-item>
-                        <el-form-item label="合同内容" v-else">
-                            <editor v-model="form.contractedContent" :min-height="192" />
-                        </el-form-item>
-                        <el-form-item label="合同金额" prop="amount">
-                            <el-input v-model="form.amount" placeholder="请输入合同金额"
-                                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                            <el-input v-model="form.remark" placeholder="请输入备注" />
-                        </el-form-item>
-                        <el-form-item label="附件">
-                            <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
-                                :ref="fileRef" :defaultFileList="tempFileList" />
-                        </el-form-item>
-                    </el-form>
-                </template>
-                <template v-else-if="contract_type == 'expenses'">
-                    <el-form ref="expensesContractFormRef" :model="form" :rules="expensesContractFormRules"
-                        label-width="80px">
-                        <!-- <el-form-item label="项目名称">
+            <el-form-item label="合同编号" prop="contractCode">
+              <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+            </el-form-item>
+            <el-form-item label="合同类型" prop="contractType">
+              <el-select v-model="form.contractType" placeholder="请选择合同类型">
+                <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="业主单位" prop="contractOwner">
+              <el-input disabled v-model="form.contractOwner" placeholder="请输入业主单位" />
+            </el-form-item>
+            <el-form-item label="承包内容" v-if="contract_type !== 'income'">
+              <editor v-model="form.contractedContent" :min-height="192" />
+            </el-form-item>
+            <el-form-item label="合同内容" v-else>
+              <editor v-model="form.contractedContent" :min-height="192" />
+            </el-form-item>
+            <el-form-item label="合同金额" prop="amount">
+              <el-input
+                v-model="form.amount"
+                placeholder="请输入合同金额"
+                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
+              />
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+            <el-form-item label="附件">
+              <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
+            </el-form-item>
+          </el-form>
+        </template>
+        <template v-else-if="contract_type == 'expenses'">
+          <el-form ref="expensesContractFormRef" :model="form" :rules="expensesContractFormRules" label-width="80px">
+            <!-- <el-form-item label="项目名称">
                             <el-input :model-value="projectName" placeholder="请输入项目ID" disabled />
                         </el-form-item> -->
-                        <el-form-item label="合同编号" prop="contractCode">
-                            <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
-                        </el-form-item>
-                        <el-form-item label="合同类型" prop="contractType">
-                            <el-select v-model="form.contractType" placeholder="请选择合同类型">
-                                <el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label"
-                                    :value="item.value" />
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="招标计划" prop="tenderId">
-                            <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> -->
-                            <el-input v-model="form.name" placeholder="请选择招标计划" disabled />
-                            <el-button type="primary" @click="handleChoose">选择招标</el-button>
-                        </el-form-item>
-                        <el-form-item label="供应商" prop="contractSupplier">
-                            <el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled />
-                        </el-form-item>
-                        <el-form-item label="分包内容">
-                            <!-- <editor v-model="form.contractedContent" :min-height="192" disabled /> -->
-                            <el-input v-model="form.contractedContent" style="width: 300px"
-                                :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" disabled />
-                        </el-form-item>
-                        <el-form-item label="合同金额" prop="amount">
-                            <el-input
-                                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-                                v-model="form.amount" placeholder="请输入合同金额" disabled />
-                        </el-form-item>
+            <el-form-item label="合同编号" prop="contractCode">
+              <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+            </el-form-item>
+            <el-form-item label="合同类型" prop="contractType">
+              <el-select v-model="form.contractType" placeholder="请选择合同类型">
+                <el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="招标计划" prop="tenderId">
+              <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> -->
+              <el-input v-model="form.name" placeholder="请选择招标计划" disabled />
+              <el-button type="primary" @click="handleChoose" v-hasPermi="['ctr:expensesContract:tenderList']">选择招标</el-button>
+            </el-form-item>
+            <el-form-item label="供应商" prop="contractSupplier">
+              <el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled />
+            </el-form-item>
+            <el-form-item label="分包内容">
+              <!-- <editor v-model="form.contractedContent" :min-height="192" disabled /> -->
+              <el-input v-model="form.contractedContent" style="width: 300px" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" disabled />
+            </el-form-item>
+            <el-form-item label="合同金额" prop="amount">
+              <el-input
+                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
+                v-model="form.amount"
+                placeholder="请输入合同金额"
+                disabled
+              />
+            </el-form-item>
 
-                        <el-form-item label="备注" prop="remark">
-                            <el-input v-model="form.remark" placeholder="请输入备注" />
-                        </el-form-item>
-                        <el-form-item label="合同附件">
-                            <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
-                                :ref="fileRef" :defaultFileList="tempFileList" />
-                        </el-form-item>
-                    </el-form>
-                </template>
-                <div>
-                    <el-button @click="back(true)">上一步</el-button>
-                    <el-button type="primary" @click="next">下一步</el-button>
-                </div>
-            </template>
-            <template v-else-if="active == 2">
-                <h1>{{ contract_type == "income" ? "收入合同" : "支出合同" }}</h1>
-                <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
-                    <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
-                        <el-select v-model="form.payType">
-                            <el-option :value="1" label="月结算">月结算</el-option>
-                            <el-option :value="2" label="形象节点">形象节点</el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="预付款比例（%）" prop="advancePayRatio">
-                        <el-input-number v-model="form.advancePayRatio" :max="100" :min="0" />
-                    </el-form-item>
-                    <el-form-item label="尾款比例（%）" prop="balancePayRatio">
-                        <el-input-number v-model="form.balancePayRatio" :max="100" :min="0" />
-                    </el-form-item>
-                    <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio">
-                        <el-input-number v-model="form.assuranceDepositRatio" :max="100" :min="0" />
-                    </el-form-item>
-                    <el-form-item label="付款比例（%）" prop="payRatio">
-                        <el-input-number v-model="payRatioComputed" disabled />
-                    </el-form-item>
-                    <el-form-item>
-                        <div>
-                            <el-button @click="back(false)">上一步</el-button>
-                            <el-button type="success" @click="submitForm">提交</el-button>
-                        </div>
-                    </el-form-item>
-                </el-form>
-            </template>
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+            <el-form-item label="合同附件">
+              <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
+            </el-form-item>
+          </el-form>
+        </template>
+        <div>
+          <el-button @click="back(true)">上一步</el-button>
+          <el-button type="primary" @click="next">下一步</el-button>
         </div>
-        <el-dialog v-model="dialogVisible" title="选择招标计划" width="45%">
-            <el-table :data="planList">
-                <el-table-column type="index" width="50" label="序号" />
-                <el-table-column label="名称" align="center" prop="name" />
-                <el-table-column label="合同额" align="center" prop="contractPrice" />
-                <el-table-column label="分包内容" align="center" prop="content" />
-                <el-table-column label="中标单位" align="center" prop="winningBidder" />
-                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                    <template #default="scope">
-                        <el-button type="primary" @click="handleChooseData(scope.row)">选择</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button type="primary" @click="dialogVisible = false">
-                        关闭
-                    </el-button>
-                </div>
-            </template>
-        </el-dialog>
+      </template>
+      <template v-else-if="active == 2">
+        <h1>{{ contract_type == 'income' ? '收入合同' : '支出合同' }}</h1>
+        <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
+          <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
+            <el-select v-model="form.payType">
+              <el-option :value="1" label="月结算">月结算</el-option>
+              <el-option :value="2" label="形象节点">形象节点</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="预付款比例（%）" prop="advancePayRatio">
+            <el-input-number v-model="form.advancePayRatio" :max="100" :min="0" />
+          </el-form-item>
+          <el-form-item label="尾款比例（%）" prop="balancePayRatio">
+            <el-input-number v-model="form.balancePayRatio" :max="100" :min="0" />
+          </el-form-item>
+          <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio">
+            <el-input-number v-model="form.assuranceDepositRatio" :max="100" :min="0" />
+          </el-form-item>
+          <el-form-item label="付款比例（%）" prop="payRatio">
+            <el-input-number v-model="payRatioComputed" disabled />
+          </el-form-item>
+          <el-form-item>
+            <div>
+              <el-button @click="back(false)">上一步</el-button>
+              <el-button type="success" @click="submitForm">提交</el-button>
+            </div>
+          </el-form-item>
+        </el-form>
+      </template>
     </div>
+    <el-dialog v-model="dialogVisible" title="选择招标计划" width="45%">
+      <el-table :data="planList">
+        <el-table-column type="index" width="50" label="序号" />
+        <el-table-column label="名称" align="center" prop="name" />
+        <el-table-column label="合同额" align="center" prop="contractPrice" />
+        <el-table-column label="分包内容" align="center" prop="content" />
+        <el-table-column label="中标单位" align="center" prop="winningBidder" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button type="primary" @click="handleChooseData(scope.row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="dialogVisible = false"> 关闭 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 <script setup>
 import FileUpload from '@/components/FileUpload';
-import {  addExpensesContract, getTenderPlan } from '@/api/ctr/expensesContract';
-import {  addIncomeContract,  getInfoByProjectId } from '@/api/ctr/incomeContract';
+import { addExpensesContract, getTenderPlan } from '@/api/ctr/expensesContract';
+import { addIncomeContract, getInfoByProjectId } from '@/api/ctr/incomeContract';
 import { useUserStore } from '@/store/modules/user';
 
 const active = ref(0);
-const contract_type = ref("")
-const form = ref({ payType: 1 })
-const fileList = ref([])
-const tempFileList = ref([])
+const contract_type = ref('');
+const form = ref({ payType: 1 });
+const fileList = ref([]);
+const tempFileList = ref([]);
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
 const planList = ref([]);
 const dialogVisible = ref(false);
 
-const { expenses_contract_type, income_contract_type } = toRefs(
-    proxy?.useDict('income_contract_type', 'expenses_contract_type')
-);
+const { expenses_contract_type, income_contract_type } = toRefs(proxy?.useDict('income_contract_type', 'expenses_contract_type'));
 const fileRef = ref(null);
 const incomeContractFormRef = ref(null);
 const expensesContractFormRef = ref(null);
 const payMentRef = ref(null);
 const incomeContractFormRules = {
-    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
-    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
-    contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
-    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
-    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+  contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+  contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+  contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
+  amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+  remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
 };
 const expensesContractFormRules = {
-    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
-    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+  contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+  contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
 
-    contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
-    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
-    tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
+  contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+  amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+  tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
 
-    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+  remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
 };
 const payMentRules = {
-    payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
-    advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
-    balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
-    assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }],
-
+  payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
+  advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
+  balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
+  assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }]
 };
 
 const project = computed(() => {
-    console.log(111);
+  console.log(111);
 
-    return JSON.parse(localStorage.getItem("selectedProject"))
+  return JSON.parse(localStorage.getItem('selectedProject'));
 });
 
 const payRatioComputed = computed({
-    get: () => {
-        const { advancePayRatio = 0, balancePayRatio = 0, assuranceDepositRatio = 0 } = form.value;
-        const total = 100 - (advancePayRatio + balancePayRatio + assuranceDepositRatio);
-        // form.value.payRatio = total;
-        return total;
-    },
-    // 只读
-    set: () => { }
+  get: () => {
+    const { advancePayRatio = 0, balancePayRatio = 0, assuranceDepositRatio = 0 } = form.value;
+    const total = 100 - (advancePayRatio + balancePayRatio + assuranceDepositRatio);
+    // form.value.payRatio = total;
+    return total;
+  },
+  // 只读
+  set: () => {}
 });
 const checkContractType = (type) => {
-    contract_type.value = type;
-    form.value.contract_type = type;
-    active.value = 1;
-    form.value.step = active.value;
+  contract_type.value = type;
+  form.value.contract_type = type;
+  active.value = 1;
+  form.value.step = active.value;
 };
 const onUploadSuccess = (data) => {
-    fileList.value = data
-}
+  fileList.value = data;
+};
 const back = async (reset) => {
-    console.log(active.value);
+  console.log(active.value);
 
-    if (reset) {
-        await ElMessageBox.confirm('返回上一步将清空目前填写的内容，确定返回？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-        }).then(() => {
-            resetForm();
-            active.value--;
-        }).catch(() => {
-            return;
-        });
-    } else {
+  if (reset) {
+    await ElMessageBox.confirm('返回上一步将清空目前填写的内容，确定返回？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+      .then(() => {
+        resetForm();
         active.value--;
-    }
-    console.log(active.value);
-
-    form.value.step = active.value;
+      })
+      .catch(() => {
+        return;
+      });
+  } else {
+    active.value--;
+  }
+  console.log(active.value);
 
+  form.value.step = active.value;
 };
 const next = async () => {
-    if (contract_type.value === 'income') {
-        await incomeContractFormRef.value.validate((valid) => {
-            if (valid) {
-                active.value++;
-            } else {
-                ElMessage.error('请填写完整的收入合同信息');
-            }
-        });
-    } else if (contract_type.value === 'expenses') {
-        await expensesContractFormRef.value.validate((valid) => {
-            if (valid) {
-                active.value++;
-            } else {
-                ElMessage.error('请填写完整的支出合同信息');
-            }
-        });
-    }
-    console.log(active.value);
+  if (contract_type.value === 'income') {
+    await incomeContractFormRef.value.validate((valid) => {
+      if (valid) {
+        active.value++;
+      } else {
+        ElMessage.error('请填写完整的收入合同信息');
+      }
+    });
+  } else if (contract_type.value === 'expenses') {
+    await expensesContractFormRef.value.validate((valid) => {
+      if (valid) {
+        active.value++;
+      } else {
+        ElMessage.error('请填写完整的支出合同信息');
+      }
+    });
+  }
+  console.log(active.value);
 
-    form.value.step = active.value;
+  form.value.step = active.value;
 };
 const resetForm = () => {
-    form.value = {
-        payType: 1,
-        contractCode: '',
-        contractType: '',
-        contractOwner: '',
-        contractedContent: '',
-        amount: '',
-        remark: '',
-        advancePayRatio: '',
-        balancePayRatio: '',
-        assuranceDepositRatio: '',
-        payRatio: ''
-    };
-    fileList.value = [];
-    tempFileList.value = [];
-    contract_type.value = '';
-    setTimeout(() => {
-        localStorage.removeItem("tempContractForm");
-    }, 0);
+  form.value = {
+    payType: 1,
+    contractCode: '',
+    contractType: '',
+    contractOwner: '',
+    contractedContent: '',
+    amount: '',
+    remark: '',
+    advancePayRatio: '',
+    balancePayRatio: '',
+    assuranceDepositRatio: '',
+    payRatio: ''
+  };
+  fileList.value = [];
+  tempFileList.value = [];
+  contract_type.value = '';
+  setTimeout(() => {
+    localStorage.removeItem('tempContractForm');
+  }, 0);
 };
 
 const submitForm = async () => {
-    await payMentRef.value.validate(async (valid) => {
-        if (valid) {
-
-            if (payRatioComputed.value < 0) {
-
-                ElMessage.error('四项付款比例之和必须等于100%');
-                return;
-            }
-            form.value.payRatio = payRatioComputed.value;
-
-            // 提交付款信息逻辑
-            console.log('提交付款信息', form.value, fileList.value);
-            // 这里可以调用API提交数据
-            form.value.projectId = project.value.id;
-            form.value.fileList = fileList.value.map((data) => {
-                return {
-                    ...data,
-                    fileName: data.name,
-                    fileUrl: data.url,
-                }
-            })
-            if (contract_type.value === 'income') {
-                await addIncomeContract({ ...form.value });
-            } else if (contract_type.value === 'expenses') {
-                await addExpensesContract({ ...form.value });
-            }
-            resetForm();
-            ElMessage.success('合同提交成功');
-            // active.value = 0; // 重置步骤
-            if (contract_type.value === 'income') {
-                proxy.$router.push('/ctr/incomeContract');
-            } else {
-                proxy.$router.push('/ctr/expensesContract');
-            }
-        } else {
-            ElMessage.error('请填写完整的付款信息');
-        }
-    });
-    // if (contract_type.value === 'income') {
-    //     const incomeContractFormRef = ref(null);
-    //     await incomeContractFormRef.value.validate(async (valid) => {
-    //         if (valid) {
-    //             // 提交收入合同逻辑
-    //             console.log('提交收入合同', form.value, fileList.value);
-    //             // 这里可以调用API提交数据
-    //             resetForm();
-    //             ElMessage.success('收入合同提交成功');
-    //         } else {
-    //             ElMessage.error('请填写完整的收入合同信息');
-    //         }
-    //     });
-    // } else if (contract_type.value === 'expenses') {
-    //     const expensesContractFormRef = ref(null);
-    //     await expensesContractFormRef.value.validate(async (valid) => {
-    //         if (valid) {
-    //             // 提交支出合同逻辑
-    //             console.log('提交支出合同', form.value, fileList.value);
-    //             // 这里可以调用API提交数据
-    //             resetForm();
-    //             ElMessage.success('支出合同提交成功');
-    //         } else {
-    //             ElMessage.error('请填写完整的支出合同信息');
-    //         }
-    //     });
-    // }
-}
-const handleChoose = async () => {
-    if (!form.value.contractType) {
-        ElMessage.error('请先选择合同类型');
+  await payMentRef.value.validate(async (valid) => {
+    if (valid) {
+      if (payRatioComputed.value < 0) {
+        ElMessage.error('四项付款比例之和必须等于100%');
         return;
-    }
-    const formData = {
-        projectId: userStore.selectedProject.id,
-        dictName: form.value.contractType,
-        status: 1,
-    }
-    const { data } = await getTenderPlan(formData)
-    if (data.length === 0) {
-        ElMessage.warning('当前没有招标计划，请先创建招标计划');
-        return;
-    }
-    planList.value = data
-    dialogVisible.value = true;
+      }
+      form.value.payRatio = payRatioComputed.value;
 
-}
-const handleChooseData = (row) => {
-    form.value.tenderId = row.id;
-    form.value.name = row.name;
-    // form.value.contractPrice = row.contractPrice;
-    form.value.content = row.content;
-    form.value.contractSupplier = row.winningBidder;
-    form.value.amount = row.contractPrice;
-    dialogVisible.value = false;
+      // 提交付款信息逻辑
+      console.log('提交付款信息', form.value, fileList.value);
+      // 这里可以调用API提交数据
+      form.value.projectId = project.value.id;
+      form.value.fileList = fileList.value.map((data) => {
+        return {
+          ...data,
+          fileName: data.name,
+          fileUrl: data.url
+        };
+      });
+      if (contract_type.value === 'income') {
+        await addIncomeContract({ ...form.value });
+      } else if (contract_type.value === 'expenses') {
+        await addExpensesContract({ ...form.value });
+      }
+      resetForm();
+      ElMessage.success('合同提交成功');
+      active.value = 0; // 重置步骤
+      if (contract_type.value === 'income') {
+        proxy.$router.push('/ctr/incomeContract');
+      } else {
+        proxy.$router.push('/ctr/expensesContract');
+      }
+    } else {
+      ElMessage.error('请填写完整的付款信息');
+    }
+  });
+  // if (contract_type.value === 'income') {
+  //     const incomeContractFormRef = ref(null);
+  //     await incomeContractFormRef.value.validate(async (valid) => {
+  //         if (valid) {
+  //             // 提交收入合同逻辑
+  //             console.log('提交收入合同', form.value, fileList.value);
+  //             // 这里可以调用API提交数据
+  //             resetForm();
+  //             ElMessage.success('收入合同提交成功');
+  //         } else {
+  //             ElMessage.error('请填写完整的收入合同信息');
+  //         }
+  //     });
+  // } else if (contract_type.value === 'expenses') {
+  //     const expensesContractFormRef = ref(null);
+  //     await expensesContractFormRef.value.validate(async (valid) => {
+  //         if (valid) {
+  //             // 提交支出合同逻辑
+  //             console.log('提交支出合同', form.value, fileList.value);
+  //             // 这里可以调用API提交数据
+  //             resetForm();
+  //             ElMessage.success('支出合同提交成功');
+  //         } else {
+  //             ElMessage.error('请填写完整的支出合同信息');
+  //         }
+  //     });
+  // }
 };
-watch(form, (val) => {
-    localStorage.setItem("tempContractForm", JSON.stringify({ ...val, fileList: fileList.value }));
-}, { deep: true });
-watch(fileList, (val) => {
-    localStorage.setItem("tempContractForm", JSON.stringify({ ...form.value, fileList: val }));
-}, { deep: true });
+const handleChoose = async () => {
+  if (!form.value.contractType) {
+    ElMessage.error('请先选择合同类型');
+    return;
+  }
+  const formData = {
+    projectId: userStore.selectedProject.id,
+    dictName: form.value.contractType,
+    status: 1
+  };
+  const { data } = await getTenderPlan(formData);
+  if (data.length === 0) {
+    ElMessage.warning('当前没有招标计划，请先创建招标计划');
+    return;
+  }
+  planList.value = data;
+  dialogVisible.value = true;
+};
+const handleChooseData = (row) => {
+  form.value.tenderId = row.id;
+  form.value.name = row.name;
+  // form.value.contractPrice = row.contractPrice;
+  form.value.content = row.content;
+  form.value.contractSupplier = row.winningBidder;
+  form.value.amount = row.contractPrice;
+  dialogVisible.value = false;
+};
+watch(
+  form,
+  (val) => {
+    localStorage.setItem('tempContractForm', JSON.stringify({ ...val, fileList: fileList.value }));
+  },
+  { deep: true }
+);
+watch(
+  fileList,
+  (val) => {
+    localStorage.setItem('tempContractForm', JSON.stringify({ ...form.value, fileList: val }));
+  },
+  { deep: true }
+);
 // 获取投标列表
 const getInfoByProjectIdList = async () => {
-    const res = await getInfoByProjectId({ projectId: userStore.selectedProject.id, });
-    console.log(res);
-    form.value.contractOwner = res.data.planDuration;
-}
+  const res = await getInfoByProjectId({ projectId: userStore.selectedProject.id });
+  console.log(res);
+  form.value.contractOwner = res.data.planDuration;
+};
 onMounted(() => {
-    getInfoByProjectIdList();
+  getInfoByProjectIdList();
 
-    const tempForm = localStorage.getItem("tempContractForm");
-    if (tempForm) {
-        ElMessageBox.confirm('检测到有未完成的合同录入，是否继续？', '提示', {
-            confirmButtonText: '继续',
-            cancelButtonText: '取消',
-            type: 'warning',
-        }).then(() => {
-            const t = JSON.parse(tempForm);
-            const { fileList: files, ...rest } = JSON.parse(tempForm);
-            form.value = rest;
-            fileList.value = files || [];
-            tempFileList.value = files || [];
-            contract_type.value = form.value.contract_type;
-            active.value = form.value.step || 0;
-
-        }).catch(() => {
-            localStorage.removeItem("tempContractForm");
-        });
-
-    }
+  const tempForm = localStorage.getItem('tempContractForm');
+  if (tempForm) {
+    ElMessageBox.confirm('检测到有未完成的合同录入，是否继续？', '提示', {
+      confirmButtonText: '继续',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+      .then(() => {
+        const t = JSON.parse(tempForm);
+        const { fileList: files, ...rest } = JSON.parse(tempForm);
+        form.value = rest;
+        fileList.value = files || [];
+        tempFileList.value = files || [];
+        contract_type.value = form.value.contract_type;
+        active.value = form.value.step || 0;
+      })
+      .catch(() => {
+        localStorage.removeItem('tempContractForm');
+      });
+  }
 });
 </script>
 <style scoped lang="scss">
 .container {
-    padding: 20px;
+  padding: 20px;
 
-    .content {
-        width: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        padding: 30px;
-        flex-direction: column;
-    }
+  .content {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 30px;
+    flex-direction: column;
+  }
 }
 </style>
diff --git a/src/views/ctr/update/index.vue b/src/views/ctr/update/index.vue
index ca46c2b..4908951 100644
--- a/src/views/ctr/update/index.vue
+++ b/src/views/ctr/update/index.vue
@@ -1,80 +1,79 @@
 <template>
-  <div class="container">
-    <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
-      <el-step title="选择合同类型" />
-      <el-step title="修改合同内容" />
-      <el-step title="修改收款方式" />
-    </el-steps>
-    <div class="content">
-      <template v-if="active == 1">
-        <h1>修改收入合同</h1>
-        <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules" label-width="80px">
-          <el-form-item label="合同编号" prop="contractCode">
-            <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
-          </el-form-item>
-          <el-form-item label="合同类型" prop="contractType">
-            <el-select v-model="form.contractType" placeholder="请选择合同类型">
-              <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="业主单位" prop="contractOwner">
-            <el-input v-model="form.contractOwner" placeholder="请输入业主单位" disabled />
-          </el-form-item>
-          <el-form-item label="承包内容" v-if="contract_type !== 'income'">
-            <editor v-model="form.contractedContent" :min-height="192" />
-          </el-form-item>
-          <el-form-item label="合同内容" v-else>
-            <editor v-model="form.contractedContent" :min-height="192" />
-          </el-form-item>
-          <el-form-item label="合同金额" prop="amount">
-            <el-input
-              v-model="form.amount"
-              placeholder="请输入合同金额"
-              oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-            />
-          </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注" />
-          </el-form-item>
-          <el-form-item label="附件">
-            <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
-          </el-form-item>
-        </el-form>
-        <div>
-          <el-button type="primary" @click="next">下一步</el-button>
+    <div class="container">
+        <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
+            <el-step title="选择合同类型" />
+            <el-step title="修改合同内容" />
+            <el-step title="修改收款方式" />
+        </el-steps>
+        <div class="content">
+            <template v-if="active == 1">
+                <h1>修改收入合同</h1>
+                <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules" label-width="80px">
+                    <el-form-item label="合同编号" prop="contractCode">
+                        <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+                    </el-form-item>
+                    <el-form-item label="合同类型" prop="contractType">
+                        <el-select v-model="form.contractType" placeholder="请选择合同类型">
+                            <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label"
+                                :value="item.value" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="业主单位" prop="contractOwner">
+                        <el-input v-model="form.contractOwner" placeholder="请输入业主单位" disabled />
+                    </el-form-item>
+                    <el-form-item label="承包内容" v-if="contract_type !== 'income'">
+                        <editor v-model="form.contractedContent" :min-height="192" />
+                    </el-form-item>
+                    <el-form-item label="合同内容" v-else>
+                        <editor v-model="form.contractedContent" :min-height="192" />
+                    </el-form-item>
+                    <el-form-item label="合同金额" prop="amount">
+                        <el-input v-model="form.amount" placeholder="请输入合同金额"
+                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                    </el-form-item>
+                    <el-form-item label="备注" prop="remark">
+                        <el-input v-model="form.remark" placeholder="请输入备注" />
+                    </el-form-item>
+                    <el-form-item label="附件">
+                        <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
+                            :ref="fileRef" :defaultFileList="tempFileList" />
+                    </el-form-item>
+                </el-form>
+                <div>
+                    <el-button type="primary" @click="next">下一步</el-button>
+                </div>
+            </template>
+            <template v-else-if="active == 2">
+                <h1>修改收入合同</h1>
+                <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
+                    <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
+                        <el-select v-model="form.payType">
+                            <el-option :value="1" label="月结算">月结算</el-option>
+                            <el-option :value="2" label="形象节点">形象节点</el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="预付款比例（%）" prop="advancePayRatio">
+                        <el-input-number v-model="form.advancePayRatio" :max="100" :min="0" />
+                    </el-form-item>
+                    <el-form-item label="尾款比例（%）" prop="balancePayRatio">
+                        <el-input-number v-model="form.balancePayRatio" :max="100" :min="0" />
+                    </el-form-item>
+                    <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio">
+                        <el-input-number v-model="form.assuranceDepositRatio" :max="100" :min="0" />
+                    </el-form-item>
+                    <el-form-item label="付款比例（%）" prop="payRatio">
+                        <el-input-number v-model="payRatioComputed" disabled />
+                    </el-form-item>
+                    <el-form-item>
+                        <div>
+                            <el-button @click="back(false)">上一步</el-button>
+                            <el-button type="success" @click="submitForm">提交</el-button>
+                        </div>
+                    </el-form-item>
+                </el-form>
+            </template>
         </div>
-      </template>
-      <template v-else-if="active == 2">
-        <h1>修改收入合同</h1>
-        <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
-          <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
-            <el-select v-model="form.payType">
-              <el-option :value="1" label="月结算">月结算</el-option>
-              <el-option :value="2" label="形象节点">形象节点</el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="预付款比例（%）" prop="advancePayRatio">
-            <el-input-number v-model="form.advancePayRatio" :max="100" :min="0" />
-          </el-form-item>
-          <el-form-item label="尾款比例（%）" prop="balancePayRatio">
-            <el-input-number v-model="form.balancePayRatio" :max="100" :min="0" />
-          </el-form-item>
-          <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio">
-            <el-input-number v-model="form.assuranceDepositRatio" :max="100" :min="0" />
-          </el-form-item>
-          <el-form-item label="付款比例（%）" prop="payRatio">
-            <el-input-number v-model="payRatioComputed" disabled />
-          </el-form-item>
-          <el-form-item>
-            <div>
-              <el-button @click="back(false)">上一步</el-button>
-              <el-button type="success" @click="submitForm">提交</el-button>
-            </div>
-          </el-form-item>
-        </el-form>
-      </template>
     </div>
-  </div>
 </template>
 <script setup>
 import FileUpload from '@/components/FileUpload';
@@ -96,131 +95,140 @@ const incomeContractFormRef = ref(null);
 const expensesContractFormRef = ref(null);
 const payMentRef = ref(null);
 const incomeContractFormRules = {
-  contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
-  contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
-  contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
-  amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
-  remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
+    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+    contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
+    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
 };
 const expensesContractFormRules = {
-  contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
-  contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
 
-  contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
-  amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
-  tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
+    contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+    tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
 
-  remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
+    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
 };
 const payMentRules = {
-  payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
-  advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
-  balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
-  assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }]
+    payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
+    advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
+    balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
+    assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }]
 };
 
 const project = computed(() => {
-  return JSON.parse(localStorage.getItem('selectedProject'));
+    return JSON.parse(localStorage.getItem('selectedProject'));
 });
 
 const payRatioComputed = computed({
-  get: () => {
-    const { advancePayRatio = 0, balancePayRatio = 0, assuranceDepositRatio = 0 } = form.value;
-    const total = 100 - (advancePayRatio + balancePayRatio + assuranceDepositRatio);
-    // form.value.payRatio = total;
-    return total;
-  },
-  // 只读
-  set: () => {}
+    get: () => {
+        const { advancePayRatio = 0, balancePayRatio = 0, assuranceDepositRatio = 0 } = form.value;
+        const total = 100 - (advancePayRatio + balancePayRatio + assuranceDepositRatio);
+        // form.value.payRatio = total;
+        return total;
+    },
+    // 只读
+    set: () => { }
 });
 
 const onUploadSuccess = (data) => {
-  fileList.value = data;
+    fileList.value = data;
 };
 
 const next = async () => {
-  if (contract_type.value === 'income') {
-    await incomeContractFormRef.value.validate((valid) => {
-      if (valid) {
-        active.value++;
-      } else {
-        ElMessage.error('请填写完整的收入合同信息');
-      }
-    });
-  } else if (contract_type.value === 'expenses') {
-    await expensesContractFormRef.value.validate((valid) => {
-      if (valid) {
-        active.value++;
-      } else {
-        ElMessage.error('请填写完整的支出合同信息');
-      }
-    });
-  }
-  console.log(active.value);
+    if (contract_type.value === 'income') {
+        await incomeContractFormRef.value.validate((valid) => {
+            if (valid) {
+                active.value++;
+            } else {
+                ElMessage.error('请填写完整的收入合同信息');
+            }
+        });
+    } else if (contract_type.value === 'expenses') {
+        await expensesContractFormRef.value.validate((valid) => {
+            if (valid) {
+                active.value++;
+            } else {
+                ElMessage.error('请填写完整的支出合同信息');
+            }
+        });
+    }
+    console.log(active.value);
 
-  form.value.step = active.value;
+    form.value.step = active.value;
 };
 const submitForm = async () => {
-  await payMentRef.value.validate(async (valid) => {
-    if (valid) {
-      if (payRatioComputed.value < 0) {
-        ElMessage.error('四项付款比例之和必须等于100%');
-        return;
-      }
-      form.value.payRatio = payRatioComputed.value;
+    await payMentRef.value.validate(async (valid) => {
+        if (valid) {
+            if (payRatioComputed.value < 0) {
+                ElMessage.error('四项付款比例之和必须等于100%');
+                return;
+            }
+            form.value.payRatio = payRatioComputed.value;
 
-      // 提交付款信息逻辑
-      console.log('提交付款信息', form.value, fileList.value);
-      // 这里可以调用API提交数据
-      form.value.projectId = project.value.id;
-      form.value.fileList = fileList.value.map((data) => {
-        return {
-          ...data,
-          fileName: data.name,
-          fileUrl: data.url
-        };
-      });
-      if (contract_type.value === 'income') {
-        await updateIncomeContract({ ...form.value });
-      }
-      ElMessage.success('合同修改成功');
-    } else {
-      ElMessage.error('请填写完整的付款信息');
-    }
-  });
+            // 提交付款信息逻辑
+            console.log('提交付款信息', form.value, fileList.value);
+            // 这里可以调用API提交数据
+            form.value.projectId = project.value.id;
+            form.value.fileList = fileList.value.map((data) => {
+                return {
+                    ...data,
+                    fileName: data.name,
+                    fileUrl: data.url
+                };
+            });
+            if (contract_type.value === 'income') {
+                await updateIncomeContract({ ...form.value });
+            }
+            ElMessage.success('合同修改成功');
+        } else {
+            ElMessage.error('请填写完整的付款信息');
+        }
+    });
 };
 const handleChoose = async () => {
-  if (!form.value.contractType) {
-    ElMessage.error('请先选择合同类型');
-    return;
-  }
-  const formData = {
-    projectId: userStore.selectedProject.id,
-    dictName: form.value.contractType,
-    status: 1
-  };
-  const { data } = await getTenderPlan(formData);
-  if (data.length === 0) {
-    ElMessage.warning('当前没有招标计划，请先创建招标计划');
-    return;
-  }
-  planList.value = data;
-  dialogVisible.value = true;
+    if (!form.value.contractType) {
+        ElMessage.error('请先选择合同类型');
+        return;
+    }
+    const formData = {
+        projectId: userStore.selectedProject.id,
+        dictName: form.value.contractType,
+        status: 1
+    };
+    const { data } = await getTenderPlan(formData);
+    if (data.length === 0) {
+        ElMessage.warning('当前没有招标计划，请先创建招标计划');
+        return;
+    }
+    planList.value = data;
+    dialogVisible.value = true;
 };
 
-onMounted(async () => {});
+onMounted(async () => {
+    const id = route.query.id;
+    if (id) {
+        const { data } = await getIncomeContract(id);
+        form.value.id = data.id;
+        form.value.contractOwner = data.contractOwner
+    } else {
+        router.push('/ctr/incomeContract');
+    }
+})
 </script>
 <style scoped lang="scss">
 .container {
-  padding: 20px;
+    padding: 20px;
 
-  .content {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 30px;
-    flex-direction: column;
-  }
+    .content {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 30px;
+        flex-direction: column;
+    }
 }
 </style>
diff --git a/src/views/demo/components/1.html b/src/views/demo/components/1.html
new file mode 100644
index 0000000..846de09
--- /dev/null
+++ b/src/views/demo/components/1.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!-- 引入图标（这里用的是阿里图标库示例，实际可替换成自己的图标资源） -->
+    <link rel="stylesheet" href="https://at.alicdn.com/t/c/font_4245527_xxxxxx.css">
+    <!-- <link rel="stylesheet" href="style.css"> -->
+    <style>
+        /* 初始化样式 */
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            min-height: 100vh;
+            background: #eef5ff;
+            font-family: sans-serif;
+        }
+
+        /* 时间轴容器 */
+        .weather-timeline {
+            display: flex;
+            align-items: center;
+            background: #fff;
+            border-radius: 12px;
+            padding: 20px;
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+            overflow-x: auto;
+            /* 适配小屏幕横向滚动 */
+        }
+
+        /* 每个时间项 */
+        .time-item {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            margin: 0 12px;
+            min-width: 80px;
+            /* 保证 item 最小宽度 */
+        }
+
+        /* 当前时间项特殊样式 */
+        .time-item.current {
+            background: #e3f0ff;
+            border-radius: 8px;
+            padding: 10px;
+            transform: scale(1.1);
+            /* 稍微放大突出 */
+            box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+        }
+
+        /* 时间文本 */
+        .time {
+            font-size: 14px;
+            color: #333;
+            margin-bottom: 4px;
+        }
+
+        /* 温度文本 */
+        .temp {
+            font-size: 16px;
+            color: #666;
+            margin-bottom: 8px;
+        }
+
+        /* 图标样式（基于阿里图标库，可替换成自己的图标字体或图片） */
+        .iconfont {
+            font-size: 24px;
+            color: #f9b115;
+            /* 太阳/主色调 */
+        }
+
+        .icon-rain {
+            color: #9ec8f2;
+            /* 雨/蓝色系 */
+        }
+
+        .icon-cloud-moon {
+            color: #c9d6e5;
+            /* 多云 moon/浅灰蓝 */
+        }
+    </style>
+    <title>天气时间轴</title>
+</head>
+
+<body>
+    <div class="weather-timeline">
+        <div class="time-item">
+            <div class="time">16:00</div>
+            <div class="temp">30°C</div>
+            <i class="iconfont icon-sun"></i> <!-- 太阳图标 -->
+        </div>
+        <div class="time-item">
+            <div class="time">17:00</div>
+            <div class="temp">29°C</div>
+            <i class="iconfont icon-sun"></i>
+        </div>
+        <div class="time-item">
+            <div class="time">18:00</div>
+            <div class="temp">25°C</div>
+            <i class="iconfont icon-rain"></i> <!-- 小雨图标 -->
+        </div>
+        <div class="time-item current">
+            <div class="time">现在</div>
+            <div class="temp">25°C</div>
+            <i class="iconfont icon-rain"></i>
+        </div>
+        <div class="time-item">
+            <div class="time">20:00</div>
+            <div class="temp">25°C</div>
+            <i class="iconfont icon-cloud-moon"></i> <!-- 多云 moon 图标 -->
+        </div>
+        <div class="time-item">
+            <div class="time">21:00</div>
+            <div class="temp">20°C</div>
+            <i class="iconfont icon-cloud-moon"></i>
+        </div>
+    </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/views/demo/components/ChartBox.vue b/src/views/demo/components/ChartBox.vue
new file mode 100644
index 0000000..434eb2d
--- /dev/null
+++ b/src/views/demo/components/ChartBox.vue
@@ -0,0 +1,311 @@
+<template>
+    <div class="chart-container">
+        <!-- 图表标题和时间范围选择器 -->
+        <div class="chart-header">
+            <h2>功率与效率趋势</h2>
+            <div class="chart-actions">
+                <button @click="timeRange = 'day'" :class="{ active: timeRange === 'day' }">今日</button>
+                <button @click="timeRange = 'week'" :class="{ active: timeRange === 'week' }">本周</button>
+                <button @click="timeRange = 'month'" :class="{ active: timeRange === 'month' }">本月</button>
+            </div>
+        </div>
+        <!-- 图表内容区域 -->
+        <div ref="chartRef" class="chart-content"></div>
+    </div>
+</template>
+
+<script setup>
+import { ref, onMounted, watch } from 'vue';
+import * as echarts from 'echarts';
+
+// 图表DOM引用
+const chartRef = ref(null);
+// 时间范围状态
+const timeRange = ref('day');
+// 图表实例
+let chartInstance = null;
+
+// 定义颜色常量
+const POWER_COLOR = 'rgba(42, 130, 228, 1)';
+const EFFICIENCY_COLOR = 'rgba(67, 207, 124, 1)';
+
+// 生成指定范围内的随机数（用于模拟数据）
+const getRandomValue = (min, max) => {
+    return Math.floor(Math.random() * (max - min + 1)) + min;
+};
+
+// 生成指定范围内的随机浮点数（用于效率数据）
+const getRandomFloat = (min, max, decimalPlaces = 1) => {
+    const value = Math.random() * (max - min) + min;
+    return parseFloat(value.toFixed(decimalPlaces));
+};
+
+// 获取当前月份的天数
+const getDaysInCurrentMonth = () => {
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = now.getMonth() + 1; // 月份从0开始，所以+1
+    return new Date(year, month, 0).getDate();
+};
+
+// 根据时间范围返回对应的数据
+const getChartData = () => {
+    if (timeRange.value === 'day') {
+        return {
+            xAxis: ['00:00', '03:00', '06:00', '09:00', '12:00', '15:00', '18:00', '21:00'],
+            powerData: [320, 380, 350, 420, 580, 630, 550, 480],
+            efficiencyData: [85.2, 86.5, 87.1, 88.3, 89.5, 89.2, 88.7, 88.1]
+        };
+    } else if (timeRange.value === 'week') {
+        return {
+            xAxis: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
+            powerData: [4200, 4800, 5100, 4900, 5300, 3800, 3200],
+            efficiencyData: [86.2, 87.5, 88.1, 87.8, 89.0, 88.5, 87.9]
+        };
+    } else {
+        // 本月数据 - 按天显示
+        const daysInMonth = getDaysInCurrentMonth();
+        const xAxis = [];
+        const powerData = [];
+        const efficiencyData = [];
+
+        // 生成每天的数据
+        for (let i = 1; i <= daysInMonth; i++) {
+            xAxis.push(`${i}日`);
+            // 生成合理范围内的功率数据（10000-25000之间）
+            powerData.push(getRandomValue(10000, 25000));
+            // 生成合理范围内的效率数据（85-90之间，保留1位小数）
+            efficiencyData.push(getRandomFloat(85, 90));
+        }
+
+        return {
+            xAxis,
+            powerData,
+            efficiencyData
+        };
+    }
+};
+
+// 初始化图表
+const initChart = () => {
+    if (chartRef.value && !chartInstance) {
+        chartInstance = echarts.init(chartRef.value);
+    }
+
+    const data = getChartData();
+
+    const option = {
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: { type: 'cross' }
+        },
+        legend: {
+            data: ['总功率(kW)', '平均效率(%)'],
+            top: 0
+        },
+        grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+        },
+        xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            data: data.xAxis,
+            // 当月天数较多时，优化X轴标签显示
+            axisLabel: {
+                interval: timeRange.value === 'month' ? 'auto' : 0,
+                rotate: timeRange.value === 'month' ? 45 : 0
+            }
+        },
+        yAxis: [
+            {
+                type: 'value',
+                name: '总功率(kW)',
+                axisLabel: {
+                    formatter: '{value}'
+                }
+            },
+            {
+                type: 'value',
+                name: '平均效率(%)',
+                min: 80,
+                max: 95,
+                axisLabel: {
+                    formatter: '{value}%'
+                }
+            }
+        ],
+        series: [
+            {
+                name: '总功率(kW)',
+                type: 'line',
+                data: data.powerData,
+                smooth: true,
+                lineStyle: {
+                    width: 3,
+                    color: POWER_COLOR
+                },
+                symbol: 'circle',
+                symbolSize: 8,
+                itemStyle: {
+                    color: POWER_COLOR
+                },
+                markPoint: {
+                    data: [
+                        { type: 'max', name: '最大值' },
+                        { type: 'min', name: '最小值' }
+                    ],
+                    itemStyle: {
+                        color: POWER_COLOR
+                    }
+                }
+            },
+            {
+                name: '平均效率(%)',
+                type: 'line',
+                yAxisIndex: 1,
+                data: data.efficiencyData,
+                smooth: true,
+                lineStyle: {
+                    width: 3,
+                    type: 'dashed',
+                    color: EFFICIENCY_COLOR
+                },
+                symbol: 'diamond',
+                symbolSize: 8,
+                itemStyle: {
+                    color: EFFICIENCY_COLOR
+                },
+                markPoint: {
+                    data: [
+                        { type: 'max', name: '最大值' },
+                        { type: 'min', name: '最小值' }
+                    ],
+                    itemStyle: {
+                        color: EFFICIENCY_COLOR
+                    }
+                }
+            }
+        ]
+    };
+
+    chartInstance.setOption(option);
+};
+
+// 响应窗口大小变化
+const handleResize = () => {
+    if (chartInstance) {
+        chartInstance.resize();
+    }
+};
+
+// 生命周期钩子
+onMounted(() => {
+    initChart();
+    window.addEventListener('resize', handleResize);
+
+    // 清理函数
+    return () => {
+        window.removeEventListener('resize', handleResize);
+        if (chartInstance) {
+            chartInstance.dispose();
+            chartInstance = null;
+        }
+    };
+});
+
+// 监听时间范围变化，更新图表
+watch(timeRange, () => {
+    initChart();
+});
+</script>
+
+<style scoped>
+.chart-container {
+    background-color: #fff;
+    border-radius: 8px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+    overflow: hidden;
+    height: 400px;
+    width: 100%;
+}
+
+.chart-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 15px 20px;
+    border-bottom: 1px solid #f0f0f0;
+}
+
+.chart-header h2 {
+    font-size: 16px;
+    font-weight: 600;
+    color: #333;
+    margin: 0;
+}
+
+.chart-actions button {
+    background: none;
+    border: 1px solid #e0e0e0;
+    padding: 5px 12px;
+    border-radius: 4px;
+    margin-left: 8px;
+    cursor: pointer;
+    font-size: 12px;
+    transition: all 0.2s ease;
+}
+
+.chart-actions button.active {
+    background-color: #1890ff;
+    color: white;
+    border-color: #1890ff;
+}
+
+.chart-content {
+    width: 100%;
+    height: calc(100% - 54px);
+    padding: 10px;
+}
+
+@media (max-width: 768px) {
+    .chart-container {
+        height: 350px;
+    }
+}
+
+@media (max-width: 480px) {
+    .chart-container {
+        height: 300px;
+    }
+
+    .chart-header {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 10px;
+    }
+
+    .chart-actions {
+        width: 100%;
+        display: flex;
+        justify-content: space-between;
+    }
+
+    .chart-actions button {
+        margin: 0;
+        flex: 1;
+        margin-right: 5px;
+    }
+
+    .chart-actions button:last-child {
+        margin-right: 0;
+    }
+}
+
+.model {
+    padding: 20px;
+    background-color: rgba(242, 248, 252, 1);
+}
+</style>
diff --git a/src/views/demo/components/TitleComponent.vue b/src/views/demo/components/TitleComponent.vue
new file mode 100644
index 0000000..dade41a
--- /dev/null
+++ b/src/views/demo/components/TitleComponent.vue
@@ -0,0 +1,30 @@
+<template>
+    <el-row>
+        <el-col>
+            <div style="color: rgba(0, 30, 59, 1);;font-family: 'Alibaba-PuHuiTi-Bold';margin: 10px 0 0 0;"
+                :style="{ fontSize: fontLevelMap[props.fontLevel] }">
+                {{ props.title }}
+            </div>
+        </el-col>
+        <el-col>
+            <p style="color: rgba(154, 154, 154, 1);font-size: 14px;">
+                {{ props.subtitle }}
+            </p>
+        </el-col>
+
+    </el-row>
+</template>
+<script setup>
+const props = defineProps({
+    title: String,
+    subtitle: String,
+    fontLevel: {
+        type: Number,
+        default: 1
+    }
+})
+const fontLevelMap = {
+    1: "24px",
+    2: "18px"
+}
+</script>
\ No newline at end of file
diff --git a/src/views/demo/components/gaojing.vue b/src/views/demo/components/gaojing.vue
new file mode 100644
index 0000000..b6f55b2
--- /dev/null
+++ b/src/views/demo/components/gaojing.vue
@@ -0,0 +1,210 @@
+<template>
+    <el-card shadow="never" style="border-radius: 10px;">
+        <div style="margin-bottom: 20px;display: flex;align-items: center;justify-content: right;">
+            <span style="margin-right: 5px;color: rgba(113, 128, 150, 1);font-size: 14px;">
+                查看全部告警信息
+            </span>
+            <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="8"
+                viewBox="0 0 8 8" fill="none">
+                <path
+                    d="M5.94575 4.15722C5.94975 4.14947 5.95624 4.14298 5.95975 4.13497C6.0285 3.99197 6.00599 3.81697 5.88425 3.70197L3.1245 1.09172C2.97399 0.949466 2.73676 0.956216 2.59425 1.10648C2.45199 1.25698 2.4585 1.49422 2.60901 1.63673L5.08526 3.97922L2.61875 6.35647C2.46975 6.50021 2.46525 6.73746 2.60901 6.88672C2.6825 6.96321 2.78076 7.00148 2.87901 7.00148C2.97276 7.00148 3.06651 6.96648 3.13926 6.89648L5.87401 4.26073C5.87927 4.25547 5.88125 4.24823 5.88651 4.24274C5.89052 4.23899 5.89476 4.23623 5.89875 4.23224C5.92 4.20997 5.93124 4.18272 5.94575 4.15722Z"
+                    fill="#718096">
+                </path>
+            </svg>
+        </div>
+        <div class="notice">
+            <div class="item">
+                <div class="icon">
+                    <img src="/assets/demo/zgjxx.png" alt="">
+                </div>
+                <div class="content">
+                    <p>总告警信息</p>
+                    <p style="color: rgba(42, 130, 228, 1);">1,921条</p>
+                </div>
+            </div>
+            <div class="item">
+                <div class="icon">
+                    <img src="/assets/demo/ycl.png" alt="">
+                </div>
+                <div class="content">
+                    <p>已处理</p>
+                    <p style="color:rgba(0, 184, 122, 1);">500条</p>
+                </div>
+            </div>
+            <div class="item">
+                <div class="icon">
+                    <img src="/assets/demo/zzcl.png" alt="">
+                </div>
+                <div class="content">
+                    <p>正在处理</p>
+                    <p style="color: rgba(255, 141, 26, 1);">200条</p>
+                </div>
+            </div>
+            <div class="item">
+                <div class="icon">
+                    <img src="/assets/demo/wcl.png" alt="">
+                </div>
+                <div class="content">
+                    <p>未处理</p>
+                    <p style="color: rgba(227, 39, 39, 1);">1,221</p>
+                </div>
+            </div>
+        </div>
+        <div class="content">
+            <div class="list">
+                <div class="item waring">
+                    <div class="left">
+                        <p class="title">
+                            逆变器温度过高
+                        </p>
+                        <p class="text">INV-2023-003 温度达到52℃，超过阈值48℃</p>
+                    </div>
+                    <div class="right">
+                        <div class="time">
+                            10分钟前
+                        </div>
+                        <el-text type="warning" size="small">正在处理</el-text>
+                    </div>
+                </div>
+                <div class="item danger">
+                    <div class="left">
+                        <p class="title">
+                            通信中断
+                        </p>
+                        <p class="text">INV-2023-003 与监控系统通信中断</p>
+                    </div>
+                    <div class="right">
+                        <div class="time">
+                            20分钟前
+                        </div>
+                        <el-text type="primary" size="small">查看详情</el-text>
+                    </div>
+                </div>
+                <div class="item danger">
+                    <div class="left">
+                        <p class="title">
+                            通信中断
+                        </p>
+                        <p class="text">INV-2023-003 与监控系统通信中断</p>
+                    </div>
+                    <div class="right">
+                        <div class="time">
+                            1小时前
+                        </div>
+                        <el-text type="primary" size="small">查看详情</el-text>
+                    </div>
+                </div>
+                <div class="item grey">
+                    <div class="left">
+                        <p class="title">
+                            逆变器温度过高
+                        </p>
+                        <p class="text">INV-2023-003 温度达到52℃，超过阈值48℃</p>
+                    </div>
+                    <div class="right">
+                        <div class="time">
+                            2小时前
+                        </div>
+                        <!-- <el-text type="primary" size="small">查看详情</el-text> -->
+                        <el-button type="info" size="small" disabled>已处理</el-button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </el-card>
+</template>
+<style scoped lang="scss">
+.notice {
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid rgba(32, 32, 32, 0.05);
+    padding-bottom: 20px;
+
+    .item {
+        display: flex;
+    }
+
+    p {
+        padding: 0;
+        margin: 0;
+    }
+
+    .icon {
+        width: 50px;
+        height: 50px;
+        margin-right: 10px;
+
+        img {
+            display: block;
+            width: 100%;
+            height: 100%;
+        }
+    }
+
+    .content p:nth-child(2) {
+        font-size: 14px;
+        margin-top: 5px;
+    }
+}
+
+.content {
+    .item {
+        border-radius: 10px;
+        padding: 0 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 10px;
+
+        .text {
+            color: rgba(125, 133, 146, 1);
+            font-size: 12px;
+        }
+
+        .title {
+            font-size: 16px;
+        }
+
+        .right {
+            font-size: 12px;
+            color: rgba(125, 133, 146, 1);
+
+            .time {
+                margin-bottom: 5px;
+            }
+        }
+    }
+
+    .waring {
+        background-color: #FFFCE6;
+        border: 1px solid #FFF0E1;
+
+        .title {
+            color: #FFA408;
+        }
+    }
+
+    .danger {
+        background-color: #FFE9E5;
+        border: 1px solid #FFEFEB;
+
+        .title {
+            color: rgba(255, 87, 51, 1);
+        }
+    }
+
+    .grey {
+        background-color: #F3F3F3;
+        border: 1px solid #FCFCFC;
+
+        .right {
+            text-align: right;
+        }
+
+        .title {
+            color: rgba(102, 102, 102, 1);
+        }
+    }
+}
+</style>
+<script setup></script>
\ No newline at end of file
diff --git a/src/views/demo/components/qixiang.vue b/src/views/demo/components/qixiang.vue
new file mode 100644
index 0000000..58629bb
--- /dev/null
+++ b/src/views/demo/components/qixiang.vue
@@ -0,0 +1,224 @@
+<template>
+    <div class="cardItem">
+        <el-card>
+            <div class="tianqi"
+                style="display: flex;flex-direction: column;align-items: center;background-color: #FAFAFA;border-radius: 10px;padding-bottom: 40px;">
+                <div>
+                    <img src="/assets/demo/Sunny.png" style="display: block; width: 100px;height: 100px;" alt="">
+                </div>
+                <div style="font-family: 'Alibaba-PuHuiTi-Bold';font-size: 24px;">
+                    31℃
+                </div>
+                <div>晴朗</div>
+                <div style="color: rgba(154, 154, 154, 1);font-size: 14px;">
+                    紫外线强度：<span>高</span>
+                </div>
+                <div class="tianqi2">
+                    <div class="item">
+                        <div>
+                            <img src="/assets/demo/shidu.png" alt="">
+                        </div>
+                        <div class="text">相对湿度： <span>45%</span></div>
+                    </div>
+                    <div class="item">
+                        <div>
+                            <img src="/assets/demo/qiangdu.png" alt="">
+                        </div>
+                        <div class="text">光照强度： <span>45%</span></div>
+                    </div>
+                    <div class="item">
+                        <div>
+                            <img src="/assets/demo/fengshu.png" alt="">
+                        </div>
+                        <div class="text">风速： <span>2.3m/s</span></div>
+                    </div>
+                    <div class="item">
+                        <div>
+                            <img src="/assets/demo/riluo.png" alt="">
+                        </div>
+                        <div class="text">日落时间： <span>19.45</span></div>
+                    </div>
+                </div>
+            </div>
+            <div class="weather-timeline">
+                <div class="time-box">
+                    <div class="time-item">
+                        <div class="time">16:00</div>
+                        <div class="temp">30°C</div>
+                        <div class="img-box">
+                            <img src="/assets/demo/sunny_s.png" alt="">
+                        </div>
+                    </div>
+                    <div class="time-item">
+                        <div class="time">17:00</div>
+                        <div class="temp">29°C</div>
+                        <div class="img-box">
+                            <img src="/assets/demo/sunny_s.png" alt="">
+                        </div>
+                    </div>
+                    <div class="time-item">
+                        <div class="child">
+                            <div class="time">18:00</div>
+                            <div class="temp">25°C</div>
+                            <div class="img-box">
+                                <img src="/assets/demo/rain.png" alt="">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="time-item show">
+                        <div class="time">现在</div>
+                        <div class="temp">25°C</div>
+                        <div class="img-box">
+                            <img src="/assets/demo/rain_show.png" alt="">
+                        </div>
+                    </div>
+                    <div class="time-item">
+                        <div class="time">20:00</div>
+                        <div class="temp">25°C</div>
+                        <div class="img-box">
+                            <img src="/assets/demo/yin.png" alt="">
+                        </div>
+                    </div>
+                    <div class="time-item">
+                        <div class="time">21:00</div>
+                        <div class="temp">20°C</div>
+                        <div class="img-box">
+                            <img src="/assets/demo/yin.png" alt="">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </el-card>
+    </div>
+</template>
+<style scoped lang="scss">
+.cardItem {
+    padding: -20px !important;
+}
+
+.tianqi2 {
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    margin-top: 50px;
+
+    img {
+        width: 40px;
+        height: 40x;
+        display: block;
+    }
+
+    .item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        font-size: 14px;
+
+        .text {
+            margin-top: 10px;
+        }
+    }
+
+}
+
+.weather-timeline {
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+    margin: 15px 0;
+
+    .time {
+        margin: 10px 0;
+    }
+
+    .img-box {
+        width: 40px;
+        height: 40px;
+        margin: 10px 0;
+    }
+
+    img {
+        width: 100%;
+        height: 100%;
+        display: block;
+    }
+
+    // img[src*='Sunny'] {
+    //     width: 50px;
+    //     height: 50px;
+    // }
+
+    // img[src*='rain'] {
+    //     width: 60px;
+    //     height: 60px;
+    // }
+
+
+    padding: 15px;
+    background: linear-gradient(to right, #D6E2FF, #DEEBFF);
+    border-radius: 15px;
+
+    .time-box {
+        background: linear-gradient(to right, #447BFF, #67A3FD);
+        display: flex;
+        justify-content: space-between;
+        border-radius: 10px;
+        padding: 10px 20px;
+        align-items: center;
+    }
+
+    .time-item.show {
+        color: rgba(24, 109, 245, 1);
+        position: relative;
+        // z-index: 888;
+        background-color: #fff;
+        padding: 0 5px;
+
+    }
+
+    .show::after {
+        // color: rgba(24, 109, 245, 1);
+        // position: relative;
+        // z-index: 888;
+        // background-color: #fff;
+        content: '';
+        position: absolute;
+        width: 100%;
+        height: 25px;
+        // background-color: red;
+        background-color: #fff;
+        left: 0;
+        border-radius: 0 0 25px 25px;
+    }
+
+    .show::before {
+        // color: rgba(24, 109, 245, 1);
+        // position: relative;
+        // z-index: 888;
+        // background-color: #fff;
+        content: '';
+        position: absolute;
+        width: 100%;
+        height: 25px;
+        // background-color: red;
+        background-color: #fff;
+        left: 0;
+        top: -25px;
+        border-radius: 25px 25px 0 0;
+    }
+
+    // .show::after {
+    //     content: '';
+    //     position: absolute;
+    //     height: 155px;
+    //     background-color: #fff;
+    //     z-index: 999;
+    //     width: 100%;
+    //     top: -25px;
+    //     left: 0;
+    //     border-radius: 20px;
+    // }
+}
+</style>
+<script setup>
+</script>
diff --git a/src/views/demo/components/status.vue b/src/views/demo/components/status.vue
new file mode 100644
index 0000000..df25b2c
--- /dev/null
+++ b/src/views/demo/components/status.vue
@@ -0,0 +1,107 @@
+<template>
+    <el-card shadow="never" style="border-radius: 10px;">
+        <el-form :inline="true" :model="formInline" label-width="120" style="display: flex; justify-content: center;">
+            <el-form-item label="规则编号">
+                <el-input v-model="formInline.user" placeholder="请输入规则编号" clearable />
+            </el-form-item>
+            <el-form-item label="状态">
+                <el-select v-model="formInline.region" placeholder="请输入状态" clearable>
+                    <el-option label="Zone one" value="shanghai" />
+                    <el-option label="Zone two" value="beijing" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="更新时间">
+                <el-date-picker v-model="formInline.date" type="date" placeholder="请选择时间" clearable />
+            </el-form-item>
+            <el-form-item>
+                <el-button icon="search" type="primary" @click="onSubmit">搜索</el-button>
+            </el-form-item>
+            <el-form-item>
+                <el-button icon="refresh" type="default" @click="onSubmit">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="listData" @selection-change="handleSelectionChange">
+            <!-- <el-table-column type="index" width="50" label="序号" /> -->
+            <el-table-column label="逆变器编号" align="center" prop="id" />
+            <!-- <el-table-column label="合同类型" align="center" prop="contractType">
+                <template #default="scope">
+                    <dict-tag :options="income_contract_type" :value="scope.row.contractType" />
+                </template>
+</el-table-column> -->
+            <el-table-column label="输出功率" align="center" prop="shuchu" />
+            <el-table-column label="效率" align="center" prop="xiaolv" />
+            <el-table-column label="温度" align="center" prop="wendu" />
+            <el-table-column label="今日发电量" align="center" prop="fadian" />
+            <el-table-column label="状态" align="center" prop="status">
+                <template #default="scope">
+                    <!-- <el-button link type="primary">详情</el-button>
+                    <el-button link type="danger">处理</el-button>
+                    <el-button link type="warning">维护记录</el-button> -->
+                    <el-tag :type="statusMap[scope.row.status].type">{{ statusMap[scope.row.status].label }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+                <template #default="scope">
+                    <el-button link type="primary">详情</el-button>
+                    <el-button link type="danger">处理</el-button>
+                    <el-button link type="warning">维护记录</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" /> -->
+        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+            @pagination="getList" />
+    </el-card>
+</template>
+<script setup>
+const formInline = ref({})
+const total = ref(0);
+const loading = ref(false);
+const listData = [
+    { id: "INV-2023-001", shuchu: "12.8kw", xiaolv: "98.2%", wendu: "42℃", fadian: "158.5kWh", status: 1 },
+    { id: "INV-2023-001", shuchu: "12.8kw", xiaolv: "98.2%", wendu: "42℃", fadian: "158.5kWh", status: 1 },
+    { id: "INV-2023-001", shuchu: "12.8kw", xiaolv: "98.2%", wendu: "42℃", fadian: "158.5kWh", status: 2 },
+    { id: "INV-2023-001", shuchu: "12.8kw", xiaolv: "98.2%", wendu: "42℃", fadian: "158.5kWh", status: 2 },
+    { id: "INV-2023-001", shuchu: "12.8kw", xiaolv: "98.2%", wendu: "42℃", fadian: "158.5kWh", status: 3 },
+    { id: "INV-2023-001", shuchu: "12.8kw", xiaolv: "98.2%", wendu: "42℃", fadian: "158.5kWh", status: 3 }
+]
+const statusMap = {
+    1: {
+        label: "正常运行",
+        type: "success"
+    },
+    2: {
+        label: "异常",
+        type: "danger"
+    },
+    3: {
+        label: "维护中",
+        type: "warning"
+    }
+}
+const initFormData = {
+
+};
+const data = reactive({
+    form: { ...initFormData },
+    queryParams: {
+
+    },
+});
+const { queryParams, form, rules } = toRefs(data);
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection) => {
+    ids.value = selection.map((item) => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+};
+const getList = async () => {
+    //   loading.value = true;
+    //   const res = await listIncomeContract(queryParams.value);
+    //   incomeContractList.value = res.rows;
+    //   total.value = res.total;
+    //   loading.value = false;
+};
+</script>
\ No newline at end of file
diff --git a/src/views/demo/components/zhiban.vue b/src/views/demo/components/zhiban.vue
new file mode 100644
index 0000000..ca5df86
--- /dev/null
+++ b/src/views/demo/components/zhiban.vue
@@ -0,0 +1,148 @@
+<template>
+    <el-card shadow="never" style="border-radius: 10px;" class="card">
+        <div class="header">
+            <div style="display: flex;align-items: center;">
+                <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16"
+                    height="16" viewBox="0 0 16 16" fill="none">
+                    <path
+                        d="M8.00016 1.33325C11.6822 1.33325 14.6668 4.31792 14.6668 7.99992C14.6668 11.6819 11.6822 14.6666 8.00016 14.6666C4.31816 14.6666 1.3335 11.6819 1.3335 7.99992C1.3335 4.31792 4.31816 1.33325 8.00016 1.33325ZM8.00016 2.66659C7.91288 2.66659 7.82565 2.66873 7.73847 2.67301C7.65129 2.67729 7.56426 2.68371 7.47741 2.69226C7.39054 2.70082 7.30394 2.71151 7.2176 2.72431C7.13126 2.73712 7.04527 2.75204 6.95968 2.76906C6.87407 2.78609 6.78893 2.80521 6.70427 2.82642C6.6196 2.84763 6.53551 2.8709 6.45198 2.89623C6.36844 2.92158 6.2856 2.94895 6.20341 2.97836C6.12123 3.00777 6.03982 3.03916 5.95918 3.07256C5.87854 3.10597 5.79877 3.14133 5.71987 3.17864C5.64096 3.21595 5.56302 3.25519 5.48605 3.29634C5.40907 3.33748 5.33315 3.3805 5.25829 3.42537C5.18341 3.47023 5.10968 3.51692 5.03712 3.56542C4.96454 3.61391 4.8932 3.66414 4.8231 3.71614C4.75299 3.76814 4.6842 3.82183 4.61673 3.8772C4.54926 3.93258 4.48318 3.98956 4.41852 4.04819C4.35384 4.1068 4.29065 4.16697 4.22893 4.22869C4.16721 4.29041 4.10704 4.35359 4.04843 4.41828C3.98981 4.48294 3.93282 4.54901 3.87745 4.61648C3.82207 4.68395 3.76838 4.75275 3.71638 4.82286C3.66438 4.89295 3.61415 4.9643 3.56567 5.03687C3.51717 5.10944 3.47048 5.18317 3.42562 5.25805C3.38074 5.3329 3.33773 5.40883 3.29659 5.48581C3.25543 5.56278 3.2162 5.64072 3.17888 5.71962C3.14157 5.79853 3.10621 5.87829 3.07281 5.95893C3.0394 6.03958 3.00801 6.12098 2.9786 6.20317C2.9492 6.28536 2.92182 6.3682 2.89648 6.45173C2.87114 6.53526 2.84787 6.61936 2.82666 6.70403C2.80545 6.78868 2.78633 6.87382 2.7693 6.95943C2.75228 7.04503 2.73737 7.13101 2.72455 7.21736C2.71175 7.3037 2.70107 7.39029 2.69251 7.47717C2.68395 7.56401 2.67754 7.65104 2.67326 7.73823C2.66897 7.8254 2.66683 7.91264 2.66683 7.99992C2.66683 8.0872 2.66897 8.17442 2.67326 8.2616C2.67754 8.34879 2.68395 8.43581 2.69251 8.52268C2.70107 8.60953 2.71175 8.69613 2.72455 8.78248C2.73737 8.86882 2.75228 8.95479 2.7693 9.0404C2.78633 9.12599 2.80545 9.21113 2.82666 9.29581C2.84787 9.38046 2.87114 9.46457 2.89648 9.5481C2.92182 9.63162 2.9492 9.71448 2.9786 9.79667C3.00801 9.87884 3.0394 9.96024 3.07281 10.0409C3.10621 10.1215 3.14157 10.2013 3.17888 10.2802C3.2162 10.3591 3.25543 10.4371 3.29659 10.514C3.33773 10.591 3.38074 10.6669 3.42562 10.7418C3.47048 10.8166 3.51717 10.8904 3.56567 10.963C3.61415 11.0355 3.66438 11.1069 3.71638 11.177C3.76838 11.2471 3.82207 11.3159 3.87745 11.3834C3.93282 11.4508 3.98981 11.5169 4.04843 11.5816C4.10704 11.6462 4.16721 11.7094 4.22893 11.7711C4.29065 11.8329 4.35384 11.893 4.41852 11.9516C4.48318 12.0103 4.54926 12.0673 4.61673 12.1226C4.6842 12.178 4.75299 12.2317 4.8231 12.2837C4.8932 12.3357 4.96454 12.3859 5.03712 12.4344C5.10968 12.4829 5.18341 12.5296 5.25829 12.5745C5.33315 12.6193 5.40907 12.6623 5.48605 12.7035C5.56302 12.7446 5.64096 12.7839 5.71987 12.8212C5.79877 12.8585 5.87854 12.8939 5.95918 12.9273C6.03982 12.9607 6.12123 12.9921 6.20341 13.0215C6.2856 13.0509 6.36844 13.0783 6.45198 13.1036C6.53551 13.1289 6.6196 13.1522 6.70427 13.1734C6.78893 13.1946 6.87407 13.2137 6.95968 13.2308C7.04527 13.2478 7.13126 13.2627 7.2176 13.2755C7.30394 13.2883 7.39054 13.299 7.47741 13.3076C7.56426 13.3161 7.65129 13.3225 7.73847 13.3268C7.82565 13.3311 7.91288 13.3332 8.00016 13.3332C8.08744 13.3332 8.17466 13.3311 8.26185 13.3268C8.34904 13.3225 8.43605 13.3161 8.52293 13.3076C8.60977 13.299 8.69638 13.2883 8.78272 13.2755C8.86907 13.2627 8.95504 13.2478 9.04064 13.2308C9.12624 13.2137 9.21138 13.1946 9.29605 13.1734C9.38071 13.1522 9.46482 13.1289 9.54835 13.1036C9.63186 13.0783 9.71472 13.0509 9.79691 13.0215C9.87908 12.9921 9.96049 12.9607 10.0411 12.9273C10.1218 12.8939 10.2015 12.8585 10.2805 12.8212C10.3594 12.7839 10.4373 12.7446 10.5143 12.7035C10.5912 12.6623 10.6672 12.6193 10.742 12.5745C10.8169 12.5296 10.8906 12.4829 10.9632 12.4344C11.0358 12.3859 11.1071 12.3357 11.1772 12.2837C11.2473 12.2317 11.3161 12.178 11.3836 12.1226C11.4511 12.0673 11.5171 12.0103 11.5818 11.9516C11.6465 11.893 11.7097 11.8329 11.7714 11.7711C11.8331 11.7094 11.8933 11.6462 11.9519 11.5816C12.0105 11.5169 12.0675 11.4508 12.1229 11.3834C12.1783 11.3159 12.2319 11.2471 12.2839 11.177C12.3359 11.1069 12.3862 11.0355 12.4347 10.963C12.4832 10.8904 12.5298 10.8166 12.5747 10.7418C12.6196 10.6669 12.6626 10.591 12.7037 10.514C12.7449 10.4371 12.7841 10.3591 12.8214 10.2802C12.8588 10.2013 12.8941 10.1215 12.9275 10.0409C12.9609 9.96024 12.9923 9.87884 13.0217 9.79667C13.0511 9.71448 13.0785 9.63162 13.1038 9.5481C13.1292 9.46457 13.1524 9.38046 13.1737 9.29581C13.1949 9.21113 13.214 9.12599 13.231 9.0404C13.248 8.95479 13.263 8.86882 13.2758 8.78248C13.2886 8.69613 13.2992 8.60953 13.3078 8.52268C13.3164 8.43581 13.3228 8.34879 13.3271 8.2616C13.3313 8.17442 13.3335 8.0872 13.3335 7.99992C13.3335 7.91264 13.3313 7.8254 13.3271 7.73823C13.3228 7.65104 13.3164 7.56401 13.3078 7.47717C13.2992 7.39029 13.2886 7.3037 13.2758 7.21736C13.263 7.13101 13.248 7.04503 13.231 6.95943C13.214 6.87382 13.1949 6.78868 13.1737 6.70403C13.1524 6.61936 13.1292 6.53526 13.1038 6.45173C13.0785 6.3682 13.0511 6.28536 13.0217 6.20317C12.9923 6.12098 12.9609 6.03958 12.9275 5.95893C12.8941 5.87829 12.8588 5.79853 12.8214 5.71962C12.7841 5.64072 12.7449 5.56278 12.7037 5.48581C12.6626 5.40883 12.6196 5.3329 12.5747 5.25805C12.5298 5.18317 12.4832 5.10944 12.4347 5.03687C12.3862 4.9643 12.3359 4.89295 12.2839 4.82286C12.2319 4.75275 12.1783 4.68395 12.1229 4.61648C12.0675 4.54901 12.0105 4.48294 11.9519 4.41828C11.8933 4.35359 11.8331 4.29041 11.7714 4.22869C11.7097 4.16697 11.6465 4.1068 11.5818 4.04819C11.5171 3.98956 11.4511 3.93258 11.3836 3.8772C11.3161 3.82183 11.2473 3.76814 11.1772 3.71616C11.1071 3.66416 11.0358 3.61391 10.9632 3.56542C10.8906 3.51692 10.8169 3.47023 10.742 3.42537C10.6672 3.3805 10.5912 3.33748 10.5143 3.29634C10.4373 3.25519 10.3594 3.21595 10.2805 3.17864C10.2015 3.14133 10.1218 3.10597 10.0411 3.07256C9.96049 3.03916 9.87908 3.00777 9.79691 2.97836C9.71472 2.94895 9.63186 2.92158 9.54835 2.89623C9.46482 2.8709 9.38071 2.84763 9.29605 2.82642C9.21138 2.80521 9.12624 2.78609 9.04064 2.76906C8.95504 2.75204 8.86907 2.73712 8.78272 2.72431C8.69638 2.71151 8.60977 2.70082 8.52293 2.69226C8.43605 2.68371 8.34904 2.67729 8.26185 2.67301C8.17466 2.66873 8.08744 2.66659 8.00016 2.66659ZM7.33349 4.32525C7.34358 4.32525 7.35368 4.32548 7.36377 4.32595C7.37385 4.32641 7.38391 4.32709 7.39397 4.32801C7.40402 4.32892 7.41405 4.33008 7.42405 4.33145C7.43405 4.33281 7.44401 4.3344 7.45394 4.33625C7.46386 4.33806 7.47376 4.34011 7.4836 4.34239C7.49343 4.34466 7.50321 4.34716 7.51293 4.34987C7.52265 4.35259 7.5323 4.35553 7.5419 4.35869C7.55147 4.36184 7.56099 4.36522 7.57043 4.36881C7.57986 4.37241 7.58921 4.3762 7.59847 4.38022C7.60772 4.38422 7.6169 4.38844 7.62597 4.39287C7.63504 4.39731 7.64401 4.40194 7.65286 4.40678C7.66172 4.41162 7.67047 4.41666 7.67911 4.42189C7.68774 4.42712 7.69624 4.43255 7.70463 4.43817C7.71301 4.4438 7.72127 4.44959 7.7294 4.45559C7.73751 4.46159 7.74549 4.46776 7.75333 4.47414C7.76118 4.48048 7.76886 4.48701 7.77641 4.49373C7.78394 4.50044 7.79133 4.50731 7.79857 4.51436C7.8058 4.52139 7.81286 4.52859 7.81977 4.53597C7.82668 4.54333 7.83341 4.55084 7.83997 4.55853C7.84654 4.56619 7.85291 4.574 7.85913 4.58197C7.86533 4.58992 7.87136 4.59801 7.87721 4.60626C7.88304 4.61448 7.88868 4.62286 7.89415 4.63136C7.89961 4.63984 7.90488 4.64845 7.90994 4.65719C7.91501 4.6659 7.91988 4.67475 7.92455 4.6837C7.92921 4.69264 7.93368 4.7017 7.93793 4.71086C7.94218 4.72001 7.94622 4.72925 7.95007 4.73859C7.9539 4.74794 7.95752 4.75736 7.96094 4.76686C7.96435 4.77636 7.96754 4.78592 7.97051 4.79558C7.97347 4.80522 7.97624 4.81494 7.97877 4.82472C7.9813 4.83448 7.9836 4.84431 7.98569 4.85419C7.98777 4.86406 7.98963 4.87397 7.99127 4.88394C7.9929 4.8939 7.9943 4.90389 7.99549 4.91392L8.00016 4.99192L8.00016 7.99992L11.0202 7.99992C11.0303 7.99992 11.0403 8.00014 11.0504 8.0006C11.0605 8.00106 11.0706 8.00175 11.0806 8.00268C11.0907 8.00359 11.1007 8.00473 11.1107 8.0061C11.1207 8.00748 11.1307 8.00907 11.1406 8.0109C11.1505 8.01273 11.1604 8.01478 11.1703 8.01706C11.1801 8.01932 11.1899 8.02182 11.1996 8.02454C11.2093 8.02726 11.219 8.0302 11.2285 8.03335C11.2381 8.03651 11.2477 8.03989 11.2571 8.04348C11.2665 8.04706 11.2759 8.05085 11.2851 8.05489C11.2944 8.05889 11.3036 8.0631 11.3126 8.06754C11.3217 8.07196 11.3307 8.0766 11.3395 8.08145C11.3484 8.08628 11.3571 8.09131 11.3658 8.09656C11.3744 8.10178 11.3829 8.10721 11.3913 8.11284C11.3997 8.11846 11.4079 8.12426 11.416 8.13026C11.4242 8.13626 11.4322 8.14243 11.44 8.14879C11.4478 8.15515 11.4555 8.16168 11.4631 8.1684C11.4706 8.1751 11.478 8.18198 11.4852 8.18903C11.4925 8.19606 11.4995 8.20326 11.5064 8.21064C11.5133 8.21799 11.5201 8.22551 11.5266 8.23318C11.5332 8.24085 11.5396 8.24867 11.5458 8.25664C11.552 8.26459 11.558 8.27268 11.5639 8.28093C11.5697 8.28915 11.5753 8.29751 11.5808 8.30601C11.5863 8.3145 11.5915 8.3231 11.5966 8.33184C11.6017 8.34056 11.6065 8.3494 11.6112 8.35837C11.6159 8.36731 11.6203 8.37637 11.6246 8.38553C11.6288 8.39468 11.6329 8.40392 11.6367 8.41326C11.6406 8.42259 11.6442 8.43201 11.6476 8.44153C11.651 8.45103 11.6542 8.46059 11.6572 8.47025C11.6601 8.47989 11.6629 8.48959 11.6654 8.49937C11.668 8.50914 11.6703 8.51896 11.6724 8.52885C11.6744 8.53873 11.6763 8.54864 11.6779 8.5586C11.6796 8.56856 11.681 8.57856 11.6822 8.58859L11.6862 8.66659C11.6862 8.67668 11.6859 8.68676 11.6855 8.69685C11.685 8.70693 11.6843 8.717 11.6834 8.72706C11.6825 8.7371 11.6813 8.74714 11.68 8.75714C11.6786 8.76714 11.677 8.77709 11.6752 8.78703C11.6733 8.79695 11.6713 8.80684 11.669 8.81668C11.6667 8.82651 11.6643 8.83629 11.6615 8.84601C11.6588 8.85573 11.6559 8.86539 11.6527 8.87498C11.6496 8.88456 11.6462 8.89407 11.6426 8.90351C11.639 8.91295 11.6352 8.92229 11.6312 8.93156C11.6272 8.94081 11.623 8.94998 11.6185 8.95906C11.6141 8.96812 11.6095 8.97709 11.6046 8.98596C11.5998 8.99481 11.5948 9.00356 11.5895 9.0122C11.5843 9.02082 11.5789 9.02932 11.5732 9.03771C11.5676 9.04609 11.5618 9.05435 11.5558 9.06248C11.5498 9.0706 11.5436 9.07857 11.5373 9.08642C11.5309 9.09426 11.5244 9.10195 11.5177 9.10949C11.511 9.11703 11.5041 9.12442 11.497 9.13167C11.49 9.13888 11.4828 9.14596 11.4754 9.15287C11.4681 9.15976 11.4605 9.16649 11.4529 9.17306C11.4452 9.17962 11.4374 9.18599 11.4294 9.19221C11.4215 9.19842 11.4134 9.20445 11.4051 9.21029C11.3969 9.21612 11.3885 9.22178 11.3801 9.22724C11.3716 9.2327 11.363 9.23796 11.3542 9.24302C11.3455 9.24809 11.3367 9.25296 11.3277 9.25764C11.3188 9.26229 11.3097 9.26676 11.3005 9.27102C11.2914 9.27528 11.2821 9.27931 11.2728 9.28315C11.2635 9.28699 11.254 9.29062 11.2445 9.29403C11.235 9.29743 11.2255 9.30062 11.2158 9.30359C11.2062 9.30656 11.1965 9.30932 11.1867 9.31185C11.1769 9.31438 11.1671 9.31668 11.1572 9.31878C11.1473 9.32085 11.1374 9.32271 11.1275 9.32435C11.1175 9.32598 11.1075 9.3274 11.0975 9.32859L11.0202 9.33324L7.33349 9.33324C7.3234 9.33324 7.3133 9.33301 7.30322 9.33256C7.29313 9.33209 7.28307 9.3314 7.27302 9.33049C7.26296 9.32957 7.25294 9.32843 7.24294 9.32706C7.23294 9.32568 7.22297 9.32407 7.21305 9.32226C7.20312 9.32043 7.19324 9.31838 7.1834 9.31612C7.17355 9.31384 7.16379 9.31134 7.15407 9.30862C7.14435 9.3059 7.13469 9.30296 7.1251 9.29981C7.11551 9.29665 7.10601 9.29328 7.09657 9.2897C7.08713 9.2861 7.07777 9.28229 7.06852 9.27829C7.05926 9.27427 7.05008 9.27006 7.04102 9.26562C7.03194 9.26118 7.02297 9.25656 7.01412 9.25173C7.00526 9.24689 6.99651 9.24184 6.98788 9.23662C6.97926 9.23137 6.97074 9.22595 6.96237 9.22034C6.95397 9.21471 6.94572 9.2089 6.9376 9.2029C6.92947 9.1969 6.92149 9.19073 6.91366 9.18437C6.90582 9.17801 6.89812 9.17148 6.89058 9.16478C6.88304 9.15806 6.87565 9.15118 6.86841 9.14415C6.86118 9.13709 6.85412 9.12988 6.84721 9.12253C6.8403 9.11517 6.83358 9.10765 6.82702 9.09998C6.82046 9.09231 6.81407 9.08449 6.80787 9.07654C6.80165 9.06857 6.79563 9.06046 6.78979 9.05224C6.78394 9.04399 6.7783 9.03563 6.77283 9.02715C6.76737 9.01865 6.76212 9.01004 6.75705 9.00132C6.75198 8.99259 6.7471 8.98374 6.74244 8.97481C6.73777 8.96584 6.7333 8.95679 6.72905 8.94765C6.7248 8.93849 6.72076 8.92924 6.71693 8.9199C6.71308 8.91056 6.70946 8.90115 6.70605 8.89165C6.70265 8.88215 6.69946 8.87257 6.69649 8.86292C6.69351 8.85326 6.69076 8.84356 6.68823 8.83379C6.68569 8.82401 6.68338 8.8142 6.6813 8.80432C6.67921 8.79445 6.67735 8.78453 6.67572 8.77456C6.67408 8.76459 6.67268 8.7546 6.67149 8.74459L6.66683 8.66659L6.66683 4.99192C6.66683 4.98101 6.6671 4.97011 6.66763 4.9592C6.66816 4.9483 6.66896 4.93742 6.67004 4.92658C6.6711 4.91572 6.67244 4.90489 6.67404 4.89411C6.67563 4.8833 6.67751 4.87255 6.67963 4.86186C6.68176 4.85115 6.68415 4.84051 6.6868 4.82994C6.68946 4.81934 6.69237 4.80884 6.69554 4.7984C6.69869 4.78795 6.70212 4.77759 6.7058 4.76733C6.70948 4.75705 6.7134 4.74687 6.71757 4.7368C6.72174 4.72672 6.72616 4.71675 6.73083 4.70689C6.73549 4.69701 6.7404 4.68728 6.74555 4.67765C6.75068 4.66803 6.75605 4.65853 6.76168 4.64919C6.76727 4.63983 6.77312 4.63061 6.77918 4.62155C6.78524 4.61247 6.79152 4.60355 6.79802 4.59478C6.80452 4.58601 6.81122 4.57742 6.81816 4.569C6.82507 4.56056 6.83219 4.5523 6.83952 4.54422C6.84685 4.53612 6.85437 4.52823 6.86208 4.52051C6.8698 4.5128 6.87769 4.50526 6.88579 4.49795C6.89387 4.49062 6.90213 4.4835 6.91057 4.47658C6.91901 4.46966 6.9276 4.46295 6.93637 4.45645C6.94512 4.44995 6.95404 4.44367 6.96312 4.43761C6.97218 4.43155 6.9814 4.4257 6.99076 4.42011C7.00012 4.41448 7.0096 4.40911 7.01922 4.40397C7.02885 4.39883 7.03858 4.39392 7.04846 4.38926C7.05832 4.38459 7.06829 4.38017 7.07837 4.376C7.08844 4.37181 7.09862 4.36789 7.1089 4.36422C7.11916 4.36055 7.12952 4.35712 7.13997 4.35397C7.15041 4.35078 7.16091 4.34787 7.17151 4.34523C7.18208 4.34258 7.19272 4.34019 7.20343 4.33806C7.21413 4.33594 7.22488 4.33406 7.23568 4.33247C7.24646 4.33086 7.25729 4.32953 7.26815 4.32847C7.27901 4.32739 7.28988 4.32659 7.30079 4.32606C7.31168 4.32551 7.32258 4.32525 7.33349 4.32525Z"
+                        fill="#718096">
+                    </path>
+                </svg>
+                <span style="margin-left: 5px;">
+                    {{ currentTime }}
+                </span>
+            </div>
+            <div>
+                <span style="margin-right: 5px;">查看完整值班信息</span>
+                <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="8"
+                    viewBox="0 0 8 8" fill="none">
+                    <path
+                        d="M5.94575 4.15722C5.94975 4.14947 5.95624 4.14298 5.95975 4.13497C6.0285 3.99197 6.00599 3.81697 5.88425 3.70197L3.1245 1.09172C2.97399 0.949466 2.73676 0.956216 2.59425 1.10648C2.45199 1.25698 2.4585 1.49422 2.60901 1.63673L5.08526 3.97922L2.61875 6.35647C2.46975 6.50021 2.46525 6.73746 2.60901 6.88672C2.6825 6.96321 2.78076 7.00148 2.87901 7.00148C2.97276 7.00148 3.06651 6.96648 3.13926 6.89648L5.87401 4.26073C5.87927 4.25547 5.88125 4.24823 5.88651 4.24274C5.89052 4.23899 5.89476 4.23623 5.89875 4.23224C5.92 4.20997 5.93124 4.18272 5.94575 4.15722Z"
+                        fill="#718096">
+                    </path>
+                </svg>
+            </div>
+        </div>
+        <div class="content" v-for="value in 5" style="overflow: auto;">
+            <div class="img">
+                <img src="/assets/demo/avatar.png" alt="">
+            </div>
+            <div class="info">
+                <div>榛子(主管)</div>
+                <div class="msg">
+                    <span style="margin-right: 10px;">早班：08:00-16:00</span>
+                    <span>
+                        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10"
+                            height="10" viewBox="0 0 10 10" fill="none">
+                            <g clip-path="url(#clip-path-1_1414)">
+                                <path
+                                    d="M9.22081 3.92429L7.62082 3.92429C7.60385 3.92414 7.58689 3.92357 7.56996 3.92259C7.55303 3.9216 7.53611 3.9202 7.51925 3.91839C7.50237 3.91658 7.48556 3.91436 7.46881 3.91171C7.45204 3.90907 7.43535 3.90602 7.41875 3.90257C7.40213 3.89911 7.38561 3.89525 7.3692 3.89099C7.35277 3.88672 7.33647 3.88205 7.32027 3.87698C7.30408 3.87191 7.28802 3.86644 7.2721 3.8606C7.25617 3.85474 7.2404 3.8485 7.22478 3.84186C7.20917 3.83523 7.19372 3.82822 7.17845 3.82084C7.16316 3.81345 7.14809 3.80569 7.1332 3.79756C7.1183 3.78943 7.10362 3.78095 7.08915 3.77209C7.07467 3.76324 7.06042 3.75404 7.0464 3.7445C7.03236 3.73495 7.01858 3.72506 7.00505 3.71483C6.9915 3.70461 6.97822 3.69406 6.9652 3.68318C6.95218 3.6723 6.93943 3.66111 6.92695 3.64962C6.91448 3.63811 6.9023 3.62631 6.89041 3.61421C6.87851 3.60211 6.86692 3.58973 6.85564 3.57706C6.84435 3.56439 6.83338 3.55145 6.82273 3.53824C6.81208 3.52503 6.80176 3.51157 6.79178 3.49786C6.78178 3.48415 6.77213 3.4702 6.76282 3.45601C6.75352 3.44182 6.74457 3.42741 6.73597 3.41278C6.72737 3.39816 6.71913 3.38333 6.71127 3.3683C6.70339 3.35327 6.6959 3.33806 6.68878 3.32266C6.68165 3.30726 6.67491 3.2917 6.66854 3.27597C6.66219 3.26023 6.65622 3.24436 6.65064 3.22833C6.64506 3.2123 6.63987 3.19616 6.63508 3.17988C6.6303 3.1636 6.62592 3.14723 6.62193 3.13073C6.61794 3.11424 6.61436 3.09766 6.6112 3.08099C6.60803 3.06432 6.60526 3.04759 6.60291 3.03078C6.60057 3.01397 6.59863 2.99713 6.59711 2.98022C6.59559 2.96333 6.59447 2.94641 6.59378 2.92945C6.59309 2.9125 6.59282 2.89554 6.59297 2.87857C6.59299 2.8745 6.59291 2.87042 6.59273 2.86635C6.59256 2.86228 6.59227 2.8582 6.59191 2.85415C6.59153 2.85009 6.59105 2.84604 6.59049 2.842C6.58991 2.83797 6.58924 2.83395 6.58847 2.82994C6.5877 2.82594 6.58684 2.82195 6.58587 2.818C6.58491 2.81404 6.58385 2.81011 6.58269 2.80619C6.58153 2.80228 6.58027 2.79841 6.57893 2.79456C6.57759 2.79071 6.57615 2.78689 6.57462 2.78311C6.57309 2.77934 6.57146 2.77561 6.56975 2.7719C6.56803 2.7682 6.56623 2.76455 6.56434 2.76095C6.56243 2.75733 6.56045 2.75377 6.55838 2.75026C6.55632 2.74675 6.55416 2.74329 6.55192 2.73988C6.54968 2.73647 6.54736 2.73311 6.54495 2.72982C6.54256 2.72653 6.54008 2.7233 6.53752 2.72013C6.53496 2.71695 6.53231 2.71385 6.52961 2.7108C6.52689 2.70776 6.52411 2.70478 6.52125 2.70187C6.5184 2.69897 6.51547 2.69613 6.51248 2.69337C6.50947 2.69061 6.50642 2.68791 6.50329 2.6853C6.50016 2.68269 6.49696 2.68015 6.49371 2.6777C6.49046 2.67523 6.48715 2.67285 6.48379 2.67056C6.48042 2.66826 6.47699 2.66605 6.47352 2.66393C6.47003 2.6618 6.46651 2.65976 6.46294 2.65779C6.45936 2.65584 6.45574 2.65397 6.45207 2.65219C6.4484 2.65041 6.4447 2.64872 6.44094 2.64713C6.4372 2.64553 6.43341 2.64402 6.42957 2.64261C6.42575 2.64119 6.4219 2.63987 6.41802 2.63865C6.41412 2.63743 6.4102 2.6363 6.40625 2.63527C6.40231 2.63424 6.39835 2.6333 6.39436 2.63247C6.39037 2.63163 6.38637 2.63089 6.38234 2.63024C6.37831 2.62961 6.37427 2.62906 6.37021 2.62861C6.36616 2.62817 6.3621 2.62782 6.35803 2.62758C6.35396 2.62733 6.34989 2.62719 6.34582 2.62714L3.65152 2.62714C3.64746 2.6272 3.64339 2.62735 3.63933 2.62762C3.63527 2.62787 3.63122 2.62822 3.62717 2.62868C3.62312 2.62914 3.6191 2.62969 3.61508 2.63034C3.61106 2.631 3.60707 2.63174 3.60309 2.63259C3.59911 2.63344 3.59516 2.63437 3.59121 2.63542C3.58728 2.63645 3.58338 2.63759 3.57949 2.63882C3.57561 2.64005 3.57177 2.64138 3.56795 2.64279C3.56414 2.64421 3.56037 2.64572 3.55662 2.64732C3.55289 2.64894 3.54919 2.65062 3.54553 2.65241C3.54187 2.65419 3.53826 2.65605 3.53469 2.65802C3.53112 2.65998 3.52761 2.66203 3.52414 2.66416C3.52067 2.66629 3.51727 2.66851 3.51391 2.6708C3.51055 2.6731 3.50725 2.67548 3.504 2.67794C3.50076 2.6804 3.49759 2.68294 3.49446 2.68556C3.49135 2.68816 3.48829 2.69086 3.4853 2.69362C3.48231 2.69639 3.4794 2.69922 3.47655 2.70213C3.4737 2.70503 3.47093 2.70801 3.46822 2.71104C3.46553 2.71408 3.4629 2.71719 3.46034 2.72036C3.45779 2.72353 3.45532 2.72677 3.45292 2.73006C3.45054 2.73335 3.44822 2.73669 3.44599 2.7401C3.44376 2.74351 3.44161 2.74696 3.43955 2.75047C3.43749 2.75397 3.43552 2.75753 3.43362 2.76113C3.43174 2.76474 3.42994 2.76839 3.42823 2.77208C3.42652 2.77578 3.4249 2.77951 3.42337 2.78328C3.42185 2.78705 3.42042 2.79086 3.41907 2.7947C3.41773 2.79854 3.41648 2.80242 3.41533 2.80632C3.41418 2.81022 3.41312 2.81415 3.41216 2.81811C3.4112 2.82206 3.41033 2.82603 3.40957 2.83003C3.40881 2.83402 3.40813 2.83804 3.40756 2.84207C3.40699 2.8461 3.40652 2.85014 3.40614 2.85419C3.40577 2.85824 3.4055 2.8623 3.40532 2.86637C3.40515 2.87044 3.40508 2.8745 3.4051 2.87857C3.40524 2.89552 3.40497 2.91245 3.40428 2.92938C3.40359 2.94631 3.40249 2.96321 3.40097 2.9801C3.39945 2.99697 3.39752 3.0138 3.39518 3.03059C3.39283 3.04736 3.39008 3.06408 3.38691 3.08073C3.38376 3.09737 3.38019 3.11394 3.37621 3.13041C3.37225 3.14688 3.36787 3.16324 3.3631 3.1795C3.35832 3.19576 3.35314 3.21189 3.34758 3.2279C3.34201 3.24391 3.33606 3.25976 3.32972 3.27547C3.32337 3.29118 3.31665 3.30674 3.30954 3.32212C3.30244 3.3375 3.29496 3.3527 3.28711 3.36771C3.27926 3.38273 3.27104 3.39755 3.26246 3.41216C3.25389 3.42678 3.24496 3.44117 3.23567 3.45534C3.2264 3.46952 3.21678 3.48347 3.20681 3.49717C3.19685 3.51087 3.18654 3.52433 3.17592 3.53753C3.16529 3.55072 3.15436 3.56365 3.1431 3.57632C3.13184 3.58898 3.12027 3.60136 3.10841 3.61346C3.09654 3.62556 3.08438 3.63736 3.07194 3.64886C3.0595 3.66036 3.04679 3.67155 3.03379 3.68243C3.0208 3.6933 3.00755 3.70386 2.99403 3.71408C2.98053 3.72431 2.96678 3.7342 2.95278 3.74376C2.93879 3.75332 2.92457 3.76252 2.91012 3.77138C2.89567 3.78023 2.88103 3.78874 2.86616 3.79687C2.8513 3.80501 2.83625 3.81278 2.821 3.82019C2.80576 3.82759 2.79034 3.83461 2.77476 3.84125C2.75917 3.8479 2.74343 3.85416 2.72753 3.86003C2.71164 3.86591 2.69562 3.87139 2.67944 3.87647C2.66329 3.88156 2.64701 3.88626 2.63061 3.89055C2.61423 3.89483 2.59773 3.89872 2.58115 3.90221C2.56457 3.90569 2.54791 3.90876 2.53117 3.91143C2.51444 3.91409 2.49766 3.91635 2.48081 3.91819C2.46396 3.92004 2.44708 3.92146 2.43018 3.92248C2.41325 3.9235 2.39633 3.9241 2.37938 3.92429L0.779388 3.92429C0.766514 3.92418 0.75365 3.92376 0.740797 3.92303C0.727944 3.92228 0.715117 3.92123 0.702315 3.91986C0.689514 3.9185 0.676753 3.91682 0.664034 3.91482C0.651315 3.91282 0.638653 3.91052 0.626048 3.9079C0.613442 3.90528 0.600909 3.90236 0.588447 3.89913C0.575985 3.8959 0.56361 3.89235 0.551322 3.88852C0.539034 3.88468 0.526849 3.88054 0.514765 3.87609C0.50268 3.87165 0.490712 3.86691 0.47886 3.86188C0.467009 3.85686 0.455288 3.85154 0.443698 3.84594C0.432107 3.84033 0.420662 3.83444 0.409361 3.82828C0.398061 3.82211 0.386918 3.81566 0.375935 3.80895C0.36495 3.80224 0.354138 3.79525 0.343496 3.78801C0.332855 3.78076 0.322399 3.77326 0.312127 3.7655C0.301854 3.75773 0.291779 3.74973 0.281901 3.74147C0.272023 3.73321 0.262353 3.72472 0.252893 3.71599C0.243432 3.70726 0.23419 3.6983 0.22517 3.68911C0.216149 3.67992 0.20736 3.67053 0.198802 3.66091C0.190243 3.65129 0.181927 3.64146 0.173852 3.63144C0.165776 3.62141 0.157951 3.61119 0.150378 3.60078C0.142805 3.59037 0.135492 3.57978 0.128439 3.56901C0.121387 3.55824 0.114603 3.5473 0.108088 3.5362C0.101573 3.5251 0.0953354 3.51384 0.0893736 3.50242C0.0834122 3.49102 0.0777346 3.47946 0.0723408 3.46777C0.0669472 3.45608 0.0618438 3.44427 0.0570309 3.43232C0.0522181 3.42038 0.0477014 3.40833 0.0434809 3.39617C0.0392604 3.38401 0.0353413 3.37175 0.0317234 3.35939C0.0281056 3.34704 0.0247934 3.3346 0.0217869 3.32208C0.0187805 3.30956 0.0160833 3.29697 0.0136954 3.28433C0.0113075 3.27168 0.00923186 3.25897 0.00746841 3.24622C0.00570494 3.23347 0.00425579 3.22067 0.00312097 3.20785C0.00198614 3.19503 0.00116701 3.18219 0.00066358 3.16933C0.000160145 3.15646 -2.69884e-05 3.14359 0.000102181 3.13071C-0.000309271 3.07998 0.000521877 3.02928 0.00259562 2.97858C0.00466937 2.92789 0.00798324 2.87728 0.0125372 2.82675C0.0170912 2.77622 0.0228798 2.72583 0.029903 2.67559C0.0369264 2.62534 0.0451759 2.5753 0.0546516 2.52546C0.0641273 2.47562 0.0748179 2.42604 0.0867232 2.37672C0.0986279 2.3274 0.111734 2.27841 0.126041 2.22974C0.140348 2.18106 0.155838 2.13277 0.172511 2.08485C0.189184 2.03693 0.20702 1.98945 0.226021 1.94241C0.245021 1.89537 0.265162 1.84883 0.286443 1.80277C0.307725 1.75672 0.330121 1.71121 0.353632 1.66625C0.377143 1.6213 0.401741 1.57694 0.427426 1.53319C0.45311 1.48944 0.479852 1.44635 0.507648 1.40391C0.535446 1.36146 0.564266 1.31973 0.594107 1.2787C0.62395 1.23768 0.654779 1.1974 0.686595 1.15788C0.71841 1.11836 0.751175 1.07965 0.784889 1.04174C0.818601 1.00383 0.853223 0.966764 0.888752 0.930545C0.924282 0.89433 0.960676 0.859007 0.99793 0.824574C1.0352 0.790142 1.07328 0.756644 1.11218 0.724079C1.15108 0.691514 1.19076 0.65992 1.23121 0.629299C1.27166 0.598678 1.31284 0.569065 1.35474 0.540463C1.39664 0.51186 1.43922 0.4843 1.48246 0.457783C1.52572 0.431267 1.5696 0.405825 1.61409 0.381459C1.65859 0.357093 1.70366 0.33383 1.7493 0.311673C1.79494 0.289516 1.8411 0.268488 1.88776 0.248593C1.93443 0.228697 1.98156 0.209956 2.02915 0.192369C2.07674 0.174783 2.12473 0.158373 2.17312 0.143139C2.22151 0.127904 2.27025 0.113864 2.31933 0.101019C2.36841 0.0881723 2.41777 0.0765357 2.46742 0.0661091C2.51708 0.0556824 2.56695 0.0464778 2.61705 0.0384954C2.66716 0.0305129 2.71742 0.0237622 2.76785 0.0182432C2.81829 0.0127241 2.86883 0.00844347 2.91946 0.0054011C2.97011 0.00235875 3.0208 0.00055838 3.07152 0L6.92868 0C6.9794 0.000558401 7.0301 0.00235879 7.08074 0.00540116C7.13138 0.00844355 7.18191 0.0127242 7.23235 0.0182433C7.28278 0.0237623 7.33305 0.0305131 7.38314 0.0384955C7.43324 0.046478 7.48312 0.0556826 7.53278 0.0661094C7.58242 0.076536 7.63179 0.0881725 7.68087 0.101019C7.72995 0.113864 7.77868 0.127904 7.82707 0.143139C7.87547 0.158373 7.92347 0.174783 7.97105 0.19237C8.01864 0.209956 8.06577 0.228697 8.11244 0.248593C8.15911 0.268488 8.20526 0.289516 8.25091 0.311673C8.29654 0.33383 8.34161 0.357093 8.3861 0.381459C8.4306 0.405825 8.47448 0.431268 8.51773 0.457784C8.56099 0.484301 8.60356 0.51186 8.64547 0.540463C8.68736 0.569066 8.72854 0.598679 8.76899 0.6293C8.80945 0.659921 8.84912 0.691514 8.88802 0.724079C8.92692 0.756644 8.96501 0.790143 9.00227 0.824575C9.03953 0.859007 9.07593 0.89433 9.11145 0.930546C9.14698 0.966764 9.18161 1.00383 9.21531 1.04174C9.24903 1.07965 9.2818 1.11836 9.31361 1.15788C9.34542 1.1974 9.37626 1.23768 9.4061 1.2787C9.43595 1.31973 9.46476 1.36146 9.49256 1.40391C9.52035 1.44635 9.54709 1.48944 9.57278 1.53319C9.59847 1.57694 9.62306 1.6213 9.64658 1.66625C9.67009 1.71121 9.69248 1.75672 9.71377 1.80277C9.73505 1.84883 9.75519 1.89537 9.77422 1.94241C9.79326 1.98945 9.81103 2.03693 9.82773 2.08485C9.84443 2.13277 9.85986 2.18106 9.87412 2.22974C9.88848 2.27841 9.90156 2.3274 9.91348 2.37672C9.92539 2.42604 9.93613 2.47562 9.9456 2.52546C9.95508 2.5753 9.96328 2.62534 9.97031 2.67559C9.97734 2.72583 9.9831 2.77622 9.98769 2.82675C9.99228 2.87728 9.9956 2.92789 9.99765 2.97858C9.99971 3.02928 10.0005 3.07998 10.0001 3.13071C10.0002 3.14359 10 3.15646 9.99951 3.16933C9.99902 3.18219 9.99824 3.19503 9.99707 3.20785C9.99599 3.22067 9.99453 3.23347 9.99277 3.24622C9.99101 3.25897 9.98896 3.27168 9.98652 3.28433C9.98408 3.29697 9.98144 3.30956 9.97842 3.32208C9.97539 3.3346 9.97207 3.34704 9.96846 3.35939C9.96484 3.37175 9.96094 3.38401 9.95674 3.39617C9.95254 3.40833 9.94795 3.42038 9.94316 3.43232C9.93838 3.44427 9.9332 3.45608 9.92783 3.46777C9.92246 3.47946 9.9168 3.49101 9.91084 3.50242C9.90488 3.51384 9.89863 3.5251 9.89209 3.5362C9.88555 3.5473 9.87881 3.55824 9.87178 3.56901C9.86475 3.57978 9.85742 3.59037 9.8498 3.60078C9.84228 3.61119 9.83447 3.62141 9.82637 3.63144C9.81826 3.64146 9.80996 3.65129 9.80137 3.66091C9.79287 3.67053 9.78408 3.67992 9.775 3.68911C9.76602 3.6983 9.75678 3.70726 9.74731 3.71599C9.73785 3.72472 9.72818 3.73321 9.71831 3.74147C9.70843 3.74973 9.69836 3.75773 9.68808 3.7655C9.67781 3.77326 9.66735 3.78076 9.65672 3.78801C9.64607 3.79525 9.63525 3.80224 9.62428 3.80895C9.61329 3.81566 9.60215 3.82211 9.59085 3.82828C9.57954 3.83444 9.56809 3.84033 9.5565 3.84594C9.54492 3.85154 9.5332 3.85686 9.52135 3.86188C9.50949 3.86691 9.49753 3.87165 9.48545 3.87609C9.47336 3.88054 9.46116 3.88468 9.44888 3.88852C9.43659 3.89235 9.42423 3.8959 9.41177 3.89913C9.39931 3.90236 9.38677 3.90528 9.37416 3.9079C9.36155 3.91052 9.3489 3.91282 9.33618 3.91482C9.32346 3.91682 9.31069 3.9185 9.29789 3.91986C9.28509 3.92123 9.27225 3.92228 9.25941 3.92303C9.24656 3.92376 9.23369 3.92418 9.22081 3.92429ZM3.07224 0.793571C3.03437 0.793978 2.99654 0.795313 2.95874 0.797574C2.92095 0.799836 2.88322 0.803022 2.84557 0.807133C2.80793 0.811243 2.77041 0.816273 2.73301 0.822223C2.69561 0.828173 2.65838 0.835034 2.62132 0.842808C2.58426 0.850583 2.5474 0.85926 2.51076 0.868841C2.47413 0.878421 2.43775 0.888892 2.40162 0.900257C2.36551 0.91162 2.32969 0.923861 2.29417 0.936981C2.25864 0.9501 2.22346 0.964082 2.18862 0.978926C2.15378 0.993769 2.11933 1.00945 2.08526 1.02599C2.05119 1.04252 2.01754 1.05988 1.98433 1.07806C1.9511 1.09624 1.91835 1.11522 1.88606 1.13501C1.85378 1.1548 1.82199 1.17537 1.79071 1.19671C1.75943 1.21806 1.72869 1.24016 1.6985 1.26301C1.6683 1.28585 1.63868 1.30942 1.60964 1.33373C1.58061 1.35804 1.55217 1.38304 1.52435 1.40873C1.49653 1.43442 1.46937 1.46079 1.44284 1.48782C1.41632 1.51484 1.39048 1.54251 1.3653 1.5708C1.34014 1.59909 1.31567 1.62799 1.29193 1.65749C1.26817 1.68698 1.24516 1.71704 1.22287 1.74766C1.2006 1.77828 1.17908 1.80943 1.15833 1.8411C1.13758 1.87278 1.11762 1.90495 1.09844 1.93761C1.07927 1.97025 1.0609 2.00336 1.04334 2.03691C1.02579 2.07047 1.00907 2.10443 0.993183 2.13881C0.977295 2.17318 0.962263 2.20793 0.948077 2.24304C0.933891 2.27814 0.920574 2.31358 0.908126 2.34936C0.895678 2.38512 0.884113 2.42116 0.873432 2.4575C0.86275 2.49383 0.852965 2.5304 0.844075 2.56721C0.835186 2.60401 0.827204 2.64103 0.820129 2.67822C0.813054 2.71543 0.806893 2.75278 0.801648 2.79028C0.796404 2.82779 0.792081 2.8654 0.78868 2.90312C0.785278 2.94083 0.782804 2.9786 0.781254 3.01644C0.779704 3.05429 0.779082 3.09214 0.779388 3.13L2.37938 3.13C2.38347 3.12994 2.38754 3.12978 2.3916 3.12953C2.39567 3.12927 2.39974 3.12892 2.40378 3.12846C2.40783 3.128 2.41187 3.12745 2.41591 3.1268C2.41992 3.12614 2.42393 3.12539 2.42791 3.12454C2.4319 3.12369 2.43587 3.12274 2.43981 3.1217C2.44375 3.12065 2.44767 3.11952 2.45154 3.11828C2.45543 3.11704 2.45929 3.11571 2.46311 3.1143C2.46693 3.11287 2.47071 3.11136 2.47445 3.10975C2.4782 3.10813 2.4819 3.10644 2.48557 3.10465C2.48924 3.10286 2.49285 3.10098 2.49642 3.09901C2.49999 3.09705 2.50352 3.095 2.50698 3.09286C2.51046 3.09072 2.51387 3.0885 2.51723 3.08619C2.5206 3.08389 2.5239 3.0815 2.52714 3.07903C2.53039 3.07656 2.53357 3.07401 2.53669 3.0714C2.53981 3.06877 2.54287 3.06607 2.54586 3.0633C2.54885 3.06053 2.55177 3.05769 2.55461 3.05477C2.55746 3.05185 2.56024 3.04887 2.56294 3.04581C2.56565 3.04276 2.56828 3.03965 2.57082 3.03646C2.57338 3.03329 2.57585 3.03005 2.57824 3.02675C2.58063 3.02345 2.58295 3.02009 2.58518 3.01667C2.5874 3.01326 2.58955 3.00979 2.5916 3.00627C2.59366 3.00275 2.59563 2.99919 2.59752 2.99558C2.5994 2.99195 2.6012 2.98829 2.6029 2.98459C2.60461 2.98089 2.60622 2.97715 2.60774 2.97337C2.60927 2.96959 2.6107 2.96577 2.61203 2.96191C2.61337 2.95806 2.61461 2.95418 2.61575 2.95026C2.6169 2.94636 2.61795 2.94242 2.6189 2.93846C2.61985 2.93449 2.6207 2.93051 2.62146 2.92649C2.62223 2.92249 2.62288 2.91847 2.62344 2.91443C2.624 2.9104 2.62447 2.90635 2.62482 2.90228C2.6252 2.89822 2.62546 2.89415 2.62561 2.89008C2.62579 2.88601 2.62585 2.88193 2.62581 2.87786C2.62568 2.86092 2.62597 2.84399 2.62667 2.82707C2.62737 2.81015 2.62849 2.79324 2.63001 2.77638C2.63154 2.75951 2.63349 2.74269 2.63583 2.72592C2.63818 2.70915 2.64095 2.69244 2.64411 2.6758C2.64728 2.65916 2.65086 2.64261 2.65484 2.62615C2.65883 2.60969 2.6632 2.59333 2.66799 2.57708C2.67277 2.56084 2.67795 2.54472 2.68352 2.52872C2.68909 2.51272 2.69505 2.49687 2.7014 2.48117C2.70775 2.46547 2.71448 2.44993 2.72159 2.43456C2.7287 2.41919 2.73618 2.404 2.74403 2.38899C2.75189 2.37398 2.76011 2.35918 2.76868 2.34458C2.77727 2.32998 2.7862 2.3156 2.79548 2.30143C2.80477 2.28726 2.81439 2.27333 2.82436 2.25963C2.83433 2.24594 2.84462 2.2325 2.85524 2.21931C2.86587 2.20611 2.87682 2.19319 2.88807 2.18054C2.89934 2.16789 2.9109 2.15552 2.92275 2.14343C2.93463 2.13134 2.94678 2.11955 2.95922 2.10806C2.97166 2.09656 2.98437 2.08539 2.99736 2.07452C3.01035 2.06365 3.0236 2.05311 3.03711 2.04288C3.05061 2.03266 3.06436 2.02277 3.07835 2.01323C3.09234 2.00369 3.10656 1.99449 3.12101 1.98563C3.13545 1.97679 3.1501 1.9683 3.16495 1.96017C3.17981 1.95203 3.19485 1.94427 3.21009 1.93687C3.22533 1.92948 3.24074 1.92246 3.25632 1.91582C3.2719 1.90918 3.28765 1.90293 3.30352 1.89706C3.31941 1.89119 3.33544 1.88571 3.35159 1.88062C3.36774 1.87554 3.38401 1.87086 3.4004 1.86657C3.41679 1.86229 3.43327 1.8584 3.44984 1.85492C3.46643 1.85144 3.48308 1.84837 3.4998 1.8457C3.51653 1.84304 3.53331 1.84079 3.55015 1.83895C3.56698 1.8371 3.58386 1.83567 3.60076 1.83466C3.61768 1.83364 3.63459 1.83305 3.65152 1.83286L6.34796 1.83286C6.36488 1.83307 6.38179 1.83369 6.39867 1.83473C6.41557 1.83576 6.43242 1.83721 6.44925 1.83907C6.46606 1.84094 6.48283 1.8432 6.49953 1.84589C6.51625 1.84857 6.53288 1.85166 6.54944 1.85516C6.566 1.85865 6.58246 1.86255 6.59882 1.86686C6.61519 1.87116 6.63144 1.87586 6.64757 1.88096C6.66371 1.88605 6.67972 1.89154 6.69559 1.89743C6.71144 1.90331 6.72717 1.90958 6.74273 1.91623C6.75829 1.92288 6.77368 1.9299 6.78889 1.9373C6.80411 1.94472 6.81914 1.95249 6.83397 1.96062C6.84881 1.96876 6.86344 1.97726 6.87786 1.98611C6.89227 1.99497 6.90647 2.00417 6.92045 2.01372C6.93441 2.02327 6.94814 2.03315 6.96164 2.04338C6.97512 2.0536 6.98835 2.06415 7.00132 2.07502C7.01429 2.08589 7.02698 2.09707 7.03941 2.10856C7.05183 2.12006 7.06396 2.13185 7.0758 2.14393C7.08766 2.15602 7.0992 2.16839 7.11044 2.18104C7.12168 2.19368 7.13261 2.2066 7.14321 2.21978C7.15382 2.23297 7.1641 2.24641 7.17404 2.2601C7.18399 2.27378 7.1936 2.2877 7.20288 2.30187C7.21215 2.31603 7.22106 2.3304 7.22963 2.34499C7.23819 2.35959 7.2464 2.37438 7.25423 2.38938C7.26207 2.40437 7.26954 2.41956 7.27665 2.43492C7.28374 2.45028 7.29046 2.46581 7.2968 2.4815C7.30313 2.4972 7.30908 2.51303 7.31465 2.52901C7.32021 2.545 7.32538 2.5611 7.33015 2.57733C7.33492 2.59357 7.3393 2.60991 7.34327 2.62637C7.34725 2.64281 7.35082 2.65935 7.35397 2.67598C7.35715 2.6926 7.3599 2.70929 7.36226 2.72604C7.3646 2.74281 7.36653 2.75962 7.36806 2.77646C7.36958 2.79332 7.37069 2.8102 7.3714 2.82711C7.37209 2.84401 7.37237 2.86094 7.37225 2.87786C7.37221 2.88193 7.37227 2.88601 7.37244 2.89008C7.3726 2.89415 7.37286 2.89822 7.37322 2.90228C7.37359 2.90635 7.37405 2.9104 7.37462 2.91443C7.37517 2.91847 7.37584 2.92249 7.3766 2.92649C7.37735 2.93051 7.3782 2.93449 7.37915 2.93846C7.38012 2.94242 7.38116 2.94636 7.3823 2.95026C7.38346 2.95418 7.3847 2.95806 7.38603 2.96191C7.38736 2.96577 7.38879 2.96959 7.39031 2.97337C7.39184 2.97715 7.39346 2.98089 7.39515 2.98459C7.39685 2.98829 7.39865 2.99195 7.40054 2.99558C7.40242 2.99919 7.40439 3.00275 7.40646 3.00627C7.40851 3.00979 7.41066 3.01326 7.41289 3.01667C7.41511 3.02009 7.41742 3.02345 7.41981 3.02675C7.42221 3.03005 7.42468 3.03329 7.42724 3.03646C7.42978 3.03965 7.43241 3.04276 7.43512 3.04581C7.43782 3.04887 7.44059 3.05185 7.44344 3.05477C7.44629 3.05769 7.44921 3.06053 7.45221 3.0633C7.45518 3.06607 7.45824 3.06877 7.46137 3.07139C7.46449 3.07401 7.46768 3.07656 7.47091 3.07903C7.47416 3.0815 7.47747 3.08389 7.48082 3.08619C7.48419 3.0885 7.48761 3.09071 7.49107 3.09285C7.49455 3.09499 7.49807 3.09705 7.50164 3.09901C7.50521 3.10098 7.50883 3.10286 7.5125 3.10465C7.51615 3.10644 7.51986 3.10813 7.52361 3.10975C7.52735 3.11136 7.53113 3.11287 7.53496 3.1143C7.53878 3.11571 7.54263 3.11704 7.54651 3.11828C7.5504 3.11952 7.55432 3.12065 7.55826 3.1217C7.5622 3.12274 7.56616 3.12369 7.57014 3.12454C7.57413 3.12539 7.57814 3.12614 7.58217 3.1268C7.58619 3.12745 7.59022 3.128 7.59428 3.12846C7.59833 3.12892 7.60239 3.12927 7.60645 3.12953C7.61053 3.12978 7.6146 3.12994 7.61868 3.13L9.21867 3.13C9.21897 3.09213 9.21834 3.05428 9.21677 3.01644C9.21521 2.97859 9.21272 2.94081 9.20932 2.9031C9.2059 2.86537 9.20157 2.82776 9.19632 2.79025C9.19105 2.75274 9.18488 2.71539 9.1778 2.67819C9.17071 2.64099 9.16271 2.60397 9.15382 2.56717C9.14491 2.53035 9.13512 2.49378 9.12442 2.45745C9.11374 2.42111 9.10217 2.38507 9.08971 2.3493C9.07724 2.31353 9.06392 2.2781 9.04973 2.24299C9.03553 2.20788 9.02049 2.17313 9.00459 2.13876C8.98869 2.10438 8.97196 2.07042 8.9544 2.03686C8.93684 2.00331 8.91846 1.9702 8.89928 1.93755C8.8801 1.90489 8.86012 1.87272 8.83936 1.84105C8.8186 1.80937 8.79707 1.77822 8.77479 1.74761C8.7525 1.71699 8.72947 1.68693 8.70572 1.65744C8.68195 1.62794 8.65748 1.59905 8.6323 1.57076C8.60714 1.54247 8.58129 1.5148 8.55476 1.48777C8.52822 1.46075 8.50104 1.43438 8.47323 1.40869C8.4454 1.383 8.41696 1.358 8.38791 1.3337C8.35887 1.30939 8.32924 1.28582 8.29904 1.26297C8.26884 1.24012 8.2381 1.21802 8.20682 1.19668C8.17553 1.17534 8.14373 1.15478 8.11144 1.13499C8.07914 1.1152 8.04639 1.09622 8.01315 1.07804C7.97994 1.05986 7.94629 1.04251 7.91222 1.02598C7.87813 1.00944 7.84368 0.99375 7.80884 0.978916C7.77399 0.96407 7.7388 0.950088 7.70327 0.93697C7.66774 0.923851 7.63192 0.91161 7.5958 0.900248C7.55966 0.888886 7.52327 0.878414 7.48664 0.868835C7.45 0.859255 7.41314 0.850578 7.37607 0.842805C7.33901 0.835031 7.30178 0.82817 7.26437 0.822221C7.22697 0.816271 7.18944 0.811242 7.1518 0.807132C7.11415 0.803021 7.07643 0.799836 7.03862 0.797574C7.00081 0.795312 6.96297 0.793978 6.9251 0.793571L3.07224 0.793571ZM8.55725 10L1.44225 10C1.42932 10 1.4164 9.9998 1.40348 9.99932C1.39057 9.99883 1.37766 9.99824 1.36476 9.99746C1.35187 9.99658 1.33898 9.9956 1.32611 9.99434C1.31325 9.99307 1.3004 9.9917 1.28758 9.99004C1.27477 9.98838 1.26197 9.98662 1.2492 9.98457C1.23645 9.98252 1.22371 9.98027 1.21102 9.97783C1.19832 9.97539 1.18567 9.97285 1.17306 9.97002C1.16045 9.96719 1.14788 9.96416 1.13536 9.96094C1.12284 9.95771 1.11038 9.9543 1.09797 9.95068C1.08556 9.94707 1.0732 9.94326 1.06091 9.93926C1.04862 9.93525 1.03639 9.93115 1.02422 9.92676C1.01206 9.92236 0.999971 9.91787 0.987949 9.91308C0.975932 9.9083 0.963987 9.90342 0.952121 9.89824C0.940254 9.89316 0.92847 9.88789 0.916768 9.88232C0.905067 9.87685 0.893455 9.87119 0.881931 9.86533C0.870406 9.85947 0.858975 9.85342 0.84764 9.84726C0.836303 9.84111 0.825066 9.83467 0.81393 9.82812C0.802792 9.82158 0.79176 9.81484 0.780833 9.80791C0.769906 9.80098 0.759089 9.79394 0.748383 9.78672C0.737676 9.77949 0.727085 9.77207 0.716609 9.76451C0.706134 9.75694 0.695778 9.74921 0.685544 9.74131C0.675309 9.73342 0.665201 9.72537 0.655218 9.71716C0.645234 9.70894 0.635382 9.70059 0.625659 9.69207C0.615937 9.68355 0.60635 9.67489 0.596897 9.66607C0.587445 9.65726 0.578134 9.6483 0.568961 9.6392C0.559788 9.63009 0.55076 9.62084 0.541876 9.61145C0.532992 9.60207 0.524257 9.59255 0.51567 9.58289C0.507083 9.57323 0.498648 9.56344 0.490367 9.55351C0.482086 9.54359 0.473961 9.53354 0.465993 9.52337C0.458025 9.51319 0.450218 9.50289 0.442571 9.49247C0.434924 9.48205 0.427441 9.47152 0.420124 9.46087C0.412806 9.45021 0.405655 9.43944 0.398674 9.42857C0.39159 9.41757 0.384675 9.40646 0.377929 9.39524C0.371183 9.38403 0.364608 9.37272 0.358206 9.36131C0.351804 9.34989 0.345576 9.33839 0.339523 9.32678C0.333471 9.31518 0.327596 9.30349 0.321897 9.29171C0.3162 9.27992 0.310683 9.26806 0.305346 9.25611C0.300009 9.24417 0.294854 9.23214 0.289883 9.22003C0.284911 9.20793 0.280124 9.19575 0.275522 9.1835C0.270921 9.17124 0.266507 9.15893 0.262279 9.14654C0.258052 9.13416 0.254014 9.12172 0.250164 9.10921C0.246315 9.0967 0.242657 9.08414 0.239189 9.07151C0.235722 9.0589 0.232446 9.04623 0.229363 9.03351C0.226281 9.02079 0.223393 9.00803 0.220697 8.99522C0.218003 8.98242 0.215503 8.96958 0.213198 8.9567C0.210894 8.94382 0.208785 8.9309 0.206873 8.91795C0.20496 8.90501 0.203245 8.89203 0.201727 8.87903C0.200208 8.86603 0.198888 8.85302 0.197766 8.83998C0.196644 8.82694 0.195719 8.8139 0.194992 8.80082C0.194267 8.78776 0.193739 8.77469 0.19341 8.7616C0.193081 8.74852 0.192951 8.73544 0.19302 8.72235C0.193089 8.70927 0.193356 8.69618 0.193822 8.6831C0.194288 8.67003 0.194953 8.65695 0.195816 8.6439C0.19668 8.63084 0.197741 8.6178 0.199 8.60477C0.20026 8.59175 0.201717 8.57874 0.203371 8.56576C0.205026 8.55278 0.206878 8.53982 0.208926 8.5269C0.210974 8.51398 0.213217 8.50109 0.215657 8.48823C0.218097 8.47537 0.220731 8.46256 0.223561 8.44978C0.22639 8.437 0.229412 8.42428 0.232628 8.41159C0.235844 8.39891 0.239252 8.38627 0.242853 8.37369C0.246452 8.3611 0.250242 8.34858 0.254223 8.33611C0.258203 8.32364 0.262372 8.31124 0.266728 8.29891C0.271086 8.28657 0.27563 8.2743 0.280359 8.2621C0.285089 8.24989 0.290004 8.23776 0.295103 8.22571L1.70081 4.91143C1.70666 4.89736 1.71276 4.88341 1.71912 4.86957C1.72549 4.85573 1.7321 4.84201 1.73896 4.82841C1.74583 4.8148 1.75294 4.80134 1.7603 4.788C1.76766 4.77466 1.77525 4.76145 1.7831 4.7484C1.79094 4.73534 1.79901 4.72242 1.80732 4.70966C1.81564 4.69689 1.82419 4.68429 1.83296 4.67184C1.84174 4.65938 1.85074 4.6471 1.85998 4.63498C1.8692 4.62286 1.87864 4.61092 1.88831 4.59914C1.89798 4.58736 1.90785 4.57577 1.91794 4.56436C1.92804 4.55295 1.93833 4.54173 1.94884 4.53069C1.95934 4.51966 1.97004 4.50882 1.98094 4.49817C1.99184 4.48754 2.00293 4.4771 2.01421 4.46686C2.0255 4.45662 2.03696 4.4466 2.0486 4.43679C2.06025 4.42697 2.07208 4.41737 2.08408 4.40799C2.09608 4.3986 2.10825 4.38944 2.12059 4.38051C2.13293 4.37157 2.14543 4.36287 2.15809 4.35439C2.17075 4.34592 2.18355 4.33768 2.19651 4.32967C2.20947 4.32166 2.22257 4.3139 2.23581 4.30637C2.24905 4.29884 2.26243 4.29155 2.27595 4.28451C2.28945 4.27748 2.3031 4.27069 2.31685 4.26416C2.33061 4.25763 2.34448 4.25134 2.35847 4.24531C2.37246 4.23929 2.38656 4.23352 2.40077 4.228C2.41496 4.22249 2.42927 4.21725 2.44365 4.21226C2.45805 4.20727 2.47253 4.20255 2.48709 4.19809C2.50166 4.19363 2.51631 4.18944 2.53103 4.18553C2.54575 4.18161 2.56054 4.17796 2.57538 4.17458C2.59024 4.1712 2.60516 4.1681 2.62012 4.16526C2.63509 4.16244 2.65011 4.15988 2.66517 4.1576C2.68022 4.15532 2.69532 4.15332 2.71046 4.15159C2.7256 4.14986 2.74076 4.14842 2.75595 4.14725C2.77114 4.14607 2.78635 4.14518 2.80156 4.14457C2.81679 4.14395 2.83201 4.14362 2.84724 4.14357L7.15153 4.14357C7.16672 4.14367 7.1819 4.14405 7.19709 4.14471C7.21226 4.14536 7.22741 4.14629 7.24256 4.1475C7.25769 4.14871 7.27281 4.1502 7.2879 4.15195C7.30299 4.15372 7.31804 4.15575 7.33306 4.15807C7.34807 4.16038 7.36303 4.16296 7.37796 4.16582C7.39287 4.16868 7.40773 4.17181 7.42254 4.1752C7.43733 4.1786 7.45208 4.18227 7.46676 4.18622C7.48142 4.19016 7.49601 4.19437 7.51053 4.19884C7.52505 4.20331 7.53947 4.20805 7.55383 4.21305C7.56816 4.21805 7.58241 4.22331 7.59656 4.22883C7.61071 4.23435 7.62475 4.24013 7.6387 4.24616C7.65264 4.25219 7.66647 4.25848 7.68018 4.26502C7.69389 4.27155 7.70747 4.27834 7.72094 4.28538C7.73439 4.29241 7.74772 4.29969 7.76093 4.30722C7.77412 4.31474 7.78718 4.3225 7.80009 4.3305C7.81301 4.3385 7.82576 4.34673 7.83838 4.3552C7.851 4.36366 7.86345 4.37236 7.87574 4.38128C7.88804 4.39019 7.90017 4.39935 7.91213 4.40871C7.92408 4.41808 7.93587 4.42765 7.94748 4.43744C7.95909 4.44724 7.97052 4.45725 7.98177 4.46745C7.99301 4.47767 8.00406 4.48809 8.01493 4.4987C8.02579 4.50932 8.03646 4.52013 8.04692 4.53113C8.0574 4.54214 8.06767 4.55333 8.07772 4.56472C8.08778 4.57609 8.09763 4.58766 8.10727 4.59939C8.1169 4.61113 8.12633 4.62305 8.13553 4.63514C8.14474 4.64722 8.15371 4.65947 8.16246 4.67188C8.17122 4.6843 8.17975 4.69686 8.18805 4.70959C8.19634 4.72231 8.20439 4.73519 8.21223 4.7482C8.22005 4.76122 8.22764 4.77438 8.23498 4.78768C8.24231 4.80098 8.24942 4.8144 8.25628 4.82796C8.26313 4.84151 8.26974 4.85519 8.27608 4.86898C8.28244 4.88278 8.28854 4.8967 8.29439 4.91071L9.69939 8.225C9.7045 8.23705 9.70942 8.24917 9.71417 8.26137C9.71891 8.27356 9.72346 8.28584 9.72783 8.29817C9.73219 8.31051 9.73637 8.3229 9.74036 8.33537C9.74434 8.34783 9.74815 8.36035 9.75177 8.37293C9.75537 8.38551 9.75879 8.39813 9.76201 8.41082C9.76526 8.4235 9.76826 8.43623 9.77109 8.449C9.77392 8.46179 9.77656 8.4746 9.779 8.48745C9.78144 8.50031 9.78379 8.5132 9.78584 8.52612C9.78789 8.53904 9.78975 8.55199 9.7914 8.56497C9.79307 8.57795 9.79453 8.59096 9.7958 8.60398C9.79707 8.617 9.79814 8.63005 9.79902 8.6431C9.7999 8.65616 9.80049 8.66923 9.80098 8.6823C9.80146 8.69538 9.80176 8.70847 9.80185 8.72155C9.80195 8.73464 9.80176 8.74772 9.80146 8.76081C9.80117 8.77389 9.80058 8.78696 9.7999 8.80003C9.79922 8.8131 9.79824 8.82615 9.79717 8.83919C9.79609 8.85223 9.79473 8.86524 9.79326 8.87824C9.7917 8.89124 9.78994 8.90422 9.78808 8.91716C9.78623 8.93011 9.78408 8.94303 9.78183 8.95591C9.77949 8.96879 9.77695 8.98164 9.77431 8.99444C9.77168 9.00725 9.76875 9.02001 9.76572 9.03273C9.76262 9.04546 9.75933 9.05812 9.75586 9.07074C9.7524 9.08336 9.74876 9.09593 9.74491 9.10844C9.74106 9.12095 9.73704 9.13339 9.73282 9.14578C9.72859 9.15816 9.72418 9.17048 9.71959 9.18273C9.71499 9.19499 9.7102 9.20717 9.70524 9.21928C9.70028 9.23139 9.69513 9.24342 9.68978 9.25536C9.68446 9.26731 9.67894 9.27918 9.67326 9.29097C9.66757 9.30275 9.6617 9.31444 9.65565 9.32604C9.6496 9.33766 9.64338 9.34916 9.63698 9.36058C9.63058 9.37199 9.624 9.38331 9.61726 9.39452C9.61052 9.40574 9.60361 9.41685 9.59653 9.42786C9.58955 9.43873 9.5824 9.4495 9.5751 9.46016C9.56777 9.47081 9.56029 9.48136 9.55266 9.49178C9.54501 9.5022 9.5372 9.5125 9.52924 9.52267C9.52127 9.53286 9.51314 9.54291 9.50487 9.55283C9.49659 9.56276 9.48815 9.57256 9.47957 9.58222C9.47099 9.59187 9.46225 9.60141 9.45337 9.61079C9.44448 9.62017 9.43546 9.62942 9.42629 9.63853C9.41711 9.64765 9.4078 9.6566 9.39836 9.66542C9.38891 9.67424 9.37932 9.6829 9.3696 9.69143C9.35987 9.69994 9.35002 9.7083 9.34003 9.71651C9.33006 9.72473 9.31994 9.73277 9.30972 9.74067C9.29948 9.74856 9.28912 9.7563 9.27864 9.76387C9.26817 9.77139 9.25758 9.77881 9.24687 9.78613C9.23617 9.79336 9.22535 9.80039 9.21442 9.80732C9.2035 9.81426 9.19246 9.821 9.18133 9.82754C9.17018 9.83408 9.15894 9.84043 9.14762 9.84668C9.13628 9.85283 9.12484 9.85889 9.11331 9.86475C9.10179 9.8706 9.09018 9.87627 9.07849 9.88174C9.06678 9.88721 9.05499 9.89248 9.04312 9.89766C9.03126 9.90283 9.01932 9.90771 9.00728 9.9125C8.99526 9.91719 8.98317 9.92178 8.97101 9.92617C8.95885 9.93057 8.94662 9.93467 8.93433 9.93867C8.92203 9.94267 8.90968 9.94648 8.89726 9.9501C8.88484 9.95371 8.87238 9.95703 8.85986 9.96025C8.84735 9.96348 8.83478 9.9665 8.82217 9.96933C8.80955 9.97217 8.79689 9.9748 8.78421 9.97725C8.77151 9.97969 8.75878 9.98184 8.74601 9.98389C8.73324 9.98594 8.72045 9.98769 8.70763 9.98935C8.6948 9.99101 8.68196 9.99238 8.6691 9.99365C8.65623 9.99492 8.64335 9.9959 8.63045 9.99678C8.61755 9.99756 8.60464 9.99814 8.59173 9.99863C8.57881 9.99902 8.56589 9.99922 8.55296 9.99932L8.55725 10ZM2.84724 4.93571C2.84156 4.93575 2.83589 4.9359 2.8302 4.93614C2.82454 4.93639 2.81887 4.93674 2.8132 4.93719C2.80754 4.93765 2.80189 4.9382 2.79625 4.93886C2.79061 4.93951 2.78498 4.94027 2.77936 4.94113C2.77375 4.942 2.76815 4.94296 2.76257 4.94402C2.75699 4.94509 2.75144 4.94626 2.7459 4.94752C2.74036 4.94879 2.73485 4.95016 2.72936 4.95162C2.72388 4.9531 2.71842 4.95466 2.71299 4.95633C2.70756 4.95799 2.70216 4.95975 2.69679 4.96161C2.69143 4.96348 2.68609 4.96543 2.68079 4.96749C2.6755 4.96954 2.67024 4.97169 2.66503 4.97394C2.65981 4.97618 2.65464 4.97852 2.6495 4.98096C2.64437 4.98339 2.63929 4.98592 2.63424 4.98853C2.6292 4.99115 2.62421 4.99386 2.61927 4.99666C2.61433 4.99946 2.60944 5.00235 2.6046 5.00533C2.59977 5.00831 2.59498 5.01137 2.59025 5.01452C2.58553 5.01768 2.58086 5.02091 2.57625 5.02423C2.57164 5.02755 2.5671 5.03095 2.56261 5.03443C2.55812 5.03792 2.5537 5.04148 2.54935 5.04513C2.54499 5.04877 2.5407 5.0525 2.53648 5.0563C2.53227 5.0601 2.52812 5.06397 2.52403 5.06793C2.51996 5.07188 2.51596 5.07591 2.51201 5.08001C2.50809 5.0841 2.50423 5.08827 2.50044 5.09251C2.49666 5.09675 2.49296 5.10105 2.48934 5.10543C2.4857 5.10979 2.48216 5.11424 2.47869 5.11874C2.47523 5.12324 2.47185 5.1278 2.46854 5.13242C2.46525 5.13704 2.46204 5.14173 2.45891 5.14647C2.45578 5.15121 2.45273 5.15601 2.44978 5.16086C2.44683 5.16571 2.44396 5.17061 2.44118 5.17557C2.43841 5.18052 2.43573 5.18553 2.43312 5.19058C2.43053 5.19562 2.42803 5.20072 2.42562 5.20587C2.42321 5.21102 2.4209 5.2162 2.41868 5.22143L1.01152 8.53642C1.00961 8.54096 1.00777 8.54552 1.006 8.55011C1.00422 8.5547 1.00252 8.55932 1.00088 8.56395C0.999248 8.56859 0.997685 8.57325 0.996191 8.57794C0.994707 8.58263 0.993281 8.58733 0.991924 8.59207C0.990576 8.59681 0.989307 8.60155 0.988096 8.60632C0.986894 8.61109 0.985762 8.61588 0.984697 8.62068C0.983642 8.62549 0.982656 8.6303 0.981738 8.63514C0.98082 8.63997 0.97998 8.64481 0.979219 8.64968C0.978457 8.65453 0.977764 8.6594 0.977139 8.66429C0.976526 8.66916 0.975982 8.67405 0.975513 8.67895C0.975043 8.68385 0.974648 8.68875 0.974327 8.69366C0.974007 8.69857 0.973761 8.70349 0.973589 8.7084C0.973418 8.71331 0.973321 8.71823 0.973299 8.72315C0.973276 8.72807 0.973329 8.73299 0.973457 8.73791C0.973585 8.74282 0.973787 8.74774 0.974063 8.75266C0.97434 8.75757 0.974691 8.76247 0.975117 8.76737C0.975543 8.77227 0.976043 8.77717 0.976611 8.78205C0.977187 8.78693 0.977832 8.79181 0.978555 8.79668C0.979277 8.80154 0.980078 8.8064 0.980947 8.81124C0.981826 8.81608 0.982764 8.82091 0.983779 8.82572C0.984795 8.83054 0.985889 8.83533 0.987051 8.84012C0.988213 8.84489 0.989443 8.84966 0.990752 8.85439C0.99206 8.85914 0.993447 8.86387 0.994892 8.86856C0.996338 8.87326 0.997861 8.87794 0.999453 8.8826C1.00105 8.88725 1.00271 8.89187 1.00444 8.89648C1.00618 8.90108 1.00798 8.90566 1.00985 8.91021C1.01173 8.91475 1.01367 8.91928 1.01567 8.92377C1.01769 8.92826 1.01977 8.93272 1.02191 8.93715C1.02406 8.94157 1.02627 8.94597 1.02854 8.95032C1.03083 8.95469 1.03317 8.95901 1.03558 8.9633C1.038 8.96759 1.04047 8.97184 1.04301 8.97605C1.04555 8.98026 1.04815 8.98444 1.05081 8.98857C1.05345 8.99266 1.05613 8.9967 1.05889 9.00069C1.06164 9.00469 1.06445 9.00864 1.06732 9.01255C1.0702 9.01646 1.07314 9.02032 1.07614 9.02414C1.07914 9.02796 1.0822 9.03174 1.0853 9.03546C1.08843 9.03918 1.0916 9.04285 1.09482 9.04647C1.09806 9.0501 1.10134 9.05367 1.10468 9.0572C1.10802 9.06072 1.11142 9.06419 1.11486 9.0676C1.11831 9.07101 1.12181 9.07437 1.12536 9.07768C1.12892 9.081 1.13252 9.08425 1.13617 9.08744C1.13983 9.09063 1.14354 9.09377 1.14728 9.09684C1.15104 9.09992 1.15483 9.10295 1.15868 9.10591C1.16253 9.10887 1.16643 9.11177 1.17036 9.11461C1.1743 9.11745 1.17827 9.12022 1.18229 9.12294C1.18633 9.12565 1.19039 9.12831 1.19449 9.1309C1.1986 9.13349 1.20275 9.13601 1.20693 9.13847C1.21112 9.14093 1.21534 9.14332 1.2196 9.14564C1.22386 9.14798 1.22815 9.15023 1.23248 9.15243C1.23682 9.15463 1.24118 9.15675 1.24558 9.15881C1.24997 9.16087 1.2544 9.16285 1.25887 9.16477C1.26331 9.16669 1.2678 9.16853 1.27231 9.17032C1.27684 9.1721 1.28139 9.17381 1.28596 9.17545C1.29052 9.17709 1.29511 9.17865 1.29973 9.18015C1.30435 9.18164 1.30898 9.18307 1.31365 9.18441C1.31831 9.18577 1.323 9.18705 1.3277 9.18825C1.3324 9.18945 1.33712 9.19059 1.34186 9.19164C1.34659 9.19269 1.35135 9.19368 1.35612 9.19459C1.36088 9.1955 1.36566 9.19634 1.37046 9.19709C1.37525 9.19785 1.38006 9.19853 1.38487 9.19915C1.38969 9.19977 1.39451 9.20029 1.39934 9.20075C1.40417 9.20121 1.40901 9.2016 1.41386 9.20191C1.4187 9.20222 1.42355 9.20245 1.4284 9.20261C1.43325 9.20276 1.43811 9.20285 1.44296 9.20286L8.55939 9.20286C8.56424 9.20285 8.56909 9.20276 8.57393 9.20261C8.5788 9.20245 8.58365 9.20222 8.58849 9.20191C8.59334 9.2016 8.59817 9.20121 8.60301 9.20075C8.60783 9.20029 8.61266 9.19977 8.61748 9.19915C8.62229 9.19853 8.6271 9.19785 8.63189 9.19709C8.63668 9.19634 8.64146 9.1955 8.64624 9.19459C8.651 9.19368 8.65575 9.19269 8.6605 9.19164C8.66522 9.19059 8.66994 9.18945 8.67465 9.18825C8.67935 9.18705 8.68403 9.18577 8.6887 9.18441C8.69336 9.18307 8.698 9.18164 8.70262 9.18015C8.70724 9.17865 8.71183 9.17708 8.7164 9.17545C8.72098 9.17381 8.72551 9.1721 8.73003 9.17032C8.73454 9.16853 8.73903 9.16669 8.74349 9.16477C8.74794 9.16285 8.75237 9.16087 8.75677 9.15881C8.76116 9.15675 8.76553 9.15463 8.76986 9.15243C8.77419 9.15023 8.77849 9.14798 8.78275 9.14564C8.787 9.14332 8.79123 9.14093 8.79542 9.13847C8.79959 9.13601 8.80374 9.13349 8.80785 9.1309C8.81195 9.12831 8.81601 9.12565 8.82004 9.12294C8.82407 9.12022 8.82805 9.11745 8.83199 9.11461C8.83592 9.11177 8.83981 9.10887 8.84366 9.10591C8.8475 9.10295 8.85131 9.09992 8.85506 9.09684C8.85881 9.09377 8.86251 9.09063 8.86617 9.08744C8.86982 9.08425 8.87343 9.081 8.87698 9.07768C8.88054 9.07437 8.88403 9.07101 8.88748 9.0676C8.89094 9.06419 8.89433 9.06072 8.89767 9.0572C8.90101 9.05367 8.9043 9.0501 8.90752 9.04647C8.91075 9.04285 8.91393 9.03918 8.91703 9.03546C8.92015 9.03174 8.9232 9.02796 8.92621 9.02414C8.9292 9.02032 8.93214 9.01646 8.93501 9.01255C8.93789 9.00864 8.94071 9.00469 8.94346 9.00069C8.94622 8.9967 8.9489 8.99266 8.95153 8.98857C8.9542 8.98444 8.95681 8.98026 8.95934 8.97605C8.96188 8.97184 8.96435 8.96759 8.96677 8.9633C8.96917 8.95901 8.97151 8.95469 8.9738 8.95032C8.97607 8.94597 8.97829 8.94157 8.98043 8.93715C8.98258 8.93272 8.98466 8.92826 8.98666 8.92377C8.98867 8.91928 8.99061 8.91475 8.99249 8.91021C8.99436 8.90566 8.99616 8.90108 8.9979 8.89648C8.99963 8.89187 9.0013 8.88725 9.00289 8.8826C9.00448 8.87794 9.00601 8.87326 9.00746 8.86856C9.00891 8.86387 9.01028 8.85914 9.01158 8.85439C9.0129 8.84966 9.01413 8.84489 9.0153 8.84012C9.01645 8.83533 9.01754 8.83054 9.01855 8.82572C9.01958 8.82091 9.02053 8.81608 9.0214 8.81124C9.02226 8.8064 9.02306 8.80154 9.02379 8.79668C9.0245 8.79181 9.02516 8.78693 9.02572 8.78205C9.0263 8.77716 9.0268 8.77226 9.02723 8.76737C9.02766 8.76247 9.02801 8.75756 9.02829 8.75265C9.02856 8.74773 9.02876 8.74282 9.0289 8.73791C9.02901 8.73299 9.02907 8.72807 9.02905 8.72315C9.02903 8.71823 9.02892 8.71331 9.02875 8.7084C9.02858 8.70349 9.02834 8.69857 9.02802 8.69366C9.02769 8.68875 9.0273 8.68385 9.02684 8.67895C9.02636 8.67405 9.02582 8.66916 9.0252 8.66429C9.02458 8.6594 9.0239 8.65453 9.02313 8.64968C9.02236 8.64481 9.02152 8.63997 9.02061 8.63514C9.0197 8.6303 9.0187 8.62548 9.01764 8.62068C9.01659 8.61588 9.01546 8.61109 9.01426 8.60632C9.01304 8.60155 9.01177 8.59681 9.01042 8.59207C9.00907 8.58733 9.00765 8.58263 9.00614 8.57794C9.00466 8.57325 9.00309 8.56859 9.00146 8.56395C8.99982 8.55932 8.99812 8.5547 8.99636 8.55011C8.99457 8.54552 8.99273 8.54096 8.99081 8.53642L7.58511 5.22214C7.58289 5.21691 7.58058 5.21172 7.57817 5.20657C7.57576 5.20143 7.57326 5.19633 7.57067 5.19127C7.56808 5.18622 7.5654 5.18121 7.56263 5.17625C7.55985 5.17129 7.55699 5.16639 7.55404 5.16153C7.55108 5.15668 7.54804 5.15187 7.54491 5.14714C7.5418 5.14239 7.53858 5.1377 7.53529 5.13308C7.53199 5.12846 7.5286 5.12389 7.52515 5.11938C7.52169 5.11488 7.51814 5.11044 7.51452 5.10606C7.51089 5.10169 7.50719 5.09738 7.50341 5.09314C7.49963 5.0889 7.49577 5.08473 7.49184 5.08063C7.4879 5.07653 7.4839 5.07251 7.47982 5.06855C7.47574 5.0646 7.47159 5.06071 7.46737 5.05691C7.46315 5.05311 7.45887 5.04938 7.4545 5.04574C7.45016 5.04209 7.44573 5.03853 7.44125 5.03504C7.43676 5.03155 7.43222 5.02814 7.4276 5.02482C7.423 5.0215 7.41833 5.01827 7.4136 5.01512C7.40888 5.01196 7.40409 5.00891 7.39924 5.00593C7.3944 5.00295 7.38952 5.00006 7.38458 4.99726C7.37963 4.99445 7.37464 4.99175 7.36959 4.98913C7.36455 4.98651 7.35946 4.98398 7.35433 4.98155C7.34919 4.97912 7.34402 4.97679 7.33881 4.97454C7.33358 4.97229 7.32832 4.97015 7.32303 4.9681C7.31773 4.96603 7.31239 4.96408 7.30703 4.96223C7.30166 4.96036 7.29626 4.9586 7.29083 4.95694C7.2854 4.95527 7.27994 4.95371 7.27445 4.95225C7.26895 4.95078 7.26344 4.94941 7.25791 4.94815C7.25236 4.94689 7.24681 4.94573 7.24123 4.94467C7.23564 4.9436 7.23004 4.94265 7.22442 4.94179C7.21881 4.94094 7.21318 4.94018 7.20754 4.93952C7.20189 4.93887 7.19624 4.93832 7.19058 4.93787C7.18491 4.93743 7.17925 4.93709 7.17356 4.93685C7.16789 4.9366 7.16222 4.93646 7.15652 4.93643L2.84724 4.93571Z"
+                                    fill="#718096">
+                                </path>
+                                <path
+                                    d="M5.00002 8.34578C4.97644 8.34579 4.95287 8.34522 4.92931 8.34408C4.90575 8.34294 4.88224 8.34121 4.85877 8.33892C4.8353 8.33661 4.8119 8.33373 4.78857 8.33028C4.76524 8.32684 4.74201 8.32281 4.71888 8.31822C4.69574 8.31363 4.67274 8.30848 4.64986 8.30276C4.62698 8.29704 4.60426 8.29076 4.58169 8.28393C4.55912 8.27709 4.53673 8.26971 4.51452 8.26177C4.49231 8.25383 4.47031 8.24535 4.44852 8.23634C4.42673 8.22732 4.40517 8.21778 4.38385 8.2077C4.36252 8.19764 4.34145 8.18704 4.32065 8.17593C4.29985 8.16482 4.27934 8.15321 4.2591 8.14109C4.23887 8.12897 4.21895 8.11637 4.19934 8.10327C4.17972 8.09018 4.16044 8.07661 4.14149 8.06257C4.12254 8.04852 4.10395 8.03402 4.08571 8.01907C4.06748 8.00412 4.04962 7.98873 4.03215 7.9729C4.01467 7.95707 3.99759 7.94081 3.98091 7.92414C3.96422 7.90747 3.94796 7.8904 3.93212 7.87293C3.91627 7.85546 3.90087 7.83762 3.8859 7.81939C3.87093 7.80116 3.85642 7.78258 3.84237 7.76364C3.82832 7.74471 3.81474 7.72543 3.80163 7.70583C3.78852 7.68623 3.7759 7.66631 3.76377 7.64608C3.75164 7.62586 3.74001 7.60535 3.72889 7.58456C3.71777 7.56376 3.70716 7.5427 3.69707 7.52139C3.68699 7.50007 3.67743 7.47853 3.6684 7.45674C3.65937 7.43495 3.65088 7.41295 3.64292 7.39075C3.63497 7.36855 3.62757 7.34616 3.62072 7.32359C3.61387 7.30103 3.60758 7.27831 3.60185 7.25544C3.59611 7.23256 3.59094 7.20956 3.58633 7.18643C3.58173 7.1633 3.57769 7.14008 3.57423 7.11675C3.57077 7.09342 3.56787 7.07002 3.56556 7.04655C3.56324 7.02309 3.5615 6.99957 3.56034 6.97602C3.55918 6.95246 3.55859 6.92889 3.55859 6.9053C3.55859 6.88172 3.55916 6.85815 3.56031 6.8346C3.56146 6.81104 3.5632 6.78753 3.56551 6.76406C3.56782 6.7406 3.5707 6.71719 3.57416 6.69386C3.57762 6.67053 3.58164 6.6473 3.58624 6.62417C3.59084 6.60104 3.596 6.57804 3.60173 6.55517C3.60746 6.53228 3.61374 6.50956 3.62059 6.48699C3.62743 6.46442 3.63482 6.44204 3.64276 6.41983C3.65071 6.39763 3.65919 6.37563 3.66821 6.35384C3.67724 6.33205 3.68679 6.31049 3.69688 6.28918C3.70695 6.26786 3.71755 6.2468 3.72866 6.226C3.73978 6.2052 3.7514 6.18468 3.76353 6.16445C3.77565 6.14423 3.78826 6.12431 3.80136 6.1047C3.81446 6.08509 3.82804 6.06581 3.84209 6.04688C3.85613 6.02793 3.87063 6.00934 3.8856 5.99111C3.90056 5.97288 3.91596 5.95503 3.9318 5.93756C3.94764 5.92008 3.96389 5.903 3.98057 5.88633C3.99724 5.86965 4.01432 5.8534 4.0318 5.83756C4.04927 5.82172 4.06712 5.80632 4.08535 5.79136C4.10358 5.7764 4.12217 5.76189 4.14111 5.74785C4.16005 5.7338 4.17933 5.72023 4.19894 5.70713C4.21854 5.69402 4.23846 5.68141 4.25869 5.66929C4.27892 5.65717 4.29943 5.64555 4.32023 5.63443C4.34103 5.62331 4.3621 5.61271 4.38342 5.60264C4.40473 5.59255 4.42629 5.583 4.44808 5.57397C4.46987 5.56495 4.49187 5.55647 4.51407 5.54852C4.53627 5.54058 4.55866 5.53319 4.58123 5.52635C4.6038 5.5195 4.62652 5.51322 4.64939 5.50749C4.67228 5.50176 4.69527 5.4966 4.71841 5.492C4.74154 5.48741 4.76477 5.48338 4.7881 5.47992C4.81143 5.47646 4.83483 5.47358 4.8583 5.47127C4.88177 5.46896 4.90528 5.46723 4.92884 5.46607C4.95239 5.46492 4.97596 5.46435 4.99954 5.46436C5.02312 5.46436 5.0467 5.46494 5.07025 5.4661C5.09381 5.46726 5.11732 5.469 5.14079 5.47132C5.16426 5.47364 5.18765 5.47653 5.21098 5.47999C5.23431 5.48345 5.25754 5.48749 5.28066 5.49209C5.3038 5.4967 5.3268 5.50187 5.34967 5.50761C5.37255 5.51334 5.39526 5.51964 5.41783 5.52648C5.4404 5.53333 5.46279 5.54074 5.48499 5.54869C5.50719 5.55664 5.52919 5.56513 5.55098 5.57416C5.57276 5.58319 5.59431 5.59275 5.61562 5.60284C5.63694 5.61293 5.658 5.62353 5.6788 5.63466C5.69959 5.64578 5.7201 5.6574 5.74032 5.66953C5.76055 5.68166 5.78047 5.69428 5.80007 5.70739C5.81968 5.7205 5.83894 5.73408 5.85788 5.74813C5.87682 5.76218 5.8954 5.77669 5.91363 5.79166C5.93186 5.80663 5.9497 5.82203 5.96717 5.83788C5.98464 5.85372 6.00171 5.86998 6.01838 5.88667C6.03505 5.90335 6.05131 5.92043 6.06714 5.93791C6.08297 5.95538 6.09836 5.97324 6.11331 5.99147C6.12826 6.00971 6.14276 6.0283 6.15681 6.04726C6.17085 6.0662 6.18441 6.08548 6.19751 6.1051C6.21061 6.12471 6.22321 6.14463 6.23533 6.16486C6.24745 6.1851 6.25906 6.20562 6.27017 6.22642C6.28128 6.24722 6.29187 6.26829 6.30194 6.28961C6.31201 6.31093 6.32156 6.33249 6.33058 6.35428C6.33959 6.37607 6.34807 6.39808 6.35601 6.42028C6.36395 6.44249 6.37133 6.46488 6.37816 6.48745C6.385 6.51002 6.39128 6.53274 6.397 6.55562C6.40271 6.57851 6.40787 6.6015 6.41246 6.62464C6.41705 6.64777 6.42107 6.67101 6.42452 6.69434C6.42797 6.71767 6.43085 6.74106 6.43314 6.76453C6.43545 6.788 6.43718 6.81151 6.43832 6.83508C6.43946 6.85863 6.44003 6.8822 6.44002 6.90578C6.44001 6.92935 6.43941 6.9529 6.43825 6.97643C6.43709 6.99996 6.43534 7.02346 6.43302 7.0469C6.4307 7.07035 6.42781 7.09373 6.42435 7.11704C6.42088 7.14035 6.41684 7.16355 6.41224 7.18666C6.40763 7.20977 6.40246 7.23275 6.39673 7.25562C6.391 7.27847 6.3847 7.30116 6.37785 7.32371C6.37101 7.34626 6.3636 7.36862 6.35566 7.39081C6.34772 7.41299 6.33924 7.43497 6.33021 7.45674C6.32119 7.47851 6.31164 7.50004 6.30156 7.52134C6.29148 7.54264 6.28089 7.56367 6.26977 7.58445C6.25866 7.60523 6.24705 7.62573 6.23493 7.64594C6.22281 7.66614 6.21021 7.68604 6.19712 7.70563C6.18402 7.72522 6.17046 7.74448 6.15642 7.76341C6.14238 7.78233 6.12789 7.80091 6.11294 7.81912C6.09799 7.83733 6.0826 7.85517 6.06678 7.87263C6.05095 7.89009 6.03471 7.90715 6.01805 7.92381C6.00139 7.94047 5.98433 7.95671 5.96686 7.97254C5.9494 7.98837 5.93156 8.00375 5.91335 8.0187C5.89514 8.03365 5.87657 8.04814 5.85765 8.06218C5.83872 8.07622 5.81946 8.08978 5.79987 8.10288C5.78028 8.11598 5.76038 8.12857 5.74018 8.14069C5.71996 8.15281 5.69946 8.16443 5.67869 8.17554C5.65791 8.18665 5.63687 8.19725 5.61558 8.20732C5.59428 8.2174 5.57274 8.22695 5.55098 8.23598C5.52921 8.245 5.50723 8.25349 5.48505 8.26143C5.46286 8.26937 5.4405 8.27677 5.41795 8.28361C5.3954 8.29046 5.3727 8.29676 5.34984 8.30249C5.32699 8.30822 5.30401 8.31339 5.2809 8.318C5.25779 8.3226 5.23459 8.32664 5.21128 8.33011C5.18797 8.33357 5.16459 8.33646 5.14114 8.33879C5.11769 8.3411 5.0942 8.34285 5.07066 8.34401C5.04713 8.34517 5.02358 8.34577 5.00002 8.34578ZM5.00002 6.25936C4.9894 6.25928 4.97879 6.25948 4.96817 6.25993C4.95756 6.26038 4.94697 6.26109 4.9364 6.26207C4.92582 6.26304 4.91527 6.26427 4.90476 6.26577C4.89424 6.26726 4.88377 6.26901 4.87334 6.27103C4.86291 6.27303 4.85254 6.27529 4.84222 6.27781C4.8319 6.28033 4.82166 6.28311 4.81147 6.28613C4.80129 6.28915 4.79119 6.29242 4.78117 6.29595C4.77115 6.29947 4.76122 6.30324 4.75139 6.30725C4.74155 6.31126 4.73183 6.31551 4.7222 6.32C4.71258 6.32449 4.70307 6.32921 4.69367 6.33417C4.68428 6.33912 4.67501 6.34431 4.66588 6.34973C4.65675 6.35514 4.64774 6.36077 4.63889 6.36663C4.63003 6.37249 4.62132 6.37856 4.61275 6.38484C4.60419 6.39113 4.59579 6.39762 4.58755 6.40432C4.57931 6.41102 4.57123 6.41791 4.56333 6.42501C4.55543 6.43211 4.54771 6.4394 4.54017 6.44687C4.53262 6.45435 4.52527 6.462 4.51811 6.46984C4.51094 6.47769 4.50397 6.4857 4.4972 6.49388C4.49043 6.50206 4.48386 6.5104 4.4775 6.51891C4.47114 6.52741 4.46499 6.53607 4.45905 6.54488C4.45312 6.55369 4.44741 6.56264 4.44191 6.57173C4.43642 6.58082 4.43115 6.59004 4.42611 6.59938C4.42107 6.60873 4.41627 6.6182 4.41169 6.62778C4.40712 6.63737 4.40278 6.64707 4.39868 6.65687C4.39459 6.66666 4.39074 6.67655 4.38713 6.68654C4.38352 6.69653 4.38015 6.7066 4.37704 6.71676C4.37393 6.7269 4.37107 6.73713 4.36846 6.74743C4.36585 6.75772 4.36349 6.76808 4.36139 6.77849C4.35929 6.7889 4.35745 6.79936 4.35586 6.80985C4.35427 6.82035 4.35294 6.83089 4.35187 6.84145C4.35081 6.85202 4.35001 6.86261 4.34946 6.87322C4.34892 6.88383 4.34863 6.89444 4.3486 6.90506C4.34858 6.91567 4.34882 6.92629 4.34932 6.9369C4.34982 6.94751 4.35058 6.9581 4.3516 6.96867C4.35262 6.97925 4.3539 6.98979 4.35544 7.00029C4.35698 7.0108 4.35878 7.02127 4.36083 7.03169C4.36289 7.04211 4.3652 7.05247 4.36776 7.06277C4.37033 7.07308 4.37314 7.08332 4.37621 7.09349C4.37928 7.10365 4.3826 7.11374 4.38616 7.12374C4.38973 7.13375 4.39354 7.14366 4.3976 7.15348C4.40165 7.16329 4.40594 7.17301 4.41047 7.18261C4.415 7.19222 4.41977 7.20171 4.42477 7.21107C4.42977 7.22044 4.43499 7.22969 4.44045 7.2388C4.4459 7.24791 4.45157 7.25688 4.45747 7.26572C4.46337 7.27456 4.46948 7.28324 4.4758 7.29177C4.48212 7.3003 4.48865 7.30867 4.49539 7.31688C4.50212 7.3251 4.50905 7.33314 4.51618 7.34102C4.52332 7.34888 4.53064 7.35657 4.53814 7.36408C4.54565 7.37159 4.55335 7.37892 4.56122 7.38604C4.56909 7.39317 4.57713 7.40011 4.58534 7.40685C4.59355 7.41357 4.60192 7.42011 4.61046 7.42644C4.61899 7.43275 4.62768 7.43887 4.63651 7.44476C4.64535 7.45065 4.65432 7.45633 4.66343 7.46179C4.67254 7.46724 4.68179 7.47246 4.69116 7.47746C4.70053 7.48246 4.71002 7.48723 4.71962 7.49176C4.72923 7.49629 4.73894 7.50059 4.74875 7.50464C4.75856 7.50869 4.76848 7.5125 4.77849 7.51606C4.7885 7.51963 4.79857 7.52295 4.80874 7.52602C4.81891 7.52909 4.82915 7.5319 4.83945 7.53447C4.84976 7.53704 4.86013 7.53935 4.87055 7.5414C4.88097 7.54346 4.89143 7.54525 4.90193 7.54679C4.91244 7.54833 4.92298 7.54961 4.93355 7.55063C4.94413 7.55165 4.95472 7.55241 4.96532 7.55291C4.97594 7.55341 4.98655 7.55365 4.99717 7.55362C5.00779 7.5536 5.01841 7.55332 5.02901 7.55277C5.03962 7.55223 5.0502 7.55142 5.06077 7.55035C5.07134 7.54929 5.08187 7.54796 5.09237 7.54637C5.10287 7.54478 5.11333 7.54294 5.12374 7.54084C5.13416 7.53874 5.14451 7.53639 5.1548 7.53378C5.1651 7.53117 5.17532 7.5283 5.18548 7.52519C5.19562 7.52207 5.2057 7.51871 5.21569 7.51511C5.22568 7.51149 5.23558 7.50764 5.24537 7.50354C5.25517 7.49945 5.26486 7.49512 5.27444 7.49054C5.28403 7.48597 5.29351 7.48116 5.30285 7.47611C5.3122 7.47107 5.32142 7.46581 5.33051 7.46032C5.3396 7.45482 5.34854 7.44911 5.35735 7.44317C5.36616 7.43725 5.37481 7.43109 5.38332 7.42474C5.39183 7.41837 5.40017 7.4118 5.40835 7.40503C5.41653 7.39826 5.42454 7.39129 5.43238 7.38413C5.44022 7.37696 5.44788 7.36961 5.45535 7.36206C5.46283 7.35452 5.47012 7.3468 5.47722 7.3389C5.48432 7.331 5.49121 7.32292 5.49791 7.31468C5.50461 7.30645 5.5111 7.29805 5.51738 7.28948C5.52367 7.28092 5.52975 7.27221 5.5356 7.26335C5.54145 7.25449 5.54709 7.24549 5.55251 7.23636C5.55792 7.22722 5.56311 7.21795 5.56807 7.20855C5.57302 7.19917 5.57774 7.18966 5.58224 7.18003C5.58672 7.17041 5.59097 7.16067 5.59498 7.15084C5.59899 7.14101 5.60275 7.13108 5.60628 7.12106C5.6098 7.11104 5.61308 7.10095 5.6161 7.09076C5.61912 7.08058 5.62189 7.07033 5.62441 7.06001C5.62693 7.0497 5.6292 7.03933 5.63121 7.0289C5.63321 7.01847 5.63497 7.008 5.63646 6.99748C5.63796 6.98696 5.63919 6.97642 5.64017 6.96584C5.64113 6.95526 5.64185 6.94468 5.6423 6.93406C5.64275 6.92345 5.64295 6.91283 5.64288 6.90221C5.64281 6.89171 5.64248 6.88121 5.6419 6.87073C5.64133 6.86024 5.64049 6.84978 5.63939 6.83934C5.63831 6.82889 5.63696 6.81848 5.63537 6.8081C5.63377 6.79771 5.63192 6.78738 5.62982 6.77709C5.62772 6.76681 5.62537 6.75657 5.62277 6.7464C5.62018 6.73622 5.61733 6.72611 5.61425 6.71607C5.61115 6.70603 5.60782 6.69607 5.60425 6.6862C5.60067 6.67633 5.59686 6.66655 5.59281 6.65686C5.58876 6.64717 5.58447 6.63759 5.57996 6.62811C5.57544 6.61862 5.57069 6.60926 5.56572 6.60001C5.56075 6.59076 5.55556 6.58163 5.55014 6.57264C5.54472 6.56364 5.53908 6.55478 5.53323 6.54606C5.52738 6.53734 5.52133 6.52877 5.51506 6.52034C5.5088 6.51191 5.50232 6.50364 5.49565 6.49553C5.48898 6.48741 5.48213 6.47947 5.47507 6.47169C5.46801 6.46391 5.46077 6.45631 5.45335 6.44889C5.44592 6.44145 5.43832 6.43422 5.43054 6.42716C5.42275 6.4201 5.41481 6.41324 5.4067 6.40657C5.39858 6.39991 5.39032 6.39344 5.38189 6.38717C5.37347 6.3809 5.36489 6.37485 5.35617 6.36899C5.34745 6.36315 5.33858 6.35752 5.32959 6.3521C5.3206 6.34668 5.31146 6.34149 5.30222 6.33651C5.29297 6.33154 5.2836 6.32679 5.27412 6.32228C5.26464 6.31776 5.25506 6.31347 5.24537 6.30942C5.23568 6.30537 5.2259 6.30156 5.21603 6.29799C5.20615 6.29441 5.19619 6.29107 5.18615 6.28799C5.17612 6.2849 5.16602 6.28205 5.15584 6.27945C5.14566 6.27686 5.13543 6.27451 5.12514 6.27241C5.11485 6.27031 5.10451 6.26846 5.09413 6.26686C5.08375 6.26526 5.07334 6.26392 5.0629 6.26283C5.05245 6.26174 5.04198 6.26091 5.0315 6.26033C5.02102 6.25975 5.01052 6.25943 5.00002 6.25936Z"
+                                    fill="#718096">
+                                </path>
+                            </g>
+                            <defs>
+                                <clipPath id="clip-path-1_1414">
+                                    <path d="M0 10L10 10L10 0L0 0L0 10Z" fill="white" />
+                                </clipPath>
+                            </defs>
+                        </svg>
+                        <span>13325568888</span>
+                    </span>
+                </div>
+            </div>
+            <div class="icon">
+                <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40"
+                    height="40" viewBox="0 0 40 40" fill="none">
+                    <path fill="#FAFAFA"
+                        d="M0 20C0 31.0457 8.9543 40 20 40C31.0457 40 40 31.0457 40 20C40 8.9543 31.0457 0 20 0C8.9543 0 0 8.9543 0 20">
+                    </path>
+                    <path
+                        d="M28 16C28 15.2001 27.68 14.44 27.12 13.88C26.56 13.32 25.8 13 25 13L15 13C14.2 13 13.44 13.32 12.88 13.88C12.32 14.44 12 15.2001 12 16L12 22C12 22.7999 12.32 23.56 12.88 24.1199C13.44 24.68 14.2 25 15 25L17 25L20 28L23 25L25 25C25.8 25 26.56 24.68 27.12 24.1199C27.68 23.56 28 22.7999 28 22L28 16Z"
+                        stroke="rgba(160, 174, 192, 1)" stroke-width="1.5" stroke-linejoin="round">
+                    </path>
+                    <path stroke="rgba(160, 174, 192, 1)" stroke-width="1.5" stroke-linejoin="round"
+                        d="M16 17.5L24 17.5">
+                    </path>
+                    <path stroke="rgba(160, 174, 192, 1)" stroke-width="1.5" stroke-linejoin="round"
+                        d="M16 17.5L24 17.5">
+                    </path>
+                    <path stroke="rgba(160, 174, 192, 1)" stroke-width="1.5" stroke-linejoin="round"
+                        d="M16 21.5L22 21.5">
+                    </path>
+                </svg>
+            </div>
+        </div>
+
+    </el-card>
+</template>
+<style scoped lang="scss">
+:deep(.el-card__body) {
+    padding: 15px 0 !important;
+}
+
+.header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 12px;
+    color: rgba(113, 128, 150, 1);
+    padding: 0 15px;
+}
+
+.content {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid rgba(230, 230, 230, 1);
+    padding: 10px 15px;
+
+    .img {
+        width: 60px;
+        height: 60px;
+
+        img {
+            display: flex;
+            width: 100%;
+            height: 100%;
+        }
+    }
+
+    .info {
+        .msg {
+            font-size: 12px;
+            color: rgba(113, 128, 150, 1);
+
+        }
+
+        margin-right: auto;
+        margin-left: 10px;
+    }
+}
+</style>
+<script setup>
+const currentTime = computed(() => {
+    // 获取当前日期对象
+    const today = new Date();
+
+    // 获取年份
+    const year = today.getFullYear();
+
+    // 获取月份（月份从0开始，所以需要+1）
+    // 使用padStart确保月份是两位数
+    const month = String(today.getMonth() + 1).padStart(2, '0');
+
+    // 获取日期
+    // 使用padStart确保日期是两位数
+    const day = String(today.getDate()).padStart(2, '0');
+
+    // 拼接成"YYYY-MM-DD"格式
+    return `${year}-${month}-${day}`;
+})
+
+
+</script>
\ No newline at end of file
diff --git a/src/views/demo/index.vue b/src/views/demo/index.vue
new file mode 100644
index 0000000..643b878
--- /dev/null
+++ b/src/views/demo/index.vue
@@ -0,0 +1,226 @@
+<template>
+    <div class="model">
+        <el-row :gutter="24">
+            <el-col :span="12">
+                <TitleComponent title="XXX电站·逆变器综合监控" subtitle="实时监控X台逆变器运行状态、发电趋势及环境信息" />
+            </el-col>
+            <!-- 外层col：控制整体宽度并右对齐，同时作为flex容器 -->
+            <el-col :span="12" style="display: flex; justify-content: flex-end; align-items: center;">
+                <!-- 子col1：输入框容器 -->
+                <el-col :span="8">
+                    <el-input placeholder="请输入逆变器...">
+                        <template #prefix>
+                            <el-icon>
+                                <Search />
+                            </el-icon>
+                        </template>
+                    </el-input>
+                </el-col>
+                <!-- 子col2：下拉框容器 -->
+                <el-col :span="4">
+                    <el-select placeholder="请选择状态">
+                        <el-option label="所有状态" value="all"></el-option>
+                    </el-select>
+                </el-col>
+                <el-col :span="4">
+                    <el-button type="primary">
+                        刷新数据
+                        <el-icon class="el-icon--right">
+                            <Refresh />
+                        </el-icon>
+                    </el-button>
+                </el-col>
+            </el-col>
+        </el-row>
+        <el-row style="display: flex; gap: 30px;" class="card">
+            <el-col style="flex: 1;" class="item">
+                <div class="box" style="height: 100%;display: flex;">
+                    <div class="left"
+                        style="display: flex;flex-direction: column;height: 100%;justify-content: space-around;padding: 15px;">
+                        <div style="color: rgba(102, 102, 102, 1);">今日总发电量</div>
+                        <div><span
+                                style="font-size: 30px;font-weight: 400;letter-spacing: 0px;line-height: 36px;color: rgba(0, 0, 0, 1);font-weight: bold;">1,248</span>
+                            <span
+                                style="font-size: 12px;font-weight: 400;letter-spacing: 0px;line-height: 17.38px;color: rgba(154, 154, 154, 1);">
+                                KWH
+                            </span>
+                        </div>
+                        <div style="display: flex;align-items: center">
+                            <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+                                width="18" height="18" viewBox="0 0 18 18" fill="none">
+                                <path
+                                    d="M15.15 5.77505L15.15 5.70006L15.15 5.62505L15.075 5.62505C15.075 5.62505 15 5.62505 14.925 5.55005L11.25 5.55005C10.875 5.55005 10.575 5.85005 10.575 6.22505C10.575 6.60006 10.875 6.90005 11.25 6.90005L13.125 6.90005L9.52501 10.5L7.72501 8.70005C7.35 8.32505 6.60001 8.32505 6.225 8.70005L3.075 11.85C2.85 12.075 2.85 12.525 3.075 12.75C3.22501 12.9001 3.37501 12.975 3.525 12.975C3.67501 12.975 3.82501 12.975 3.975 12.75L6.9 9.82505L8.7 11.625C9.07501 12.0001 9.825 12.0001 10.2 11.625L13.95 7.87505L13.95 9.75006C13.95 10.1251 14.25 10.4251 14.625 10.4251C15 10.4251 15.3 10.1251 15.3 9.75006L15.3 6.37506L15.3 6.15006L15.15 5.77505Z"
+                                    fill="#00B87A">
+                                </path>
+                            </svg>
+                            <span
+                                style="font-size: 12px;font-weight: 500;letter-spacing: 0px;line-height: 14.48px;color: rgba(0, 184, 122, 1)">8.2%</span>
+                            <span
+                                style="font-size: 12px;font-weight: 500;letter-spacing: 0px;line-height: 14.48px;color: rgba(154, 154, 154, 1)">较昨日同期</span>
+                        </div>
+                    </div>
+                    <div class="right">
+                        <img src="/assets/demo/back.png" alt="" style="height: 100%;">
+                    </div>
+                </div>
+            </el-col>
+            <el-col style="flex: 1" class="item">
+                <div class="box" style="height: 100%;display: flex;">
+                    <div class="left"
+                        style="display: flex;flex-direction: column;height: 100%;justify-content: space-around;padding: 15px;">
+                        <div style="color: rgba(102, 102, 102, 1);">逆变器总数</div>
+                        <div><span
+                                style="font-size: 30px;font-weight: 400;letter-spacing: 0px;line-height: 36px;color: rgba(0, 0, 0, 1);font-weight: bold;">54</span>
+                            <span
+                                style="font-size: 12px;font-weight: 400;letter-spacing: 0px;line-height: 17.38px;color: rgba(154, 154, 154, 1);">
+                                台
+                            </span>
+                        </div>
+                        <div style="display: flex;">
+                            <div
+                                style="width: 63px;height: 18px;border-radius: 16px;background: rgba(0, 184, 122, .3);text-align: center;">
+                                <span
+                                    style="font-size: 12px;font-weight: 400;letter-spacing: 0;line-height: 17.38px;color: rgba(0, 184, 122, 1);">
+                                    正常：<span>53</span>
+                                </span>
+                            </div>
+                            <div
+                                style="width: 63px;height: 18px;border-radius: 16px;background: rgba(227, 39, 39, .3);text-align: center;margin-left: 10px;">
+                                <span
+                                    style="font-size: 12px;font-weight: 400;letter-spacing: 0;line-height: 17.38px;color: rgba(0, 184, 122, 1);color: red;">
+                                    异常<span>53</span>
+                                </span>
+                            </div>
+                            <!-- <div>异常：<span>1</span></div> -->
+                        </div>
+                    </div>
+                    <div class="right">
+                        <img src="/assets/demo/back2.png" alt="" style="height: 100%;">
+                    </div>
+                </div>
+            </el-col>
+            <el-col style="flex: 1" class="item">
+                <div class="box" style="height: 100%;display: flex;">
+                    <div class="left"
+                        style="display: flex;flex-direction: column;height: 100%;justify-content: space-around;padding: 15px;">
+                        <div style="color: rgba(102, 102, 102, 1);">平均效率</div>
+                        <div><span
+                                style="font-size: 30px;font-weight: 400;letter-spacing: 0px;line-height: 36px;color: rgba(0, 0, 0, 1);font-weight: bold;">98</span>
+                            <span
+                                style="font-size: 12px;font-weight: 400;letter-spacing: 0px;line-height: 17.38px;color: rgba(154, 154, 154, 1);">
+                                %
+                            </span>
+                        </div>
+                        <div style="display: flex;align-items: center">
+                            <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+                                width="18" height="18" viewBox="0 0 18 18" fill="none">
+                                <path
+                                    d="M15.15 12.2252L15.15 12.3002L15.15 12.3752L15.075 12.3752C15.075 12.3752 15 12.3752 14.925 12.4502L11.25 12.4502C10.875 12.4502 10.575 12.1502 10.575 11.7752C10.575 11.4002 10.875 11.1002 11.25 11.1002L13.125 11.1002L9.52501 7.5002L7.72501 9.3002C7.35 9.67519 6.60001 9.67519 6.225 9.3002L3.075 6.1502C2.85 5.9252 2.85 5.4752 3.075 5.2502C3.22501 5.10019 3.37501 5.0252 3.525 5.0252C3.67501 5.0252 3.82501 5.0252 3.975 5.2502L6.9 8.1752L8.7 6.3752C9.07501 6.00019 9.825 6.00019 10.2 6.3752L13.95 10.1252L13.95 8.25019C13.95 7.87519 14.25 7.57519 14.625 7.57519C15 7.57519 15.3 7.87519 15.3 8.25019L15.3 11.6252L15.3 11.8502L15.15 12.2252Z"
+                                    fill="#E32727">
+                                </path>
+                            </svg>
+
+                            <span
+                                style="font-size: 12px;font-weight: 500;letter-spacing: 0px;line-height: 14.48px;color:  rgba(227, 39, 39, 1)">0.2%</span>
+                            <span
+                                style="font-size: 12px;font-weight: 500;letter-spacing: 0px;line-height: 14.48px;color: rgba(154, 154, 154, 1)">较昨日同期</span>
+                        </div>
+                    </div>
+                    <div class="right">
+                        <img src="/assets/demo/back3.png" alt="" style="height: 100%;">
+                    </div>
+                </div>
+            </el-col>
+            <el-col style="flex: 1" class="item">
+                <div class="box" style="height: 100%;display: flex;">
+                    <div class="left"
+                        style="display: flex;flex-direction: column;height: 100%;justify-content: space-around;padding: 15px;">
+                        <div style="color: rgba(102, 102, 102, 1);">当前总功率</div>
+                        <div><span
+                                style="font-size: 30px;font-weight: 400;letter-spacing: 0px;line-height: 36px;color: rgba(0, 0, 0, 1);font-weight: bold;">325</span>
+                            <span
+                                style="font-size: 12px;font-weight: 400;letter-spacing: 0px;line-height: 17.38px;color: rgba(154, 154, 154, 1);">
+                                KW
+                            </span>
+                        </div>
+                        <div style="display: flex;align-items: center">
+                            <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+                                width="18" height="18" viewBox="0 0 18 18" fill="none">
+                                <path
+                                    d="M1.561 6.19974L2.68001 6.19974C2.68598 6.1995 2.69196 6.19932 2.69795 6.19925C2.70395 6.19918 2.70995 6.19921 2.71594 6.19932C2.72193 6.19944 2.72791 6.19965 2.73388 6.19995C2.73987 6.20027 2.74585 6.20066 2.75181 6.20115C2.75779 6.20164 2.76375 6.20222 2.76971 6.20289C2.77565 6.20357 2.78158 6.20435 2.78752 6.20521C2.79344 6.20607 2.79935 6.20702 2.80526 6.20806C2.81116 6.20911 2.81703 6.21025 2.8229 6.21148C2.82876 6.21271 2.83459 6.21403 2.84043 6.21544C2.84625 6.21686 2.85205 6.21837 2.85783 6.21996C2.8636 6.22156 2.86935 6.22324 2.87508 6.225C2.88079 6.22678 2.88648 6.22864 2.89214 6.23057C2.8978 6.23254 2.90343 6.23458 2.90904 6.23669C2.91463 6.23884 2.9202 6.24105 2.92574 6.24334C2.93126 6.24564 2.93676 6.24803 2.94222 6.25049C2.94767 6.25297 2.95309 6.25552 2.95847 6.25815C2.96385 6.26079 2.96917 6.26352 2.97448 6.26633C2.97975 6.26914 2.98501 6.27202 2.99021 6.27499C2.99542 6.27796 3.00057 6.28101 3.00568 6.28413C3.01078 6.28726 3.01584 6.29048 3.02085 6.29377C3.02584 6.29705 3.0308 6.30041 3.03572 6.30386C3.04061 6.3073 3.04546 6.31084 3.05026 6.31442C3.05504 6.31801 3.05979 6.32168 3.06446 6.32543C3.06914 6.32917 3.07374 6.33298 3.07831 6.33687C3.08287 6.34075 3.08737 6.34471 3.09181 6.34873C3.09624 6.35278 3.1006 6.35687 3.10493 6.36102C3.10922 6.36519 3.11347 6.36941 3.11765 6.37369C3.12182 6.378 3.12593 6.38236 3.12998 6.38677C3.134 6.3912 3.13797 6.3957 3.14188 6.40024C3.14578 6.40479 3.14959 6.4094 3.15336 6.41405C3.15712 6.41873 3.16079 6.42344 3.16441 6.42822C3.16802 6.433 3.17155 6.43786 3.17501 6.44274L4.37351 8.21423L6.08351 4.67124C6.15401 4.51973 6.2965 4.41623 6.4585 4.37724C6.751 4.30224 7.057 4.45673 7.14551 4.72673L9.4555 11.7062L11.14 6.61673C11.1925 6.37674 11.4175 6.19974 11.6905 6.19974L14.5045 6.19974C14.5522 6.19951 14.5992 6.20502 14.6455 6.21623C14.652 6.20586 14.6586 6.19559 14.6654 6.18543C14.6722 6.17527 14.6791 6.16524 14.6863 6.15529C14.6934 6.14536 14.7007 6.13553 14.7081 6.12583C14.7155 6.11612 14.7231 6.10652 14.7309 6.09707C14.7386 6.08761 14.7465 6.07828 14.7545 6.06907C14.7626 6.05987 14.7708 6.0508 14.7791 6.04186C14.7874 6.03293 14.7959 6.02412 14.8045 6.01544C14.8131 6.00677 14.8219 5.99824 14.8308 5.98984C14.8397 5.98146 14.8487 5.97321 14.8579 5.96511C14.867 5.95702 14.8763 5.94908 14.8857 5.94127C14.8951 5.93347 14.9047 5.92582 14.9143 5.91833C14.924 5.91085 14.9338 5.9035 14.9437 5.89633C14.9536 5.88915 14.9636 5.88212 14.9737 5.87527C14.9838 5.86841 14.994 5.86173 15.0044 5.85519C15.0147 5.84867 15.0251 5.84231 15.0357 5.83612C15.0462 5.82993 15.0569 5.82392 15.0676 5.81807C15.0783 5.81223 15.0891 5.80655 15.1001 5.80103C15.111 5.79555 15.122 5.79022 15.1331 5.78507C15.1442 5.77992 15.1553 5.77495 15.1666 5.77017C15.1778 5.76539 15.1892 5.76078 15.2005 5.75635C15.2119 5.75192 15.2234 5.74769 15.2349 5.74362C15.2465 5.73958 15.2581 5.73571 15.2697 5.73202C15.2814 5.72835 15.2931 5.72485 15.3049 5.72155C15.3166 5.71824 15.3284 5.71513 15.3403 5.7122C15.3522 5.70928 15.3641 5.70655 15.3761 5.704C15.388 5.70147 15.4 5.69912 15.412 5.69695C15.4241 5.69481 15.4361 5.69284 15.4482 5.69107C15.4603 5.68931 15.4724 5.68774 15.4846 5.68636C15.4967 5.68498 15.5089 5.68381 15.5211 5.6828C15.5333 5.68182 15.5455 5.68105 15.5577 5.68045C15.5699 5.67985 15.5821 5.67946 15.5943 5.67925C15.6066 5.67906 15.6188 5.67906 15.631 5.67924C16.252 5.67924 16.756 6.14423 16.756 6.71874C16.756 7.29474 16.252 7.75973 15.631 7.75973C15.6188 7.75991 15.6066 7.75987 15.5944 7.75964C15.5821 7.75943 15.5699 7.75901 15.5577 7.75838C15.5455 7.75776 15.5333 7.75695 15.5211 7.75593C15.509 7.75493 15.4968 7.75374 15.4847 7.75233C15.4725 7.75094 15.4604 7.74936 15.4483 7.74757C15.4362 7.74577 15.4242 7.7438 15.4122 7.74162C15.4001 7.73946 15.3882 7.73711 15.3762 7.73454C15.3642 7.73199 15.3523 7.72925 15.3405 7.7263C15.3286 7.72338 15.3168 7.72025 15.305 7.71693C15.2933 7.71362 15.2816 7.71011 15.2699 7.70642C15.2583 7.70272 15.2467 7.69886 15.2352 7.69478C15.2236 7.69074 15.2122 7.68648 15.2008 7.68205C15.1894 7.67762 15.1781 7.67302 15.1669 7.66822C15.1556 7.66344 15.1445 7.65848 15.1334 7.65331C15.1223 7.64818 15.1113 7.64285 15.1004 7.63735C15.0895 7.63185 15.0786 7.62617 15.0679 7.62032C15.0572 7.61448 15.0465 7.60847 15.036 7.60228C15.0255 7.5961 15.015 7.58973 15.0047 7.58321C14.9944 7.57671 14.9841 7.57001 14.974 7.56315C14.9639 7.55632 14.9539 7.5493 14.944 7.54213C14.9341 7.53496 14.9243 7.52763 14.9147 7.52014C14.905 7.51267 14.8955 7.50504 14.8861 7.49724C14.8766 7.48947 14.8673 7.48152 14.8582 7.47344C14.849 7.46535 14.84 7.45712 14.8311 7.44874C14.8222 7.44037 14.8134 7.43185 14.8048 7.4232C14.7962 7.41455 14.7877 7.40574 14.7794 7.39681C14.771 7.38788 14.7628 7.37883 14.7548 7.36964C14.7467 7.36046 14.7388 7.35114 14.7311 7.34169C14.7233 7.33225 14.7157 7.32269 14.7082 7.313C14.7008 7.30331 14.6935 7.29351 14.6864 7.28359C14.6792 7.27368 14.6723 7.26364 14.6655 7.25348C14.6586 7.24336 14.652 7.23311 14.6455 7.22274C14.5992 7.23395 14.5522 7.23945 14.5045 7.23924L12.1105 7.23924L9.9955 13.6322C9.9055 13.9052 9.5905 14.0612 9.2935 13.9772C9.28273 13.9742 9.27205 13.9709 9.26147 13.9673C9.25089 13.9636 9.24041 13.9597 9.23008 13.9554C9.21972 13.9512 9.20951 13.9466 9.19944 13.9417C9.18937 13.9369 9.17945 13.9317 9.16968 13.9263C9.15991 13.9208 9.15031 13.9151 9.14089 13.9091C9.13145 13.903 9.1222 13.8967 9.11315 13.8902C9.1041 13.8836 9.09525 13.8768 9.08661 13.8697C9.07796 13.8626 9.06952 13.8552 9.06131 13.8476C9.05308 13.84 9.0451 13.8322 9.03737 13.8241C9.0296 13.8161 9.02209 13.8078 9.01485 13.7993C9.00759 13.7907 9.0006 13.782 8.99386 13.7731C8.98711 13.7642 8.98064 13.755 8.97446 13.7457C8.96825 13.7364 8.96233 13.7269 8.9567 13.7172C8.95108 13.7076 8.94573 13.6978 8.94069 13.6878C8.93563 13.6778 8.93088 13.6677 8.92643 13.6574C8.92197 13.6471 8.91784 13.6368 8.91401 13.6262L6.50651 6.34824L4.98551 9.50724C4.97821 9.52457 4.96997 9.54145 4.96079 9.55787C4.9516 9.57429 4.94151 9.59012 4.93054 9.60538C4.91955 9.62066 4.90774 9.63526 4.89512 9.64919C4.8825 9.66314 4.86912 9.67633 4.85501 9.68874L4.84451 9.69923C4.83931 9.7037 4.83404 9.70805 4.82869 9.71233C4.82335 9.7166 4.81792 9.72078 4.81243 9.72486C4.80693 9.72894 4.80138 9.73293 4.79575 9.73683C4.79012 9.74073 4.78443 9.74451 4.77866 9.7482C4.7729 9.75191 4.76708 9.75552 4.76119 9.759C4.7553 9.76249 4.74936 9.76589 4.74337 9.76917C4.73736 9.77248 4.73131 9.77566 4.72521 9.77874C4.71909 9.78183 4.71292 9.7848 4.70672 9.78767C4.70049 9.79055 4.69424 9.79331 4.68793 9.79595C4.68162 9.79862 4.67527 9.80115 4.66887 9.80357C4.66247 9.80602 4.65604 9.80834 4.64957 9.81055C4.64308 9.81277 4.63656 9.81488 4.63002 9.81686C4.62347 9.81885 4.61689 9.82073 4.61028 9.82249C4.60367 9.82425 4.59703 9.8259 4.59035 9.82743C4.58367 9.82896 4.57699 9.83036 4.57028 9.83166C4.56354 9.83296 4.55681 9.83416 4.55006 9.83523C4.54329 9.8363 4.53651 9.83725 4.52972 9.83808C4.52292 9.83892 4.51612 9.83964 4.50931 9.84024C4.50249 9.84084 4.49566 9.84133 4.48884 9.84168C4.48198 9.84205 4.47514 9.8423 4.4683 9.84244C4.46147 9.84258 4.45463 9.84258 4.44779 9.84246C4.44094 9.84235 4.4341 9.84214 4.42726 9.84179C4.42042 9.84146 4.4136 9.841 4.40678 9.84042C4.39996 9.83984 4.39314 9.83913 4.38636 9.83833C4.37955 9.83752 4.37277 9.8366 4.36602 9.83555C4.35925 9.83449 4.3525 9.83333 4.34579 9.83205C4.33905 9.83078 4.33236 9.82938 4.32569 9.82787C4.31901 9.82635 4.31235 9.82474 4.30574 9.823C4.29912 9.82128 4.29252 9.81941 4.28598 9.81744C4.27943 9.81547 4.27291 9.8134 4.26642 9.8112C4.25993 9.80902 4.25348 9.80672 4.24708 9.80429C4.24069 9.8019 4.23432 9.79937 4.22801 9.79674C4.21372 9.79106 4.19971 9.78478 4.18598 9.77789C4.17224 9.77102 4.15882 9.76357 4.14573 9.75555C4.13262 9.74754 4.11989 9.73896 4.10751 9.72983C4.09514 9.72073 4.08319 9.7111 4.07165 9.70094C4.06011 9.69081 4.04901 9.68019 4.03838 9.6691C4.02774 9.65801 4.0176 9.64648 4.00797 9.63453C3.9983 9.62257 3.98918 9.61023 3.9806 9.59749C3.972 9.58476 3.96397 9.57167 3.9565 9.55824L2.38599 7.23924L1.561 7.23924C1.2505 7.23924 1 7.00674 1 6.71874C1 6.43374 1.252 6.19974 1.561 6.19974Z"
+                                    fill="#FF9900">
+                                </path>
+                            </svg>
+                            <span
+                                style="font-size: 12px;font-weight: 500;letter-spacing: 0px;line-height: 14.48px;color:  rgba(255, 153, 0, 1)">峰值功率：384KW</span>
+                        </div>
+                    </div>
+                    <div class="right">
+                        <img src="/assets/demo/back4.png" alt="" style="height: 100%;">
+                    </div>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="15">
+                <el-row style="display: flex;flex-direction: column;height: 100%;">
+                    <div>
+                        <TitleComponent title="逆变器发电趋势" subtitle="过去24小时发电功率与效率趋势" :fontLevel="2" />
+                    </div>
+                    <ChartBox style="flex-grow: 1;" />
+                </el-row>
+            </el-col>
+            <el-col :span="8" :offset="1">
+                <div>
+                    <TitleComponent title="气象监测信息" subtitle="未来24小时天气预报及环境监测" :fontLevel="2" />
+                </div>
+                <QiXiang />
+            </el-col>
+        </el-row>
+        <el-row>
+            <div>
+                <TitleComponent title="逆变器运行状态" :fontLevel="2" />
+            </div>
+            <status style="width: 100%;" />
+        </el-row>
+        <el-row style="display: flex;">
+            <el-col :span="6" style="display: flex;flex-direction: column;">
+                <div>
+                    <TitleComponent title="今日值班信息" :fontLevel="2" />
+                </div>
+                <zhiban style="width: 100%;flex-grow: 1;overflow: auto;" />
+            </el-col>
+            <el-col :span="17" :offset="1">
+                <div>
+                    <TitleComponent title="最近告警消息" :fontLevel="2" />
+                </div>
+                <gaojing />
+            </el-col>
+        </el-row>
+    </div>
+</template>
+<script setup>
+import TitleComponent from './components/TitleComponent.vue';
+import ChartBox from './components/ChartBox.vue';
+import QiXiang from './components/qixiang.vue';
+import status from './components/status.vue';
+import zhiban from './components/zhiban.vue';
+import gaojing from './components/gaojing.vue';
+</script>
+<style scoped lang="scss">
+.model {
+    padding: 20px;
+    background-color: rgba(242, 248, 252, 1);
+}
+
+.card {
+    .item {
+        flex: 1;
+        height: 123px;
+        box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.25);
+        border-radius: 12px;
+        background-color: #fff;
+    }
+
+}
+</style>
diff --git a/src/views/demo1/components/sbqk.vue b/src/views/demo1/components/sbqk.vue
new file mode 100644
index 0000000..6a6a560
--- /dev/null
+++ b/src/views/demo1/components/sbqk.vue
@@ -0,0 +1,186 @@
+<template>
+    <el-card>
+        <div class="container">
+            <div class="item">
+                <div class="top">
+                    <div class="icon">
+                        <img src="/assets/demo/sb1.png" alt="">
+                    </div>
+                    <div class="content">
+                        <p class="t1">运行中</p>
+                        <p class="t2">当前状态</p>
+                    </div>
+                </div>
+                <div class="bottom">
+                    <span class="icon"><svg xmlns="http://www.w3.org/2000/svg"
+                            xmlns:xlink="http://www.w3.org/1999/xlink" width="17.4462890625" height="4.361663818359375"
+                            viewBox="0 0 17.4462890625 4.361663818359375" fill="none">
+                            <path
+                                d="M14.43 2.05L14.43 0.4C14.43 0.32495 14.5049 0.25 14.58 0.25L14.66 0.25L17.14 2.05C17.2151 2.12505 17.2151 2.20495 17.14 2.28L14.66 4.08C14.585 4.15505 14.505 4.08 14.43 4.08L14.43 2.5L0.55 2.5C0.399897 2.6501 0.25 2.4301 0.25 2.28C0.25 2.12988 0.399897 1.98 0.55 1.98L14.43 1.98L14.43 2.05Z"
+                                stroke="rgba(67, 207, 124, 1)" stroke-width="0.5" fill="#43CF7C">
+                            </path>
+                        </svg>
+                    </span>
+                    <span class="t1">平稳运行</span>
+                    <span class="t2">(30 days)</span>
+                </div>
+            </div>
+            <div class="item">
+                <div class="top">
+                    <div class="icon">
+                        <img src="/assets/demo/sb2.png" alt="">
+                    </div>
+                    <div class="content">
+                        <p class="t1">128小时</p>
+                        <p class="t2">运行时长</p>
+                    </div>
+                </div>
+                <div class="bottom">
+                    <span class="icon"><svg xmlns="http://www.w3.org/2000/svg"
+                            xmlns:xlink="http://www.w3.org/1999/xlink" width="17.4462890625" height="4.361663818359375"
+                            viewBox="0 0 17.4462890625 4.361663818359375" fill="none">
+                            <path
+                                d="M14.43 2.05L14.43 0.4C14.43 0.32495 14.5049 0.25 14.58 0.25L14.66 0.25L17.14 2.05C17.2151 2.12505 17.2151 2.20495 17.14 2.28L14.66 4.08C14.585 4.15505 14.505 4.08 14.43 4.08L14.43 2.5L0.55 2.5C0.399897 2.6501 0.25 2.4301 0.25 2.28C0.25 2.12988 0.399897 1.98 0.55 1.98L14.43 1.98L14.43 2.05Z"
+                                stroke="rgba(67, 207, 124, 1)" stroke-width="0.5" fill="#43CF7C">
+                            </path>
+                        </svg>
+                    </span>
+                    <span class="t1">平稳运行</span>
+                    <span class="t2">(30 days)</span>
+                </div>
+            </div>
+            <div class="item">
+                <div class="top">
+                    <div class="icon">
+                        <img src="/assets/demo/sb3.png" alt="">
+                    </div>
+                    <div class="content">
+                        <p class="t1">5/8</p>
+                        <p class="t2">已完成步骤</p>
+                    </div>
+                </div>
+                <div class="bottom">
+                    <span class="icon"><svg xmlns="http://www.w3.org/2000/svg"
+                            xmlns:xlink="http://www.w3.org/1999/xlink" width="12.393798828125" height="7.42498779296875"
+                            viewBox="0 0 12.393798828125 7.42498779296875" fill="none">
+                            <path
+                                d="M12.2438 0.225L12.2438 0.150012L12.2438 0.0750058L12.1688 0.0750058C12.1688 0.0750058 12.0937 0.0750058 12.0188 0L8.34376 0C7.96876 0 7.66876 0.300006 7.66876 0.675C7.66876 1.05001 7.96876 1.35 8.34376 1.35L10.2188 1.35L6.61876 4.95L4.81876 3.15C4.44375 2.775 3.69376 2.775 3.31875 3.15L0.16875 6.3C-0.05625 6.525 -0.05625 6.975 0.16875 7.2C0.318762 7.35001 0.468756 7.425 0.61875 7.425C0.768762 7.425 0.918756 7.425 1.06875 7.2L3.99375 4.275L5.79375 6.075C6.16876 6.45001 6.91875 6.45001 7.29376 6.075L11.0438 2.32501L11.0438 4.20001C11.0438 4.575 11.3438 4.87501 11.7188 4.87501C12.0937 4.87501 12.3938 4.575 12.3938 4.20001L12.3938 0.825011L12.3938 0.600011L12.2438 0.225Z"
+                                fill="#00B87A">
+                            </path>
+                        </svg>
+
+                    </span>
+                    <span class="t1">完成率98%</span>
+                    <span class="t2">(30 days)</span>
+                </div>
+            </div>
+            <div class="item">
+                <div class="top">
+                    <div class="icon">
+                        <img src="/assets/demo/sb4.png" alt="">
+                    </div>
+                    <div class="content">
+                        <p class="t1" style="color: rgba(255, 153, 0, 1);">2条</p>
+                        <p class="t2">告警信息</p>
+                    </div>
+                </div>
+                <div class="bottom">
+                    <span class="icon"><svg xmlns="http://www.w3.org/2000/svg"
+                            xmlns:xlink="http://www.w3.org/1999/xlink" width="12.393798828125" height="7.42498779296875"
+                            viewBox="0 0 12.393798828125 7.42498779296875" fill="none">
+                            <path
+                                d="M12.2438 0.225L12.2438 0.150012L12.2438 0.0750058L12.1688 0.0750058C12.1688 0.0750058 12.0937 0.0750058 12.0188 0L8.34376 0C7.96876 0 7.66876 0.300006 7.66876 0.675C7.66876 1.05001 7.96876 1.35 8.34376 1.35L10.2188 1.35L6.61876 4.95L4.81876 3.15C4.44375 2.775 3.69376 2.775 3.31875 3.15L0.16875 6.3C-0.05625 6.525 -0.05625 6.975 0.16875 7.2C0.318762 7.35001 0.468756 7.425 0.61875 7.425C0.768762 7.425 0.918756 7.425 1.06875 7.2L3.99375 4.275L5.79375 6.075C6.16876 6.45001 6.91875 6.45001 7.29376 6.075L11.0438 2.32501L11.0438 4.20001C11.0438 4.575 11.3438 4.87501 11.7188 4.87501C12.0937 4.87501 12.3938 4.575 12.3938 4.20001L12.3938 0.825011L12.3938 0.600011L12.2438 0.225Z"
+                                fill="#00B87A">
+                            </path>
+                        </svg>
+
+                    </span>
+                    <span class="t1">4%</span>
+                    <span class="t2">(30 days)</span>
+                </div>
+            </div>
+            <div class="back">
+                <span>34522天</span>
+                <span>已安全运行</span>
+            </div>
+        </div>
+    </el-card>
+</template>
+<style scoped lang="scss">
+.content {
+    font-family: "Alibaba-PuHuiTi-Bold";
+}
+
+.container {
+    display: flex;
+    justify-content: space-around;
+}
+
+.item {
+    background-color: rgba(240, 249, 255, 1);
+    padding: 20px 40px 20px 20px;
+    border-radius: 20px;
+    text-align: center;
+
+    .top {
+        display: flex;
+        align-items: center;
+        text-align: left;
+
+        .icon {
+            img {
+                width: 100%;
+                height: 100%;
+                display: block;
+                margin-top: -20px;
+            }
+
+            width: 50px;
+            height: 50px;
+            margin-right: 20px;
+        }
+
+        .t1 {
+            font-size: 26px;
+        }
+
+        .t2 {
+            font-size: 18px;
+            color: rgba(62, 73, 84, 1);
+        }
+
+        p {
+            margin: 10px 0;
+        }
+    }
+
+    .bottom {
+        font-size: 12px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .icon {
+            display: flex;
+            align-items: center;
+        }
+
+        .t1 {
+            color: rgba(0, 184, 122, 1);
+            margin: 0 5px;
+        }
+
+        .t2 {
+            color: rgba(150, 155, 160, 1);
+        }
+    }
+
+}
+
+.back {
+    position: relative;
+}
+</style>
+<script setup>
+
+</script>
\ No newline at end of file
diff --git a/src/views/demo1/index.vue b/src/views/demo1/index.vue
new file mode 100644
index 0000000..5517244
--- /dev/null
+++ b/src/views/demo1/index.vue
@@ -0,0 +1,23 @@
+<template>
+    <div style="padding: 20px;">
+        <el-row>
+            <el-col :span="15">
+                <TitleComponent title="设备情况" subtitle="电站一次监控数据" />
+                <sbqk />
+            </el-col>
+            <el-col :span="8">
+            </el-col>
+        </el-row>
+    </div>
+
+</template>
+<style scoped>
+.el-card {
+    border-radius: 10px;
+}
+</style>
+<script setup>
+import TitleComponent from '@/views/demo/components/TitleComponent.vue';
+import sbqk from './components/sbqk.vue';
+
+</script>
\ No newline at end of file
diff --git a/src/views/design/Professional/index.vue b/src/views/design/Professional/index.vue
index 27952ed..25340b2 100644
--- a/src/views/design/Professional/index.vue
+++ b/src/views/design/Professional/index.vue
@@ -37,7 +37,15 @@
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template #default="scope">
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:extract:query']">审核</el-button>
+            <el-button
+              link
+              type="primary"
+              v-if="scope.row.status == 'draft'"
+              icon="Edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['design:extract:query']"
+              >审核</el-button
+            >
             <el-button
               link
               type="primary"
diff --git a/src/views/design/appointment/index copy 2.vue b/src/views/design/appointment/index copy 2.vue
index d87d820..8609bfd 100644
--- a/src/views/design/appointment/index copy 2.vue	
+++ b/src/views/design/appointment/index copy 2.vue	
@@ -5,7 +5,12 @@
       <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
         <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
         <p class="text-blue-100 mt-2 opacity-90">请配置项目相关负责人员信息</p>
-        <el-button @click="disabledForm = false" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="disabledForm">
+        <el-button
+          @click="disabledForm = false"
+          v-hasPermi="['design:user:list']"
+          class="px-8 py-2.5 transition-all duration-300 font-medium"
+          v-if="disabledForm"
+        >
           点击编辑
         </el-button>
       </div>
@@ -220,7 +225,7 @@
         </div>
 
         <!-- 提交按钮区域 -->
-        <div  class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
+        <div class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
           <el-button
             type="primary"
             size="large"
diff --git a/src/views/design/appointment/index.vue b/src/views/design/appointment/index.vue
index 3e51cf9..19bc328 100644
--- a/src/views/design/appointment/index.vue
+++ b/src/views/design/appointment/index.vue
@@ -47,9 +47,9 @@
             <el-row :gutter="8" class="mb-3 font-medium text-gray-700 whitespace-nowrap">
               <el-col :span="4">专业</el-col>
               <el-col :span="5">设计人员（可多选）</el-col>
-              <el-col :span="5">校审人员（可多选）</el-col>
-              <el-col :span="5">审定人员（可多选）</el-col>
-              <el-col :span="4">审核人员（可多选）</el-col>
+              <el-col :span="5">校审人员</el-col>
+              <el-col :span="5">审定人员</el-col>
+              <el-col :span="4">审核人员</el-col>
               <el-col :span="3"></el-col>
             </el-row>
 
@@ -65,7 +65,7 @@
             >
               <el-row :gutter="8" class="items-top">
                 <!-- 1. 专业选择（核心：统一所有角色的专业来源） -->
-                <el-col :span="3" class="mb-4 sm:mb-0 pl-4">
+                <el-col :span="3" class="mb-4 sm:mb-0 pl-4" style="margin-top:8px;">
                   <el-form-item
                     :prop="`designers.${configIndex}.userMajor`"
                     :rules="[
@@ -76,7 +76,7 @@
                     label-width="60px"
                     label="专业"
                   >
-                    <el-select
+                    <el-select filterable
                       v-model="form.designers[configIndex].userMajor"
                       placeholder="请选择专业"
                       class="w-full transition-all duration-300 border-gray-300"
@@ -109,7 +109,7 @@
                           label="设计"
                           label-width="50px"
                         >
-                          <el-select
+                          <el-select filterable
                             v-model="person.userId"
                             placeholder="选择人员"
                             class="w-full transition-all duration-300 border-gray-300"
@@ -165,7 +165,7 @@
                           label="校审"
                           label-width="50px"
                         >
-                          <el-select
+                          <el-select filterable
                             v-model="person.userId"
                             placeholder="选择人员"
                             class="w-full transition-all duration-300 border-gray-300"
@@ -174,7 +174,7 @@
                             <el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
                           </el-select>
                         </el-form-item>
-                        <div class="flex gap-1">
+                        <!-- <div class="flex gap-1">
                           <el-button
                             type="danger"
                             size="small"
@@ -193,7 +193,7 @@
                           >
                             <el-icon :size="14"><Plus /></el-icon>
                           </el-button>
-                        </div>
+                        </div> -->
                       </div>
                     </div>
                     <div
@@ -221,7 +221,7 @@
                           label="审定"
                           label-width="50px"
                         >
-                          <el-select
+                          <el-select filterable
                             v-model="person.userId"
                             placeholder="选择人员"
                             class="w-full transition-all duration-300 border-gray-300"
@@ -230,7 +230,7 @@
                             <el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
                           </el-select>
                         </el-form-item>
-                        <div class="flex gap-1">
+                        <!-- <div class="flex gap-1">
                           <el-button
                             type="danger"
                             size="small"
@@ -249,7 +249,7 @@
                           >
                             <el-icon :size="14"><Plus /></el-icon>
                           </el-button>
-                        </div>
+                        </div> -->
                       </div>
                     </div>
                     <div
@@ -277,7 +277,7 @@
                           label="审核"
                           label-width="50px"
                         >
-                          <el-select
+                          <el-select filterable
                             v-model="person.userId"
                             placeholder="选择人员"
                             class="w-full transition-all duration-300 border-gray-300"
@@ -286,7 +286,7 @@
                             <el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
                           </el-select>
                         </el-form-item>
-                        <div class="flex gap-1">
+                        <!-- <div class="flex gap-1">
                           <el-button
                             type="danger"
                             size="small"
@@ -305,7 +305,7 @@
                           >
                             <el-icon :size="14"><Plus /></el-icon>
                           </el-button>
-                        </div>
+                        </div> -->
                       </div>
                     </div>
                     <div
@@ -436,6 +436,8 @@ const disabledForm = ref(true); // 初始禁用表单（编辑时开启）
 
 /** 查询当前部门的所有用户（确保用户列表有效） */
 const getDeptAllUser = async (deptId: number | undefined) => {
+  console.log(1111111111111);
+
   if (!deptId) {
     ElMessage.warning('请先选择部门');
     return;
diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue
index 79241ba..fe4e7e2 100644
--- a/src/views/design/billofQuantities/index.vue
+++ b/src/views/design/billofQuantities/index.vue
@@ -16,10 +16,10 @@
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="openTable(true, index)">一键展开</el-button>
+            <el-button type="primary" @click="openTable(index)">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="openTable(false, index)">一键收起</el-button>
+              <el-button type="success" @click="downloadTemplate(1)">下载模板</el-button>
             </el-form-item>
             <el-form-item>
               <el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel" :show-file-list="false">
@@ -51,15 +51,21 @@
                 <el-option v-for="item in state.options" :key="item.versions" :label="item.versions" :value="item.versions" />
               </el-select>
             </el-form-item>
+            <el-form-item>
+              <el-button type="success" @click="downloadTemplate(2)">下载模板</el-button>
+            </el-form-item>
             <el-form-item>
               <el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel" :show-file-list="false" style="margin-right: 10px">
                 <template #trigger>
                   <el-button type="primary">导入excel</el-button>
                 </template>
               </el-upload>
-              <el-button v-if="state.versionsData.status == 'draft'" type="primary" con="edit" @click="clickApprovalSheet()">审核</el-button>
+            </el-form-item>
+            <el-form-item v-if="state.versionsData.status == 'draft'">
+              <el-button  type="primary" con="edit" @click="clickApprovalSheet()">审核</el-button>
+            </el-form-item>
+            <el-form-item v-if="state.versionsData.status == 'waiting' || state.versionsData.status == 'finish'">
               <el-button
-                v-if="state.versionsData.status == 'waiting' || state.versionsData.status == 'finish'"
                 icon="view"
                 @click="lookApprovalFlow()"
                 type="warning"
@@ -117,6 +123,7 @@ const { proxy } = getCurrentInstance();
 const { work_order_type } = toRefs(proxy?.useDict('work_order_type'));
 const tableRef = ref({});
 console.log(work_order_type);
+const isExpandAll = ref(true);
 
 // tableData
 // 版本号
@@ -146,6 +153,7 @@ const state = reactive({
 });
 // tab切换
 const handleTabChange = (tab) => {
+  isExpandAll.value = true;
   console.log('tab', tab);
   state.tableData = [];
   state.options = [];
@@ -305,13 +313,14 @@ function handleChangeVersion(versions) {
   handleQueryList();
 }
 // 在 openTable 方法中通过索引获取对应的表格实例
-function openTable(flag, index) {
+function openTable( index) {
+  isExpandAll.value = !isExpandAll.value;
   nextTick(() => {
     // 通过索引获取当前标签页的表格实例
     const currentTable = tableRef.value[index];
     console.log(currentTable, index);
     if (currentTable) {
-      handleArr(state.tableData, flag, currentTable);
+      handleArr(state.tableData, isExpandAll.value, currentTable);
     }
   });
 }
@@ -345,6 +354,34 @@ function lookApprovalFlow(row) {
     }
   });
 }
+// 下载模板
+const downloadTemplate = (type) => {
+  // 导出模版文件
+  try {
+    let linkurl =  '';
+    let name = '';
+    if (type==1) {
+      linkurl = '/billOfQuantities.xlsx';
+      name = '工程量清单模板.xlsx';
+    }else{
+      linkurl = '/materialsEquipment.xlsx';
+      name = '物资设备清单模板.xlsx';
+    }
+    // 创建a标签
+    const link = document.createElement('a');
+    // 设置PDF文件路径 - 相对于public目录
+    link.href = linkurl;
+    // 设置下载后的文件名
+    link.download = name;
+    // 触发点击
+    document.body.appendChild(link);
+    link.click();
+    // 清理
+    document.body.removeChild(link);
+  } catch (error) {
+    alert('下载失败，请重试');
+  }
+};
 </script>
 <style>
 .billof-quantities {
diff --git a/src/views/design/condition/comm/filePage.vue b/src/views/design/condition/comm/filePage.vue
index fe0111c..bd2b3f7 100644
--- a/src/views/design/condition/comm/filePage.vue
+++ b/src/views/design/condition/comm/filePage.vue
@@ -6,7 +6,7 @@
           <el-col :span="1.5">
             <div class="box_btn">
               <file-upload :limit="1" :uploadUrl="uploadUrl" :params="uploadParams" :on-upload-success="uploadFile" :fileType="[]">
-                <el-button type="primary" style="float: left" v-hasPermi="['design:collectFile:add']">
+                <el-button type="primary" style="float: left" v-hasPermi="['design:collectFile:upload']">
                   <el-icon size="small"><Upload /></el-icon>上传文件
                 </el-button>
               </file-upload>
diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue
index 428be39..9e6e857 100644
--- a/src/views/design/designChange/indexEdit.vue
+++ b/src/views/design/designChange/indexEdit.vue
@@ -314,14 +314,14 @@ let volumeMap = new Map();
 
 const handleSelect = (val) => {
   let obj = volumeMap.get(val);
-  console.log('🚀 ~ handleSelect ~ obj:', obj);
-
   fileVoList.value = obj.fileVoList;
   designId.value = obj.design;
   form.value.volumeName = obj.volumeName;
   form.value.specialty = obj.specialty;
   form.value.specialtyName = obj.specialtyName;
   form.value.extendDetail.subName = obj.designSubitem;
+  form.value.saveFile = [];
+  getBlueprintList();
 };
 // 获取图纸列表
 const blueprintListAll = ref([]);
@@ -331,9 +331,6 @@ const getBlueprintList = async () => {
 };
 const handleRadio = (val) => {
   form.value.saveFile = [];
-  if (val == 2) {
-    getBlueprintList();
-  }
 };
 
 /** 表单重置 */
@@ -351,8 +348,15 @@ const getInfo = () => {
     let id = routeParams.value.id.split('_')[0];
     const res = await getDesignChange(id);
     Object.assign(form.value, res.data);
-    console.log(form.value);
-
+    if (form.value.status != 'draft') {
+      form.value.id = id + '_audit';
+    }
+    if (form.value.extendDetail.designDisposal == 2) {
+      let obj = volumeMap.get(form.value.volumeNo);
+      designId.value = obj.design;
+      form.value.saveFile = form.value.saveFile.split(',');
+      getBlueprintList();
+    }
     if (form.value.changeReason.length > 0) {
       form.value.changeReason = form.value.changeReason.split(',');
     }
@@ -381,8 +385,11 @@ const submitForm = (status1: string) => {
       if (valid) {
         buttonLoading.value = true;
         var res;
+        delete form.value.id;
         res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
         if (res.code == 200) {
+          routeParams.value.type = 'update';
+          form.value = res.data;
           if (form.value.costEstimation == '0') {
             ElMessage.success('通知成功');
             goBack();
@@ -425,6 +432,9 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
 };
 //审批记录
 const handleApprovalRecord = () => {
+  if (form.value.id.indexOf('_audit') == -1) {
+    form.value.id = form.value.id + '_audit';
+  }
   approvalRecordRef.value.init(form.value.id);
 };
 //提交回调
diff --git a/src/views/design/drawing/index.vue b/src/views/design/drawing/index.vue
index 404e498..e845f83 100644
--- a/src/views/design/drawing/index.vue
+++ b/src/views/design/drawing/index.vue
@@ -159,7 +159,7 @@ const histroyList = ref([]);
 const getList = async () => {
   loading.value = true;
   try {
-    const res = await joinList({ type: catalogueId.value, ...queryParams.value });
+    const res = await joinList({ type: catalogueId.value, ...queryParams.value, auditStatus: 'finish' });
     volumeCatalogList.value = res.rows;
     total.value = res.total;
   } finally {
diff --git a/src/views/design/received/index.vue b/src/views/design/received/index.vue
index b28478f..b9fc009 100644
--- a/src/views/design/received/index.vue
+++ b/src/views/design/received/index.vue
@@ -17,6 +17,7 @@
               <el-select
                 :disabled="disabledAll"
                 v-model="form.userId"
+                filterable
                 placeholder="请选择收资人"
                 class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
               >
@@ -93,6 +94,7 @@
                   <el-select
                     :disabled="disabledAll"
                     v-model="item.userId"
+                    filterable
                     placeholder="请选择人员"
                     class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
                   >
@@ -112,7 +114,7 @@
           <el-button
             type="primary"
             @click="submitForm"
-            v-hasPermi="['design:collect:add']"
+            v-hasPermi="['design:collect:batch']"
             v-if="!form.id || form.status == 'draft'"
             size="large"
             class="px-8 transition-all hover:bg-blue-600"
@@ -181,6 +183,7 @@ import { systemUserList } from '@/api/design/appointment';
 import { collectBatch, byProjectId, exportWord } from '@/api/design/received';
 import { getUser } from '@/api/system/user';
 import type { ComponentInternalInstance, ElFormInstance } from 'element-plus';
+import { getInfo } from '@/api/login';
 
 // 全局实例与状态管理
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -202,7 +205,7 @@ const disabledAll = ref(false); // 表单是否全部禁用
 const form = reactive({
   projectId: currentProject.value?.id,
   userId: '', // 收资人
-  user_major: '', // 专业
+  user_major: '1', // 专业
   phone: '', // 电话
   email: '', // 邮箱
   id: '', // 表单ID
@@ -273,6 +276,8 @@ const byProjectIdAll = async () => {
     disabledAll.value = false;
 
     if (res.code == 200 && res.data) {
+      console.log('🚀 ~ byProjectIdAll ~ res:', res);
+
       const data = res.data;
       // 回显基本信息
       form.userId = data.userId || '';
@@ -415,7 +420,7 @@ const onView = () => {
 /** 获取当前用户详情（回显个人信息） */
 const getUserDetail = async () => {
   try {
-    const res = await getUser(userId.value);
+    const res = await getInfo();
     if (res.data?.user) {
       form.userId = res.data.user.userId;
       form.phone = res.data.user.phonenumber || '';
diff --git a/src/views/design/subcontract/index.vue b/src/views/design/subcontract/index.vue
index 4262682..51892ce 100644
--- a/src/views/design/subcontract/index.vue
+++ b/src/views/design/subcontract/index.vue
@@ -49,7 +49,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button v-hasPermi="['design:subcontract:add']" :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index 35fde86..f7d77df 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -99,17 +99,22 @@
     </el-card>
     <!-- 添加或修改卷册目录对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="volumeCatalogFormRef" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="volumeCatalogFormRef" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="子项" prop="designSubitem">
           <el-input v-model="form.designSubitem" placeholder="请输入设计子项" />
         </el-form-item>
         <el-form-item label="专业" prop="specialty">
-          <el-select v-model="form.specialty" placeholder="请选择专业">
-            <el-option :value="item.value" v-for="item in des_user_major" :key="item.value" :label="item.label" />
+          <el-select v-model="form.specialty" placeholder="请选择专业" @change="changeSpecialty">
+            <el-option :value="item.userMajor" v-for="item in des_user_major" :key="item.userMajor" :label="item.userMajorName" />
           </el-select>
         </el-form-item>
         <el-form-item label="设计人员" prop="principal">
-          <el-select v-model="form.principal" placeholder="请选择设计人员" class="transition-all duration-300 border-gray-300">
+          <el-select
+            :disabled="!form.specialty"
+            v-model="form.principal"
+            placeholder="请选择设计人员"
+            class="transition-all duration-300 border-gray-300"
+          >
             <el-option v-for="item in userAppList" :key="item.userId" :label="item.userName" :value="item.userId.toString()" />
           </el-select>
         </el-form-item>
@@ -248,6 +253,7 @@ import {
   addVolumeCatalog,
   updateVolumeCatalog,
   uploadVolumeFile,
+  majorList,
   getVolumeCatafileList,
   volumeFileList
 } from '@/api/design/volumeCatalog';
@@ -258,9 +264,10 @@ import TableContent from './comm/tableContent.vue';
 const fileList = ref([]);
 import { designUserList } from '@/api/design/appointment';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { design_state, wf_business_status, des_user_major } = toRefs(proxy?.useDict('design_state', 'wf_business_status', 'des_user_major'));
+const { design_state, wf_business_status } = toRefs(proxy?.useDict('design_state', 'wf_business_status'));
 import { drawingreviewReceiptsDetail, drawingreviewReceiptsList } from '@/api/design/drawingreview';
 const volumeCatalogList = ref<VolumeCatalogVO[]>([]);
+const des_user_major = ref([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -350,13 +357,28 @@ const data = reactive({
   rules: {
     design: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
     projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
+    designSubitem: [{ required: true, message: '子项不能为空', trigger: 'blur' }],
     volumeNumber: [{ required: true, message: '卷册号不能为空', trigger: 'blur' }],
-    documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }]
+    documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }],
+    plannedCompletion: [{ required: true, message: '计划出图事件不能为空', trigger: 'blur' }],
+    principal: [{ required: true, message: '设计人员不能为空', trigger: 'blur' }],
+    specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
-
+const changeSpecialty = (val) => {
+  form.value.principal = ''; //清空
+  getUserAppList(val);
+};
+// 获取专业列表
+const getSpecialtyList = async () => {
+  const res = await majorList({ projectId: currentProject.value?.id, userType: 2 });
+  console.log(res);
+  if (res.code === 200) {
+    des_user_major.value = res.data;
+  }
+};
 /** 查询卷册目录列表 */
 const getList = async () => {
   loading.value = true;
@@ -368,17 +390,10 @@ const getList = async () => {
     loading.value = false;
   }
 };
-const getUserAppList = async () => {
-  const res = await designUserList({ projectId: currentProject.value?.id });
+const getUserAppList = async (userMajor) => {
+  const res = await designUserList({ projectId: currentProject.value?.id, userType: 2, userMajor });
   if (res.code === 200) {
-    console.log(res.rows);
-
-    res.rows.forEach((item: any) => {
-      if (item.userType == 2) {
-        //设计人员
-        userAppList.value.push(item);
-      }
-    });
+    userAppList.value = res.rows;
   }
 };
 const handleViewHistory = async (row) => {
@@ -641,7 +656,7 @@ const handleAuditInfo = (row) => {
   // 审核图纸
 };
 onMounted(() => {
-  getUserAppList();
+  getSpecialtyList();
   getList();
 });
 
@@ -651,7 +666,7 @@ const listeningProject = watch(
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
-    getUserAppList();
+    getSpecialtyList();
     getList();
   }
 );
diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue
index 728c60a..8e80b7f 100644
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@@ -47,16 +47,16 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['formalities:formalitiesAreConsolidated:getTree']"
+              >新增</el-button
+            >
             <span style="margin-left: 10px"
               ><el-tooltip class="box-item" effect="dark" content="从原有模板列表选择新增" placement="top">
                 <el-icon color="#409efc"><WarningFilled /></el-icon> </el-tooltip
             ></span>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="addTemplate()" v-hasPermi="['formalities:formalitiesAreConsolidated:addFormalities']"
-              >新增数据</el-button
-            >
+          <el-col :span="1.5" v-hasPermi="['formalities:listOfFormalities:list']">
+            <el-button type="primary" plain icon="Plus" @click="addTemplate()">新增数据</el-button>
             <span style="margin-left: 10px">
               <el-tooltip class="box-item" effect="dark" content="创建新模板并添加数据" placement="top">
                 <el-icon color="#409efc"><WarningFilled /></el-icon>
@@ -198,6 +198,7 @@
           v-model="file"
           ref="uploadRef"
           uploadUrl="/formalities/formalitiesAnnex"
+          v-hasPermi="['formalities:formalitiesAnnex:add']"
           :data="{ formalitiesId: form.id }"
           :fileType="['pdf']"
           :auto-upload="false"
diff --git a/src/views/materials/appointment/index.vue b/src/views/materials/appointment/index.vue
index cda181e..710abb2 100644
--- a/src/views/materials/appointment/index.vue
+++ b/src/views/materials/appointment/index.vue
@@ -10,7 +10,7 @@
           @click="isDisabled = false"
           class="px-8 py-2.5 transition-all duration-300 font-medium"
           v-if="isDisabled"
-          v-hasPermi="['ailiaoshebei:purchaseUser:byProject']"
+          v-hasPermi="['cailiaoshebei:purchaseUser:addOrUpdate']"
         >
           点击编辑
         </el-button>
@@ -38,7 +38,7 @@
             @click="submitForm"
             icon="Check"
             class="px-8 py-2.5 transition-all duration-300 transform hover:scale-105 bg-blue-500 hover:bg-blue-600 text-white font-medium"
-            v-hasPermi="['cailiaoshebei:purchaseUser:add']"
+            v-hasPermi="['cailiaoshebei:purchaseUser:addOrUpdate']"
           >
             确认提交
           </el-button>
@@ -121,6 +121,7 @@ const designUser = async () => {
         return;
       }
       Object.assign(form, res.data);
+      // form.userId = res.data.userId;
       isDisabled.value = true;
     }
   } catch (error) {
diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue
index a21a726..f73db21 100644
--- a/src/views/materials/batchPlan/index.vue
+++ b/src/views/materials/batchPlan/index.vue
@@ -7,13 +7,7 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" :offset="0">
-                <el-button
-                  type="primary"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']"
-                  size="default"
-                  @click="handleAdd"
-                  icon="FolderAdd"
-                  plain
+                <el-button type="primary" v-hasPermi="['cailiaoshebei:mrpBase:addbatch']" size="default" @click="handleAdd" icon="FolderAdd" plain
                   >新增</el-button
                 >
               </el-col>
@@ -21,7 +15,7 @@
                 <el-button
                   type="danger"
                   size="default"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']"
+                  v-hasPermi="['cailiaoshebei:mrpBase:remove']"
                   @click="handleDeleteBatch"
                   :disabled="form.mrpBaseBo.status != 'draft'"
                   icon="FolderDelete"
@@ -66,9 +60,7 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" v-if="form.mrpBaseBo.status == 'draft'">
-                <el-button type="primary" plain icon="Edit" @click="handleUpdata" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']"
-                  >修改</el-button
-                >
+                <el-button type="primary" plain icon="Edit" @click="handleUpdata" v-hasPermi="['cailiaoshebei:mrpBase:addbatch']">修改</el-button>
               </el-col>
               <el-col :span="1.5" v-if="form.mrpBaseBo.status == 'draft'">
                 <el-button plain type="primary" icon="Finished" @click="handleAudit()">审核</el-button>
@@ -133,7 +125,7 @@
               </el-select>
             </template>
           </el-table-column>
-          <!-- 物资名称列 -->
+          <!-- 物资名称列（核心修改：动态过滤已选选项） -->
           <el-table-column prop="name" align="center" label="物资名称" width="160">
             <template #default="scope">
               <el-input v-model="scope.row.name" v-if="scope.row.mrpBaseId" placeholder="请输入物资名称" disabled />
@@ -144,7 +136,13 @@
                 placeholder="请选择"
                 @change="(val) => selectName(val, scope.row, scope.$index)"
               >
-                <el-option v-for="item in nameList" :key="item.id" :label="item.name" :value="item.id" />
+                <!-- 动态过滤：排除当前行外已选中的物资ID -->
+                <el-option 
+                  v-for="item in getAvailableNameList(scope.$index)" 
+                  :key="item.id" 
+                  :label="item.name" 
+                  :value="item.id" 
+                />
               </el-select>
             </template>
           </el-table-column>
@@ -152,24 +150,21 @@
           <el-table-column align="center" label="剩余量" width="80">
             <template #default="scope">
               <span>{{ scope.row.Remaining }}</span>
-              <!-- <el-input disabled v-model="scope.row.Remaining" placeholder="剩余量" /> -->
             </template>
           </el-table-column>
           <!-- 规格型号列 -->
           <el-table-column prop="specification" align="center" label="规格型号" width="100">
             <template #default="scope">
               <span>{{ scope.row.specification }}</span>
-              <!-- <el-input v-model="scope.row.specification" placeholder="请输入规格型号" disabled /> -->
             </template>
           </el-table-column>
           <!-- 单位列 -->
           <el-table-column prop="unit" align="center" label="单位" width="80">
             <template #default="scope">
               <span>{{ scope.row.unit }}</span>
-              <!-- <el-input v-model="scope.row.unit" placeholder="请输入单位" disabled /> -->
             </template>
           </el-table-column>
-          <!-- 数量列（新增错误提示展示） -->
+          <!-- 数量列 -->
           <el-table-column prop="demandQuantity" align="center" label="数量" width="140">
             <template #default="scope">
               <el-input
@@ -181,7 +176,7 @@
                 type="number"
                 min="0"
               />
-              <!-- 数量错误提示（红色小字体） -->
+              <!-- 数量错误提示 -->
               <div v-if="scope.row.quantityError" class="text-red-500 text-xs mt-1">{{ scope.row.quantityError }}</div>
             </template>
           </el-table-column>
@@ -239,7 +234,7 @@ import {
 } from '@/api/materials/batchPlan';
 import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types';
 import { useUserStoreHook } from '@/store/modules/user';
-import { getCurrentInstance, ComponentInternalInstance, watch, onMounted, onUnmounted } from 'vue';
+import { getCurrentInstance, ComponentInternalInstance, watch, onMounted, onUnmounted, computed } from 'vue';
 import type { ElFormInstance } from 'element-plus';
 
 // 类型定义补充
@@ -302,7 +297,7 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-// 初始化表单数据（补充版本号、重复错误提示字段）
+// 初始化表单数据
 const initFormData: FormData = {
   mrpBaseBo: {
     id: undefined,
@@ -323,10 +318,10 @@ const initFormData: FormData = {
       qs: undefined,
       arrivalTime: undefined,
       remark: undefined,
-      Remaining: 0, // 初始化剩余量
-      quantityError: '', // 初始化数量错误提示
-      batchNumber: undefined, // 初始化版本号
-      duplicateError: '', // 初始化重复错误提示
+      Remaining: 0,
+      quantityError: '',
+      batchNumber: undefined,
+      duplicateError: '',
       mrpBaseId: undefined
     }
   ]
@@ -390,7 +385,7 @@ const validateDemandQuantity = (row: PlanListItem, index: number) => {
   // 1. 清除之前的错误信息
   row.quantityError = '';
 
-  // 2. 处理空值（若需必填可补充：row.quantityError = '数量不能为空'）
+  // 2. 处理空值
   if (row.demandQuantity === null || row.demandQuantity === undefined || row.demandQuantity === '') {
     return;
   }
@@ -426,42 +421,20 @@ const getMrpBaseRemaining = async (suppliespriceId: number, row: PlanListItem) =
   }
 };
 
-/** 校验重复数据：版本号+物资名称不能重复 */
-const checkDuplicate = () => {
-  const planList = form.value.planList;
-  let hasDuplicate = false;
+/** 获取可用物资列表（过滤已选选项） */
+const getAvailableNameList = (currentIndex: number) => {
+  // 收集除当前行外已选中的物资ID
+  const selectedIds = form.value.planList
+    .filter((_, index) => index !== currentIndex)
+    .map(item => item.suppliespriceId)
+    .filter(id => id !== undefined && id !== null);
 
-  // 1. 清除所有重复错误提示
-  planList.forEach((item) => {
-    item.duplicateError = '';
-  });
-
-  // 2. 遍历校验重复（只校验版本号和物资名称都存在的行）
-  for (let i = 0; i < planList.length; i++) {
-    const current = planList[i];
-    // 跳过版本号或物资名称为空的行
-    if (!current.batchNumber || !current.suppliespriceId) continue;
-
-    for (let j = i + 1; j < planList.length; j++) {
-      const compare = planList[j];
-      if (!compare.batchNumber || !compare.suppliespriceId) continue;
-
-      // 版本号和物资ID都相同则判定为重复
-      if (current.batchNumber === compare.batchNumber && current.suppliespriceId === compare.suppliespriceId) {
-        current.duplicateError = `与第${j + 1}行重复（同版本+同物资）`;
-        compare.duplicateError = `与第${i + 1}行重复（同版本+同物资）`;
-        hasDuplicate = true;
-      }
-    }
-  }
-
-  return hasDuplicate;
+  // 过滤掉已选中的物资
+  return nameList.value.filter(item => !selectedIds.includes(item.id));
 };
 
-/** 选择物资名称触发（新增索引参数，用于触发重复校验） */
+/** 选择物资名称触发 */
 const selectName = (val: number, row: PlanListItem, index: number) => {
-  console.log(row);
-
   // 1. 获取剩余量并更新基础信息
   getMrpBaseRemaining(val, row).then(() => {
     const selected = nameList.value.find((item: any) => item.id === val);
@@ -473,9 +446,6 @@ const selectName = (val: number, row: PlanListItem, index: number) => {
       row.remark = selected.remark || '';
       row.arrivalTime = selected.arrivalTime || '';
     }
-
-    // 2. 触发重复校验
-    checkDuplicate();
   });
 };
 
@@ -514,8 +484,6 @@ const delRow = (index: number) => {
     return proxy?.$modal.msgWarning('请至少保留一项物资数据');
   }
   form.value.planList.splice(index, 1);
-  // 删除后重新校验重复（避免删除重复行后错误提示残留）
-  checkDuplicate();
 };
 
 /** 新增表格行 */
@@ -577,15 +545,15 @@ const handleUpdata = () => {
   if (!queryParams.value.mainData.mrpBaseId) {
     return proxy?.$modal.msgError('请先选择批次');
   }
-  // 1. 获取对应版本的物资列表
+  // 获取对应版本的物资列表
   reset();
   loading.value = true;
   getCailiaoshebei(queryParams.value.mainData.mrpBaseId)
     .then((res: any) => {
-      // 1. 更新基础信息
+      // 更新基础信息
       form.value.mrpBaseBo = res.data.mrpBaseBo || initFormData.mrpBaseBo;
 
-      // 2. 更新表格数据（补充缺失字段）
+      // 更新表格数据（补充缺失字段）
       form.value.planList = (res.data.planList || []).map((item: any) => ({
         id: item.id,
         name: item.name,
@@ -597,13 +565,12 @@ const handleUpdata = () => {
         arrivalTime: item.arrivalTime,
         remark: item.remark,
         Remaining: Number(item.remaining) || 0,
-        // remaining:
         quantityError: '',
         batchNumber: item.batchNumber,
         duplicateError: '',
         mrpBaseId: item.mrpBaseId
       }));
-      // 3. 打开对话框
+      // 打开对话框
       dialog.visible = true;
       dialog.title = '修改物资-需求';
     })
@@ -617,38 +584,32 @@ const handleUpdata = () => {
 
 /** 提交数据（整合所有校验） */
 const submitTransferForm = async () => {
-  // 1. 先校验重复数据
-  const hasDuplicate = checkDuplicate();
-  if (hasDuplicate) {
-    return proxy?.$modal.msgError('存在重复的版本号+物资组合，请修正后提交');
-  }
-
-  // 2. 校验数量合法性（检查是否有数量错误）
+  // 1. 校验数量合法性（检查是否有数量错误）
   const hasQuantityError = form.value.planList.some((row) => row.quantityError);
   if (hasQuantityError) {
     return proxy?.$modal.msgError('存在非法数量，请修正后提交');
   }
 
-  // 3. 执行表单基础验证
+  // 2. 执行表单基础验证
   const result = validateAndClean(form.value.planList);
   if (!result.valid) {
     return proxy?.$modal.msgError(result.message);
   }
 
-  // 4. 表单组件验证
+  // 3. 表单组件验证
   cailiaoshebeiFormRef.value?.validate(async (valid: boolean) => {
     if (!valid) return;
 
     buttonLoading.value = true;
     try {
-      // 5. 提交数据
+      // 4. 提交数据
       await updateCailiaoshebei({
         ...form.value,
         planList: result.data // 使用清洗后的数据
       });
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
-      // 6. 刷新列表
+      // 5. 刷新列表
       await getList();
     } catch (error) {
       proxy?.$modal.msgError('操作失败，请重试');
@@ -773,7 +734,7 @@ const getVersion = () => {
     });
 };
 
-/** 选择版本号触发（新增索引参数，用于触发重复校验） */
+/** 选择版本号触发 */
 const selectNameVersion = (val: string, row: PlanListItem, index: number) => {
   row.batchNumber = val;
   row.suppliespriceId = undefined; // 切换版本号时清空物资选择
@@ -788,11 +749,8 @@ const selectNameVersion = (val: string, row: PlanListItem, index: number) => {
   row.duplicateError = '';
   row.mrpBaseId = '';
 
-  // 1. 获取对应版本的物资列表
+  // 获取对应版本的物资列表
   getNameList(val);
-
-  // 2. 触发重复校验（清空物资后可能消除重复）
-  checkDuplicate();
 };
 
 /** 页面挂载时初始化 */
diff --git a/src/views/materials/materials/index.vue b/src/views/materials/materials/index.vue
index 833a731..91385e7 100644
--- a/src/views/materials/materials/index.vue
+++ b/src/views/materials/materials/index.vue
@@ -1,11 +1,13 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
             <el-form-item label="材料名称" prop="materialsName">
-              <el-input v-model="queryParams.materialsName" placeholder="请输入材料名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.materialsName" placeholder="请输入材料名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="材料提供商" prop="companyId">
               <el-select v-model="queryParams.companyId" clearable placeholder="全部">
@@ -25,20 +27,22 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materials:add']"> 新增 </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['materials:materials:edit']"
-              >修改
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materials:add']"> 新增
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['materials:materials:remove']"
-              >删除
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+              v-hasPermi="['materials:materials:edit']">修改
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['materials:materials:export']">导出 </el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+              v-hasPermi="['materials:materials:remove']">删除
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+              v-hasPermi="['materials:materials:export']">导出 </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -68,20 +72,25 @@
         <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="320">
           <template #default="scope">
             <el-space>
-              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['materials:materials:query']">
+              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)"
+                v-hasPermi="['materials:materials:query']">
                 详情
               </el-button>
-              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materials:edit']"> 修改 </el-button>
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['materials:materials:remove']">
+              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['materials:materials:edit']"> 修改 </el-button>
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['materials:materials:remove']">
                 删除
               </el-button>
-              <el-button link type="primary" icon="Plus" @click="handleAddMaterialsInventory(scope.row)"> 出入库 </el-button>
+              <el-button v-hasPermi="['materials:materialsInventory:edit']" link type="primary" icon="Plus"
+                @click="handleAddMaterialsInventory(scope.row)"> 出入库 </el-button>
             </el-space>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改材料名称对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -112,17 +121,12 @@
         <el-form-item label="材料文件" prop="fileOssIdMap">
           <div :key="item.value" v-for="item in materials_file_type">
             <h3>{{ item.label }}</h3>
-            <file-upload
-              v-model="ossIdMap[item.value]"
-              :limit="1"
-              :file-size="50"
-              :file-type="['pdf']"
+            <file-upload v-model="ossIdMap[item.value]" :limit="1" :file-size="50" :file-type="['pdf']"
               @update:model-value="
                 (args) => {
                   handleOssUpdate(args, item.value);
                 }
-              "
-            />
+              " />
           </div>
         </el-form-item>
       </el-form>
@@ -133,7 +137,8 @@
         </div>
       </template>
     </el-dialog>
-    <materials-inventory-add-dialog :materials-id="currentMaterialsId" :project-id="currentProject.id" ref="dialogRef" @submit="getList" />
+    <materials-inventory-add-dialog :materials-id="currentMaterialsId" :project-id="currentProject.id" ref="dialogRef"
+      @submit="getList" />
     <el-dialog title="材料详情" v-model="showDetailDrawer" width="700px">
       <materials-detail-drawer :materials-id="currentMaterialsId" />
     </el-dialog>
diff --git a/src/views/materials/materialsEquipment/materialIssue/index.vue b/src/views/materials/materialsEquipment/materialIssue/index.vue
index 1a0e899..8d4cdff 100644
--- a/src/views/materials/materialsEquipment/materialIssue/index.vue
+++ b/src/views/materials/materialsEquipment/materialIssue/index.vue
@@ -7,9 +7,6 @@
             <el-form-item label="表单编号" prop="formCode">
               <el-input v-model="queryParams.formCode" placeholder="请输入表单编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="工程名称" prop="projectName">
-              <el-input v-model="queryParams.projectName" placeholder="请输入工程名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="材料名称" prop="materialName">
               <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -45,7 +42,6 @@
       <el-table v-loading="loading" :data="materialIssueList" @selection-change="handleSelectionChange">
         <el-table-column type="index" width="60" label="序号" align="center" />
         <el-table-column label="表单编号" align="center" prop="formCode" />
-        <el-table-column label="工程名称" align="center" prop="projectName" />
         <el-table-column label="设备材料名称" align="center" prop="materialName" />
         <el-table-column label="订货单位" align="center" prop="orderingUnit" />
         <el-table-column label="供货单位" align="center" prop="supplierUnit" />
@@ -82,7 +78,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="工程名称" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入工程名称" />
+              <el-input v-model="form.projectName" disabled placeholder="请输入工程名称" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -206,28 +202,25 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="合格证文件" prop="certCountFileId">
-              <file-upload :isShowTip="false" v-model="form.certCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.certCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="出厂报告文件" prop="reportCountFileId">
-              <file-upload :isShowTip="false" v-model="form.reportCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.reportCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="技术资料文件" prop="techDocCountFileId">
-              <file-upload :isShowTip="false" v-model="form.techDocCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.techDocCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="厂家资质文件" prop="licenseCountFileId">
-              <file-upload :isShowTip="false" v-model="form.licenseCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.licenseCountFileId" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <span style="color: #ff0000ab; margin-bottom: 10px; display: block"
-              >注意：请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件</span
-            > </el-col
+          <el-col :span="24"> <span style="color: #ff0000ab; margin-bottom: 10px; display: block">注意：pdf/png/jpg/jpeg格式文件</span> </el-col
           ><el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -295,7 +288,7 @@ const getInitFormData = () => {
     projectId: currentProject.value?.id,
     materialSource: '1',
     formCode: undefined,
-    projectName: undefined,
+    projectName: currentProject.value?.name,
     materialName: '', // 初始化为空字符串
     orderingUnit: undefined,
     supplierUnit: undefined,
diff --git a/src/views/materials/materialsEquipment/materialReceive/index.vue b/src/views/materials/materialsEquipment/materialReceive/index.vue
index 78d9741..3f1d4c0 100644
--- a/src/views/materials/materialsEquipment/materialReceive/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/index.vue
@@ -1,20 +1,23 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="表单编号" prop="formCode">
               <el-input v-model="queryParams.formCode" placeholder="请输入表单编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="工程名称" prop="projectName">
-              <el-input v-model="queryParams.projectName" placeholder="请输入工程名称" clearable @keyup.enter="handleQuery" />
+             <el-form-item label="材料来源" prop="materialSource">
+              <el-select v-model="queryParams.materialSource" filterable placeholder="请选择材料来源">
+                <el-option label="全部" value="0"></el-option>
+                <el-option label="甲供材料" value="1"></el-option>
+                <el-option label="乙供材料" value="2"></el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="材料名称" prop="materialName">
-              <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="合同编号" prop="contractName">
-              <el-input v-model="queryParams.contractName" placeholder="请输入合同编号" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="订货单位" prop="orderingUnit">
               <el-input v-model="queryParams.orderingUnit" placeholder="请输入订货单位" clearable @keyup.enter="handleQuery" />
@@ -35,7 +38,8 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materialReceive:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+              v-hasPermi="['materials:materialReceive:add']">新增</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -44,11 +48,24 @@
       <el-table v-loading="loading" :data="materialReceiveList" @selection-change="handleSelectionChange">
         <el-table-column type="index" width="60" label="序号" align="center" />
         <el-table-column label="表单编号" align="center" prop="formCode" />
-        <el-table-column label="工程名称" align="center" prop="projectName" />
+        <el-table-column label="材料来源" align="center" prop="projectName">
+          <template #default="scope">
+            <el-tag :type="scope.row.materialSource == '1' ? 'success' : 'warning'">{{ scope.row.materialSource == '1' ?
+              '甲供材料' : '乙供材料' }}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="设备材料名称" align="center" prop="materialName" />
         <el-table-column label="合同名称" align="center" prop="contractName" />
-        <el-table-column label="订货单位" align="center" prop="orderingUnit" />
-        <el-table-column label="供货单位" align="center" prop="supplierUnit" />
+        <el-table-column label="订货单位" align="center" prop="orderingUnit">
+          <template #default="scope">
+            <span>{{ scope.row.orderingUnit || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="供货单位" align="center" prop="supplierUnit">
+          <template #default="scope">
+            <span>{{ scope.row.supplierUnit || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="设备材料入库/移交" align="center" prop="storageType">
           <template #default="scope">
             <dict-tag :options="storage_type" :value="scope.row.storageType" />
@@ -60,28 +77,20 @@
             <!-- <el-button link type="primary" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialReceive:edit']"
               >修改</el-button
             > -->
-            <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['materials:materialReceive:query']"
-              >查看</el-button
-            >
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['materials:materialReceive:remove']"
-              >删除</el-button
-            >
+            <el-button link type="primary" icon="View" @click="handleView(scope.row)"
+              v-hasPermi="['materials:materialReceive:query']">查看</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['materials:materialReceive:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
     <!-- 添加或修改物料接收单对话框 -->
-    <el-dialog
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      draggable
-      :title="dialog.title"
-      v-model="dialog.visible"
-      width="800px"
-      append-to-body
-    >
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" draggable :title="dialog.title"
+      v-model="dialog.visible" width="800px" append-to-body>
       <el-form ref="materialReceiveFormRef" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="12">
@@ -99,8 +108,10 @@
           </el-col>
           <el-col v-if="form.materialSource == '2'" :span="12">
             <el-form-item label="采购单编号" prop="docId">
-              <el-select @change="handleSelect" v-model="form.docId" filterable placeholder="请选择采购单" style="width: 100%">
-                <el-option v-for="item in purchaseDocList" :key="item.id" :label="item.docCode" :value="item.id"></el-option>
+              <el-select @change="handleSelect" v-model="form.docId" filterable placeholder="请选择采购单"
+                style="width: 100%">
+                <el-option v-for="item in purchaseDocList" :key="item.id" :label="item.docCode"
+                  :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -119,15 +130,11 @@
               <el-input disabled v-model="form.projectName" placeholder="请输入工程名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="form.materialSource == '2'">
             <el-form-item label="合同编号" prop="contractName">
               <el-select v-model="form.contractName" filterable placeholder="请选择合同" style="width: 100%">
-                <el-option
-                  v-for="item in contractNameList"
-                  :key="item.contractCode"
-                  :label="item.contractCode"
-                  :value="item.contractCode"
-                ></el-option>
+                <el-option v-for="item in contractNameList" :key="item.contractCode" :label="item.contractCode"
+                  :value="item.contractCode"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -142,59 +149,48 @@
             <div class="detail">
               <div class="detail-header">
                 <span>数量验收</span>
-                <el-button type="primary" v-if="form.materialSource == '1'" link @click="addItem" icon="Plus">添加数量验收</el-button>
+                <el-button type="primary" v-if="form.materialSource == '1'" link @click="addItem"
+                  icon="Plus">添加数量验收</el-button>
               </div>
               <div v-for="(item, index) in form.itemList" :key="item.id" class="detail-item">
                 <el-row>
                   <el-col :span="12">
-                    <el-form-item label="名称" :prop="`itemList.${index}.name`" :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
+                    <el-form-item label="名称" :prop="`itemList.${index}.name`"
+                      :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
                       <el-input :disabled="form.materialSource == '2'" v-model="item.name" placeholder="请输入名称" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item
-                      label="规格"
-                      :prop="`itemList.${index}.specification`"
-                      :rules="{ required: true, message: '规格不能为空', trigger: 'blur' }"
-                    >
-                      <el-input :disabled="form.materialSource == '2'" v-model="item.specification" placeholder="请输入规格" />
+                    <el-form-item label="规格" :prop="`itemList.${index}.specification`"
+                      :rules="{ required: true, message: '规格不能为空', trigger: 'blur' }">
+                      <el-input :disabled="form.materialSource == '2'" v-model="item.specification"
+                        placeholder="请输入规格" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="单位" :prop="`itemList.${index}.unit`" :rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
+                    <el-form-item label="单位" :prop="`itemList.${index}.unit`"
+                      :rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
                       <el-input :disabled="form.materialSource == '2'" v-model="item.unit" placeholder="请输入单位" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="数量" :prop="`itemList.${index}.quantity`" :rules="rules.quantityRule" ref="quantityFormItemRefs[index]">
-                      <el-input
-                        :disabled="form.materialSource == '2'"
-                        type="number"
-                        v-model.number="item.quantity"
-                        placeholder="请输入数量"
-                        min="0"
-                        @input="handleQuantityInput(index)"
-                        @blur="handleQuantityBlur(index)"
-                      />
+                    <el-form-item label="数量" :prop="`itemList.${index}.quantity`" :rules="rules.quantityRule"
+                      ref="quantityFormItemRefs[index]">
+                      <el-input :disabled="form.materialSource == '2'" type="number" v-model.number="item.quantity"
+                        placeholder="请输入数量" min="0" @input="handleQuantityInput(index)"
+                        @blur="handleQuantityBlur(index)" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="验收" :prop="`itemList.${index}.acceptedQuantity`" :rules="rules.acceptedQuantityRule">
-                      <el-input
-                        type="number"
-                        v-model.number="item.acceptedQuantity"
-                        placeholder="请输入验收"
-                        min="0"
-                        @input="handleAcceptedInput(index)"
-                      />
+                    <el-form-item label="验收" :prop="`itemList.${index}.acceptedQuantity`"
+                      :rules="rules.acceptedQuantityRule">
+                      <el-input type="number" v-model.number="item.acceptedQuantity" placeholder="请输入验收" min="0"
+                        @input="handleAcceptedInput(index)" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item
-                      label="缺件"
-                      :prop="`itemList.${index}.shortageQuantity`"
-                      :rules="{ required: true, message: '缺件数量不能为空', trigger: 'blur' }"
-                    >
+                    <el-form-item label="缺件" :prop="`itemList.${index}.shortageQuantity`"
+                      :rules="{ required: true, message: '缺件数量不能为空', trigger: 'blur' }">
                       <el-input type="number" min="0" v-model="item.shortageQuantity" placeholder="自动计算" readonly />
                       <span class="tips">*自动计算（数量-验收数量）</span>
                     </el-form-item>
@@ -216,22 +212,26 @@
 
           <el-col :span="12">
             <el-form-item label="合格证文件" prop="certCountFileId">
-              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.certCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+                v-model="form.certCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="出厂报告文件" prop="reportCountFileId">
-              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.reportCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+                v-model="form.reportCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="技术资料文件" prop="techDocCountFileId">
-              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.techDocCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+                v-model="form.techDocCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="厂家资质文件" prop="licenseCountFileId">
-              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.licenseCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+                v-model="form.licenseCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -357,7 +357,7 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     projectId: currentProject.value?.id,
-    materialSource: '1',
+    materialSource: '0',
     formCode: undefined,
     projectName: undefined,
     materialName: undefined,
@@ -412,6 +412,9 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   try {
+    if(queryParams.value.materialSource=='0'){
+      delete queryParams.value.materialSource;
+    }
     const res = await listMaterialReceive(queryParams.value);
     materialReceiveList.value = res.rows;
     total.value = res.total;
@@ -503,9 +506,9 @@ const handleUpdate = async (row?: MaterialReceiveVO) => {
       watchItemChanges(index);
       // 手动触发当前条目的数量、验收数量、缺件数量验证
       if (materialReceiveFormRef.value) {
-        materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => {});
-        materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => {});
-        materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => {});
+        materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => { });
+        materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => { });
+        materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => { });
       }
     });
 
@@ -616,9 +619,9 @@ const handleAcceptedInput = (index: number) => {
 // 手动验证数量和验收数量字段
 const validateQuantityField = (index: number) => {
   if (materialReceiveFormRef.value) {
-    materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => {});
-    materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => {});
-    materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => {});
+    materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => { });
+    materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => { });
+    materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => { });
   }
 };
 
diff --git a/src/views/materials/materialsEquipment/materialReceive/word/index.vue b/src/views/materials/materialsEquipment/materialReceive/word/index.vue
index d717d19..9ce8dc6 100644
--- a/src/views/materials/materialsEquipment/materialReceive/word/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/word/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog v-model="isShowDialog" title="材料设备详情" draggable width="1200px" :close-on-click-modal="false" :destroy-on-close="true">
     <el-card :body-style="{ padding: '20px' }" style="border: none; box-shadow: none">
-      <div class="dialog-footer">
+      <div class="dialog-footer" v-hasPermi="['materials:materialReceive:exportWord']">
         <div class="btn-item" @click="onLoad">
           <img src="./icon/down.png" />
           <span>导出</span>
diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index 686a1f8..4106dc8 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -9,7 +9,26 @@
               <el-button type="primary" icon="edit" @click="clickApprovalSheet1()">审批</el-button>
             </el-form-item>
             <el-form-item v-if="state.masterData.status == 'waiting' || state.masterData.status == 'finish'">
-              <el-button icon="view"  @click="lookApprovalFlow()" type="warning">查看流程</el-button>
+              <el-button icon="view" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
+            </el-form-item>
+            <el-form-item>
+              <file-upload
+                upload-url="/design/totalsupplyplan/import"
+                v-model="file"
+                :limit="1"
+                :file-type="['xls', 'xlsx']"
+                :on-upload-success="handleSuccess"
+              >
+                <el-button :disabled="state.masterData.status == 'finish'" type="primary" plain icon="upload">导入</el-button>
+              </file-upload>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" plain icon="Download" @click="handleExport">导出</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button icon="Finished" @click="editApprovalSheet()" type="success" :disabled="state.masterData.status == 'finish'"
+                >一键全部保存</el-button
+              >
             </el-form-item>
           </el-form>
           <right-toolbar @queryTable="getMasterDataList"></right-toolbar>
@@ -23,25 +42,83 @@
       style="width: 100%; margin-bottom: 20px; height: calc(100vh - 230px)"
       row-key="id"
       border
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="num" label="编号" />
+      <el-table-column align="center" prop="num" label="编号" />
       <el-table-column prop="name" label="工程或费用名称" width="180" />
       <el-table-column prop="unit" label="单位" />
-      <el-table-column prop="specification" label="规格型号" />
-      <el-table-column prop="quantity" label="数量" width="60" />
+      <el-table-column prop="specification" label="规格型号" width="80" />
+      <el-table-column prop="quantity" label="数量" width="100" />
       <el-table-column prop="batchNumber" label="批次号" width="200" />
-      <el-table-column prop="brand" label="品牌" />
-      <el-table-column prop="texture" label="材质" />
-      <el-table-column prop="qualityStandard" label="质量标准" />
-      <el-table-column prop="partUsed" label="使用部位" />
-      <el-table-column prop="deliveryPoints" label="交货地点" />
-      <el-table-column label="预计使用日期">
+      <el-table-column prop="brand" label="品牌">
         <template #default="{ row }">
-          <span>{{ row.dateService ? row.dateService.split(' ')[0] : '' }}</span>
+          <el-input
+            v-model="row.brand"
+            :disabled="state.masterData.status != 'draft'"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="texture" label="材质">
+        <template #default="{ row }">
+          <el-input
+            v-model="row.texture"
+            :disabled="state.masterData.status != 'draft'"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualityStandard" label="质量标准">
+        <template #default="{ row }">
+          <el-input
+            :disabled="state.masterData.status != 'draft'"
+            v-model="row.qualityStandard"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="partUsed" label="使用部位">
+        <template #default="{ row }">
+          <el-input
+            :disabled="state.masterData.status != 'draft'"
+            v-model="row.partUsed"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="deliveryPoints" label="交货地点">
+        <template #default="{ row }">
+          <el-input
+            :disabled="state.masterData.status != 'draft'"
+            v-model="row.deliveryPoints"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="预计使用日期" width="150">
+        <template #default="{ row }">
+          <el-date-picker
+            v-model="row.dateService"
+            v-if="!(row.children && row.children.length > 0)"
+            type="date"
+            value-format="YYYY-MM-DD"
+            :disabled="state.masterData.status != 'draft'"
+            placeholder="请选择日期"
+          />
         </template>
       </el-table-column>
       <el-table-column prop="remark" label="备注" />
-      <el-table-column label="操作">
+      <!-- <el-table-column label="操作">
         <template #default="{ row }">
           <el-button
             :disabled="state.masterData.status == 'waiting' || state.masterData.status == 'finish'"
@@ -51,7 +128,7 @@
             >修改</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <!-- 编辑 -->
     <el-dialog v-model="visible" title="修改物料信息" :width="800" :close-on-click-modal="false" @close="handleClose">
@@ -124,7 +201,8 @@ import {
   obtainMasterDataList,
   totalsupplyplan,
   totalSupplyplanDetails,
-  materialChangeSupplyplan
+  materialChangeSupplyplan,
+  totalSupplyplanBatchEdit
 } from '@/api/materials/overallPlanMaterialSupply/index';
 import { useUserStoreHook } from '@/store/modules/user';
 const userStore = useUserStoreHook();
@@ -210,7 +288,8 @@ async function getMasterDataList() {
 
     // 处理结果
     if (supplyPlanRes.list == null) {
-      state.tableData = supplyPlanRes.rows || [];
+      // state.tableData = supplyPlanRes.rows || [];
+      state.tableData = proxy?.handleTree(supplyPlanRes.rows, 'sid', 'pid');
       console.log('state.tableData', state.tableData);
     } else {
       // 根据实际业务逻辑处理有list的情况
@@ -261,11 +340,13 @@ async function totalSupplyplanDetail(id) {
   }
 }
 // 修改
-function editApprovalSheet(row) {
-  console.log(row);
-  totalSupplyplanDetail(row.id);
-  visible.value = true;
-}
+const editApprovalSheet = async () => {
+  state.loading.list = true;
+  await totalSupplyplanBatchEdit(state.tableData);
+  proxy.$modal.msgSuccess('修改成功');
+
+  state.loading.list = false;
+};
 // 提交表单
 const handleSubmit = async () => {
   try {
@@ -292,6 +373,17 @@ function editMaterialSupply(formData) {
   });
 }
 
+const handleExport = async () => {
+  proxy?.download(
+    '/design/totalsupplyplan/export',
+    {
+      projectId: currentProject.value?.id
+    },
+    `物资供应总计划.xlsx`,
+    true
+  );
+};
+
 // 关闭弹窗
 const handleClose = () => {
   visible.value = false;
diff --git a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
index a35f892..56c849b 100644
--- a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
+++ b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
@@ -16,7 +16,7 @@
       <!-- 表单区域 -->
       <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
         <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
-          <h3 class="text-lg font-semibold text-gray-800">设计原则</h3>
+          <h3 class="text-lg font-semibold text-gray-800">物质供应总计划</h3>
         </div>
         <div class="p-6">
           <!-- <el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view' || form.status == 'waiting' || routeParams.type === 'update'" :model="form"
@@ -148,7 +148,7 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const flowCodeOptions = [
   {
     value: currentProject.value?.id + '_totalsupplyplan',
-    label: '物资总计划审核'
+    label: '物质供应总计划审核'
   }
 ];
 
@@ -214,7 +214,7 @@ const getInfo = () => {
     console.log('res.data', masterDataRes);
     Object.assign(form.value, masterDataRes?.data[0]);
     // console.log('form', form.value);
-    tableData.value = res.rows;
+    tableData.value = res.rows.reverse();//翻转
     loading.value = false;
     buttonLoading.value = false;
   });
diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue
index a1bc27a..1ece2ac 100644
--- a/src/views/materials/purchaseDoc/index.vue
+++ b/src/views/materials/purchaseDoc/index.vue
@@ -10,9 +10,9 @@
             <el-form-item label="设备统称" prop="name">
               <el-input v-model="queryParams.name" placeholder="请输入设备统称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="到货日期" prop="arrivalDate">
+            <!-- <el-form-item label="到货日期" prop="arrivalDate">
               <el-date-picker clearable v-model="queryParams.arrivalDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择到货日期" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" v-hasPermi="['cailiaoshebei:purchaseDoc:list']" icon="Search" @click="handleQuery">搜索</el-button>
 
@@ -116,7 +116,7 @@
             <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['cailiaoshebei:purchaseDoc:remove']"
               >详情</el-button
             >
-            <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-hasPermi="['cailiaoshebei:purchaseDoc:downloadWord']"
+            <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-hasPermi="['cailiaoshebei:purchaseDoc:exportWord']"
               >下载</el-button
             >
           </template>
diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue
index e2778d1..4078def 100644
--- a/src/views/materials/usageMaterials/purchase/index.vue
+++ b/src/views/materials/usageMaterials/purchase/index.vue
@@ -1,23 +1,12 @@
 <template>
   <div style="padding: 20px">
-    <el-card class="mb-5">
-      <el-button
-        type="primary"
-        v-hasPermi="['cailiaoshebei:physicalsupply:add']"
-        icon="Plus"
-        @click="handleAdd"
-        class="transition-all duration-200 hover:shadow-md"
-      >
-        新增
-      </el-button>
-      <el-button
-        v-hasPermi="['cailiaoshebei:physicalsupply:list']"
-        icon="Refresh"
-        @click="refreshData"
-        class="transition-all duration-200 hover:shadow-md"
-      >
-        刷新
-      </el-button>
+    <el-card class="mb-5" shadow="never">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+        </el-col>
+        <right-toolbar @queryTable="refreshData"></right-toolbar>
+      </el-row>
     </el-card>
 
     <!-- 数据表格 -->
@@ -258,7 +247,6 @@ const formRules = reactive({
 const queryParams = reactive({
   pageSize: 10,
   pageNum: 1,
-  findType: 1,
   projectId: currentProject.value?.id
 });
 
diff --git a/src/views/out/constructionValue/index.vue b/src/views/out/constructionValue/index.vue
index 0887fb5..b6d49e0 100644
--- a/src/views/out/constructionValue/index.vue
+++ b/src/views/out/constructionValue/index.vue
@@ -58,7 +58,19 @@
     <!-- 添加或修改施工产值对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="constructionValueFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="方阵" prop="matrixId" v-if="!form.id">
+        <el-form-item label="对应项目结构" prop="progressCategoryId">
+          <el-tree-select
+            v-model="form.progressCategoryId"
+            :data="ProjectStructureList"
+            @node-click="handleCheckChange"
+            :props="{ value: 'id', label: 'name', children: 'children' }"
+            value-key="id"
+            @change="selectTime"
+            placeholder="请选择项目结构"
+            check-strictly
+          />
+        </el-form-item>
+        <!-- <el-form-item label="方阵" prop="matrixId" v-if="!form.id">
           <el-cascader
             :options="matrixOptions"
             placeholder="请选择"
@@ -81,7 +93,7 @@
             clearable
           >
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="计划日期" prop="reportDateId" v-if="!form.id">
           <el-cascader
             :options="progressTimeList"
@@ -129,6 +141,7 @@ import {
   updateConstructionValue
 } from '@/api/out/constructionValue';
 import { ConstructionValueVO, ConstructionValueQuery, ConstructionValueForm } from '@/api/out/constructionValue/types';
+import { getProjectStructure } from '@/api/progress/constructionSchedulePlan';
 import { getProjectSquare, listProgressCategory, workScheduleList, workScheduleListDetail, workScheduleListPosition } from '@/api/progress/plan';
 import { ProgressCategoryVO } from '@/api/progress/plan/types';
 
@@ -216,7 +229,7 @@ const data = reactive<PageData<ConstructionValueForm, ConstructionValueQuery>>({
 });
 
 const { queryParams, form, rules } = toRefs(data);
-
+const ProjectStructureList = ref([]);
 /** 查询施工产值列表 */
 const getList = async () => {
   loading.value = true;
@@ -260,19 +273,19 @@ const handleSelectionChange = (selection: ConstructionValueVO[]) => {
 /** 新增按钮操作 */
 const handleAdd = async () => {
   reset();
-  const res = await getProjectSquare(currentProject.value?.id);
-  if (res.data.length === 0) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵');
-  const isFangzhen = res.data.some((item) => item.children && item.children.length);
-  console.log('🚀 ~ handleAdd ~ isFangzhen:', isFangzhen);
+  // const res = await getProjectSquare(currentProject.value?.id);
+  // if (res.data.length === 0) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵');
+  // const isFangzhen = res.data.some((item) => item.children && item.children.length);
+  // console.log('🚀 ~ handleAdd ~ isFangzhen:', isFangzhen);
 
-  if (!isFangzhen) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵');
-  let matrixList = res.data.map((item) => {
-    return {
-      ...item,
-      matrixId: item?.projectId
-    };
-  });
-  matrixOptions.value = matrixList;
+  // if (!isFangzhen) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵');
+  // let matrixList = res.data.map((item) => {
+  //   return {
+  //     ...item,
+  //     matrixId: item?.projectId
+  //   };
+  // });
+  // matrixOptions.value = matrixList;
   dialog.visible = true;
   dialog.title = '添加施工产值';
 };
@@ -304,6 +317,18 @@ const submitTime = async (value: string) => {
   form.value.artificialNum = data?.finishedNumber;
 };
 
+/** 查询施工进度计划列表 */
+const getProjectStructureList = async () => {
+  const res = await getProjectStructure(currentProject.value?.id);
+  ProjectStructureList.value = [res.data];
+  console.log(ProjectStructureList.value);
+};
+
+/** 查询施工进度计划列表 */
+const handleCheckChange = (val) => {
+  form.value.projectStructureName = val.name;
+};
+
 /** 重置选择器 */
 const resetCascader = (index?: number) => {
   if (index) {
@@ -370,6 +395,7 @@ const handleExport = () => {
 };
 
 onMounted(() => {
+  getProjectStructureList();
   getList();
 });
 
diff --git a/src/views/out/monthPlan/index.vue b/src/views/out/monthPlan/index.vue
index e24ca17..c426eca 100644
--- a/src/views/out/monthPlan/index.vue
+++ b/src/views/out/monthPlan/index.vue
@@ -8,7 +8,7 @@
               <el-date-picker v-model="queryParams.planMonth" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
             </el-form-item>
             <el-form-item label="产值类型" prop="valueType">
-              <el-select v-model="queryParams.valueType" placeholder="请选择产值类型">
+              <el-select v-model="queryParams.valueType" placeholder="全部">
                 <el-option v-for="item in out_value_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -40,9 +40,9 @@
       <el-table v-loading="loading" :data="monthPlanList">
         <el-table-column type="index" label="序号" width="55" align="center" />
         <el-table-column label="计划月份" align="center" prop="planMonth" />
-        <el-table-column label="计划产值" align="center" prop="planValue" />
-        <el-table-column label="完成产值" align="center" prop="completeValue" />
-        <el-table-column label="差额" align="center" prop="differenceValue" />
+        <el-table-column label="计划产值(元)" align="center" prop="planValue" />
+        <el-table-column label="完成产值(元)" align="center" prop="completeValue" />
+        <el-table-column label="差额(元)" align="center" prop="differenceValue" />
         <el-table-column label="产值类型" align="center" prop="valueType">
           <template #default="scope">
             <dict-tag :options="out_value_type" :value="scope.row.valueType" />
@@ -72,17 +72,17 @@
     </el-card>
     <!-- 添加或修改月度产值计划对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="类型" prop="planValue">
           <el-select v-model="form.type" placeholder="请选择类型">
             <el-option label="对甲" value="1" />
             <el-option label="对乙" value="2" />
           </el-select>
         </el-form-item>
-        <el-form-item label="计划产值" prop="planValue">
+        <el-form-item label="计划产值(元)" prop="planValue">
           <el-input v-model="form.planValue" placeholder="请输入计划产值" type="number" />
         </el-form-item>
-        <el-form-item label="计划月份" prop="planMonth">
+        <el-form-item label="计划月份(元)" prop="planMonth">
           <el-date-picker v-model="form.planMonth" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
         </el-form-item>
         <el-form-item label="产值类型" prop="valueType">
@@ -113,6 +113,13 @@ import { useUserStoreHook } from '@/store/modules/user';
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
+const month = computed(() => {
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0'); // getMonth() 从0开始
+  const currentMonth = `${year}-${month}`;
+  return currentMonth;
+});
 const monthPlanList = ref<MonthPlanVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -152,7 +159,8 @@ const data = reactive({
     planValue: undefined,
     completeValue: undefined,
     differenceValue: undefined,
-    planMonth: undefined,
+    planMonth: month.value,
+
     valueType: undefined,
     planAuditStatus: undefined,
     completeAuditStatus: undefined,
diff --git a/src/views/out/monthPlanAudit/index.vue b/src/views/out/monthPlanAudit/index.vue
index b134549..7db8adf 100644
--- a/src/views/out/monthPlanAudit/index.vue
+++ b/src/views/out/monthPlanAudit/index.vue
@@ -32,10 +32,10 @@
 
       <el-table v-loading="loading" :data="monthPlanAuditList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="设计产值" align="center" prop="designValue" />
-        <el-table-column label="采购产值" align="center" prop="purchaseValue" />
-        <el-table-column label="施工产值" align="center" prop="constructionValue" />
-        <el-table-column label="总产值" align="center" prop="totalValue" />
+        <el-table-column label="设计产值(元)" align="center" prop="designValue" />
+        <el-table-column label="采购产值(元)" align="center" prop="purchaseValue" />
+        <el-table-column label="施工产值(元)" align="center" prop="constructionValue" />
+        <el-table-column label="总产值(元)" align="center" prop="totalValue" />
         <el-table-column label="计划月份" align="center" prop="planMonth" />
       </el-table>
 
@@ -44,16 +44,16 @@
     <!-- 添加或修改审核通过月度产值计划对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="monthPlanAuditFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="设计产值" prop="designValue">
+        <el-form-item label="设计产值(元)" prop="designValue">
           <el-input v-model="form.designValue" placeholder="请输入设计产值" />
         </el-form-item>
-        <el-form-item label="采购产值" prop="purchaseValue">
+        <el-form-item label="采购产值(元)" prop="purchaseValue">
           <el-input v-model="form.purchaseValue" placeholder="请输入采购产值" />
         </el-form-item>
-        <el-form-item label="施工产值" prop="constructionValue">
+        <el-form-item label="施工产值(元)" prop="constructionValue">
           <el-input v-model="form.constructionValue" placeholder="请输入施工产值" />
         </el-form-item>
-        <el-form-item label="总产值" prop="totalValue">
+        <el-form-item label="总产值(元)" prop="totalValue">
           <el-input v-model="form.totalValue" placeholder="请输入总产值" />
         </el-form-item>
         <el-form-item label="计划月份" prop="planMonth">
@@ -80,6 +80,13 @@ import { useUserStoreHook } from '@/store/modules/user';
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
+const month = computed(() => {
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0'); // getMonth() 从0开始
+  const currentMonth = `${year}-${month}`;
+  return currentMonth;
+});
 const monthPlanAuditList = ref<MonthPlanAuditVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -116,7 +123,7 @@ const data = reactive<PageData<MonthPlanAuditForm, MonthPlanAuditQuery>>({
     purchaseValue: undefined,
     constructionValue: undefined,
     totalValue: undefined,
-    planMonth: undefined,
+    planMonth: month.value,
     params: {}
   },
   rules: {
diff --git a/src/views/out/purchase/comm/purchPage.vue b/src/views/out/purchase/comm/purchPage.vue
index dd854d3..2a882fd 100644
--- a/src/views/out/purchase/comm/purchPage.vue
+++ b/src/views/out/purchase/comm/purchPage.vue
@@ -24,8 +24,8 @@
     <!-- 添加或修改月度产值计划对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="金额" prop="unitPrice">
-          <el-input v-model="form.unitPrice" placeholder="请输入金额" type="number" />
+        <el-form-item label="接收数量" prop="acceptedQuantity">
+          <el-input v-model="form.acceptedQuantity" placeholder="请输入接收数量" type="number" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -76,7 +76,8 @@ const initFormData = {
   valueType: undefined,
   planAuditStatus: undefined,
   completeAuditStatus: undefined,
-  unitPrice: undefined
+  unitPrice: undefined,
+  acceptedQuantity: undefined
 };
 const data = reactive({
   form: { ...initFormData },
diff --git a/src/views/patch/index.vue b/src/views/patch/index.vue
index ce0cc0d..3f87d2e 100644
--- a/src/views/patch/index.vue
+++ b/src/views/patch/index.vue
@@ -93,7 +93,14 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
             <template #default="scope">
               <el-tooltip content="修改进度" placement="top">
-                <el-button link type="primary" icon="Edit" size="small" @click="handleProgressUpdate(scope.row)"></el-button>
+                <el-button
+                  link
+                  type="primary"
+                  v-hasPermi="['patch:master:editProgress']"
+                  icon="Edit"
+                  size="small"
+                  @click="handleProgressUpdate(scope.row)"
+                ></el-button>
               </el-tooltip>
               <el-tooltip content="删除进度" placement="top">
                 <el-button
diff --git a/src/views/progress/constructionSchedulePlan/index.vue b/src/views/progress/constructionSchedulePlan/index.vue
index 7109158..5342916 100644
--- a/src/views/progress/constructionSchedulePlan/index.vue
+++ b/src/views/progress/constructionSchedulePlan/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -10,8 +9,7 @@
             </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-                <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -27,8 +25,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()"
-              v-hasPermi="['progress:constructionSchedulePlan:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['progress:constructionSchedulePlan:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@@ -36,9 +33,14 @@
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-      <el-table ref="constructionSchedulePlanTableRef" v-loading="loading" :data="constructionSchedulePlanList"
-        row-key="id" :default-expand-all="isExpandAll"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+      <el-table
+        ref="constructionSchedulePlanTableRef"
+        v-loading="loading"
+        :data="constructionSchedulePlanList"
+        row-key="id"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
         <!-- <el-table-column label="序号" type="id" /> -->
         <el-table-column label="节点名称" prop="nodeName" />
         <el-table-column label="对应项目结构" align="center" prop="projectStructureName" />
@@ -71,16 +73,19 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['progress:constructionSchedulePlan:edit']" />
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['progress:constructionSchedulePlan:edit']" />
             </el-tooltip>
             <el-tooltip content="新增" placement="top">
-              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
-                v-hasPermi="['progress:constructionSchedulePlan:add']" />
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['progress:constructionSchedulePlan:add']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['progress:constructionSchedulePlan:remove']" />
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['progress:constructionSchedulePlan:remove']"
+              />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -90,39 +95,57 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="constructionSchedulePlanFormRef" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="父节点" prop="parentId">
-          <el-tree-select v-model="form.parentId" :data="constructionSchedulePlanOptions"
-            :props="{ value: 'id', label: 'nodeName', children: 'children' }" value-key="id" placeholder="请选择父节点"
-            check-strictly />
+          <el-tree-select
+            v-model="form.parentId"
+            :data="constructionSchedulePlanOptions"
+            :props="{ value: 'id', label: 'nodeName', children: 'children' }"
+            value-key="id"
+            placeholder="请选择父节点"
+            check-strictly
+          />
         </el-form-item>
         <el-form-item label="节点名称" prop="nodeName">
           <el-input v-model="form.nodeName" placeholder="请输入节点名称" />
         </el-form-item>
         <el-form-item label="对应项目结构" prop="projectStructure">
-          <el-tree-select v-model="form.projectStructure" :data="ProjectStructureList" @node-click="handleCheckChange"
-            :props="{ value: 'id', label: 'name', children: 'children' }" value-key="id" placeholder="请选择项目结构"
-            check-strictly />
+          <el-tree-select
+            v-model="form.projectStructure"
+            :data="ProjectStructureList"
+            @node-click="handleCheckChange"
+            :props="{ value: 'id', label: 'name', children: 'children' }"
+            value-key="id"
+            placeholder="请选择项目结构"
+            check-strictly
+          />
           <!-- <el-input v-model="form.projectStructure" placeholder="请输入对应项目结构" /> -->
         </el-form-item>
         <el-form-item label="预计开始时间" prop="planStartDate">
-          <el-date-picker clearable v-model="form.planStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="选择预计开始时间" />
+          <el-date-picker clearable v-model="form.planStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择预计开始时间" />
         </el-form-item>
         <el-form-item label="预计结束时间" prop="planEndDate">
-          <el-date-picker clearable v-model="form.planEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="选择预计结束时间" />
+          <el-date-picker clearable v-model="form.planEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择预计结束时间" />
         </el-form-item>
         <el-form-item label="实际开始时间" prop="practicalStartDate">
-          <el-date-picker clearable v-model="form.practicalStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="选择实际开始时间" />
+          <el-date-picker
+            clearable
+            v-model="form.practicalStartDate"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择实际开始时间"
+          />
         </el-form-item>
         <el-form-item label="实际结束时间" prop="practicalEndDate">
-          <el-date-picker clearable v-model="form.practicalEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="选择实际结束时间" />
+          <el-date-picker
+            clearable
+            v-model="form.practicalEndDate"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择实际结束时间"
+          />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
-            <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label"
-              :value="dict.value" />
+            <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -145,7 +168,8 @@ import {
   getConstructionSchedulePlan,
   delConstructionSchedulePlan,
   addConstructionSchedulePlan,
-  updateConstructionSchedulePlan, getProjectStructure
+  updateConstructionSchedulePlan,
+  getProjectStructure
 } from '@/api/progress/constructionSchedulePlan';
 import {
   ConstructionSchedulePlanVO,
@@ -196,7 +220,6 @@ const initFormData = {
   status: undefined,
   remark: undefined,
   projectStructureName: undefined
-
 };
 
 const data = reactive<PageData<ConstructionSchedulePlanForm, ConstructionSchedulePlanQuery>>({
@@ -243,7 +266,7 @@ const handleCheckChange = (val) => {
 
 /** 查询施工进度计划下拉树结构 */
 const getTreeselect = async () => {
-  const res = await listConstructionSchedulePlan();
+  const res = await listConstructionSchedulePlan({ projectId: currentProject.value?.id });
   constructionSchedulePlanOptions.value = [];
   const data: ConstructionSchedulePlanOption = { id: 0, nodeName: '顶级节点', children: [] };
   data.children = proxy?.handleTree<ConstructionSchedulePlanOption>(res.data, 'id', 'parentId');
diff --git a/src/views/progress/plan/component/createDailyRate.vue b/src/views/progress/plan/component/createDailyRate.vue
index 98cefa8..6546c08 100644
--- a/src/views/progress/plan/component/createDailyRate.vue
+++ b/src/views/progress/plan/component/createDailyRate.vue
@@ -345,7 +345,6 @@ const getWorkList = (bool = false) => {
     if (res.code === 200) {
       state.tableData = res.rows.map((item: any, i: number) => {
         item.index = i + 1;
-        item.aiFill = item.detailList?.reduce((sum: number, child: any) => sum + child.aiFill, 0) || 0;
         return item;
       });
       state.total = res.total;
diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue
index f285399..0344712 100644
--- a/src/views/progress/progressCategory/index.vue
+++ b/src/views/progress/progressCategory/index.vue
@@ -34,7 +34,7 @@
                 :file-type="['xls', 'xlsx']"
                 :on-upload-success="handleSuccess"
               >
-                <el-button type="primary" plain icon="Compass">导入</el-button>
+                <el-button type="primary" plain icon="upload">导入</el-button>
               </file-upload>
             </el-col>
             <el-col :span="1.5">
@@ -140,10 +140,10 @@
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
         </el-form-item>
         <el-form-item label="综合单价(业主)" prop="ownerPrice" v-if="form.unitType != '0'">
-          <el-input v-model="form.ownerPrice" placeholder="请输入综合单价(业主)" />
+          <el-input v-model="form.ownerPrice" type="number" min="0" placeholder="请输入综合单价(业主)" />
         </el-form-item>
         <el-form-item label="综合单价(分包)" prop="constructionPrice" v-if="form.unitType != '0'">
-          <el-input v-model="form.constructionPrice" placeholder="请输入综合单价(分包)" />
+          <el-input v-model="form.constructionPrice" type="number" min="0" placeholder="请输入综合单价(分包)" />
         </el-form-item>
         <el-form-item label="数量" prop="total" v-if="!form.workType && form.unitType != '0'">
           <el-input v-model="form.total" placeholder="请输入数量" />
@@ -249,6 +249,7 @@ const initFormData: ProgressCategoryForm = {
   status: undefined,
   remark: undefined
 };
+const labelTitle = ref('测试方阵');
 
 const data = reactive<PageData<ProgressCategoryForm, ProgressCategoryQuery>>({
   form: { ...initFormData },
@@ -323,7 +324,8 @@ const getList = async () => {
     if (data) {
       progressCategoryList.value = data;
       progressCategoryOptions.value = [];
-      const datas: ProgressCategoryOption = { id: 0, name: '顶级节点', children: [...data] };
+      const datas: ProgressCategoryOption = { id: 0, name: '顶级节点', children: [{ id: id, children: [...data], name: labelTitle.value }] };
+      // form.value.parentId = id;
       progressCategoryOptions.value.push(datas);
       console.log('🚀 ~ getList ~ progressCategoryOptions.value:', progressCategoryOptions.value);
       loading.value = false;
@@ -336,6 +338,7 @@ const getList = async () => {
 const handleSuccess = () => {
   console.log(111);
   proxy.$modal.msgSuccess('操作成功');
+  getList();
 };
 
 /** 查询分项工程单价下拉树结构 */
@@ -355,6 +358,8 @@ const cancel = () => {
 };
 
 const handleTabClick = (tab: any) => {
+  console.log(tab);
+  labelTitle.value = tab.props.label;
   const id = tab.props.name; // 实际上就是 item.id
   const current = tabList.value.find((item) => item.id === id);
   if (current.matrixStructureList && current.matrixStructureList.length > 0) {
diff --git a/src/views/progress/progressCategoryTemplate/index.vue b/src/views/progress/progressCategoryTemplate/index.vue
index 5d4257b..a4bc971 100644
--- a/src/views/progress/progressCategoryTemplate/index.vue
+++ b/src/views/progress/progressCategoryTemplate/index.vue
@@ -106,7 +106,7 @@
           <el-input v-model="form.name" placeholder="请输入类别名称" />
         </el-form-item>
         <el-form-item label="关联数据" prop="workType">
-          <el-select v-model="form.workType" placeholder="请选择关联数据">
+          <el-select v-model="form.workType" clearable filterable placeholder="请选择关联数据">
             <el-option v-for="dict in progress_work_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
diff --git a/src/views/project/attendance/index.vue b/src/views/project/attendance/index.vue
index 7634fdb..73ec6de 100644
--- a/src/views/project/attendance/index.vue
+++ b/src/views/project/attendance/index.vue
@@ -87,11 +87,11 @@
         <el-table-column label="迟到(次)" align="center" prop="lateDays" />
         <el-table-column label="早退(次)" align="center" prop="leaveEarlyDays" />
         <el-table-column label="缺卡(次)" align="center" prop="unClockDays" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button link type="primary" icon="View" @click="handleDetails(scope.row)" v-hasPermi="['project:attendance:edit']">详情</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
@@ -347,10 +347,10 @@ const getList = async () => {
 /** 查询近两周考勤列表 */
 const getListTwoWeek = async () => {
   loading.value = true;
-  const res = await listAttendanceTwoWeek(queryParams.value);
-  attendanceTwoWeekList.value = res.data;
-  echartsOption.value = { ...option(attendanceTwoWeekList.value) };
-  commandstatsIntance.value.setOption(echartsOption.value);
+  // const res = await listAttendanceTwoWeek(queryParams.value);
+  // attendanceTwoWeekList.value = res.data;
+  // echartsOption.value = { ...option(attendanceTwoWeekList.value) };
+  // commandstatsIntance.value.setOption(echartsOption.value);
 };
 
 /** 取消按钮 */
diff --git a/src/views/project/landTransfer/BasicData/enterRoad/index.vue b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
index 2c73084..a553d98 100644
--- a/src/views/project/landTransfer/BasicData/enterRoad/index.vue
+++ b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
@@ -31,16 +31,20 @@
             <el-button type="success" plain icon="Plus" @click="downloadTemplate" v-hasPermi="['land:enterRoad:import']">模板下载</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-upload ref="uploadRef" class="upload-demo" :http-request="handleImport" :show-file-list="false">
-                <template #trigger>
-                  <el-button plain type="primary">导入excel</el-button>
-                </template>
-              </el-upload>
+            <el-upload
+              ref="uploadRef"
+              v-hasPermi="['land:enterRoad:upload']"
+              class="upload-demo"
+              :http-request="handleImport"
+              :show-file-list="false"
+            >
+              <template #trigger>
+                <el-button plain type="primary" icon="upload">导入excel</el-button>
+              </template>
+            </el-upload>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['land:enterRoad:remove']"
-              >删除</el-button
-            >
+            <el-button type="success" plain icon="Download" @click="exportFile">导出模版</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -93,7 +97,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button :loading="buttonLoading" type="primary" v-hasPermi="['land:enterRoad:add']" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -102,7 +106,7 @@
 </template>
 
 <script setup name="EnterRoad" lang="ts">
-import { listEnterRoad, getEnterRoad, delEnterRoad, addEnterRoad, updateEnterRoad ,importEnterRoad} from '@/api/system/landTransfer/enterRoad';
+import { listEnterRoad, getEnterRoad, delEnterRoad, addEnterRoad, updateEnterRoad, importEnterRoad } from '@/api/system/landTransfer/enterRoad';
 import { EnterRoadVO, EnterRoadQuery, EnterRoadForm } from '@/api/system/landTransfer/enterRoad/types';
 import { listLandBlock } from '@/api/system/landTransfer/landBlock';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -204,7 +208,24 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
 };
-
+const exportFile = () => {
+  // 导出模版文件
+  try {
+    // 创建a标签
+    const link = document.createElement('a');
+    // 设置PDF文件路径 - 相对于public目录
+    link.href = '/daolu.xlsx';
+    // 设置下载后的文件名
+    link.download = '道路信息导入模版.xlsx';
+    // 触发点击
+    document.body.appendChild(link);
+    link.click();
+    // 清理
+    document.body.removeChild(link);
+  } catch (error) {
+    alert('下载失败，请重试');
+  }
+};
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: EnterRoadVO[]) => {
   ids.value = selection.map((item) => item.id);
@@ -267,20 +288,23 @@ const listeningProject = watch(
 
 // 导入文件
 const handleImport = (options: any) => {
-   loading.value = true;
+  loading.value = true;
   let formData = new FormData();
   formData.append('file', options.file);
-  importEnterRoad(currentProject.value?.id,formData).then((res) => {
-    if (res.code == 200) {
-      proxy.$modal.msgSuccess(res.msg || '导入成功');
-      getListLand();
-      getList();
-    }
-  }).catch((err) => {
-    proxy.$modal.msgError(err.msg || '导入失败');
-  }).finally(() => {
-    loading.value = false;
-  });
+  importEnterRoad(currentProject.value?.id, formData)
+    .then((res) => {
+      if (res.code == 200) {
+        proxy.$modal.msgSuccess(res.msg || '导入成功');
+        getListLand();
+        getList();
+      }
+    })
+    .catch((err) => {
+      proxy.$modal.msgError(err.msg || '导入失败');
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 };
 // 下载模板
 const downloadTemplate = () => {
diff --git a/src/views/project/landTransfer/BasicData/landBlock/index.vue b/src/views/project/landTransfer/BasicData/landBlock/index.vue
index 12ec35f..8c215a0 100644
--- a/src/views/project/landTransfer/BasicData/landBlock/index.vue
+++ b/src/views/project/landTransfer/BasicData/landBlock/index.vue
@@ -42,10 +42,13 @@
           <el-col :span="1.5">
             <el-upload ref="uploadRef" class="upload-demo" :http-request="handleImport" :show-file-list="false">
               <template #trigger>
-                <el-button plain type="primary">导入excel</el-button>
+                <el-button plain type="primary" icon="upload">导入excel</el-button>
               </template>
             </el-upload>
           </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Download" @click="exportFile">导出模版</el-button>
+          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -99,7 +102,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm" v-hasPermi="['land:landBlock:add']">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -521,7 +524,24 @@ const handleImport = (options: { file: File }) => {
       loading.value = false;
     });
 };
-
+const exportFile = () => {
+  // 导出模版文件
+  try {
+    // 创建a标签
+    const link = document.createElement('a');
+    // 设置PDF文件路径 - 相对于public目录
+    link.href = '/dikuai.xlsx';
+    // 设置下载后的文件名
+    link.download = '地块信息导入模版.xlsx';
+    // 触发点击
+    document.body.appendChild(link);
+    link.click();
+    // 清理
+    document.body.removeChild(link);
+  } catch (error) {
+    alert('下载失败，请重试');
+  }
+};
 /** 下载导入模板 */
 const downloadTemplate = () => {
   try {
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
index c9bb0f4..28839b3 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
@@ -208,7 +208,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button v-hasPermi="['land:landTransferLedger:add']" :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
index 4de4cb7..ff53174 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
@@ -142,7 +142,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button v-hasPermi="['land:landTransferLedger:add']" :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
diff --git a/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
index 2daab93..cae05e3 100644
--- a/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
@@ -145,7 +145,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button :loading="buttonLoading" type="primary" v-hasPermi="['land:landTransferLedger:add']" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
diff --git a/src/views/project/project/index.vue b/src/views/project/project/index.vue
index 31a0bbd..04ec6b7 100644
--- a/src/views/project/project/index.vue
+++ b/src/views/project/project/index.vue
@@ -46,7 +46,9 @@
         <el-table-column type="expand" width="50">
           <template #default="{ row }">
             <div class="w212.25 ml-12.5">
-              <el-button class="mb" type="primary" size="small" @click="handleOpenSetChild(row.id)" icon="plus">添加子项目</el-button>
+              <el-button class="mb" type="primary" size="small" v-hasPermi="['project:project:add']" @click="handleOpenSetChild(row.id)" icon="plus"
+                >添加子项目</el-button
+              >
 
               <el-table :data="row.children" border stripe>
                 <el-table-column label="序号" type="index" width="55" align="center" />
@@ -73,7 +75,7 @@
                         uploadUrl="/project/projectFile/upload/dxf"
                         :data="{ projectId: scope.row.id }"
                       >
-                        <el-button link type="primary" icon="upload">上传DXF </el-button>
+                        <el-button link type="primary" icon="upload" v-hasPermi="['project:projectFile:add']">上传DXF </el-button>
                       </file-upload>
                       <el-button
                         link
@@ -145,7 +147,9 @@
         <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="400">
           <template #default="scope">
             <el-space>
-              <el-button link type="primary" icon="FolderOpened" @click="handleShowUpload(scope.row)">导入安全协议书 </el-button>
+              <el-button link type="primary" icon="FolderOpened" @click="handleShowUpload(scope.row)" v-hasPermi="['project:project:edit']"
+                >导入安全协议书
+              </el-button>
 
               <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:project:edit']">修改 </el-button>
               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:project:remove']">删除 </el-button>
diff --git a/src/views/project/subcontract/index.vue b/src/views/project/subcontract/index.vue
index e9d49a2..f3d658a 100644
--- a/src/views/project/subcontract/index.vue
+++ b/src/views/project/subcontract/index.vue
@@ -119,7 +119,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button v-hasPermi="['design:subcontract:add']" :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
diff --git a/src/views/quality/knowledgeDocument/component/recyclingStation.vue b/src/views/quality/knowledgeDocument/component/recyclingStation.vue
index 01063c7..00c70c9 100644
--- a/src/views/quality/knowledgeDocument/component/recyclingStation.vue
+++ b/src/views/quality/knowledgeDocument/component/recyclingStation.vue
@@ -5,23 +5,19 @@
         <el-form :model="param" ref="queryRef" :inline="true" label-width="100px">
           <el-row>
             <el-col :span="2">
-              <el-button
-                type="success"
-                v-auth="'/zm/api/v1/system/document/templateRecycleBin'"
-                :disabled="multiple"
-                @click="onRecyclingStation(null, true)"
-              >
-                <el-icon><RefreshRight /></el-icon>批量恢复
+              <el-button type="success" v-auth="'/zm/api/v1/system/document/templateRecycleBin'" :disabled="multiple"
+                @click="onRecyclingStation(null, true)" v-hasPermi="['quality:knowledgeDocument:recovery']">
+                <el-icon>
+                  <RefreshRight />
+                </el-icon>批量恢复
               </el-button>
             </el-col>
             <el-col :span="2">
-              <el-button
-                type="danger"
-                v-auth="'/zm/api/v1/system/document/templateRecycleBin'"
-                :disabled="multiple"
-                @click="onRecyclingStation(null, false)"
-              >
-                <el-icon><DeleteFilled /></el-icon>批量删除
+              <el-button type="danger" v-auth="'/zm/api/v1/system/document/templateRecycleBin'" :disabled="multiple"
+                @click="onRecyclingStation(null, false)">
+                <el-icon>
+                  <DeleteFilled />
+                </el-icon>批量删除
               </el-button>
             </el-col>
           </el-row>
@@ -40,14 +36,18 @@
         <el-table-column label="操作" align="center" class-name="small-padding" min-width="80px" fixed="right">
           <template #default="scope">
             <div>
-              <el-button type="success" v-auth="'/zm/api/v1/system/document/templateRecycleBin'" link @click="onRecyclingStation(scope.row, true)">
-                <el-icon><RefreshRight /></el-icon>恢复
+              <el-button type="success" v-auth="'/zm/api/v1/system/document/templateRecycleBin'" link
+                @click="onRecyclingStation(scope.row, true)">
+                <el-icon>
+                  <RefreshRight />
+                </el-icon>恢复
               </el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="param.pageNum" v-model:limit="param.pageSize" @pagination="getDocumentDataList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="param.pageNum" v-model:limit="param.pageSize"
+        @pagination="getDocumentDataList" />
     </el-card>
   </div>
 </template>
@@ -139,7 +139,7 @@ const onRecyclingStation = (row: any, flag: boolean) => {
         });
       }
     })
-    .catch(() => {});
+    .catch(() => { });
 };
 
 const filterfilenPath = (val: string): string => {
@@ -155,6 +155,7 @@ defineExpose({
 .colBlock {
   display: block;
 }
+
 .colNone {
   display: none;
 }
diff --git a/src/views/quality/knowledgeDocument/index.vue b/src/views/quality/knowledgeDocument/index.vue
index 2d68be4..595db09 100644
--- a/src/views/quality/knowledgeDocument/index.vue
+++ b/src/views/quality/knowledgeDocument/index.vue
@@ -5,48 +5,39 @@
         <div class="box_info">
           <div class="tree_left1" id="tree_left1">
             <div class="file_upload check_select">
-              <div class="box_btn" v-auth="'/zm/api/v1/system/documentData/add'">
-                <file-upload
-                  v-model="state.paramsQuery.file"
-                  :limit="100"
-                  :uploadUrl="uploadUrl"
-                  :params="uploadParams"
-                  :on-upload-success="uploadFile"
-                >
+              <div class="box_btn" v-auth="'/zm/api/v1/system/documentData/add'"
+                v-hasPermi="['quality:knowledgeDocument:file']">
+
+                <file-upload v-model="state.paramsQuery.file" :limit="100" :uploadUrl="uploadUrl" :params="uploadParams"
+                  :on-upload-success="uploadFile">
                   <el-button type="primary" style="float: left" :disabled="!state.parentPid">
-                    <el-icon size="small"><Plus /></el-icon>上传文件
+                    <el-icon size="small">
+                      <Plus />
+                    </el-icon>上传文件
                   </el-button>
                 </file-upload>
               </div>
-              <el-button
-                type="primary"
-                v-auth="'/zm/api/v1/system/documentProject/dataCompressedDownload'"
-                :disabled="!state.parentPid"
-                @click="onExport"
-                ><el-icon><Download /></el-icon>下载</el-button
-              >
-              <el-button type="primary" @click="onBook" v-auth="'/zm/api/v1/system/documentData/dataFileQuery'"
-                ><el-icon><View /></el-icon>查看全项目文件</el-button
-              >
+              <el-button type="primary" v-auth="'/zm/api/v1/system/documentProject/dataCompressedDownload'"
+                v-hasPermi="['quality:knowledgeDocument:fileList']" :disabled="!state.parentPid"
+                @click="onExport"><el-icon>
+                  <Download />
+                </el-icon>下载</el-button>
+              <el-button type="primary" @click="onBook"
+                v-auth="'/zm/api/v1/system/documentData/dataFileQuery'"><el-icon>
+                  <View />
+                </el-icon>查看全项目文件</el-button>
             </div>
             <div class="file_upload check_select">
               <el-input class="input_left" v-model="filterText" size="small" placeholder="请输入文件名称" />
             </div>
-            <el-tree
-              ref="treeRef"
-              highlight-current
-              :default-expand-all="state.checked"
-              :filter-node-method="filterFolder"
-              :data="state.treeList"
-              node-key="id"
-              accordion
-              :expand-on-click-node="false"
-              @node-click="handleNodeClick"
-              :current-node-key="state.selectedNodeId"
-            >
+            <el-tree ref="treeRef" highlight-current :default-expand-all="state.checked"
+              :filter-node-method="filterFolder" :data="state.treeList" node-key="id" accordion
+              :expand-on-click-node="false" @node-click="handleNodeClick" :current-node-key="state.selectedNodeId">
               <template #default="{ node, data }">
                 <span class="custom-tree-node">
-                  <el-icon color="#f1a81a"><FolderOpened /></el-icon>
+                  <el-icon color="#f1a81a">
+                    <FolderOpened />
+                  </el-icon>
                   <span>{{ node.label }}</span>
                 </span>
               </template>
@@ -59,22 +50,18 @@
                 <el-row>
                   <el-col :span="7" class="colBlock">
                     <el-form-item label="文件名称" prop="fileName">
-                      <el-input
-                        v-model="state.paramsQuery.fileName"
-                        placeholder="请输入文件名称"
-                        clearable
-                        @keyup.enter.native="getdocumentDataList"
-                      />
+                      <el-input v-model="state.paramsQuery.fileName" placeholder="请输入文件名称" clearable
+                        @keyup.enter.native="getdocumentDataList" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="6" class="m-l10">
                     <el-form-item>
-                      <el-button type="primary" @click="searchInfo"
-                        ><el-icon><Search /></el-icon>搜索</el-button
-                      >
-                      <el-button @click="resetQuery"
-                        ><el-icon><Refresh /></el-icon>重置</el-button
-                      >
+                      <el-button type="primary" @click="searchInfo"><el-icon>
+                          <Search />
+                        </el-icon>搜索</el-button>
+                      <el-button @click="resetQuery"><el-icon>
+                          <Refresh />
+                        </el-icon>重置</el-button>
                     </el-form-item>
                   </el-col>
                   <!-- <el-col :span="4">
@@ -97,44 +84,38 @@
               <el-table-column label="上传时间" align="center" prop="createTime"> </el-table-column>
               <el-table-column label="操作" align="center" width="300">
                 <template #default="scope">
-                  <el-button
-                    type="primary"
-                    v-auth="'/zm/api/v1/system/documentData/get'"
-                    v-if="acceptType.includes(scope.row.fileSuffix)"
-                    link
-                    @click="handleView(scope.row)"
-                    ><el-icon><View /></el-icon>查看</el-button
-                  >
-                  <el-button
-                    type="primary"
-                    v-auth="'/zm/api/v1/system/documentData/complaintBoxAdd'"
-                    v-if="state.wordType.includes(scope.row.fileSuffix)"
-                    link
-                    @click="updataView(scope.row)"
-                    ><el-icon><EditPen /></el-icon>修改文件</el-button
-                  >
-                  <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/uniFolderDownload'" link @click="onExportView(scope.row)"
-                    ><el-icon><Download /></el-icon>下载</el-button
-                  >
-                  <el-button type="success" v-auth="'/zm/api/v1/system/documentData/edit'" link @click="updateName(scope.row)"
-                    ><el-icon><EditPen /></el-icon>修改名称</el-button
-                  >
-                  <el-button type="danger" v-auth="'/zm/api/v1/system/documentData/delete'" link @click="handleDelete(scope.row)"
-                    ><el-icon><DeleteFilled /></el-icon>删除</el-button
-                  >
+                  <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/get'"
+                    v-if="acceptType.includes(scope.row.fileSuffix)" link @click="handleView(scope.row)"><el-icon>
+                      <View />
+                    </el-icon>查看</el-button>
+                  <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/complaintBoxAdd'"
+                    v-hasPermi="['quality:knowledgeDocument:file']" v-if="state.wordType.includes(scope.row.fileSuffix)"
+                    link @click="updataView(scope.row)"><el-icon>
+                      <EditPen />
+                    </el-icon>修改文件</el-button>
+                  <el-button type="primary" v-auth="'/zm/api/v1/system/documentData/uniFolderDownload'" link
+                    v-hasPermi="['quality:knowledgeDocument:file']" @click="onExportView(scope.row)"><el-icon>
+                      <Download />
+                    </el-icon>下载</el-button>
+                  <el-button type="success" v-auth="'/zm/api/v1/system/documentData/edit'" link
+                    @click="updateName(scope.row)" v-hasPermi="['quality:knowledgeDocument:file']"><el-icon>
+                      <EditPen />
+                    </el-icon>修改名称</el-button>
+                  <el-button type="danger" v-auth="'/zm/api/v1/system/documentData/delete'" link
+                    @click="handleDelete(scope.row)"><el-icon>
+                      <DeleteFilled />
+                    </el-icon>删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
-            <pagination
-              :total="state.total"
-              v-model:page="state.paramsQuery.pageNum"
-              v-model:limit="state.paramsQuery.pageSize"
-              @pagination="getdocumentDataList"
-            />
+            <pagination :total="state.total" v-model:page="state.paramsQuery.pageNum"
+              v-model:limit="state.paramsQuery.pageSize" @pagination="getdocumentDataList" />
           </div>
         </div>
-        <documentsDeailsVue ref="documentDetailRef" v-if="state.showDocumentDetail" @onClose="onClose"></documentsDeailsVue>
-        <documentsEdit ref="documentDataEditRef" v-if="state.showdocumentDataEdit" @onClose="onCloseEdit"></documentsEdit>
+        <documentsDeailsVue ref="documentDetailRef" v-if="state.showDocumentDetail" @onClose="onClose">
+        </documentsDeailsVue>
+        <documentsEdit ref="documentDataEditRef" v-if="state.showdocumentDataEdit" @onClose="onCloseEdit">
+        </documentsEdit>
         <!-- <uploadFileder
       ref="uploadFilederRef"
       v-if="state.showUploadFileder"
@@ -154,15 +135,8 @@
           </template>
         </el-dialog>
       </div>
-      <el-image-viewer
-        ref="imageRef"
-        style="width: 100%; height: 100%"
-        :url-list="[imgUrl]"
-        v-if="imgUrl"
-        show-progress
-        fit="cover"
-        @close="imgUrl = ''"
-      />
+      <el-image-viewer ref="imageRef" style="width: 100%; height: 100%" :url-list="[imgUrl]" v-if="imgUrl" show-progress
+        fit="cover" @close="imgUrl = ''" />
     </el-tab-pane>
     <el-tab-pane label="回收站" name="second">
       <RecyclingStation ref="recylingRef"></RecyclingStation>
@@ -472,7 +446,7 @@ const delFile = (msg, data, cb) => {
         }
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 };
 const editName = (data, title, type) => {
   ElMessageBox.prompt(title, '温馨提示', {
@@ -502,7 +476,7 @@ const editName = (data, title, type) => {
         }
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 };
 const onExport = () => {
   getUniFolderDownloadList(state.paramsQuery.folderId).then((res: any) => {
@@ -535,30 +509,37 @@ onMounted(() => {
 <style lang="scss" scoped>
 .profile_engin {
   height: 80vh;
+
   .set-tool {
     display: none;
   }
+
   .el-tree-node__content:hover,
   .el-tree-node__content:active {
     .set-tool {
       display: inline-block;
     }
   }
-  .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+
+  .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
     background-color: #354e67 !important;
     color: #fff;
   }
+
   .box_info {
     display: flex;
     justify-content: space-between;
   }
+
   .pagination-container {
     padding: 10px 0 !important;
   }
-  > div {
+
+  >div {
     height: 100%;
     width: 100%;
   }
+
   .tree_left1 {
     width: 30%;
     background-color: #fff;
@@ -569,6 +550,7 @@ onMounted(() => {
     min-width: 26%;
     border-right: 6px solid;
     border-right-color: rgba(204, 230, 255, 0);
+
     .resize-handle-right {
       top: 0;
       width: 6px;
@@ -578,6 +560,7 @@ onMounted(() => {
       position: absolute;
       z-index: 999;
     }
+
     .check_select {
       display: flex;
       align-items: center;
@@ -585,43 +568,52 @@ onMounted(() => {
       // justify-content: space-between;
       padding: 4px;
       border-bottom: 1px solid #f1f1f1;
+
       .box_btn {
         margin: 0 10px 0 20px;
         position: relative;
-        > span {
+
+        >span {
           padding: 4px 10px;
           background: #67c23a;
           color: #fff;
           border-radius: 2px;
         }
+
         .btn {
           position: absolute;
           left: 20%;
           display: none;
           top: -2px;
           width: 220px;
+
           .el-button {
             float: left;
           }
         }
       }
+
       .box_btn:hover,
       .box_btn:active {
         cursor: pointer;
+
         .btn {
           display: block;
         }
       }
     }
+
     .file_upload {
       margin: 2px 0;
     }
+
     .input_left {
       padding: 6px;
       box-sizing: border-box;
       // border-bottom: 1px solid #cbcbcb;
     }
   }
+
   .list_right {
     width: 69.5%;
     background: white;
@@ -629,11 +621,13 @@ onMounted(() => {
     padding: 10px;
     box-sizing: border-box;
   }
+
   .el-tree {
     height: calc(80vh - 160px);
     width: 100%;
     overflow: auto !important;
   }
+
   // .el-tree-node__children {
   // 	overflow: visible !important;
   // }
diff --git a/src/views/safety/questionUserAnswer/index.vue b/src/views/safety/questionUserAnswer/index.vue
index 871de5f..d60fd4f 100644
--- a/src/views/safety/questionUserAnswer/index.vue
+++ b/src/views/safety/questionUserAnswer/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -24,26 +25,21 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+          <el-col :span="1.5" v-hasPermi="['safety:questionUserAnswer:uploadZip']">
             <el-tooltip placement="top" effect="dark">
               <template #content>
                 注:上传压缩包内的文件夹名称需设置为【姓名-身份证-满分-得分-及格分】， <br />
                 例如:小明-5130112333654X-100-59-60
               </template>
-              <file-upload
-                :limit="1"
-                v-model:model-value="filePath"
-                isImportInfo
-                :fileType="['zip']"
-                uploadUrl="/safety/questionUserAnswer/upload/zip"
-                :file-size="5000"
-                :data="{ projectId: currentProject.id }"
-                ><el-button type="success" plain icon="Upload">上传线下安全考试</el-button></file-upload
-              >
+              <file-upload :limit="1" v-model:model-value="filePath" isImportInfo :fileType="['zip']"
+                uploadUrl="/safety/questionUserAnswer/upload/zip" :file-size="5000"
+                :data="{ projectId: currentProject.id }"><el-button type="success" plain
+                  icon="Upload">上传线下安全考试</el-button></file-upload>
             </el-tooltip>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Download" :disabled="single" @click="handleDownload()">批量下载试卷</el-button>
+            <el-button type="primary" plain icon="Download" :disabled="single"
+              @click="handleDownload()">批量下载试卷</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -70,12 +66,14 @@
               <el-button link type="primary" icon="View">预览试卷</el-button>
             </el-link>
 
-            <el-button link type="primary" icon="Download" @click="downloadOssOne(scope.row)">下载试卷</el-button>
+            <el-button link type="primary" icon="Download" @click="downloadOssOne(scope.row)"
+              v-hasPermi="['system:oss:download']">下载试卷</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
 </template>
diff --git a/src/views/safety/violationLevel/index.vue b/src/views/safety/violationLevel/index.vue
index 0e02a41..b954995 100644
--- a/src/views/safety/violationLevel/index.vue
+++ b/src/views/safety/violationLevel/index.vue
@@ -145,7 +145,7 @@ const state = reactive<any>({
 });
 
 const postList = () => {
-  listTreeByProject(currentProject.value?.id).then((res) => {
+  listTreeByProject().then((res) => {
     console.log('🚀 ~ listTreeByProject ~ res:', res);
     state.postListAll = res.data ?? [];
   });
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index f39f01c..89a185e 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -12,23 +13,19 @@
             </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="角色状态" clearable>
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="创建时间" style="width: 308px">
-              <el-date-picker
-                v-model="dateRange"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-              ></el-date-picker>
+              <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+                range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"></el-date-picker>
             </el-form-item>
 
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" icon="Search" @click="handleQuery"
+                v-hasPermi="['system:role:query']">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
@@ -40,18 +37,9 @@
       <el-col :lg="4" :xs="24" style="">
         <el-card shadow="hover">
           <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
-          <el-tree
-            ref="deptTreeRef"
-            class="mt-2"
-            node-key="id"
-            :data="deptOptions"
-            :props="{ label: 'label', children: 'children' }"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            highlight-current
-            default-expand-all
-            @node-click="handleNodeClick"
-          />
+          <el-tree ref="deptTreeRef" class="mt-2" node-key="id" :data="deptOptions"
+            :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false"
+            :filter-node-method="filterNode" highlight-current default-expand-all @node-click="handleNodeClick" />
         </el-card>
       </el-col>
       <el-col :lg="20" :xs="24">
@@ -59,20 +47,20 @@
           <template #header>
             <el-row :gutter="10">
               <el-col :span="1.5">
-                <el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+                <el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus"
+                  @click="handleAdd()">新增</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()"
-                  >修改</el-button
-                >
+                <el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit"
+                  @click="handleUpdate()">修改</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()"
-                  >删除</el-button
-                >
+                <el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0"
+                  @click="handleDelete()">删除</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+                <el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download"
+                  @click="handleExport">导出</el-button>
               </el-col>
               <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
             </el-row>
@@ -86,7 +74,8 @@
             <el-table-column label="显示顺序" prop="roleSort" width="100" />
             <el-table-column label="状态" align="center" width="100">
               <template #default="scope">
-                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                  @change="handleStatusChange(scope.row)"></el-switch>
               </template>
             </el-table-column>
             <el-table-column label="创建时间" align="center" prop="createTime">
@@ -98,28 +87,27 @@
             <el-table-column fixed="right" label="操作" width="180">
               <template #default="scope">
                 <el-tooltip v-if="scope.row.roleId !== 1" content="修改" placement="top">
-                  <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+                  <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="Edit"
+                    @click="handleUpdate(scope.row)"></el-button>
                 </el-tooltip>
                 <el-tooltip v-if="scope.row.roleId !== 1" content="删除" placement="top">
-                  <el-button v-hasPermi="['system:role:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+                  <el-button v-hasPermi="['system:role:remove']" link type="primary" icon="Delete"
+                    @click="handleDelete(scope.row)"></el-button>
                 </el-tooltip>
                 <el-tooltip v-if="scope.row.roleId !== 1" content="数据权限" placement="top">
-                  <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"></el-button>
+                  <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="CircleCheck"
+                    @click="handleDataScope(scope.row)"></el-button>
                 </el-tooltip>
                 <el-tooltip v-if="scope.row.roleId !== 1" content="分配用户" placement="top">
-                  <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User" @click="handleAuthUser(scope.row)"></el-button>
+                  <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User"
+                    @click="handleAuthUser(scope.row)"></el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
           </el-table>
 
-          <pagination
-            v-if="total > 0"
-            v-model:total="total"
-            v-model:page="queryParams.pageNum"
-            v-model:limit="queryParams.pageSize"
-            @pagination="getList"
-          />
+          <pagination v-if="total > 0" v-model:total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
         </el-card>
       </el-col>
     </el-row>
@@ -127,16 +115,8 @@
     <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
       <el-form ref="roleFormRef" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="所属部门" prop="deptId">
-          <el-cascader
-            :options="deptOptions"
-            v-model="form.deptId"
-            placeholder="请选择所属部门"
-            clearable
-            filterable
-            :show-all-levels="false"
-            :props="{ value: 'id', emitPath: false, checkStrictly: true }"
-            @change=""
-          >
+          <el-cascader :options="deptOptions" v-model="form.deptId" placeholder="请选择所属部门" clearable filterable
+            :show-all-levels="false" :props="{ value: 'id', emitPath: false, checkStrictly: true }" @change="">
           </el-cascader>
         </el-form-item>
         <el-form-item label="角色名称" prop="roleName">
@@ -158,26 +138,23 @@
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="菜单权限">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand(Boolean($event), 'menu')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="menuExpand"
+            @change="handleCheckedTreeExpand(Boolean($event), 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-          <el-tree
-            ref="menuRef"
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            node-key="id"
-            :check-strictly="!form.menuCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"
-          ></el-tree>
+          <el-checkbox v-model="form.menuCheckStrictly"
+            @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
+          <el-tree ref="menuRef" class="tree-border" :data="menuOptions" show-checkbox node-key="id"
+            :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' }"></el-tree>
         </el-form-item>
         <el-form-item label="是否为特殊角色">
-          <el-switch v-model="form.isSpecial" active-value="1" inactive-value="0" active-text="是" inactive-text="否"> </el-switch>
+          <el-switch v-model="form.isSpecial" active-value="1" inactive-value="0" active-text="是" inactive-text="否">
+          </el-switch>
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
@@ -202,24 +179,19 @@
         </el-form-item>
         <el-form-item label="权限范围">
           <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-show="form.dataScope === '2'" label="数据权限">
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand(Boolean($event), 'dept')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="deptExpand"
+            @change="handleCheckedTreeExpand(Boolean($event), 'dept')">展开/折叠</el-checkbox>
           <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-          <el-tree
-            ref="deptRef"
-            class="tree-border"
-            :data="deptOptions"
-            show-checkbox
-            default-expand-all
-            node-key="id"
-            :check-strictly="!form.deptCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"
-          ></el-tree>
+          <el-checkbox v-model="form.deptCheckStrictly"
+            @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
+          <el-tree ref="deptRef" class="tree-border" :data="deptOptions" show-checkbox default-expand-all node-key="id"
+            :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' }"></el-tree>
         </el-form-item>
       </el-form>
       <template #footer>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index da397cf..d8c00ac 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -5,22 +5,14 @@
       <el-col :lg="4" :xs="24" style="">
         <el-card shadow="hover">
           <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
-          <el-tree
-            ref="deptTreeRef"
-            class="mt-2"
-            node-key="id"
-            :data="deptOptions"
-            :props="{ label: 'label', children: 'children' }"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            highlight-current
-            default-expand-all
-            @node-click="handleNodeClick"
-          />
+          <el-tree ref="deptTreeRef" class="mt-2" node-key="id" :data="deptOptions"
+            :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false"
+            :filter-node-method="filterNode" highlight-current default-expand-all @node-click="handleNodeClick" />
         </el-card>
       </el-col>
       <el-col :lg="20" :xs="24">
-        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+          :leave-active-class="proxy?.animate.searchAnimate.leave">
           <div v-show="showSearch" class="mb-[10px]">
             <el-card shadow="hover">
               <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -28,27 +20,25 @@
                   <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
                 <el-form-item label="手机号码" prop="phonenumber">
-                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable
+                    @keyup.enter="handleQuery" />
                 </el-form-item>
 
                 <el-form-item label="状态" prop="status">
                   <el-select v-model="queryParams.status" placeholder="用户状态" clearable>
-                    <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                      :value="dict.value" />
                   </el-select>
                 </el-form-item>
                 <el-form-item label="创建时间" style="width: 308px">
-                  <el-date-picker
-                    v-model="dateRange"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    type="daterange"
-                    range-separator="-"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-                  ></el-date-picker>
+                  <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+                    range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"></el-date-picker>
                 </el-form-item>
                 <el-form-item>
-                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button type="primary" icon="Search" @click="handleQuery"
+                    @v-has-permi="['system:user:query']">搜索</el-button>
+
                   <el-button icon="Refresh" @click="resetQuery">重置</el-button>
                 </el-form-item>
               </el-form>
@@ -60,15 +50,18 @@
           <template #header>
             <el-row :gutter="10">
               <el-col :span="1.5">
-                <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()"> 新增 </el-button>
+                <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()"> 新增
+                </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button v-has-permi="['system:user:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
+                <el-button v-has-permi="['system:user:edit']" type="success" plain :disabled="single" icon="Edit"
+                  @click="handleUpdate()">
                   修改
                 </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button v-has-permi="['system:user:remove']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()">
+                <el-button v-has-permi="['system:user:remove']" type="danger" plain :disabled="multiple" icon="Delete"
+                  @click="handleDelete()">
                   删除
                 </el-button>
               </el-col>
@@ -83,26 +76,34 @@
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>
-                      <el-dropdown-item v-has-permi="['system:user:import']" icon="Top" @click="handleImport">导入数据 </el-dropdown-item>
-                      <el-dropdown-item v-has-permi="['system:user:export']" icon="Download" @click="handleExport"> 导出数据 </el-dropdown-item>
+                      <el-dropdown-item v-has-permi="['system:user:import']" icon="Top" @click="handleImport">导入数据
+                      </el-dropdown-item>
+                      <el-dropdown-item v-has-permi="['system:user:export']" icon="Download" @click="handleExport"> 导出数据
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
               </el-col>
-              <right-toolbar v-model:show-search="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
+              <right-toolbar v-model:show-search="showSearch" :columns="columns" :search="true"
+                @query-table="getList"></right-toolbar>
             </el-row>
           </template>
 
           <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column v-if="columns[0].visible" key="userId" label="用户编号" align="center" prop="userId" />
-            <el-table-column v-if="columns[1].visible" key="userName" label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-            <el-table-column v-if="columns[2].visible" key="nickName" label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
-            <el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
-            <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
+            <el-table-column v-if="columns[1].visible" key="userName" label="用户名称" align="center" prop="userName"
+              :show-overflow-tooltip="true" />
+            <el-table-column v-if="columns[2].visible" key="nickName" label="用户昵称" align="center" prop="nickName"
+              :show-overflow-tooltip="true" />
+            <el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName"
+              :show-overflow-tooltip="true" />
+            <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber"
+              width="120" />
             <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center">
               <template #default="scope">
-                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                  @change="handleStatusChange(scope.row)"></el-switch>
               </template>
             </el-table-column>
 
@@ -115,24 +116,30 @@
             <el-table-column label="操作" fixed="right" width="230" class-name="small-padding fixed-width">
               <template #default="scope">
                 <el-tooltip v-if="scope.row.userId !== 1" content="修改" placement="top">
-                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit"
+                    @click="handleUpdate(scope.row)"></el-button>
                 </el-tooltip>
                 <el-tooltip v-if="scope.row.userId !== 1" content="删除" placement="top">
-                  <el-button v-hasPermi="['system:user:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+                  <el-button v-hasPermi="['system:user:remove']" link type="primary" icon="Delete"
+                    @click="handleDelete(scope.row)"></el-button>
                 </el-tooltip>
 
                 <el-tooltip v-if="scope.row.userId !== 1" content="重置密码" placement="top">
-                  <el-button v-hasPermi="['system:user:resetPwd']" link type="primary" icon="Key" @click="handleResetPwd(scope.row)"></el-button>
+                  <el-button v-hasPermi="['system:user:resetPwd']" link type="primary" icon="Key"
+                    @click="handleResetPwd(scope.row)"></el-button>
                 </el-tooltip>
 
                 <el-tooltip v-if="scope.row.userId !== 1" content="分配角色" placement="top">
-                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"></el-button>
+                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck"
+                    @click="handleAuthRole(scope.row)"></el-button>
                 </el-tooltip>
                 <el-tooltip v-if="scope.row.userId !== 1" content="编辑关联项目" placement="top">
-                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdateProject(scope.row)"></el-button>
+                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit"
+                    @click="handleUpdateProject(scope.row)"></el-button>
                 </el-tooltip>
                 <el-tooltip v-if="scope.row.userId !== 1" content="上传证书目录" placement="top">
-                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Upload" @click="handleUploadCert(scope.row)"></el-button>
+                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Upload"
+                    @click="handleUploadCert(scope.row)"></el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -141,19 +148,15 @@
             <shuttle-frame :userId="selectedUserId" @close="shuttleVisible = false" />
           </el-dialog>
 
-          <pagination
-            v-show="total > 0"
-            v-model:page="queryParams.pageNum"
-            v-model:limit="queryParams.pageSize"
-            :total="total"
-            @pagination="getList"
-          />
+          <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+            :total="total" @pagination="getList" />
         </el-card>
       </el-col>
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog ref="formDialogRef" v-model="dialog.visible" :title="dialog.title" width="600px" append-to-body @close="closeDialog">
+    <el-dialog ref="formDialogRef" v-model="dialog.visible" :title="dialog.title" width="600px" append-to-body
+      @close="closeDialog">
       <el-form ref="userFormRef" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -163,15 +166,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <el-tree-select
-                v-model="form.deptId"
-                :data="enabledDeptOptions"
-                :props="{ value: 'id', label: 'label', children: 'children' }"
-                value-key="id"
-                placeholder="请选择归属部门"
-                check-strictly
-                @change="handleDeptChange"
-              />
+              <el-tree-select v-model="form.deptId" :data="enabledDeptOptions"
+                :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属部门"
+                check-strictly @change="handleDeptChange" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -197,20 +194,16 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option
-                  v-for="item in postOptions"
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == '1'"
-                ></el-option>
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
+                  :disabled="item.status == '1'"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -219,20 +212,16 @@
               <el-col :span="11" :offset="0">
                 <el-form-item label="项目列表">
                   <el-select v-model="item.projectId" placeholder="请选择">
-                    <el-option v-for="dict in projectOptions" :key="dict.id" :label="dict.shortName" :value="dict.id"></el-option>
+                    <el-option v-for="dict in projectOptions" :key="dict.id" :label="dict.shortName"
+                      :value="dict.id"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="11" :offset="0">
                 <el-form-item label="角色">
                   <el-select v-model="item.roleIds" filterable multiple placeholder="请选择">
-                    <el-option
-                      v-for="item in roleOptions"
-                      :key="item.roleId"
-                      :label="item.roleName"
-                      :value="item.roleId"
-                      :disabled="item.status == '1'"
-                    ></el-option>
+                    <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName"
+                      :value="item.roleId" :disabled="item.status == '1'"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -245,7 +234,8 @@
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -266,18 +256,9 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog draggable v-model="upload.open" :title="upload.title" width="400px" append-to-body>
-      <el-upload
-        ref="uploadRef"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <el-icon class="el-icon--upload">
           <i-ep-upload-filled />
         </el-icon>
@@ -289,7 +270,8 @@
               是否更新已经存在的用户数据
             </div>
             <span>仅允许导入xls、xlsx格式文件。</span>
-            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板 </el-link>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate">下载模板 </el-link>
           </div>
         </template>
       </el-upload>
diff --git a/src/views/tender/bidd/index.vue b/src/views/tender/bidd/index.vue
index 27afe21..3c3972b 100644
--- a/src/views/tender/bidd/index.vue
+++ b/src/views/tender/bidd/index.vue
@@ -17,10 +17,7 @@
               </el-form-item>
 
               <el-form-item>
-                <el-button type="primary" @click="toggleExpandAll(true)">一键展开</el-button>
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
+                <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
               </el-form-item>
 
               <el-form-item>
@@ -163,11 +160,12 @@ const changeSheet = (val: any) => {
   getTableData();
 };
 //展开树
-const toggleExpandAll = (isExpand: boolean) => {
+const toggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  console.log(isExpandAll.value);
   tableData.value.forEach((row) => {
-    tableRef.value.toggleRowExpansion(row, isExpand);
+    tableRef.value.toggleRowExpansion(row, isExpandAll.value);
   });
-  isExpandAll.value = isExpand;
 };
 
 //获取版本号
diff --git a/src/views/tender/plan/comm/winTheBid.vue b/src/views/tender/plan/comm/winTheBid.vue
index f0056d8..db758d3 100644
--- a/src/views/tender/plan/comm/winTheBid.vue
+++ b/src/views/tender/plan/comm/winTheBid.vue
@@ -6,7 +6,7 @@
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="招标文件" prop="name">
+      <el-form-item label="中标文件" prop="name">
         <file-upload
           v-model="form.costEstimationFile"
           :fileSize="100"
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index dfc29b3..7c69723 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -161,16 +161,13 @@
                   <el-option v-for="item in options" :key="item.versions" :label="item.versions" :value="item.versions" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="表名" prop="sheet">
+              <el-form-item label="表名" prop="sheet" v-if="planType == '2'">
                 <el-select v-model="treeForm.sheet" placeholder="选择表名" @change="changeSheet">
                   <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" @click="toggleExpandAll(true)">一键展开</el-button>
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
+                <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
               </el-form-item>
             </el-form>
           </el-card>
@@ -190,6 +187,16 @@
             <el-table-column prop="unit" label="单位" />
             <!-- <el-table-column prop="quantity" label="数量" /> -->
             <el-table-column prop="quantity" label="计划量" align="center" />
+
+            <el-table-column prop="useQuantity" label="剩余量" align="center">
+              <template #default="scope">
+                {{
+                  (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) == 0
+                    ? ''
+                    : (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)
+                }}
+              </template>
+            </el-table-column>
             <el-table-column prop="selectNum" label="设计量" align="center">
               <template #default="scope">
                 <el-input-number
@@ -208,17 +215,6 @@
                 />
               </template>
             </el-table-column>
-
-            <el-table-column prop="useQuantity" label="剩余量" align="center">
-              <template #default="scope">
-                {{
-                  (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) == 0
-                    ? ''
-                    : (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)
-                }}
-              </template>
-            </el-table-column>
-
             <el-table-column prop="unitPrice" label="单价" align="center" />
             <el-table-column prop="price" label="总价" align="center">
               <template #default="scope">
@@ -434,9 +430,12 @@ const getVersionNums = async () => {
       options.value = res.data;
       if (res.data.length > 0) {
         console.log(11111);
-
         treeForm.value.versions = res.data[0].versions;
-        getSheetName();
+        if (planType.value == '2') {
+          getSheetName();
+        } else {
+          getTreeList();
+        }
       } else {
         treeForm.value.versions = '';
         // getSheetName();
@@ -514,11 +513,12 @@ const changeSheet = () => {
   getTreeList();
 };
 
-const toggleExpandAll = (isExpand: boolean) => {
+const toggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  console.log(isExpandAll.value);
   treeData.value.forEach((row) => {
-    treeTableRef.value.toggleRowExpansion(row, isExpand);
+    treeTableRef.value.toggleRowExpansion(row, isExpandAll.value);
   });
-  isExpandAll.value = isExpand;
 };
 //打开获取表数据
 const getTreeList = async () => {
@@ -665,7 +665,7 @@ const handleDetail = (row: any) => {
   getDetails(row);
 };
 const getDetails = (row: any) => {
-  getTenderPlanDetail({ id: row.id }).then((res) => {
+  getTenderPlanDetail({ id: row.id, projectId: currentProject.value?.id }).then((res) => {
     if (res.code == 200) {
       detailData.value = res.data;
     }
diff --git a/src/views/tender/supplierInput/index.vue b/src/views/tender/supplierInput/index.vue
index 680aaf1..cea16ef 100644
--- a/src/views/tender/supplierInput/index.vue
+++ b/src/views/tender/supplierInput/index.vue
@@ -277,7 +277,7 @@
             <el-form-item label="入库资料" prop="inputFile">
               <template #label> <span class="text-red">*</span> 入库资料 </template>
               <file-upload
-                v-model="form.inputFile"
+                v-model="form.fileId"
                 :fileType="['doc', 'docx', 'pdf']"
                 :autoUpload="false"
                 ref="fileUploadRef"
@@ -289,22 +289,7 @@
                 @handleChange="change"
                 showFileList
               >
-                <div>
-                  <el-button type="primary">上传文件</el-button><br />
-                  <transition-group
-                    class="upload-file-list el-upload-list el-upload-list--text"
-                    name="el-fade-in-linear"
-                    tag="ul"
-                    @click.stop
-                    v-if="fileUrl"
-                  >
-                    <li style="margin-top: 10px" class="el-upload-list__item ele-upload-list__item-content">
-                      <el-link :href="`${fileUrl}`" :underline="false" target="_blank">
-                        <el-button class="el-icon-document"> 查看文件 </el-button>
-                      </el-link>
-                    </li>
-                  </transition-group>
-                </div>
+                <div><el-button type="primary">上传文件</el-button><br /></div>
               </file-upload>
             </el-form-item>
           </el-col>
diff --git a/src/views/tender/supplierInput/indexEdit.vue b/src/views/tender/supplierInput/indexEdit.vue
index fd495ff..b6f6677 100644
--- a/src/views/tender/supplierInput/indexEdit.vue
+++ b/src/views/tender/supplierInput/indexEdit.vue
@@ -16,7 +16,7 @@
       <!-- 表单区域 -->
       <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
         <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
-          <h3 class="text-lg font-semibold text-gray-800">专项方案信息</h3>
+          <h3 class="text-lg font-semibold text-gray-800">供应商入库</h3>
         </div>
         <div class="p-6">
           <el-form ref="leaveFormRef" v-loading="loading" disabled :model="form" :rules="rules" label-width="150px" class="space-y-4">
@@ -333,6 +333,17 @@ const getInfo = () => {
   nextTick(async () => {
     const res = await getSupplierInput(routeParams.value.id);
     Object.assign(form.value, res.data);
+    form.value.registeredNumber = form.value.registeredNumber?.split(',');
+    form.value.build1 = form.value.registeredNumber[0] || '';
+    form.value.build2 = form.value.registeredNumber[1] || '';
+    form.value.build3 = form.value.registeredNumber[2] || '';
+    form.value.build4 = form.value.registeredNumber[3] || '';
+    form.value.personnelNumber = form.value.personnelNumber?.split(',');
+    form.value.personnelNumber1 = form.value.personnelNumber[0] || '';
+    form.value.personnelNumber2 = form.value.personnelNumber[1] || '';
+    form.value.personnelNumber3 = form.value.personnelNumber[2] || '';
+    form.value.personnelNumber4 = form.value.personnelNumber[3] || '';
+
     loading.value = false;
     buttonLoading.value = false;
   });
@@ -437,7 +448,9 @@ onMounted(() => {
   .el-input__inner,
   .el-select .el-input__inner {
     border-radius: 4px;
-    transition: border-color 0.2s, box-shadow 0.2s;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
 
     &:focus {
       border-color: var(--primary-light);
@@ -447,7 +460,9 @@ onMounted(() => {
 
   .el-textarea__inner {
     border-radius: 4px;
-    transition: border-color 0.2s, box-shadow 0.2s;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
 
     &:focus {
       border-color: var(--primary-light);
diff --git a/vite.config.ts.timestamp-1756496937860-efea843310722.mjs b/vite.config.ts.timestamp-1756496937860-efea843310722.mjs
new file mode 100644
index 0000000..4d6b455
--- /dev/null
+++ b/vite.config.ts.timestamp-1756496937860-efea843310722.mjs
@@ -0,0 +1,230 @@
+// vite.config.ts
+import { loadEnv, defineConfig } from "file:///E:/ljj/plus-ui/node_modules/vite/dist/node/index.js";
+
+// vite/plugins/index.ts
+import vue from "file:///E:/ljj/plus-ui/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+
+// vite/plugins/unocss.ts
+import UnoCss from "file:///E:/ljj/plus-ui/node_modules/unocss/dist/vite.mjs";
+var unocss_default = () => {
+  return UnoCss({
+    hmrTopLevelAwait: false
+    // unocss默认是true，低版本浏览器是不支持的，启动后会报错
+  });
+};
+
+// vite/plugins/auto-import.ts
+import AutoImport from "file:///E:/ljj/plus-ui/node_modules/unplugin-auto-import/dist/vite.js";
+import { ElementPlusResolver } from "file:///E:/ljj/plus-ui/node_modules/unplugin-vue-components/dist/resolvers.js";
+import IconsResolver from "file:///E:/ljj/plus-ui/node_modules/unplugin-icons/dist/resolver.js";
+var __vite_injected_original_dirname = "E:\\ljj\\plus-ui\\vite\\plugins";
+var auto_import_default = (path3) => {
+  return AutoImport({
+    // 自动导入 Vue 相关函数
+    imports: ["vue", "vue-router", "@vueuse/core", "pinia"],
+    eslintrc: {
+      enabled: false,
+      filepath: "./.eslintrc-auto-import.json",
+      globalsPropValue: true
+    },
+    resolvers: [
+      // 自动导入 Element Plus 相关函数ElMessage, ElMessageBox... (带样式)
+      ElementPlusResolver(),
+      IconsResolver({
+        prefix: "Icon"
+      })
+    ],
+    vueTemplate: true,
+    // 是否在 vue 模板中自动导入
+    dts: path3.resolve(path3.resolve(__vite_injected_original_dirname, "../../src"), "types", "auto-imports.d.ts")
+  });
+};
+
+// vite/plugins/components.ts
+import Components from "file:///E:/ljj/plus-ui/node_modules/unplugin-vue-components/dist/vite.js";
+import { ElementPlusResolver as ElementPlusResolver2 } from "file:///E:/ljj/plus-ui/node_modules/unplugin-vue-components/dist/resolvers.js";
+import IconsResolver2 from "file:///E:/ljj/plus-ui/node_modules/unplugin-icons/dist/resolver.js";
+var __vite_injected_original_dirname2 = "E:\\ljj\\plus-ui\\vite\\plugins";
+var components_default = (path3) => {
+  return Components({
+    resolvers: [
+      // 自动导入 Element Plus 组件
+      ElementPlusResolver2(),
+      // 自动注册图标组件
+      IconsResolver2({
+        enabledCollections: ["ep"]
+      })
+    ],
+    dts: path3.resolve(path3.resolve(__vite_injected_original_dirname2, "../../src"), "types", "components.d.ts")
+  });
+};
+
+// vite/plugins/icons.ts
+import Icons from "file:///E:/ljj/plus-ui/node_modules/unplugin-icons/dist/vite.js";
+var icons_default = () => {
+  return Icons({
+    // 自动安装图标库
+    autoInstall: true
+  });
+};
+
+// vite/plugins/svg-icon.ts
+import { createSvgIconsPlugin } from "file:///E:/ljj/plus-ui/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+var __vite_injected_original_dirname3 = "E:\\ljj\\plus-ui\\vite\\plugins";
+var svg_icon_default = (path3, isBuild) => {
+  return createSvgIconsPlugin({
+    // 指定需要缓存的图标文件夹
+    iconDirs: [path3.resolve(path3.resolve(__vite_injected_original_dirname3, "../../src"), "assets/icons/svg")],
+    // 指定symbolId格式
+    symbolId: "icon-[dir]-[name]",
+    svgoOptions: isBuild
+  });
+};
+
+// vite/plugins/compression.ts
+import compression from "file:///E:/ljj/plus-ui/node_modules/vite-plugin-compression/dist/index.mjs";
+var compression_default = (env) => {
+  const { VITE_BUILD_COMPRESS } = env;
+  const plugin = [];
+  if (VITE_BUILD_COMPRESS) {
+    const compressList = VITE_BUILD_COMPRESS.split(",");
+    if (compressList.includes("gzip")) {
+      plugin.push(
+        compression({
+          ext: ".gz",
+          deleteOriginFile: false
+        })
+      );
+    }
+    if (compressList.includes("brotli")) {
+      plugin.push(
+        compression({
+          ext: ".br",
+          algorithm: "brotliCompress",
+          deleteOriginFile: false
+        })
+      );
+    }
+  }
+  return plugin;
+};
+
+// vite/plugins/setup-extend.ts
+import setupExtend from "file:///E:/ljj/plus-ui/node_modules/unplugin-vue-setup-extend-plus/dist/vite.js";
+var setup_extend_default = () => {
+  return setupExtend({});
+};
+
+// vite/plugins/index.ts
+import path from "path";
+var plugins_default = (viteEnv, isBuild = false) => {
+  const vitePlugins = [];
+  vitePlugins.push(vue());
+  vitePlugins.push(unocss_default());
+  vitePlugins.push(auto_import_default(path));
+  vitePlugins.push(components_default(path));
+  vitePlugins.push(compression_default(viteEnv));
+  vitePlugins.push(icons_default());
+  vitePlugins.push(svg_icon_default(path, isBuild));
+  vitePlugins.push(setup_extend_default());
+  return vitePlugins;
+};
+
+// vite.config.ts
+import path2 from "path";
+var __vite_injected_original_dirname4 = "E:\\ljj\\plus-ui";
+var vite_config_default = defineConfig(({ mode, command }) => {
+  const env = loadEnv(mode, process.cwd());
+  return {
+    // 部署生产环境和开发环境下的URL。
+    // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
+    // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+    base: env.VITE_APP_CONTEXT_PATH,
+    resolve: {
+      alias: {
+        "~": path2.resolve(__vite_injected_original_dirname4, "./"),
+        "@": path2.resolve(__vite_injected_original_dirname4, "./src")
+      },
+      extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue", ".tif"]
+    },
+    // https://cn.vitejs.dev/config/#resolve-extensions
+    plugins: plugins_default(env, command === "build"),
+    server: {
+      host: "0.0.0.0",
+      port: Number(env.VITE_APP_PORT),
+      open: true,
+      proxy: {
+        [env.VITE_APP_BASE_API]: {
+          target: "http://localhost:8899",
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/warm-flow-ui": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/warm-flow": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/workflow": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/auth": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        }
+      }
+    },
+    css: {
+      preprocessorOptions: {
+        scss: {
+          javascriptEnabled: true
+        }
+      },
+      postcss: {
+        plugins: [
+          {
+            postcssPlugin: "internal:charset-removal",
+            AtRule: {
+              charset: (atRule) => {
+                if (atRule.name === "charset") {
+                  atRule.remove();
+                }
+              }
+            }
+          }
+        ]
+      }
+    },
+    // 预编译
+    optimizeDeps: {
+      include: [
+        "vue",
+        "vue-router",
+        "pinia",
+        "axios",
+        "@vueuse/core",
+        "echarts",
+        "vue-i18n",
+        "@vueup/vue-quill",
+        "image-conversion",
+        "element-plus/es/components/**/css"
+      ]
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts", "vite/plugins/index.ts", "vite/plugins/unocss.ts", "vite/plugins/auto-import.ts", "vite/plugins/components.ts", "vite/plugins/icons.ts", "vite/plugins/svg-icon.ts", "vite/plugins/compression.ts", "vite/plugins/setup-extend.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\ljj\\\\plus-ui\";const __vite_injected_original_filename = \"E:\\\\ljj\\\\plus-ui\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/ljj/plus-ui/vite.config.ts\";import { UserConfig, ConfigEnv, loadEnv, defineConfig } from 'vite';\r\n\r\nimport createPlugins from './vite/plugins';\r\n\r\nimport path from 'path';\r\nexport default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {\r\n  const env = loadEnv(mode, process.cwd());\r\n  return {\r\n    // \u90E8\u7F72\u751F\u4EA7\u73AF\u5883\u548C\u5F00\u53D1\u73AF\u5883\u4E0B\u7684URL\u3002\r\n    // \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0Cvite \u4F1A\u5047\u8BBE\u4F60\u7684\u5E94\u7528\u662F\u88AB\u90E8\u7F72\u5728\u4E00\u4E2A\u57DF\u540D\u7684\u6839\u8DEF\u5F84\u4E0A\r\n    // \u4F8B\u5982 https://www.ruoyi.vip/\u3002\u5982\u679C\u5E94\u7528\u88AB\u90E8\u7F72\u5728\u4E00\u4E2A\u5B50\u8DEF\u5F84\u4E0A\uFF0C\u4F60\u5C31\u9700\u8981\u7528\u8FD9\u4E2A\u9009\u9879\u6307\u5B9A\u8FD9\u4E2A\u5B50\u8DEF\u5F84\u3002\u4F8B\u5982\uFF0C\u5982\u679C\u4F60\u7684\u5E94\u7528\u88AB\u90E8\u7F72\u5728 https://www.ruoyi.vip/admin/\uFF0C\u5219\u8BBE\u7F6E baseUrl \u4E3A /admin/\u3002\r\n    base: env.VITE_APP_CONTEXT_PATH,\r\n    resolve: {\r\n      alias: {\r\n        '~': path.resolve(__dirname, './'),\r\n        '@': path.resolve(__dirname, './src')\r\n      },\r\n      extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue', '.tif']\r\n    },\r\n    // https://cn.vitejs.dev/config/#resolve-extensions\r\n    plugins: createPlugins(env, command === 'build'),\r\n    server: {\r\n      host: '0.0.0.0',\r\n      port: Number(env.VITE_APP_PORT),\r\n      open: true,\r\n      proxy: {\r\n        [env.VITE_APP_BASE_API]: {\r\n          target: 'http://localhost:8899',\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/warm-flow-ui': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/warm-flow': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/workflow': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n         '/auth': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        }\r\n      }\r\n    },\r\n    css: {\r\n      preprocessorOptions: {\r\n        scss: {\r\n          javascriptEnabled: true\r\n        }\r\n      },\r\n      postcss: {\r\n        plugins: [\r\n          {\r\n            postcssPlugin: 'internal:charset-removal',\r\n            AtRule: {\r\n              charset: (atRule) => {\r\n                if (atRule.name === 'charset') {\r\n                  atRule.remove();\r\n                }\r\n              }\r\n            }\r\n          }\r\n        ]\r\n      }\r\n    },\r\n    // \u9884\u7F16\u8BD1\r\n    optimizeDeps: {\r\n      include: [\r\n        'vue',\r\n        'vue-router',\r\n        'pinia',\r\n        'axios',\r\n        '@vueuse/core',\r\n        'echarts',\r\n        'vue-i18n',\r\n        '@vueup/vue-quill',\r\n        'image-conversion',\r\n        'element-plus/es/components/**/css'\r\n      ]\r\n    }\r\n  };\r\n});\r\n", "const __vite_injected_original_dirname = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\\\\index.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/ljj/plus-ui/vite/plugins/index.ts\";import vue from '@vitejs/plugin-vue';\r\nimport createUnoCss from './unocss';\r\nimport createAutoImport from './auto-import';\r\nimport createComponents from './components';\r\nimport createIcons from './icons';\r\nimport createSvgIconsPlugin from './svg-icon';\r\nimport createCompression from './compression';\r\nimport createSetupExtend from './setup-extend';\r\nimport path from 'path';\r\n\r\nexport default (viteEnv: any, isBuild = false): [] => {\r\n  const vitePlugins: any = [];\r\n  vitePlugins.push(vue());\r\n  vitePlugins.push(createUnoCss());\r\n  vitePlugins.push(createAutoImport(path));\r\n  vitePlugins.push(createComponents(path));\r\n  vitePlugins.push(createCompression(viteEnv));\r\n  vitePlugins.push(createIcons());\r\n  vitePlugins.push(createSvgIconsPlugin(path, isBuild));\r\n  vitePlugins.push(createSetupExtend());\r\n  return vitePlugins;\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\\\\unocss.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/ljj/plus-ui/vite/plugins/unocss.ts\";import UnoCss from 'unocss/vite';\r\n\r\nexport default () => {\r\n  return UnoCss({\r\n    hmrTopLevelAwait: false // unocss\u9ED8\u8BA4\u662Ftrue\uFF0C\u4F4E\u7248\u672C\u6D4F\u89C8\u5668\u662F\u4E0D\u652F\u6301\u7684\uFF0C\u542F\u52A8\u540E\u4F1A\u62A5\u9519\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\\\\auto-import.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/ljj/plus-ui/vite/plugins/auto-import.ts\";import AutoImport from 'unplugin-auto-import/vite';\r\nimport { ElementPlusResolver } from 'unplugin-vue-components/resolvers';\r\nimport IconsResolver from 'unplugin-icons/resolver';\r\n\r\nexport default (path: any) => {\r\n  return AutoImport({\r\n    // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\r\n    imports: ['vue', 'vue-router', '@vueuse/core', 'pinia'],\r\n    eslintrc: {\r\n      enabled: false,\r\n      filepath: './.eslintrc-auto-import.json',\r\n      globalsPropValue: true\r\n    },\r\n    resolvers: [\r\n      // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570ElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\r\n      ElementPlusResolver(),\r\n      IconsResolver({\r\n        prefix: 'Icon'\r\n      })\r\n    ],\r\n    vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\r\n    dts: path.resolve(path.resolve(__dirname, '../../src'), 'types', 'auto-imports.d.ts')\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\\\\components.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/ljj/plus-ui/vite/plugins/components.ts\";import Components from 'unplugin-vue-components/vite';\r\nimport { ElementPlusResolver } from 'unplugin-vue-components/resolvers';\r\nimport IconsResolver from 'unplugin-icons/resolver';\r\n\r\nexport default (path: any) => {\r\n  return Components({\r\n    resolvers: [\r\n      // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\r\n      ElementPlusResolver(),\r\n      // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\r\n      IconsResolver({\r\n        enabledCollections: ['ep']\r\n      })\r\n    ],\r\n    dts: path.resolve(path.resolve(__dirname, '../../src'), 'types', 'components.d.ts')\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\\\\icons.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/ljj/plus-ui/vite/plugins/icons.ts\";import Icons from 'unplugin-icons/vite';\r\n\r\nexport default () => {\r\n  return Icons({\r\n    // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\r\n    autoInstall: true\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\\\\svg-icon.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/ljj/plus-ui/vite/plugins/svg-icon.ts\";import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';\r\nexport default (path: any, isBuild: boolean) => {\r\n  return createSvgIconsPlugin({\r\n    // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\r\n    iconDirs: [path.resolve(path.resolve(__dirname, '../../src'), 'assets/icons/svg')],\r\n    // \u6307\u5B9AsymbolId\u683C\u5F0F\r\n    symbolId: 'icon-[dir]-[name]',\r\n    svgoOptions: isBuild\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\\\\compression.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/ljj/plus-ui/vite/plugins/compression.ts\";import compression from 'vite-plugin-compression';\r\n\r\nexport default (env: any) => {\r\n  const { VITE_BUILD_COMPRESS } = env;\r\n  const plugin: any[] = [];\r\n  if (VITE_BUILD_COMPRESS) {\r\n    const compressList = VITE_BUILD_COMPRESS.split(',');\r\n    if (compressList.includes('gzip')) {\r\n      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#\u4F7F\u7528gzip\u89E3\u538B\u7F29\u9759\u6001\u6587\u4EF6\r\n      plugin.push(\r\n        compression({\r\n          ext: '.gz',\r\n          deleteOriginFile: false\r\n        })\r\n      );\r\n    }\r\n    if (compressList.includes('brotli')) {\r\n      plugin.push(\r\n        compression({\r\n          ext: '.br',\r\n          algorithm: 'brotliCompress',\r\n          deleteOriginFile: false\r\n        })\r\n      );\r\n    }\r\n  }\r\n  return plugin;\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\ljj\\\\plus-ui\\\\vite\\\\plugins\\\\setup-extend.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/ljj/plus-ui/vite/plugins/setup-extend.ts\";import setupExtend from 'unplugin-vue-setup-extend-plus/vite';\r\n\r\nexport default () => {\r\n  return setupExtend({});\r\n};\r\n"],
  "mappings": ";AAAkO,SAAgC,SAAS,oBAAoB;;;ACA9B,OAAO,SAAS;;;ACAd,OAAO,YAAY;AAEtR,IAAO,iBAAQ,MAAM;AACnB,SAAO,OAAO;AAAA,IACZ,kBAAkB;AAAA;AAAA,EACpB,CAAC;AACH;;;ACN6Q,OAAO,gBAAgB;AACpS,SAAS,2BAA2B;AACpC,OAAO,mBAAmB;AAF1B,IAAM,mCAAmC;AAIzC,IAAO,sBAAQ,CAACA,UAAc;AAC5B,SAAO,WAAW;AAAA;AAAA,IAEhB,SAAS,CAAC,OAAO,cAAc,gBAAgB,OAAO;AAAA,IACtD,UAAU;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA,MACV,kBAAkB;AAAA,IACpB;AAAA,IACA,WAAW;AAAA;AAAA,MAET,oBAAoB;AAAA,MACpB,cAAc;AAAA,QACZ,QAAQ;AAAA,MACV,CAAC;AAAA,IACH;AAAA,IACA,aAAa;AAAA;AAAA,IACb,KAAKA,MAAK,QAAQA,MAAK,QAAQ,kCAAW,WAAW,GAAG,SAAS,mBAAmB;AAAA,EACtF,CAAC;AACH;;;ACvB2Q,OAAO,gBAAgB;AAClS,SAAS,uBAAAC,4BAA2B;AACpC,OAAOC,oBAAmB;AAF1B,IAAMC,oCAAmC;AAIzC,IAAO,qBAAQ,CAACC,UAAc;AAC5B,SAAO,WAAW;AAAA,IAChB,WAAW;AAAA;AAAA,MAETC,qBAAoB;AAAA;AAAA,MAEpBC,eAAc;AAAA,QACZ,oBAAoB,CAAC,IAAI;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,IACA,KAAKF,MAAK,QAAQA,MAAK,QAAQG,mCAAW,WAAW,GAAG,SAAS,iBAAiB;AAAA,EACpF,CAAC;AACH;;;AChBiQ,OAAO,WAAW;AAEnR,IAAO,gBAAQ,MAAM;AACnB,SAAO,MAAM;AAAA;AAAA,IAEX,aAAa;AAAA,EACf,CAAC;AACH;;;ACPuQ,SAAS,4BAA4B;AAA5S,IAAMC,oCAAmC;AACzC,IAAO,mBAAQ,CAACC,OAAW,YAAqB;AAC9C,SAAO,qBAAqB;AAAA;AAAA,IAE1B,UAAU,CAACA,MAAK,QAAQA,MAAK,QAAQC,mCAAW,WAAW,GAAG,kBAAkB,CAAC;AAAA;AAAA,IAEjF,UAAU;AAAA,IACV,aAAa;AAAA,EACf,CAAC;AACH;;;ACT6Q,OAAO,iBAAiB;AAErS,IAAO,sBAAQ,CAAC,QAAa;AAC3B,QAAM,EAAE,oBAAoB,IAAI;AAChC,QAAM,SAAgB,CAAC;AACvB,MAAI,qBAAqB;AACvB,UAAM,eAAe,oBAAoB,MAAM,GAAG;AAClD,QAAI,aAAa,SAAS,MAAM,GAAG;AAEjC,aAAO;AAAA,QACL,YAAY;AAAA,UACV,KAAK;AAAA,UACL,kBAAkB;AAAA,QACpB,CAAC;AAAA,MACH;AAAA,IACF;AACA,QAAI,aAAa,SAAS,QAAQ,GAAG;AACnC,aAAO;AAAA,QACL,YAAY;AAAA,UACV,KAAK;AAAA,UACL,WAAW;AAAA,UACX,kBAAkB;AAAA,QACpB,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;;;AC3B+Q,OAAO,iBAAiB;AAEvS,IAAO,uBAAQ,MAAM;AACnB,SAAO,YAAY,CAAC,CAAC;AACvB;;;APIA,OAAO,UAAU;AAEjB,IAAO,kBAAQ,CAAC,SAAc,UAAU,UAAc;AACpD,QAAM,cAAmB,CAAC;AAC1B,cAAY,KAAK,IAAI,CAAC;AACtB,cAAY,KAAK,eAAa,CAAC;AAC/B,cAAY,KAAK,oBAAiB,IAAI,CAAC;AACvC,cAAY,KAAK,mBAAiB,IAAI,CAAC;AACvC,cAAY,KAAK,oBAAkB,OAAO,CAAC;AAC3C,cAAY,KAAK,cAAY,CAAC;AAC9B,cAAY,KAAK,iBAAqB,MAAM,OAAO,CAAC;AACpD,cAAY,KAAK,qBAAkB,CAAC;AACpC,SAAO;AACT;;;ADjBA,OAAOC,WAAU;AAJjB,IAAMC,oCAAmC;AAKzC,IAAO,sBAAQ,aAAa,CAAC,EAAE,MAAM,QAAQ,MAA6B;AACxE,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,SAAO;AAAA;AAAA;AAAA;AAAA,IAIL,MAAM,IAAI;AAAA,IACV,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAKC,MAAK,QAAQC,mCAAW,IAAI;AAAA,QACjC,KAAKD,MAAK,QAAQC,mCAAW,OAAO;AAAA,MACtC;AAAA,MACA,YAAY,CAAC,QAAQ,OAAO,OAAO,QAAQ,QAAQ,SAAS,QAAQ,MAAM;AAAA,IAC5E;AAAA;AAAA,IAEA,SAAS,gBAAc,KAAK,YAAY,OAAO;AAAA,IAC/C,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,OAAO,IAAI,aAAa;AAAA,MAC9B,MAAM;AAAA,MACN,OAAO;AAAA,QACL,CAAC,IAAI,iBAAiB,GAAG;AAAA,UACvB,QAAQ;AAAA,UACR,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACD,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,iBAAiB;AAAA,UACf,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,cAAc;AAAA,UACZ,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,aAAa;AAAA,UACX,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACC,SAAS;AAAA,UACR,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,MACF;AAAA,IACF;AAAA,IACA,KAAK;AAAA,MACH,qBAAqB;AAAA,QACnB,MAAM;AAAA,UACJ,mBAAmB;AAAA,QACrB;AAAA,MACF;AAAA,MACA,SAAS;AAAA,QACP,SAAS;AAAA,UACP;AAAA,YACE,eAAe;AAAA,YACf,QAAQ;AAAA,cACN,SAAS,CAAC,WAAW;AACnB,oBAAI,OAAO,SAAS,WAAW;AAC7B,yBAAO,OAAO;AAAA,gBAChB;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA;AAAA,IAEA,cAAc;AAAA,MACZ,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path", "ElementPlusResolver", "IconsResolver", "__vite_injected_original_dirname", "path", "ElementPlusResolver", "IconsResolver", "__vite_injected_original_dirname", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname"]
}
