diff --git a/.env.development b/.env.development index 07ca8d5..5e5fd53 100644 --- a/.env.development +++ b/.env.development @@ -7,11 +7,11 @@ VITE_APP_ENV = 'development' # 开发环境 # VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 李陈杰 209 -VITE_APP_BASE_API = 'http://192.168.110.209:8899' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 李陈杰 209 - VITE_APP_BASE_API = 'http://192.168.110.209:8899' +# VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 -# VITE_APP_BASE_API = 'http://192.168.110.209:8899' +# VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 朱银 diff --git a/public/xx.xlsx b/public/xx.xlsx index fb25b99..95009db 100644 Binary files a/public/xx.xlsx and b/public/xx.xlsx differ diff --git a/public/供应商导入模板(1).xlsx b/public/供应商导入模板(1).xlsx new file mode 100644 index 0000000..6f6cfb3 Binary files /dev/null and b/public/供应商导入模板(1).xlsx differ diff --git a/src/api/project/constructionUser/index.ts b/src/api/project/constructionUser/index.ts index 9c20a99..aad0902 100644 --- a/src/api/project/constructionUser/index.ts +++ b/src/api/project/constructionUser/index.ts @@ -186,7 +186,7 @@ export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateF */ export const delConstructionUserMember = (data: ConstructionUserMembeForm) => { return request({ - url: '/contractor/projectTeamMember/', + url: '/project/projectTeamMember/', method: 'delete', data }); diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue index 2130d23..e428c0d 100644 --- a/src/views/design/billofQuantities/index.vue +++ b/src/views/design/billofQuantities/index.vue @@ -170,6 +170,7 @@ async function getVersionNums(isSheet = true) { state.loading.versions = true; state.error = null; + console.log('🚀 ~ handleSheetName ~ currentProject.value?.id:', currentProject.value?.id); const res = await obtainAllVersionNumbers({ projectId: currentProject.value?.id, workOrderType: state.work_order_type, @@ -375,6 +376,16 @@ const downloadTemplate = (type) => { alert('下载失败，请重试'); } }; +const resetState = () => { + state.tableData = []; + state.options = []; + state.sheets = []; + state.queryForm.versions = ''; + state.queryForm.sheet = ''; + state.versionsData = {}; + state.error = null; + isExpandAll.value = true; +}; onMounted(async () => { await getVersionNums(); }); @@ -382,6 +393,8 @@ onMounted(async () => { const listeningProject = watch( () => currentProject.value?.id, (nid, oid) => { + resetState(); + state.queryForm.projectId = nid; getVersionNums(); } ); diff --git a/src/views/dhr_demo/InspectionManagement.vue b/src/views/dhr_demo/InspectionManagement.vue index 69c9de5..4cfceaf 100644 --- a/src/views/dhr_demo/InspectionManagement.vue +++ b/src/views/dhr_demo/InspectionManagement.vue @@ -4,10 +4,11 @@
待办事项
巡检管理
-
试验管理
-
报修管理
-
抢修管理
-
工单管理
+
试验管理
+
报修管理
+
抢修管理
+
工单管理
+
运维组织
@@ -486,6 +487,21 @@ const handleInspection1 = () => { const handleInspection2 = () => { router.push('/rili/InspectionManagement'); }; +const handleInspection3 = () => { + router.push('/rili/shiyanguanli'); +}; +const handleInspection4 = () => { + router.push('/rili/baoxiuguanli'); +}; +const handleInspection5 = () => { + router.push('/rili/qiangxiuguanli'); +}; +const handleInspection6 = () => { + router.push('/rili/gongdanliebiao'); +}; +const handleInspection7 = () => { + router.push('/rili/renyuanzhuangtai'); +}; const handleInspectionManagement1 = () => { router.push('/rili/InspectionManagement'); }; diff --git a/src/views/dhr_demo/banzhuzhuangtai.vue b/src/views/dhr_demo/banzhuzhuangtai.vue new file mode 100644 index 0000000..04601d2 --- /dev/null +++ b/src/views/dhr_demo/banzhuzhuangtai.vue @@ -0,0 +1,1031 @@ + + + + + diff --git a/src/views/dhr_demo/baoxiuguanli.vue b/src/views/dhr_demo/baoxiuguanli.vue new file mode 100644 index 0000000..f2c0165 --- /dev/null +++ b/src/views/dhr_demo/baoxiuguanli.vue @@ -0,0 +1,1165 @@ + + + + + diff --git a/src/views/dhr_demo/baoxiujilu.vue b/src/views/dhr_demo/baoxiujilu.vue new file mode 100644 index 0000000..7703c31 --- /dev/null +++ b/src/views/dhr_demo/baoxiujilu.vue @@ -0,0 +1,720 @@ + + + + + diff --git a/src/views/dhr_demo/cheliangzhuangtai.vue b/src/views/dhr_demo/cheliangzhuangtai.vue new file mode 100644 index 0000000..3634227 --- /dev/null +++ b/src/views/dhr_demo/cheliangzhuangtai.vue @@ -0,0 +1,700 @@ + + + + + diff --git a/src/views/dhr_demo/gongdanliebiao.vue b/src/views/dhr_demo/gongdanliebiao.vue new file mode 100644 index 0000000..e19ce22 --- /dev/null +++ b/src/views/dhr_demo/gongdanliebiao.vue @@ -0,0 +1,1095 @@ + + + + + diff --git a/src/views/dhr_demo/index.vue b/src/views/dhr_demo/index.vue index 11d5bf9..01731b3 100644 --- a/src/views/dhr_demo/index.vue +++ b/src/views/dhr_demo/index.vue @@ -4,10 +4,11 @@
待办事项
巡检管理
-
试验管理
-
报修管理
-
抢修管理
-
工单管理
+
试验管理
+
报修管理
+
抢修管理
+
工单管理
+
运维组织
@@ -310,6 +311,21 @@ const handleInspection1 = () => { const handleInspection2 = () => { router.push('/rili/InspectionManagement'); }; +const handleInspection3 = () => { + router.push('/rili/shiyanguanli'); +}; +const handleInspection4 = () => { + router.push('/rili/baoxiuguanli'); +}; +const handleInspection5 = () => { + router.push('/rili/qiangxiuguanli'); +}; +const handleInspection6 = () => { + router.push('/rili/gongdanliebiao'); +}; +const handleInspection7 = () => { + router.push('/rili/renyuanzhuangtai'); +}; diff --git a/src/views/dhr_demo/qiangxiuguanli.vue b/src/views/dhr_demo/qiangxiuguanli.vue new file mode 100644 index 0000000..e4c06f4 --- /dev/null +++ b/src/views/dhr_demo/qiangxiuguanli.vue @@ -0,0 +1,912 @@ + + + + + diff --git a/src/views/dhr_demo/qiangxiujilu.vue b/src/views/dhr_demo/qiangxiujilu.vue new file mode 100644 index 0000000..2a8e7fa --- /dev/null +++ b/src/views/dhr_demo/qiangxiujilu.vue @@ -0,0 +1,741 @@ + + + + + diff --git a/src/views/dhr_demo/renyuanzhuangtai.vue b/src/views/dhr_demo/renyuanzhuangtai.vue new file mode 100644 index 0000000..5d4f259 --- /dev/null +++ b/src/views/dhr_demo/renyuanzhuangtai.vue @@ -0,0 +1,866 @@ + + + + + diff --git a/src/views/dhr_demo/shiyanguanli.vue b/src/views/dhr_demo/shiyanguanli.vue new file mode 100644 index 0000000..5086214 --- /dev/null +++ b/src/views/dhr_demo/shiyanguanli.vue @@ -0,0 +1,1587 @@ + + + + + diff --git a/src/views/dhr_demo/shiyanjilu.vue b/src/views/dhr_demo/shiyanjilu.vue new file mode 100644 index 0000000..b937d73 --- /dev/null +++ b/src/views/dhr_demo/shiyanjilu.vue @@ -0,0 +1,969 @@ + + + + + diff --git a/src/views/dhr_demo/shiyanrenwu.vue b/src/views/dhr_demo/shiyanrenwu.vue new file mode 100644 index 0000000..b4787c0 --- /dev/null +++ b/src/views/dhr_demo/shiyanrenwu.vue @@ -0,0 +1,907 @@ + + + + + diff --git a/src/views/dhr_demo/xunjianjihua.vue b/src/views/dhr_demo/xunjianjihua.vue index a0eb98c..662bc78 100644 --- a/src/views/dhr_demo/xunjianjihua.vue +++ b/src/views/dhr_demo/xunjianjihua.vue @@ -3,14 +3,15 @@
待办事项
巡检管理
-
试验管理
-
报修管理
-
抢修管理
-
工单管理
+
试验管理
+
报修管理
+
抢修管理
+
工单管理
+
运维组织
-
+
-
+
筛选 导入数据
@@ -58,10 +59,10 @@
- -
+ +
-
+
@@ -260,14 +261,14 @@
-
-
+
+

最近巡检结果

- -
+ +
@@ -281,7 +282,7 @@
系统连接量 - 128<500 + 128
@@ -421,6 +422,21 @@ const handleInspection1 = () => { const handleInspection2 = () => { router.push('/rili/InspectionManagement'); }; +const handleInspection3 = () => { + router.push('/rili/shiyanguanli'); +}; +const handleInspection4 = () => { + router.push('/rili/baoxiuguanli'); +}; +const handleInspection5 = () => { + router.push('/rili/qiangxiuguanli'); +}; +const handleInspection6 = () => { + router.push('/rili/gongdanliebiao'); +}; +const handleInspection7 = () => { + router.push('/rili/renyuanzhuangtai'); +}; const handleInspectionManagement1 = () => { router.push('/rili/InspectionManagement'); }; @@ -440,6 +456,19 @@ const handleInspectionManagement3 = () => { min-height: 100vh; } +/* 头部容器 - 替换了固定gap的flex布局 */ +.header-container { + display: flex; + justify-content: space-between; + align-items: center; +} + +.header-actions { + display: flex; + align-items: center; + gap: 10px; +} + /* 导航栏样式 */ .navigation-tabs { display: flex; @@ -527,12 +556,35 @@ const handleInspectionManagement3 = () => { border-radius: 4px; } +/* 主内容区 - 使用flex确保等高 */ +.main-content-container { + display: flex; + gap: 20px; + height: calc(100% - 20px); + min-height: 500px; /* 确保有最小高度 */ +} + +.left-content { + flex: 2; /* 左侧占2/3宽度 */ + display: flex; + flex-direction: column; +} + +.right-content { + flex: 1; /* 右侧占1/3宽度 */ + display: flex; + flex-direction: column; +} + /* 内容卡片样式 */ .content-card { background-color: #fff; border-radius: 8px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); overflow: hidden; + height: 100%; /* 卡片高度占满容器 */ + display: flex; + flex-direction: column; } .card-header { @@ -552,6 +604,7 @@ const handleInspectionManagement3 = () => { .card-body { padding: 0 20px; + flex: 1; /* 内容区域占满剩余空间 */ } /* 统计卡片样式 */ @@ -657,8 +710,36 @@ const handleInspectionManagement3 = () => { background-color: #ecf5ff; } +/* 滚动条样式优化 */ +.scrollbar-thin { + scrollbar-width: thin; + scrollbar-color: #d1d5db #f3f4f6; +} + +.scrollbar-thin::-webkit-scrollbar { + width: 6px; +} + +.scrollbar-thin::-webkit-scrollbar-track { + background: #f3f4f6; + border-radius: 3px; +} + +.scrollbar-thin::-webkit-scrollbar-thumb { + background-color: #d1d5db; + border-radius: 3px; +} + +.scrollbar-thin::-webkit-scrollbar-thumb:hover { + background-color: #9ca3af; +} + /* 响应式设计 */ @media (max-width: 1200px) { + .main-content-container { + flex-direction: column; + } + .filter-bar { flex-direction: column; align-items: stretch; diff --git a/src/views/dhr_demo/xunjianrenwu.vue b/src/views/dhr_demo/xunjianrenwu.vue index d4f5f47..f804f2b 100644 --- a/src/views/dhr_demo/xunjianrenwu.vue +++ b/src/views/dhr_demo/xunjianrenwu.vue @@ -4,10 +4,11 @@
待办事项
巡检管理
-
试验管理
-
报修管理
-
抢修管理
-
工单管理
+
试验管理
+
报修管理
+
抢修管理
+
工单管理
+
运维组织
@@ -49,7 +50,7 @@
- 搜索 + 搜索 手动创建任务
@@ -422,6 +423,21 @@ const handleInspection1 = () => { const handleInspection2 = () => { router.push('/rili/InspectionManagement'); }; +const handleInspection3 = () => { + router.push('/rili/shiyanguanli'); +}; +const handleInspection4 = () => { + router.push('/rili/baoxiuguanli'); +}; +const handleInspection5 = () => { + router.push('/rili/qiangxiuguanli'); +}; +const handleInspection6 = () => { + router.push('/rili/gongdanliebiao'); +}; +const handleInspection7 = () => { + router.push('/rili/运维组织'); +}; diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue index 546339b..b7decbf 100644 --- a/src/views/materials/purchaseDoc/index.vue +++ b/src/views/materials/purchaseDoc/index.vue @@ -421,6 +421,7 @@ const handleDetail = async (row?: PurchaseDocVO) => { /** 表单重置 */ const reset = () => { form.value = { ...initFormData }; + planList.value = []; purchaseDocFormRef.value?.resetFields(); form.value.projectId = currentProject.value?.id; }; @@ -494,7 +495,7 @@ const submitForm = () => { purchaseDocFormRef.value?.validate(async (valid: boolean) => { if (valid) { buttonLoading.value = true; - form.value.associationList = selectPlanList.value; + form.value.associationList = JSON.parse(JSON.stringify(selectPlanList.value)); form.value.associationList.forEach((item: any) => { item.planId = item.id; delete item.id; diff --git a/src/views/progress/plan/index.vue b/src/views/progress/plan/index.vue index 433cb9b..6cab6da 100644 --- a/src/views/progress/plan/index.vue +++ b/src/views/progress/plan/index.vue @@ -1,14 +1,12 @@