+ 
+
+
+
+ {{ item.title }}
+ {{ item.id === newId ? '关闭' : '查看' }}
+
+
+
+
+
+
+
+
diff --git a/src/views/projectLarge/digitalizationScreen/components/leftPage.vue b/src/views/projectLarge/digitalizationScreen/components/leftPage.vue
new file mode 100644
index 0000000..b7e438b
--- /dev/null
+++ b/src/views/projectLarge/digitalizationScreen/components/leftPage.vue
@@ -0,0 +1,326 @@
+
+
+
+
+ 
+
+
+ 安全生产天数：
+
+ {{ safetyDay }}
+ 天
+
+
+
+ 煤科建管-新能源项目数智化管理平台
+ Coal Science Construction Management - New Energy Project Digital Intelligent Management Platform
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+ {{ item.weather }}{{ item.tempMin }}°/{{ item.tempMax }}°
+ {{ item.week }}({{ item.date }})
+
+
+
+
+
+
+ 
+ 管理系统
+
+
+
+ 管理系统
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/projectLarge/digitalizationScreen/components/optionList.ts b/src/views/projectLarge/digitalizationScreen/components/optionList.ts
new file mode 100644
index 0000000..bcdf958
--- /dev/null
+++ b/src/views/projectLarge/digitalizationScreen/components/optionList.ts
@@ -0,0 +1,153 @@
+export let pieOption = {
+ // 定义中心文字
+ graphic: [
+ {
+ type: 'text',
+ left: 'center',
+ top: '40%',
+ style: {
+ // 需要从接口替换
+ text: '70%',
+ fontSize: 24,
+ fontWeight: 'bold',
+ fill: '#fff'
+ }
+ },
+ {
+ type: 'text',
+ left: 'center',
+ top: '50%',
+ style: {
+ text: '总进度',
+ fontSize: 14,
+ fill: '#fff'
+ }
+ },
+ ],
+ legend: {
+ show: true,
+ type: 'plain',
+ bottom: 20,
+ itemWidth: 12,
+ itemHeight: 12,
+ textStyle: {
+ color: '#fff'
+ }
+ },
+ series: {
+ type: 'pie',
+ data: [],
+ radius: [50, 80],
+ center: ['50%', '45%'],
+ itemStyle: {
+ borderColor: '#fff',
+ borderWidth: 1
+ },
+ label: {
+ alignTo: 'edge',
+ formatter: '{name|{b}}\n{percent|{c} %}',
+ minMargin: 10,
+ edgeDistance: 20,
+ lineHeight: 15,
+ rich: {
+ name: {
+ fontSize: 12,
+ color: '#fff'
+ },
+ percent: {
+ fontSize: 12,
+ color: '#fff'
+ }
+ }
+ },
+ legend: {
+ top: 'bottom'
+ },
+ }
+};
+
+export let barOption = {
+ legend: {
+ icon: 'rect',
+ itemWidth: 12,
+ itemHeight: 12,
+ // 调整文字与图标间距
+ data: ['计划流转面积', '已流转面积'],
+ top: 0,
+ right: 20,
+ textStyle: {
+ color: '#fff',
+ }
+ },
+ xAxis: {
+ type: 'category',
+ data: ['地块1', '地块2', '地块3', '地块4', '地块5', '地块6'],
+ axisLabel: {
+ color: '#fff'
+ },
+ axisLine: {
+ show: false
+ },
+ splitLine: {
+ show: false
+ }
+ },
+ yAxis: {
+ name: '单位：m²',
+ type: 'value',
+ axisLabel: {
+ formatter: '{value}'
+ }
+ },
+ grid: {
+ bottom: 0, // 距离容器底部的距离
+ containLabel: true // 确保坐标轴标签不被裁剪
+ },
+ series: [
+ {
+ name: '计划流转面积',
+ type: 'bar',
+ data: [],
+ barWidth: '20%',
+ itemStyle: {
+ color: 'rgb(29, 253, 253)'
+ },
+ },
+ {
+ name: '已流转面积',
+ type: 'bar',
+ data: [],
+ barWidth: '20%',
+ itemStyle: {
+ color: 'rgb(25, 181, 251)'
+ },
+ }
+ ]
+};
+
+export let mapOption = {
+ geo: {
+ map: 'ch',
+ roam: true,
+ aspectScale: Math.cos((47 * Math.PI) / 180),
+ },
+ series: [
+ {
+ type: 'graph',
+ coordinateSystem: 'geo',
+ data: [
+ { name: 'a', value: [7.667821250000001, 46.791734269956265] },
+ { name: 'b', value: [7.404848750000001, 46.516308805996054] },
+ { name: 'c', value: [7.376673125000001, 46.24728858538375] },
+ { name: 'd', value: [8.015320625000001, 46.39460918238572] },
+ { name: 'e', value: [8.616400625, 46.7020608630855] },
+ { name: 'f', value: [8.869981250000002, 46.37539345234199] },
+ { name: 'g', value: [9.546196250000001, 46.58676648282309] },
+ { name: 'h', value: [9.311399375, 47.182454114178896] },
+ { name: 'i', value: [9.085994375000002, 47.55395822835779] },
+ { name: 'j', value: [8.653968125000002, 47.47709530818285] },
+ { name: 'k', value: [8.203158125000002, 47.44506909144329] }
+ ],
+ }
+ ]
+};
diff --git a/src/views/projectLarge/digitalizationScreen/components/rightPage.vue b/src/views/projectLarge/digitalizationScreen/components/rightPage.vue
new file mode 100644
index 0000000..0d08c08
--- /dev/null
+++ b/src/views/projectLarge/digitalizationScreen/components/rightPage.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+ 
+
+
+ 出勤人
+
+ {{ attendanceCount }}
+ 人
+
+
+
+
+
+ 在岗人
+
+ {{ peopleCount }}
+ 人
+
+
+
+
+
+ 出勤率
+
+ {{ attendanceRate }}
+ %
+
+
+
+
+
+
+ 在岗人数
+ 出勤率
+ 出勤时间
+
+
+ {{ item.teamName }}
+
+ {{ item.attendanceNumber }} 人/{{ item.allNumber }}
+
+ {{ item.attendanceRate }} %
+ {{ item.attendanceTime }}
+
+
+
+
+
+
+
diff --git a/src/views/projectLarge/digitalizationScreen/components/title.vue b/src/views/projectLarge/digitalizationScreen/components/title.vue
new file mode 100644
index 0000000..361f557
--- /dev/null
+++ b/src/views/projectLarge/digitalizationScreen/components/title.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/projectLarge/digitalizationScreen/index.vue b/src/views/projectLarge/digitalizationScreen/index.vue
new file mode 100644
index 0000000..fead15c
--- /dev/null
+++ b/src/views/projectLarge/digitalizationScreen/index.vue
@@ -0,0 +1,107 @@
+
+
+ 
+ 
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
From d01a56d9dc5f9e311dc9411879f9e452ffee140f Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Tue, 9 Sep 2025 15:37:59 +0800
Subject: [PATCH 09/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.ts | 2 +-
.../digitalizationScreen/components/centerPage.vue | 0
.../digitalizationScreen/components/header.vue | 0
.../digitalizationScreen/components/leftPage.vue | 0
.../digitalizationScreen/components/optionList.ts | 0
.../digitalizationScreen/components/rightPage.vue | 0
.../digitalizationScreen/components/title.vue | 0
.../digitalizationScreen/index.vue | 0
8 files changed, 1 insertion(+), 1 deletion(-)
rename src/views/{projectLarge => enterpriseLarge}/digitalizationScreen/components/centerPage.vue (100%)
rename src/views/{projectLarge => enterpriseLarge}/digitalizationScreen/components/header.vue (100%)
rename src/views/{projectLarge => enterpriseLarge}/digitalizationScreen/components/leftPage.vue (100%)
rename src/views/{projectLarge => enterpriseLarge}/digitalizationScreen/components/optionList.ts (100%)
rename src/views/{projectLarge => enterpriseLarge}/digitalizationScreen/components/rightPage.vue (100%)
rename src/views/{projectLarge => enterpriseLarge}/digitalizationScreen/components/title.vue (100%)
rename src/views/{projectLarge => enterpriseLarge}/digitalizationScreen/index.vue (100%)
diff --git a/src/router/index.ts b/src/router/index.ts
index 87951e5..e168127 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -80,7 +80,7 @@ export const constantRoutes: RouteRecordRaw[] = [
},
{
path: '/digitalizationScreen',
- component: () => import('@/views/projectLarge/digitalizationScreen/index.vue'),
+ component: () => import('@/views/enterpriseLarge/digitalizationScreen/index.vue'),
hidden: true
},
{
diff --git a/src/views/projectLarge/digitalizationScreen/components/centerPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue
similarity index 100%
rename from src/views/projectLarge/digitalizationScreen/components/centerPage.vue
rename to src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue
diff --git a/src/views/projectLarge/digitalizationScreen/components/header.vue b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue
similarity index 100%
rename from src/views/projectLarge/digitalizationScreen/components/header.vue
rename to src/views/enterpriseLarge/digitalizationScreen/components/header.vue
diff --git a/src/views/projectLarge/digitalizationScreen/components/leftPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue
similarity index 100%
rename from src/views/projectLarge/digitalizationScreen/components/leftPage.vue
rename to src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue
diff --git a/src/views/projectLarge/digitalizationScreen/components/optionList.ts b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts
similarity index 100%
rename from src/views/projectLarge/digitalizationScreen/components/optionList.ts
rename to src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts
diff --git a/src/views/projectLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
similarity index 100%
rename from src/views/projectLarge/digitalizationScreen/components/rightPage.vue
rename to src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
diff --git a/src/views/projectLarge/digitalizationScreen/components/title.vue b/src/views/enterpriseLarge/digitalizationScreen/components/title.vue
similarity index 100%
rename from src/views/projectLarge/digitalizationScreen/components/title.vue
rename to src/views/enterpriseLarge/digitalizationScreen/components/title.vue
diff --git a/src/views/projectLarge/digitalizationScreen/index.vue b/src/views/enterpriseLarge/digitalizationScreen/index.vue
similarity index 100%
rename from src/views/projectLarge/digitalizationScreen/index.vue
rename to src/views/enterpriseLarge/digitalizationScreen/index.vue
From db6d39e02e41b0fec0cf87c971e7aeb30c92e3ed Mon Sep 17 00:00:00 2001
From: dhr <2216804034@qq.com>
Date: Tue, 9 Sep 2025 15:38:38 +0800
Subject: [PATCH 10/29] 0909
---
src/assets/images/contract.png | Bin 0 -> 4422 bytes
.../digitalizationScreen/components/leftPage.vue | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
create mode 100644 src/assets/images/contract.png
diff --git a/src/assets/images/contract.png b/src/assets/images/contract.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7c69479355c28aecfc5f28d79aa0e3d3cd07d5a
GIT binary patch
literal 4422
zcmV-M5xMS(P)
-
Date: Tue, 9 Sep 2025 17:03:01 +0800
Subject: [PATCH 11/29] =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=A0=BC=E5=BC=8F?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
src/plugins/index.ts | 3 +-
src/utils/ruoyi.ts | 16 +
src/views/contract/bidCost/index.vue | 6 +-
src/views/contract/division/index.vue | 35 +-
src/views/contract/limitPrice/index.vue | 10 +-
src/views/contract/limitPrice/indexEdit.vue | 18 +-
src/views/ctr/update/index.vue | 355 +++++++++---------
src/views/design/designChange/indexEdit.vue | 8 +-
src/views/out/constructionValue/index.vue | 12 +-
src/views/out/designCompletion/index.vue | 18 +-
src/views/out/monthPlan/index.vue | 20 +-
src/views/out/monthPlanAudit/index.vue | 26 +-
src/views/out/outDesignTable/index.vue | 34 +-
src/views/out/outDesignTableVS/index.vue | 74 +++-
src/views/out/outTable/index.vue | 79 +++-
src/views/out/purchase/comm/purchPage.vue | 6 +-
.../out/settlementValueSubcontract/index.vue | 6 +-
src/views/out/valueAllocation/index.vue | 48 ++-
src/views/progress/progressCategory/index.vue | 10 +-
src/views/project/constructionUser/index.vue | 4 +-
.../landTransferLedger/index.vue | 40 +-
.../landTransferLedgerFangzhen/index.vue | 20 +-
src/views/project/projectUser/index.vue | 4 +-
src/views/project/salaryExcel/index.vue | 6 +-
src/views/project/subManagementUser/index.vue | 4 +-
src/views/project/subcontract/index.vue | 8 +-
src/views/project/workWage/index.vue | 8 +-
src/views/tender/bidd/index.vue | 8 +-
src/views/tender/bidd/indexEdit.vue | 8 +-
src/views/tender/bidd/indexEdit2.vue | 8 +-
src/views/tender/plan/index.vue | 47 ++-
32 files changed, 633 insertions(+), 318 deletions(-)
diff --git a/.env.development b/.env.development
index 4a874b9..6359576 100644
--- a/.env.development
+++ b/.env.development
@@ -14,7 +14,7 @@ VITE_APP_BASE_API = 'http://192.168.110.149:8899'
# 罗成
# VITE_APP_BASE_API = 'http://192.168.110.188:8899'
# 朱银
-VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
#曾涛
# VITE_APP_BASE_API = 'http://192.168.110.171:8899'
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 7449bde..1b5d412 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -9,7 +9,7 @@ import animate from '@/animate';
import { download as dl } from '@/utils/request';
import { useDict } from '@/utils/dict';
import { getConfigKey, updateConfigByKey } from '@/api/system/config';
-import { parseTime, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi';
+import { parseTime, addDateRange, handleTree, selectDictLabel, selectDictLabels,formatPrice } from '@/utils/ruoyi';
import { downloadFile } from '@/utils/useFileDownload';
import { App } from 'vue';
@@ -42,4 +42,5 @@ export default function installPlugin(app: App) {
app.config.globalProperties.selectDictLabels = selectDictLabels;
app.config.globalProperties.animate = animate;
app.config.globalProperties.downloadFile = downloadFile;
+ app.config.globalProperties.formatPrice = formatPrice;
}
diff --git a/src/utils/ruoyi.ts b/src/utils/ruoyi.ts
index 8efd12c..c92994d 100644
--- a/src/utils/ruoyi.ts
+++ b/src/utils/ruoyi.ts
@@ -62,7 +62,23 @@ export const addDateRange = (params: any, dateRange: any[], propName?: string) =
}
return search;
};
+// 价格格式化函数
+export const formatPrice = (price, show = true) => {
+ if ((!show && price == 0) || price == '' || price == undefined || price == null) return '';
+ if (!price && price !== 0) return '0.0000';
+ // 转换为数字并保留四位小数
+ const num = Number(price);
+ if (isNaN(num)) return '0.0000';
+
+ const fixedNum = num.toFixed(4);
+ const [integer, decimal] = fixedNum.split('.');
+
+ // 千分位处理
+ const formattedInteger = integer.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+
+ return `${formattedInteger}.${decimal}`;
+};
// 回显数据字典
export const selectDictLabel = (datas: any, value: number | string) => {
if (value === undefined) {
diff --git a/src/views/contract/bidCost/index.vue b/src/views/contract/bidCost/index.vue
index a69eb4c..8df9d45 100644
--- a/src/views/contract/bidCost/index.vue
+++ b/src/views/contract/bidCost/index.vue
@@ -77,8 +77,8 @@
changePrice(scope.row);
}
"
- :precision="2"
- :step="0.1"
+ :min="0"
+ :precision="4"
:controls="false"
v-if="scope.row.quantity && scope.row.quantity != 0"
/>
@@ -86,7 +86,7 @@
- {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
+ {{ proxy.formatPrice(scope.row.price) }}
diff --git a/src/views/contract/division/index.vue b/src/views/contract/division/index.vue
index 1f085b2..23c50f5 100644
--- a/src/views/contract/division/index.vue
+++ b/src/views/contract/division/index.vue
@@ -25,7 +25,11 @@
+
+ {{ proxy.formatPrice(scope.row.price) }}
+
+
*计划招标时间
@@ -158,22 +162,28 @@
-
+
+ {{ proxy.formatPrice(scope.row.unitPrice) }}
+
+
+
{{
- ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
- (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
- (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
- Number(scope.row.unitPrice) ==
- 0
- ? ''
- : (
- ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ proxy.formatPrice(
+ ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
+ Number(scope.row.unitPrice) ==
+ 0
+ ? ''
+ : ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
(scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
(scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
- Number(scope.row.unitPrice)
- ).toFixed(2)
+ Number(scope.row.unitPrice),
+ false
+ )
}}
@@ -207,6 +217,7 @@ import { useUserStoreHook } from '@/store/modules/user';
import { getDicts } from '@/api/system/dict/data';
import { Plus } from '@element-plus/icons-vue';
import { FormInstance } from 'element-plus';
+const { proxy } = getCurrentInstance();
import {
treeList,
sheetList,
diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue
index 505add3..dce5f23 100644
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@@ -79,18 +79,16 @@
changePrice(scope.row);
}
"
- :precision="2"
- :step="0.1"
+ :min="0"
+ :precision="4"
:controls="false"
v-if="scope.row.quantity && scope.row.quantity != 0"
/>
-
+
-
- {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
-
+ {{ proxy.formatPrice(scope.row.price) }}
diff --git a/src/views/contract/limitPrice/indexEdit.vue b/src/views/contract/limitPrice/indexEdit.vue
index facd683..4665f32 100644
--- a/src/views/contract/limitPrice/indexEdit.vue
+++ b/src/views/contract/limitPrice/indexEdit.vue
@@ -41,10 +41,14 @@
+
- {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
+ {{ proxy.formatPrice(scope.row.unitPrice, false) }}
+
+
+
+
+ {{ proxy.formatPrice(scope.row.price) }}
@@ -70,8 +74,12 @@
diff --git a/src/views/ctr/update/index.vue b/src/views/ctr/update/index.vue
index 4908951..d813daf 100644
--- a/src/views/ctr/update/index.vue
+++ b/src/views/ctr/update/index.vue
@@ -1,79 +1,80 @@
-
From d92a54078602161ec5348f3900a5bb99108e5e0f Mon Sep 17 00:00:00 2001
From: taoge1020
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 月结算
- 形象节点
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
diff --git a/src/views/out/constructionValue/index.vue b/src/views/out/constructionValue/index.vue
index b6d49e0..50d0699 100644
--- a/src/views/out/constructionValue/index.vue
+++ b/src/views/out/constructionValue/index.vue
@@ -39,8 +39,16 @@
+
+ {{ proxy.formatPrice(scope.row.outValue) }}
+
+
+
+
+ {{ proxy.formatPrice(scope.row.ownerValue) }}
+
+
+
+ {{ proxy.formatPrice(scope.row.planValue) }}
+
+
+
+
+ {{ proxy.formatPrice(scope.row.completeValue) }}
+
+
+
+
+ {{ proxy.formatPrice(scope.row.differenceValue) }}
+
+
对甲
diff --git a/src/views/out/monthPlan/index.vue b/src/views/out/monthPlan/index.vue
index af7bebd..e64d670 100644
--- a/src/views/out/monthPlan/index.vue
+++ b/src/views/out/monthPlan/index.vue
@@ -40,9 +40,21 @@
+
+ {{ proxy.formatPrice(scope.row.planValue) }}
+
+
+
+
+ {{ proxy.formatPrice(scope.row.completeValue) }}
+
+
+
+
+ {{ proxy.formatPrice(scope.row.differenceValue) }}
+
+
修改收入合同
-
- 下一步
-
-
-
- 修改收入合同
-
- 上一步
- 提交
-
-
+
+
+
diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue
index 9e6e857..7e0c7e5 100644
--- a/src/views/design/designChange/indexEdit.vue
+++ b/src/views/design/designChange/indexEdit.vue
@@ -145,7 +145,13 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 月结算
+ 形象节点
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改收入合同
+
+ 下一步
+
+
+ 修改收入合同
+
+ 上一步
+ 提交
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/projectLarge/ProjectScreen/js/CesiumFlyToRoamingController.js b/src/views/projectLarge/ProjectScreen/js/CesiumFlyToRoamingController.js
new file mode 100644
index 0000000..e6b4d4f
--- /dev/null
+++ b/src/views/projectLarge/ProjectScreen/js/CesiumFlyToRoamingController.js
@@ -0,0 +1,293 @@
+export default class CesiumFlyToRoamingController {
+ /**
+ * 构造函数 - 创建基于flyTo的漫游控制器
+ * @param {Cesium.Viewer} viewer - Cesium Viewer实例
+ * @param {Object} [options] - 漫游配置选项
+ * @param {number} [options.duration=3] - 飞行持续时间(秒)
+ * @param {number} [options.pitch=-30] - 俯仰角(度)
+ * @param {number} [options.headingOffset=0] - 航向偏移(度)
+ */
+ constructor(viewer, options = {}) {
+ if (!viewer || !(viewer instanceof Cesium.Viewer)) {
+ throw new Error('必须提供有效的Cesium Viewer实例');
+ }
+
+ this.viewer = viewer;
+ this.isRoaming = false;
+ this.path = [];
+ this.currentIndex = -1; // 初始为-1，表示尚未开始
+ this.loop = false;
+ this.duration = options.duration || 3;
+ this.pitch = Cesium.Math.toRadians(options.pitch || -30);
+ this.headingOffset = Cesium.Math.toRadians(options.headingOffset || 0);
+ this.flyToOptions = null;
+ }
+
+ /**
+ * 开始路径漫游 - 严格按照路径点顺序，首先飞入第一个点位
+ * @param {Array} path - 路径点数组（按顺序排列）
+ * @param {number} [duration] - 飞行持续时间(秒)
+ * @param {boolean} [loop=false] - 是否循环漫游
+ */
+ startPathRoaming(path, duration, loop = false) {
+ if (!path || path.length < 1) {
+ throw new Error('路径漫游需要至少1个路径点');
+ }
+
+ // 停止当前可能的漫游
+ this.stopRoaming();
+
+ // 初始化参数
+ this.path = [...path];
+ this.loop = loop;
+ this.currentIndex = -1; // 重置为初始状态
+
+ if (duration !== undefined) {
+ this.duration = duration;
+ }
+
+ this.isRoaming = true;
+
+ // 第一步：飞到第一个点位
+ this.flyToFirstPoint();
+ }
+
+ /**
+ * 专门用于飞到第一个点位的方法
+ */
+ flyToFirstPoint() {
+ if (!this.isRoaming || this.path.length === 0) return;
+
+ const firstPointIndex = 0;
+ const firstPoint = this.path[firstPointIndex];
+
+ // 计算朝向：如果有第二个点，则面向第二个点，否则保持当前朝向
+ let orientation;
+ if (this.path.length > 1) {
+ orientation = this.calculateOrientation(firstPoint, this.path[1]);
+ } else {
+ orientation = {
+ heading: this.viewer.camera.heading,
+ pitch: this.pitch,
+ roll: 0
+ };
+ }
+
+ // 飞行到第一个点
+ this.flyToOptions = {
+ destination: firstPoint,
+ orientation: orientation,
+ duration: this.duration,
+ complete: () => {
+ // 第一个点到达后更新索引
+ this.currentIndex = firstPointIndex;
+
+ // 如果有更多点，继续飞行到下一个点
+ if (this.path.length > 1) {
+ this.flyToNextPoint();
+ } else {
+ // 只有一个点时，完成后停止漫游
+ this.isRoaming = false;
+ }
+ },
+ cancel: () => {
+ this.isRoaming = false;
+ }
+ };
+
+ this.viewer.camera.flyTo(this.flyToOptions);
+ }
+
+ /**
+ * 飞行到下一个路径点
+ */
+ flyToNextPoint() {
+ if (!this.isRoaming || this.currentIndex === -1) return;
+
+ // 计算下一个点的索引
+ const nextIndex = this.currentIndex + 1;
+
+ // 检查是否超出路径范围
+ if (nextIndex >= this.path.length) {
+ if (this.loop) {
+ // 循环模式：回到第一个点
+ this.currentIndex = -1;
+ this.flyToFirstPoint();
+ } else {
+ // 非循环模式：到达终点，停止漫游
+ this.isRoaming = false;
+ }
+ return;
+ }
+
+ // 更新当前索引并获取目标点
+ this.currentIndex = nextIndex;
+ const targetPoint = this.path[this.currentIndex];
+
+ // 计算朝向
+ let orientation;
+ if (this.currentIndex < this.path.length - 1) {
+ // 面向下一个点
+ orientation = this.calculateOrientation(targetPoint, this.path[this.currentIndex + 1]);
+ } else if (this.loop) {
+ // 最后一个点且循环模式，面向第一个点
+ orientation = this.calculateOrientation(targetPoint, this.path[0]);
+ } else {
+ // 最后一个点且不循环，保持当前朝向
+ orientation = {
+ heading: this.viewer.camera.heading,
+ pitch: this.pitch,
+ roll: 0
+ };
+ }
+
+ // 执行飞行
+ this.flyToOptions = {
+ destination: targetPoint,
+ orientation: orientation,
+ duration: this.duration,
+ complete: () => this.flyToNextPoint(),
+ cancel: () => { this.isRoaming = false; }
+ };
+
+ this.viewer.camera.flyTo(this.flyToOptions);
+ }
+
+ /**
+ * 计算相机朝向
+ * @param {Cesium.Cartesian3} position - 相机位置
+ * @param {Cesium.Cartesian3} lookAtPoint - 看向的点
+ * @returns {Object} 朝向配置
+ */
+ calculateOrientation(position, lookAtPoint) {
+ const direction = Cesium.Cartesian3.subtract(lookAtPoint, position, new Cesium.Cartesian3());
+ const heading = Math.atan2(direction.x, direction.y) + this.headingOffset;
+
+ return {
+ heading: heading,
+ pitch: this.pitch,
+ roll: 0
+ };
+ }
+
+ /**
+ * 停止漫游
+ */
+ stopRoaming() {
+ if (this.isRoaming) {
+ this.isRoaming = false;
+ if (this.flyToOptions) {
+ this.viewer.camera.cancelFlight();
+ this.flyToOptions = null;
+ }
+ }
+ }
+
+ /**
+ * 暂停漫游
+ */
+ pauseRoaming() {
+ if (this.isRoaming) {
+ this.isRoaming = false;
+ if (this.flyToOptions) {
+ this.viewer.camera.cancelFlight();
+ }
+ }
+ }
+
+ /**
+ * 恢复漫游
+ */
+ resumeRoaming() {
+ if (!this.isRoaming && this.path.length > 0) {
+ this.isRoaming = true;
+ if (this.currentIndex === -1) {
+ this.flyToFirstPoint();
+ } else {
+ this.flyToNextPoint();
+ }
+ }
+ }
+
+ /**
+ * 添加路径点
+ * @param {Cesium.Cartesian3} point - 路径点
+ */
+ addPathPoint(point) {
+ if (point instanceof Cesium.Cartesian3) {
+ this.path.push(point);
+ } else {
+ console.warn('路径点必须是Cesium.Cartesian3类型');
+ }
+ }
+
+ /**
+ * 清除路径
+ */
+ clearPath() {
+ this.stopRoaming();
+ this.path = [];
+ this.currentIndex = -1;
+ }
+
+ /**
+ * 设置飞行持续时间
+ * @param {number} duration - 持续时间(秒)
+ */
+ setDuration(duration) {
+ if (typeof duration === 'number' && duration > 0) {
+ this.duration = duration;
+ }
+ }
+
+ /**
+ * 销毁控制器
+ */
+ destroy() {
+ this.stopRoaming();
+ this.viewer = null;
+ this.path = null;
+ }
+}
+
+// 使用示例：
+// 假设已经有一个Cesium Viewer实例叫做viewer
+//
+// // 创建漫游控制器
+// const roamingController = new CesiumRoamingController(viewer, {
+// speed: 20,
+// pitch: -20, // 20度俯角
+// headingOffset: 0
+// });
+//
+// // 示例1: 自由漫游
+// // 开始自由漫游
+// document.getElementById('startFreeRoam').addEventListener('click', () => {
+// roamingController.startFreeRoaming(15); // 速度15米/秒
+// });
+//
+// // 示例2: 路径漫游
+// // 创建路径点
+// const pathPoints = [
+// Cesium.Cartesian3.fromDegrees(116.3, 39.9, 200),
+// Cesium.Cartesian3.fromDegrees(116.4, 39.9, 200),
+// Cesium.Cartesian3.fromDegrees(116.4, 40.0, 200),
+// Cesium.Cartesian3.fromDegrees(116.3, 40.0, 200)
+// ];
+//
+// // 开始路径漫游
+// document.getElementById('startPathRoam').addEventListener('click', () => {
+// roamingController.startPathRoaming(pathPoints, 30, true); // 速度30米/秒，循环漫游
+// });
+//
+// // 停止漫游
+// document.getElementById('stopRoam').addEventListener('click', () => {
+// roamingController.stopRoaming();
+// });
+//
+// // 调整速度
+// document.getElementById('speedUp').addEventListener('click', () => {
+// const currentSpeed = roamingController.speed;
+// roamingController.setSpeed(currentSpeed + 5);
+// });
+
\ No newline at end of file
diff --git a/src/views/projectLarge/ProjectScreen/js/CesiumImageLabelEntity.js b/src/views/projectLarge/ProjectScreen/js/CesiumImageLabelEntity.js
new file mode 100644
index 0000000..fea29ec
--- /dev/null
+++ b/src/views/projectLarge/ProjectScreen/js/CesiumImageLabelEntity.js
@@ -0,0 +1,293 @@
+export default class CesiumImageLabelEntity {
+ /**
+ * 构造函数 - 创建带有图片和名称的Cesium Entity
+ * @param {Cesium.Viewer} viewer - Cesium Viewer实例
+ * @param {Object} options - 配置选项
+ * @param {Cesium.Cartesian3} options.position - 实体位置坐标
+ * @param {string} options.name - 实体名称（标签文本）
+ * @param {string} options.imageUrl - 图片URL
+ * @param {Function} [options.onClick] - 左击事件回调函数
+ * @param {string} [options.id] - 实体ID，可选
+ * @param {number} [options.imageWidth=64] - 图片宽度
+ * @param {number} [options.imageHeight=64] - 图片高度
+ * @param {Cesium.Color} [options.imageColor=Cesium.Color.WHITE] - 图片颜色（用于色调调整）
+ * @param {Cesium.Color} [options.labelColor=Cesium.Color.WHITE] - 标签颜色
+ * @param {string} [options.labelFont='16px sans-serif'] - 标签字体
+ * @param {number} [options.labelOffsetY=-70] - 标签Y轴偏移量（相对于图片）
+ * @param {boolean} [options.show=true] - 是否显示实体
+ * @param {Cesium.HorizontalOrigin} [options.horizontalOrigin=Cesium.HorizontalOrigin.CENTER] - 水平对齐方式
+ * @param {Cesium.VerticalOrigin} [options.verticalOrigin=Cesium.VerticalOrigin.BOTTOM] - 垂直对齐方式
+ */
+ constructor(viewer, options) {
+ // 验证必要参数
+ if (!viewer || !(viewer instanceof Cesium.Viewer)) {
+ throw new Error('必须提供有效的Cesium Viewer实例');
+ }
+ if (!options || !options.position) {
+ throw new Error('必须提供实体位置信息');
+ }
+ if (!options.name) {
+ throw new Error('必须提供实体名称');
+ }
+ if (!options.imageUrl) {
+ throw new Error('必须提供图片URL');
+ }
+
+ this.viewer = viewer;
+ this.onClickCallback = options.onClick || null;
+ this.options = {
+ // 默认配置
+ id: options.id || `image-label-entity-${Date.now()}`,
+ imageWidth: options.imageWidth || 64,
+ imageHeight: options.imageHeight || 64,
+ imageColor: options.imageColor || Cesium.Color.WHITE,
+ labelColor: options.labelColor || Cesium.Color.WHITE,
+ labelFont: options.labelFont || '16px sans-serif',
+ labelOffsetY: options.labelOffsetY || -80,
+ show: options.show !== undefined ? options.show : true,
+ horizontalOrigin: options.horizontalOrigin || Cesium.HorizontalOrigin.CENTER,
+ verticalOrigin: options.verticalOrigin || Cesium.VerticalOrigin.BOTTOM,
+ ...options
+ };
+
+ // 创建实体
+ this.entity = this.createEntity();
+
+ // 初始化点击事件监听
+ this.initClickHandler();
+ }
+
+ /**
+ * 创建实体
+ * @returns {Cesium.Entity} 创建的实体对象
+ */
+ createEntity() {
+ const entity = new Cesium.Entity({
+ id: this.options.id,
+ position: Cesium.Cartesian3.fromDegrees(
+ this.options.position.lng,
+ this.options.position.lat,
+ this.options.position.alt
+ ),
+ show: this.options.show,
+
+ // 图片属性
+ billboard: {
+ image: this.options.imageUrl,
+ width: this.options.imageWidth,
+ height: this.options.imageHeight,
+ color: this.options.imageColor,
+ horizontalOrigin: this.options.horizontalOrigin,
+ verticalOrigin: this.options.verticalOrigin,
+ // 允许实体被选中
+ pickable: true
+ },
+
+ // 名称标签属性
+ label: {
+ text: this.options.name,
+ font: this.options.labelFont,
+ fillColor: this.options.labelColor,
+ horizontalOrigin: this.options.horizontalOrigin,
+ verticalOrigin: Cesium.VerticalOrigin.TOP,
+ pixelOffset: new Cesium.Cartesian2(0, this.options.labelOffsetY),
+ // 添加背景
+ backgroundColor: new Cesium.Color(0, 0, 0, 0),
+ backgroundPadding: new Cesium.Cartesian2(5, 5),
+ showBackground: true,
+ // 允许标签被选中
+ pickable: true
+ }
+ });
+
+ // 将实体添加到viewer
+ this.viewer.entities.add(entity);
+
+ return entity;
+ }
+
+ /**
+ * 初始化点击事件处理器
+ */
+ initClickHandler() {
+ // 存储当前实例的引用，方便在回调中使用
+ const self = this;
+
+ // 注册左击事件
+ this.viewer.screenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
+ // 检测是否点击了当前实体
+ const pickedObject = self.viewer.scene.pick(movement.position);
+
+ // 检查是否点击了当前实体或其实体的子组件（billboard、label等）
+ if (Cesium.defined(pickedObject) &&
+ (pickedObject.id === self.entity ||
+ pickedObject.id === self.entity.billboard ||
+ pickedObject.id === self.entity.label)) {
+
+ // 如果设置了点击回调，则执行
+ if (self.onClickCallback && typeof self.onClickCallback === 'function') {
+ self.onClickCallback(self.entity, movement.position);
+ }
+ }
+ }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+ }
+
+ /**
+ * 设置点击事件回调函数
+ * @param {Function} callback - 回调函数，接收(entity, position)参数
+ */
+ setOnClick(callback) {
+ if (typeof callback === 'function') {
+ this.onClickCallback = callback;
+ } else {
+ console.warn('回调函数必须是一个函数');
+ }
+ }
+
+ /**
+ * 平滑飞行到实体当前位置
+ * @param {Object} [options] - 飞行参数配置
+ * @param {number} [options.duration=3] - 飞行持续时间（秒）
+ * @param {number} [options.offsetDistance=1000] - 距离目标点的距离（米）
+ * @param {Cesium.HeadingPitchRange} [options.headingPitchRange] - 方向、俯仰和范围，优先级高于offsetDistance
+ * @param {Function} [options.complete] - 飞行完成后的回调函数
+ * @param {Function} [options.cancel] - 飞行被取消后的回调函数
+ */
+ flyTo(options = {}) {
+ // 获取实体当前位置（考虑可能已更新的情况）
+ const currentPosition = this.entity?.position?.getValue(Cesium.JulianDate.now());
+
+ if (!currentPosition) {
+ console.warn('无法飞行到实体，实体或实体位置不存在');
+ return;
+ }
+
+ // 默认飞行参数
+ const defaultOptions = {
+ duration: 3,
+ offsetDistance: 1000,
+ complete: () => {},
+ cancel: () => {}
+ };
+
+ // 合并用户配置和默认配置
+ const flyOptions = { ...defaultOptions, ...options };
+
+ // 计算飞行视角
+ let headingPitchRange;
+ if (flyOptions.headingPitchRange) {
+ headingPitchRange = flyOptions.headingPitchRange;
+ } else {
+ // 默认视角：从上方稍远处看向实体
+ headingPitchRange = new Cesium.HeadingPitchRange(
+ 0, // 方向角（弧度）
+ Cesium.Math.toRadians(-30), // 俯仰角（弧度），负值表示向下看
+ flyOptions.offsetDistance // 距离目标点的距离
+ );
+ }
+
+ // 执行飞行到当前位置
+ this.viewer.flyTo(this.entity, {
+ destination: currentPosition, // 明确指定当前位置作为目标
+ duration: flyOptions.duration,
+ offset: headingPitchRange,
+ complete: flyOptions.complete,
+ cancel: flyOptions.cancel
+ });
+ }
+
+ /**
+ * 更新实体位置
+ * @param {Cesium.Cartesian3} position - 新的位置坐标
+ */
+ updatePosition(position) {
+ if (position && this.entity) {
+ this.entity.position = position;
+ // 更新options中的位置，保持同步
+ this.options.position = position;
+ }
+ }
+
+ /**
+ * 更新实体名称
+ * @param {string} name - 新的名称
+ */
+ updateName(name) {
+ if (name && this.entity && this.entity.label) {
+ this.entity.label.text = name;
+ }
+ }
+
+ /**
+ * 更新实体图片
+ * @param {string} imageUrl - 新的图片URL
+ */
+ updateImage(imageUrl) {
+ if (imageUrl && this.entity && this.entity.billboard) {
+ this.entity.billboard.image = imageUrl;
+ }
+ }
+
+ /**
+ * 显示实体
+ */
+ show() {
+ if (this.entity) {
+ this.entity.show = true;
+ }
+ }
+
+ /**
+ * 隐藏实体
+ */
+ hide() {
+ if (this.entity) {
+ this.entity.show = false;
+ }
+ }
+
+ /**
+ * 移除实体
+ */
+ remove() {
+ if (this.entity) {
+ this.viewer.entities.remove(this.entity);
+ this.entity = null;
+ }
+ }
+
+ /**
+ * 获取当前实体
+ * @returns {Cesium.Entity} 当前实体对象
+ */
+ getEntity() {
+ return this.entity;
+ }
+}
+
+// 使用示例：
+// 假设已经有一个Cesium Viewer实例叫做viewer
+// // 创建实体
+// const initialPosition = Cesium.Cartesian3.fromDegrees(116.39, 39.9, 100);
+// const imageEntity = new CesiumImageLabelEntity(viewer, {
+// position: initialPosition,
+// name: "可移动点",
+// imageUrl: "path/to/your/image.png",
+// onClick: function(entity) {
+// console.log("点击了实体，飞向当前位置");
+// entity.flyTo(); // 飞向当前位置
+// }
+// });
+//
+// // 一段时间后更新位置
+// setTimeout(() => {
+// const newPosition = Cesium.Cartesian3.fromDegrees(116.45, 39.92, 100);
+// imageEntity.updatePosition(newPosition);
+// console.log("实体位置已更新");
+// }, 2000);
+//
+// // 调用flyTo将飞向最新的位置
+// setTimeout(() => {
+// imageEntity.flyTo({duration: 2});
+// }, 4000);
+
\ No newline at end of file
From e6f235036e0d387ae238a4fc21a754282ddba28d Mon Sep 17 00:00:00 2001
From: tcy <1193318383@qq.com>
Date: Tue, 9 Sep 2025 21:12:04 +0800
Subject: [PATCH 14/29] =?UTF-8?q?refactor(components):=20=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E5=A4=9A=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=9A=84=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E5=92=8C=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 调整了多个组件的输入框、按钮等元素的样式
- 优化了部分对话框的布局结构
- 统一了表单项的样式
- 调整了部分字体大小和颜色
---
src/components/FileUpload/index.vue | 52 ++----
.../formalitiesAreConsolidated/index.vue | 132 +++++--------
src/views/progress/plan/index.vue | 104 ++++-------
src/views/progress/progressCategory/index.vue | 176 +++++++++++++++---
src/views/tender/plan/comm/planPage.vue | 18 +-
src/views/tender/plan/comm/winTheBid.vue | 14 +-
src/views/tender/plan/index.vue | 171 ++++++-----------
7 files changed, 306 insertions(+), 361 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index bd0b93c..e7a4f60 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -1,29 +1,11 @@
+
+
+ 开始漫游
+ 停止漫游
+
+
+
+
-
+
-
+
+
@@ -305,8 +277,6 @@ const handleChange = (file: any, filelist: any) => {
// 删除文件
const handleRemove = (file: any, fileList: any) => {
- console.log(11);
-
emit('handleRemove', file, fileList);
};
@@ -470,7 +440,7 @@ defineExpose({ submitUpload });
}
}
- > span {
+ >span {
width: 100%;
}
}
diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue
index b276f4d..d848aa7 100644
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@@ -1,6 +1,7 @@
@@ -42,20 +24,10 @@
的文件
-
-
+
@@ -11,25 +12,15 @@
-
-
-
+
-
+
@@ -181,7 +161,8 @@
-
+
{{ scope.row.fileName || '查看文件' }}
@@ -192,13 +173,8 @@
- 关闭
@@ -208,18 +184,9 @@
-
@@ -247,18 +214,14 @@
-
@@ -284,7 +247,8 @@
+
diff --git a/src/views/progress/plan/index.vue b/src/views/progress/plan/index.vue
index b4eb9cf..433cb9b 100644
--- a/src/views/progress/plan/index.vue
+++ b/src/views/progress/plan/index.vue
@@ -1,12 +1,14 @@
-
+
-
@@ -21,24 +23,16 @@
-
+
-
@@ -46,9 +40,8 @@
- {{ row.name }}
+ {{ row.name }}
{{ row.name }}
@@ -60,7 +53,8 @@
- {{ row.isDelay == '1' ? '是' : '否' }}
+ {{ row.isDelay == '1' ? '是' : '否'
+ }}
@@ -71,7 +65,8 @@
-
-
+ v-hasPermi="['progress:progressCategory:add']">
导入表格
-
+
计划
-
+
日报
@@ -132,7 +109,8 @@
-
@@ -140,7 +118,8 @@
- {{ row.name }}
+ {{ row.name }}
{{ row.name }}
@@ -163,7 +142,8 @@
-
-
+ v-hasPermi="['progress:progressCategory:add']">
导入表格
-
+
计划
-
+
日报
@@ -211,7 +180,8 @@
- 确 定
diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue
index f37b74d..bcce1a8 100644
--- a/src/views/progress/progressCategory/index.vue
+++ b/src/views/progress/progressCategory/index.vue
@@ -1,12 +1,14 @@
-
+
-
@@ -27,13 +29,8 @@
新增
-
+
导入
@@ -43,17 +40,39 @@
展开/折叠
+
+
+
@@ -102,10 +121,12 @@
-
@@ -191,6 +207,7 @@ import {
import { ProgressCategoryVO, ProgressCategoryQuery, ProgressCategoryForm } from '@/api/progress/progressCategory/types';
import { getTabList } from '@/api/progress/progressCategoryTemplate';
import { useUserStoreHook } from '@/store/modules/user';
+import { Money, Wallet } from '@element-plus/icons-vue';
const { proxy } = getCurrentInstance() as any;
const { progress_unit_type, progress_work_type } = toRefs(proxy?.useDict('progress_unit_type', 'progress_work_type'));
@@ -225,7 +242,7 @@ const dialog = reactive({
visible: false,
title: ''
});
-
+const tempData = ref([])
const initFormData: ProgressCategoryForm = {
id: undefined,
parentId: undefined,
@@ -291,7 +308,20 @@ const data = reactive>({
const { queryParams, form, rules } = toRefs(data);
const matrixIdList = ref([]);
-
+const ownerOutputSum = computed(() => {
+ let sum = 0;
+ tempData.value.forEach(item => {
+ sum += Number(item.ownerOutputValue);
+ })
+ return proxy.formatPrice(sum);
+});
+const constructionOutputSum = computed(() => {
+ let sum = 0;
+ tempData.value.forEach(item => {
+ sum += Number(item.constructionOutputValue);
+ })
+ return proxy.formatPrice(sum);
+});
/** 查询分项工程单价列表 */
const getList = async () => {
if (!queryParams.value.projectId) {
@@ -310,6 +340,7 @@ const getList = async () => {
matrixId: item.projectId
};
});
+
if (!matrixValue.value) matrixValue.value = matrixList[0].id;
matrixOptions.value = matrixList;
queryParams.value.projectId = matrixList[0].projectId;
@@ -325,6 +356,7 @@ const getList = async () => {
try {
const id = relevancyStructure.value == '2' ? matrixValue.value : activeTab.value;
const res = await listProgressCategory(id);
+ tempData.value = res.data;
const data = proxy?.handleTree(res.data, 'id', 'parentId');
if (data) {
progressCategoryList.value = data;
@@ -506,3 +538,89 @@ onUnmounted(() => {
listeningProject();
});
+
+
diff --git a/src/views/tender/plan/comm/planPage.vue b/src/views/tender/plan/comm/planPage.vue
index 4562ebc..a95ae9d 100644
--- a/src/views/tender/plan/comm/planPage.vue
+++ b/src/views/tender/plan/comm/planPage.vue
@@ -2,22 +2,14 @@
-
@@ -45,7 +37,11 @@ const emit = defineEmits(['success']);
const form = ref({
costEstimationFile: ''
});
+const handleRemove = (file: any, fileList: any) => {
+ console.log(file, fileList);
+ console.log('handleRemove', form.value);
+};
const open = (rows: any, type: string) => {
dialogVisible.value = true;
console.log(rows, type);
diff --git a/src/views/tender/plan/comm/winTheBid.vue b/src/views/tender/plan/comm/winTheBid.vue
index db758d3..e9d3186 100644
--- a/src/views/tender/plan/comm/winTheBid.vue
+++ b/src/views/tender/plan/comm/winTheBid.vue
@@ -7,23 +7,15 @@
-
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index 09e4b65..3b0c2de 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -13,7 +13,8 @@
搜索
重置
- 新增
+ 新增
@@ -33,9 +34,8 @@
*招标文件
- 查看文件({{ scope.row.annexCount }})
+ 查看文件({{ scope.row.annexCount }})
@@ -47,102 +47,57 @@
*中标文件
- {{ scope.row.bidFileName }}
+ {{ scope.row.bidFileName }}
+
*计划招标时间
-
*合同金额
-
- 招标上传
+ 招标上传
- 中标上传
+ 中标上传
- 详情
+ 详情
- 删除
- 确定
+ 删除
+ 确定
-
@@ -164,7 +119,8 @@
-
@@ -177,16 +133,8 @@
-
+
-
@@ -246,9 +187,9 @@
0
? ''
: ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
- (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
- (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
- Number(scope.row.unitPrice),
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
+ Number(scope.row.unitPrice),
false
)
}}
@@ -287,15 +228,8 @@
查看
- 删除
+ 删除
@@ -728,6 +662,7 @@ const delHandlebidd = (row: any) => {
});
biddView(biddViewRow.value);
}
+ getList()
});
};
//修改状态
From d5cf2a600e1954c6ad3da0b2147efffaafd474d7 Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Tue, 9 Sep 2025 21:52:59 +0800
Subject: [PATCH 15/29] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BA=A7=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=BC=AB=E6=B8=B8=E3=80=81=E6=91=84?=
=?UTF-8?q?=E5=83=8F=E5=A4=B4=E3=80=81=E5=AE=9A=E4=BD=8D=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E3=80=81=E6=97=A0=E4=BA=BA=E6=9C=BA=E3=80=81=E6=91=84=E5=83=8F?=
=?UTF-8?q?=E5=A4=B4=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 +-
public/vite.svg | 1 +
.../other/ys7Device/component/presetAdd.vue | 2 +
.../ProjectScreen/components/centerPage.vue | 4 +-
.../ProjectScreen/components/newmap.vue | 44 ++++---
.../ProjectScreen/components/video.vue | 109 ++++++++++++++++++
.../js/CesiumImageLabelEntity.js | 63 +++++-----
7 files changed, 180 insertions(+), 47 deletions(-)
create mode 100644 public/vite.svg
create mode 100644 src/views/projectLarge/ProjectScreen/components/video.vue
diff --git a/.env.development b/.env.development
index 2ee1390..038e52d 100644
--- a/.env.development
+++ b/.env.development
@@ -6,11 +6,11 @@ VITE_APP_ENV = 'development'
# 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
# 李陈杰 209
# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
# 曾涛
-# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+VITE_APP_BASE_API = 'http://192.168.110.180:8899'
# 罗成
# VITE_APP_BASE_API = 'http://192.168.110.188:8899'
# 朱银
diff --git a/public/vite.svg b/public/vite.svg
new file mode 100644
index 0000000..e7b8dfb
--- /dev/null
+++ b/public/vite.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/views/other/ys7Device/component/presetAdd.vue b/src/views/other/ys7Device/component/presetAdd.vue
index 5262a88..80421f0 100644
--- a/src/views/other/ys7Device/component/presetAdd.vue
+++ b/src/views/other/ys7Device/component/presetAdd.vue
@@ -123,6 +123,8 @@ function addPre() {
// 视频播放
function videoPlay(obj: any) {
+ console.log('objobjobj',obj);
+
getAccessToken().then((res: any) => {
if (res.code == 200 && obj.deviceSerial) {
flvPlayer.value = new EZUIKit.EZUIKitPlayer({
diff --git a/src/views/projectLarge/ProjectScreen/components/centerPage.vue b/src/views/projectLarge/ProjectScreen/components/centerPage.vue
index 3a0a78a..d0c2451 100644
--- a/src/views/projectLarge/ProjectScreen/components/centerPage.vue
+++ b/src/views/projectLarge/ProjectScreen/components/centerPage.vue
@@ -1,7 +1,7 @@
@@ -16,7 +16,7 @@
<div class="swiper_content" ref="swiperContent">
<div class="swiper_item" v-for="(item, i) in inspectionList" :key="i">
<img :src="item.picture" alt="安全巡检" class="swiper_img">
- <div class="swiper_date">{{ item.createTime.slice(5) }}</div>
+ <!-- <div class="swiper_date">{{ item.createTime.slice(5) }}</div> -->
<div class="swiper_tip">{{ item.label }}</div>
</div>
</div>
diff --git a/src/views/projectLarge/ProjectScreen/components/newmap.vue b/src/views/projectLarge/ProjectScreen/components/newmap.vue
index d456627..f2b541d 100644
--- a/src/views/projectLarge/ProjectScreen/components/newmap.vue
+++ b/src/views/projectLarge/ProjectScreen/components/newmap.vue
@@ -1,11 +1,22 @@
<script setup>
-import { onMounted, ref, onUnmounted } from 'vue';
+import { onMounted, ref, onUnmounted,defineProps} from 'vue';
import CesiumImageLabelEntity from '../js/CesiumImageLabelEntity.js';
import CesiumFlyToRoamingController from '../js/CesiumFlyToRoamingController.js';
import { setSelect, getSelectList, getGps } from '@/api/projectScreen/index.ts'
+import videoDialog from "./video.vue"
const defaultExpandedKeys = [1, 2, 3] //默认展开第一级节点
const defaultCheckedKeys = ref([]) //默认选中节点
const data = ref([]);
+const deviceId = ref('');
+const videoDialogRef = ref(null);
+const props = defineProps({
+ isHide:{
+ type:Boolean,
+ default:true,
+ }
+})
+console.log('props', props);
+
const defaultProps = {
children: 'children',
label: 'label',
@@ -58,15 +69,24 @@ function renderDevice(item) {
lat: Number(item.lat),
height: 0
},
+ imageWidth: 64,
+ imageHeight: 64,
name: item.label || item.id,
- imageUrl: "/assets/demo/avatar.png",
- onClick: entityClickHandler
+ imageUrl: `/image/${item.type}.png`,
+ onClick: (entity)=>{
+ entityClickHandler(entity,item);
+ }
});
window.deviceMap.set(item.id, imageEntity);
}
// 实体的点击事件
-function entityClickHandler(entity) {
- console.log('entity', entity);
+function entityClickHandler(entity,item) {
+ console.log('entity', entity,item);
+ if (item.type == 'camera') {
+ deviceId.value = 'AE9470016';
+ videoDialogRef.value.show();
+ videoDialogRef.value.videoPlay(deviceId.value);
+ }
}
// 初始化地球
function initEarth() {
@@ -111,11 +131,6 @@ function loadTiltData(viewer) {
// url:"http://58.17.134.85:7363/yjearth4.0/data/pak/e904acb32aaa8b872c64866ebaaaf5e2"
url: import.meta.env.VITE_EARTH_URL + "/yjearth4.0/data/pak/4eb21d3fc02873092e75640e261544b3"
});
- // var tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
- // // url: 'http://58.17.134.85:7363/zm/api/v1/data/tileset/b15be28d053fcdd98308bed74c6108e6/tileset.json',
- // url:'http://58.17.134.85:7363/yjearth4.0/data/tileset/9c25649daa610a0cfb89e2cbea74bc55/tileset.json'
- // }));
- // console.log("加载倾斜数据：", tileset);
}
// 获取ArcGIS服务的URL
function getArcGisUrlByType(type) {
@@ -134,7 +149,7 @@ function getArcGisUrlByType(type) {
return "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetGray/MapServer";
//暖色底图
case "vec_warm":
- return "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetWarm/MapServer";
+ return "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetWarm/MapServer";
}
}
// 添加ArcGIS图层
@@ -218,17 +233,18 @@ onUnmounted(() => {
<template>
<div class="earth-container-big">
<div class="earth" id="earth"></div>
- <div class="left">
+ <div v-show="isHide" class="left">
<div style="width: 100%;height: 100%;">
<el-button type="primary" @click="startRoaming">开始漫游</el-button>
<el-button type="primary" @click="stopRoaming">停止漫游</el-button>
</div>
</div>
- <div class="right">
+ <div v-show="isHide" class="right">
<el-tree show-checkbox :data="data" :props="defaultProps" node-key="id" :expand-on-click-node="false"
:check-on-click-node="false" :check-on-click-leaf="false" :default-expanded-keys="defaultExpandedKeys"
:default-checked-keys="defaultCheckedKeys" @check="handleCheck" @node-click="handleNodeClick" />
</div>
+ <videoDialog :data="deviceId" ref="videoDialogRef"></videoDialog>
</div>
</template>
<style lang="scss">
@@ -255,7 +271,7 @@ onUnmounted(() => {
.right,
.left {
position: absolute;
- width: 200px;
+ width: 400px;
height: 100%;
transform: translateY(-50%);
background-color: #00000052;
diff --git a/src/views/projectLarge/ProjectScreen/components/video.vue b/src/views/projectLarge/ProjectScreen/components/video.vue
new file mode 100644
index 0000000..b0c2dfd
--- /dev/null
+++ b/src/views/projectLarge/ProjectScreen/components/video.vue
@@ -0,0 +1,109 @@
+<template>
+ <el-dialog v-model="visible" title="摄像头直播" :width="dialogWidth" :height="dialogHeight" :before-close="handleClose"
+ destroy-on-close>
+ <div class="video-container-entity" id="video-container-entity" style="width: 100%; height: 600px"></div>
+ <!-- <template #footer>
+ <el-button type="primary" @click="handlesubmit">确定</el-button>
+ <el-button type="danger" @click="handleClose">关闭</el-button>
+ </template> -->
+ </el-dialog>
+</template>
+
+<script setup>
+import { ref, onMounted, defineEmits, defineProps,onUnmounted } from 'vue';
+import { ElMessage } from 'element-plus';
+import { getAccessToken } from '@/api/other/ys7Device';
+import EZUIKit from 'ezuikit-js';
+const emit = defineEmits(['send-data', 'close']);
+const props = defineProps({
+ data: {
+ type: Object,
+ default: () => { }
+ }
+});
+// 弹窗控制变量
+const visible = ref(false);
+const dialogWidth = ref('950px');
+const dialogHeight = ref('90%');
+let loading = ref(true);
+const flvPlayer = ref(null);
+const show = () => {
+ visible.value = true;
+}
+// 关闭弹窗
+const handleClose = () => {
+ visible.value = false;
+};
+// 处理数据传递
+const handlesubmit = () => {
+ handleClose();
+};
+// 视频播放
+function videoPlay(deviceSerial) {
+ getAccessToken().then((res) => {
+ if (res.code == 200 && deviceSerial) {
+ flvPlayer.value = new EZUIKit.EZUIKitPlayer({
+ audio: '0',
+ id: 'video-container-entity',
+ accessToken: res.data,
+ url: `ezopen://open.ys7.com/${deviceSerial}/1.hd.live`,
+ template: 'pcLive',
+ width: 870,
+ height: 600,
+ plugin: ['talk'],
+ handleError: function (err) {
+ console.log(err);
+ if (err?.data?.ret === 20020) {
+ // 20020 是并发连接限制的错误码
+ ElMessage.error('当前观看人数已达上限，请稍后再试');
+ }
+ }
+ });
+ }
+ });
+}
+
+// 组件挂载时设置容器ID
+onMounted(() => {
+
+});
+
+// 暴露显示方法给父组件
+defineExpose({
+ show,
+ videoPlay
+});
+
+//
+onUnmounted(() => {
+
+});
+</script>
+
+<style scoped>
+.earth-container {
+ width: 100%;
+ height: 600px;
+ overflow: hidden;
+ position: relative;
+}
+
+:deep(.el-dialog__body) {
+ padding: 10px;
+ height: calc(100% - 100px);
+ overflow: hidden;
+}
+
+:deep(.el-dialog) {
+ display: flex;
+ flex-direction: column;
+ max-height: 90vh;
+}
+
+:deep(.el-dialog__content) {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+}
+</style>
diff --git a/src/views/projectLarge/ProjectScreen/js/CesiumImageLabelEntity.js b/src/views/projectLarge/ProjectScreen/js/CesiumImageLabelEntity.js
index fea29ec..bef9597 100644
--- a/src/views/projectLarge/ProjectScreen/js/CesiumImageLabelEntity.js
+++ b/src/views/projectLarge/ProjectScreen/js/CesiumImageLabelEntity.js
@@ -53,8 +53,12 @@ export default class CesiumImageLabelEntity {
// 创建实体
this.entity = this.createEntity();
- // 初始化点击事件监听
- this.initClickHandler();
+ // 为实体添加标识，方便后续判断
+ this.entity._isImageLabelEntity = true;
+ this.entity._imageLabelInstance = this;
+
+ // 初始化全局点击事件（确保只注册一次）
+ this.initGlobalClickHandler();
}
/**
@@ -67,7 +71,7 @@ export default class CesiumImageLabelEntity {
position: Cesium.Cartesian3.fromDegrees(
this.options.position.lng,
this.options.position.lat,
- this.options.position.alt
+ this.options.position.height || 0 // 修复：使用height而非alt
),
show: this.options.show,
@@ -79,8 +83,7 @@ export default class CesiumImageLabelEntity {
color: this.options.imageColor,
horizontalOrigin: this.options.horizontalOrigin,
verticalOrigin: this.options.verticalOrigin,
- // 允许实体被选中
- pickable: true
+ pickable: true // 确保可拾取
},
// 名称标签属性
@@ -91,12 +94,10 @@ export default class CesiumImageLabelEntity {
horizontalOrigin: this.options.horizontalOrigin,
verticalOrigin: Cesium.VerticalOrigin.TOP,
pixelOffset: new Cesium.Cartesian2(0, this.options.labelOffsetY),
- // 添加背景
- backgroundColor: new Cesium.Color(0, 0, 0, 0),
+ backgroundColor: new Cesium.Color(0, 0, 0, 0.5), // 修复：半透明背景更易点击
backgroundPadding: new Cesium.Cartesian2(5, 5),
showBackground: true,
- // 允许标签被选中
- pickable: true
+ pickable: true // 确保可拾取
}
});
@@ -107,29 +108,33 @@ export default class CesiumImageLabelEntity {
}
/**
- * 初始化点击事件处理器
+ * 初始化全局点击事件处理器（只注册一次）
*/
- initClickHandler() {
- // 存储当前实例的引用，方便在回调中使用
- const self = this;
-
- // 注册左击事件
- this.viewer.screenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
- // 检测是否点击了当前实体
- const pickedObject = self.viewer.scene.pick(movement.position);
+ initGlobalClickHandler() {
+ // 检查是否已注册全局事件，避免重复注册
+ if (!this.viewer._imageLabelGlobalClickHandler) {
+ const handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
- // 检查是否点击了当前实体或其实体的子组件（billboard、label等）
- if (Cesium.defined(pickedObject) &&
- (pickedObject.id === self.entity ||
- pickedObject.id === self.entity.billboard ||
- pickedObject.id === self.entity.label)) {
-
- // 如果设置了点击回调，则执行
- if (self.onClickCallback && typeof self.onClickCallback === 'function') {
- self.onClickCallback(self.entity, movement.position);
+ handler.setInputAction((movement) => {
+ const pickedObject = this.viewer.scene.pick(movement.position);
+
+ // 判断是否点击了我们创建的图片标签实体
+ if (Cesium.defined(pickedObject) &&
+ Cesium.defined(pickedObject.id) &&
+ pickedObject.id._isImageLabelEntity) {
+ // 调用对应实例的回调函数
+ if (pickedObject.id._imageLabelInstance.onClickCallback) {
+ pickedObject.id._imageLabelInstance.onClickCallback(
+ pickedObject.id,
+ movement.position
+ );
+ }
}
- }
- }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+ }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
+ // 存储全局事件处理器引用，避免重复创建
+ this.viewer._imageLabelGlobalClickHandler = handler;
+ }
}
/**
From 217cf85ea4a5c92c88437e6734d3155a62b6cdb5 Mon Sep 17 00:00:00 2001
From: taoge1020 <sendtao@163.com>
Date: Tue, 9 Sep 2025 21:55:42 +0800
Subject: [PATCH 16/29] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
src/views/cory/template/index.vue | 68 +--
.../engineeringChangeApplicationForm.vue | 396 ++++++++++++++++++
src/views/design/shijibiangeng/index.vue | 279 ++++++++++++
src/views/design/volumeCatalog/index.vue | 20 +-
.../formalitiesAreConsolidated/index.vue | 11 +-
src/views/workflows/task/allTaskWaiting.vue | 5 +-
src/views/workflows/task/myDocument.vue | 37 +-
src/views/workflows/task/taskCopyList.vue | 24 +-
src/views/workflows/task/taskFinish.vue | 30 +-
src/views/workflows/task/taskWaiting.vue | 28 +-
11 files changed, 789 insertions(+), 111 deletions(-)
create mode 100644 src/views/design/shijibiangeng/components/engineeringChangeApplicationForm.vue
create mode 100644 src/views/design/shijibiangeng/index.vue
diff --git a/.env.development b/.env.development
index 2ee1390..7539635 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
# 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
# 李陈杰 209
# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
# 曾涛
diff --git a/src/views/cory/template/index.vue b/src/views/cory/template/index.vue
index 7d94a7a..4a7e431 100644
--- a/src/views/cory/template/index.vue
+++ b/src/views/cory/template/index.vue
@@ -1,54 +1,19 @@
<template>
<div class="p-2">
- <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="变更单" name="1"
- ><el-card shadow="never">
- <template #header>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" plain icon="Plus" :disabled="addSingle" @click="handleAddApp" v-hasPermi="['quality:qualityInspection:add']"
- >上传变更单模版</el-button
- >
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
- </template>
- <EngineeringChangeApplicationForm
- @selection-change="handleSelectionChange"
- :data="tableData"
- :thumbnail="projectTypeOptions[1].thumbnail"
- @delete="handleDelete"
- ></EngineeringChangeApplicationForm>
- <pagination
- v-show="total > 0"
- :total="total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- /> </el-card
- ></el-tab-pane>
- <el-tab-pane label="外部联系单" name="0"
- ><el-card shadow="never">
- <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
- >
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
- </template>
- <Contactform @selection-change="handleSelectionChange" :data="tableData" @delete="handleDelete"></Contactform>
- <pagination
- v-show="total > 0"
- :total="total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- /> </el-card
- ></el-tab-pane>
- </el-tabs>
+ <el-card shadow="never">
+ <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
+ >
+ </el-col>
+ <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+ </template>
+ <Contactform @selection-change="handleSelectionChange" :data="tableData" @delete="handleDelete"></Contactform>
+ <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+ </el-card>
<el-dialog title="新增模板" v-model="dialogVisible" width="800">
<el-form :model="form" :rules="rules" ref="formRef" label-width="110px">
<div class="flex">
@@ -109,14 +74,11 @@
<script setup lang="ts">
import { useUserStoreHook } from '@/store/modules/user';
-import type { FormInstance, FormRules } from 'element-plus';
+import type { FormInstance } from 'element-plus';
import Contactform from './components/contactform.vue';
-import EngineeringChangeApplicationForm from './components/engineeringChangeApplicationForm.vue';
import { listContactTypeformtemplate } from '@/api/cory/contactformtemplate';
import { addContactnotice, delContactnotice, listContactnotice } from '@/api/cory/contactnotice';
-
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_business_status } = toRefs(proxy?.useDict('wf_business_status'));
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
diff --git a/src/views/design/shijibiangeng/components/engineeringChangeApplicationForm.vue b/src/views/design/shijibiangeng/components/engineeringChangeApplicationForm.vue
new file mode 100644
index 0000000..d7e9e0c
--- /dev/null
+++ b/src/views/design/shijibiangeng/components/engineeringChangeApplicationForm.vue
@@ -0,0 +1,396 @@
+<template>
+ <div class="content-box">
+ <el-table :data="data" style="width: 100%" @selection-change="handleSelectionChange">
+ <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="专业">
+ <template #default="{ row }">
+ <dict-tag :options="des_user_major" :value="row.specialty" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="submitDate" label="提出日期">
+ <template #default="{ row }">
+ {{ formatDate(row.submitDate) }}
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="volumeName" label="卷册名称" />
+ <el-table-column align="center" prop="volumeNumber" label="卷册号" />
+ <el-table-column align="center" prop="content" label="变更内容" />
+ <el-table-column align="center" prop="costEstimation" label="变更费用估算" />
+ <el-table-column label="流程状态" align="center" prop="status">
+ <template #default="scope">
+ <dict-tag :options="wf_business_status" :value="scope.row.status" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="content" label="操作" width="240">
+ <template #default="scope">
+ <el-button link type="warning" v-if="scope.row.status === 'draft'" icon="Edit" @click="handleUpdate(scope.row)" class="ml-3"
+ >审批
+ </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> -->
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 详情 -->
+ <el-dialog title="变更单详情" v-model="detailVisible" width="1000">
+ <div class="w[850px] ma word-export-wrapper" ref="exportRef">
+ <div class="w80% ma">
+ <h2 style="text-align: center; margin-top: 5px; font-weight: bold">变更单</h2>
+ <el-row>
+ <el-col :span="12">编号：{{ tableDetail.id }}</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="工程名称" class-name="zebra"> {{ tableDetail.projectName }} </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="提出单位" class-name="zebra"> {{ tableDetail.submitUnit }} </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="专业" label-class-name="white"
+ ><dict-tag :options="des_user_major" :value="tableDetail.specialty" />
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="提出日期" label-class-name="white">
+ {{ dayjs(tableDetail.submitDate).format('YYYY-MM-DD') }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="卷册名称" class-name="zebra"> {{ tableDetail.volumeName }} </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="卷册号" class-name="zebra"> {{ tableDetail.volumeNumber }} </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="附图" :span="2" label-class-name="white">
+ <img :src="item.url" v-for="item in tableDetail.attachmentsImgList" alt="" style="width: 200px; height: auto" />
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="变更原因" :span="2" class-name="zebra">
+ <el-checkbox-group v-model="tableDetail.changeReasons">
+ <el-checkbox
+ v-for="(item, index) in radioList"
+ :class="index % 2 == 0 ? 'w45%' : ''"
+ :label="item.label"
+ :value="item.label"
+ disabled
+ />
+ </el-checkbox-group>
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white">
+ {{ tableDetail.content }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="附件" :span="2" label-class-name="white">
+ <el-link type="primary" :underline="false" :href="tableDetail.attachmentsList?.url" target="_blank">{{
+ tableDetail.attachmentsList?.originalName
+ }}</el-link>
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="变更费用估算" :span="2" class-name="zebra">
+ {{ tableDetail.costEstimation }}
+ </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">
+ {{ tableDetail.contractorLeader }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="日期" label-class-name="white">
+ {{ dayjs(tableDetail.contractorDate).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="项目技术负责人" label-class-name="white">{{
+ tableDetail.bsupervisorLeader
+ }}</el-descriptions-item>
+ <el-descriptions-item label-align="center" label="日期" label-class-name="white">
+ {{ dayjs(tableDetail.bsupervisorDate).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="设计代表" label-class-name="white">{{
+ tableDetail.csupervisorLeader
+ }}</el-descriptions-item>
+ <el-descriptions-item label-align="center" label="日期" label-class-name="white">
+ {{ dayjs(tableDetail.csupervisorDate).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="总监理工程师" label-align="center" label-class-name="white">
+ {{ tableDetail.supervisorLeader }}
+ </el-descriptions-item>
+ <el-descriptions-item label="日期" label-align="center" label-class-name="white">
+ {{ dayjs(tableDetail.supervisorDate).format('YYYY-MM-DD') }}
+ </el-descriptions-item>
+ </el-descriptions>
+ <!-- 一组完整两列 -->
+ <!-- <el-descriptions :column="2" border label-width="160px" size="large">
+ <el-descriptions-item label="监理工程师" label-align="center" label-class-name="white">
+ {{ tableDetail.dsupervisorLeader }}
+ </el-descriptions-item>
+ <el-descriptions-item label="日期" label-align="center" label-class-name="white">
+ {{ dayjs(tableDetail.supervisorDate).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"> {{ tableDetail.esupervisorLeader }} </el-descriptions-item> -->
+ <el-descriptions-item label-align="center" label="负责人" label-class-name="white">
+ {{ tableDetail.ownerRep }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="日期" label-class-name="white">
+ {{ dayjs(tableDetail.ownerDate).format('YYYY-MM-DD') }}
+ </el-descriptions-item>
+ </el-descriptions>
+ </div>
+ <div class="dialog-footer">
+ <div class="btn-item" @click="handleDownload">
+ <img src="@/assets/icons/svg/derived.png" />
+ <span>下载</span>
+ </div>
+ </div>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script lang="ts" setup>
+import { listByIds } from '@/api/system/oss';
+import { dayjs } from 'element-plus';
+import { saveAs } from 'file-saver';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+const props = defineProps({
+ data: {
+ type: Array,
+ default: () => []
+ },
+ thumbnail: {
+ type: String,
+ default: ''
+ }
+});
+
+const tableDetail = ref<any>({ attachmentsImgList: [], attachmentsList: [] });
+
+const exportRef = ref<HTMLElement>();
+const radioList = ref([
+ { value: 0, label: '设计漏项' },
+ { value: 1, label: '设计改进' },
+ { value: 2, label: '设计差错' },
+ { value: 3, label: '接口差错' },
+ { value: 4, label: '业主要求' },
+ { value: 5, label: '施工承包商要求' },
+ { value: 6, label: '外部资料与最终情况不符' },
+ { value: 7, label: '材料代用及其他' }
+]);
+const detailVisible = ref(false);
+const formatDate = (val: string | Date) => (val ? dayjs(val).format('YYYY-MM-DD') : '');
+const { des_user_major } = toRefs<any>(proxy?.useDict('des_user_major'));
+
+const handleDetail = async (row) => {
+ tableDetail.value = { ...row };
+
+ if (row.attachmentsImg) {
+ const res = await listByIds(row.attachmentsImg);
+ tableDetail.value.attachmentsImgList = res.data;
+ }
+ if (row.attachments) {
+ const res = await listByIds(row.attachments);
+ tableDetail.value.attachmentsList = res.data[0];
+ }
+
+ // tableDetail.value = {
+ // ...row,
+ // hasAttachmentList: res.data
+ // };
+ detailVisible.value = true;
+};
+/** 多选框选中数据 */
+const emit = defineEmits(['selection-change', 'delete']);
+const handleSelectionChange = (selection: any) => {
+ emit('selection-change', selection);
+};
+const handleDelete = (row) => {
+ emit('delete', row.id);
+};
+const handleUpdate = (row) => {
+ // 添加审批
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/approval/changeContact/indexEdit`,
+ query: {
+ thumbnailUrl: props.thumbnail,
+ row: JSON.stringify(row),
+ id: row.id,
+ type: 'update'
+ }
+ });
+};
+const handleViewInfo = (row) => {
+ // 添加审批
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/approval/changeContact/indexEdit`,
+ query: {
+ thumbnailUrl: props.thumbnail,
+ row: JSON.stringify(row),
+ id: row.id,
+ type: 'view'
+ }
+ });
+};
+const handleDownload = async () => {
+ const style = `
+ <style>
+ .white { background: #fff !important; }
+ .none { display: none !important; }
+ .zebra { background: #f5f7fa !important; }
+ .el-descriptions__table { table-layout: fixed !important; }
+ table { border-collapse: collapse; width: 100%; }
+ th, td { border: 1px solid #333; padding: 6px; font-size: 14px; }
+ </style>
+ `;
+
+ const el = exportRef.value;
+ if (!el) return;
+
+ // 拷贝 DOM，避免影响原内容
+ const clone = el.cloneNode(true) as HTMLElement;
+
+ // 删除 .dialog-footer
+ const footer = clone.querySelector('.dialog-footer');
+ if (footer) {
+ footer.remove();
+ }
+
+ // 工具函数：图片转成指定宽度的 base64
+ const resizeImageToBase64 = (img: HTMLImageElement, maxWidth = 500) => {
+ return new Promise<string>((resolve) => {
+ const image = new Image();
+ image.crossOrigin = 'anonymous';
+ image.src = img.src;
+ image.onload = () => {
+ const scale = Math.min(1, maxWidth / image.naturalWidth);
+ const canvas = document.createElement('canvas');
+ canvas.width = image.naturalWidth * scale;
+ canvas.height = image.naturalHeight * scale;
+ const ctx = canvas.getContext('2d');
+ ctx!.drawImage(image, 0, 0, canvas.width, canvas.height);
+ resolve(canvas.toDataURL('image/png'));
+ };
+ image.onerror = () => {
+ resolve(img.src); // 如果加载失败就用原地址
+ };
+ });
+ };
+
+ // 找到所有图片并替换成 base64（顺序执行以避免并发问题）
+ const imgs = Array.from(clone.querySelectorAll('img'));
+ for (let img of imgs) {
+ const base64 = await resizeImageToBase64(img, 200);
+ img.src = base64;
+ }
+
+ // 应用表格的内联样式
+ applyInlineTableStyles(clone);
+
+ // 拼接 HTML
+ const html = `
+ <html>
+ <head>
+ <meta charset="utf-8">
+ ${style}
+ </head>
+ <body>
+ ${clone.innerHTML}
+ </body>
+ </html>
+ `;
+
+ const blob = (window as any).htmlDocx.asBlob(html);
+ saveAs(blob, '变更单.docx');
+};
+
+const applyInlineTableStyles = (rootEl: HTMLElement) => {
+ rootEl.querySelectorAll('table').forEach((table) => {
+ table.setAttribute('style', 'width:100%; border-collapse:collapse; table-layout:fixed; border:1px solid #333;');
+ });
+
+ rootEl.querySelectorAll('th, td').forEach((cell) => {
+ cell.setAttribute('style', 'border:1px solid #333; padding:6px; font-size:14px; word-break:break-all;');
+ });
+};
+</script>
+
+<style lang="scss" scoped>
+:deep(.white) {
+ background: #fff !important;
+}
+
+:deep(.none) {
+ display: none !important;
+}
+
+:deep(.zebra) {
+ background: #f5f7fa;
+}
+:deep(.el-descriptions__table) {
+ table-layout: fixed !important;
+}
+.word-export-wrapper {
+ table {
+ width: 100% !important;
+ border-collapse: collapse;
+ table-layout: fixed;
+ word-break: break-all;
+ }
+
+ th,
+ td {
+ border: 1px solid #333;
+ padding: 8px;
+ font-size: 14px;
+ text-align: left;
+ vertical-align: middle;
+ }
+
+ /* 确保不超出 Word 页边距 */
+ margin: 0 auto;
+ max-width: 100%;
+ overflow: hidden;
+}
+
+.el-descriptions__label {
+ font-weight: bold;
+ background-color: #f2f2f2;
+}
+.dialog-footer {
+ height: 100px;
+ display: flex;
+
+ flex-direction: column;
+ justify-content: space-between;
+ position: absolute;
+ top: 14%;
+ right: 6%;
+ background: #fff;
+ box-shadow: 0 0 10px #ddd;
+ text-align: center;
+ padding: 20px 10px;
+
+ .btn-item {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ cursor: pointer;
+ img {
+ transform: rotateZ(180deg);
+ }
+ }
+}
+</style>
diff --git a/src/views/design/shijibiangeng/index.vue b/src/views/design/shijibiangeng/index.vue
new file mode 100644
index 0000000..aa34fd2
--- /dev/null
+++ b/src/views/design/shijibiangeng/index.vue
@@ -0,0 +1,279 @@
+<template>
+ <div class="p-2">
+ <el-card shadow="never">
+ <template #header>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button type="primary" plain icon="Plus" :disabled="addSingle" @click="handleAddApp" v-hasPermi="['quality:qualityInspection:add']"
+ >上传设计变更单</el-button
+ >
+ </el-col>
+ <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+ </template>
+ <EngineeringChangeApplicationForm
+ @selection-change="handleSelectionChange"
+ :data="tableData"
+ :thumbnail="projectTypeOptions[1].thumbnail"
+ @delete="handleDelete"
+ ></EngineeringChangeApplicationForm>
+ <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+ </el-card>
+ <el-dialog title="新增模板" v-model="dialogVisible" width="800">
+ <el-form :model="form" :rules="rules" ref="formRef" label-width="110px">
+ <div class="flex">
+ <div><image-preview :src="thumbnailUrl" width="150px"></image-preview></div>
+ <div>
+ <el-form-item label="工程名称" prop="projectName">
+ <el-input v-model="form.projectName" placeholder="请输入工程名称" />
+ </el-form-item>
+ <el-form-item label="编号" prop="serialNumber">
+ <el-input v-model="form.serialNumber" placeholder="请输入编号" />
+ </el-form-item>
+ <el-form-item label="致" prop="to">
+ <el-input v-model="form.to" placeholder="致：" />
+ </el-form-item>
+ <el-form-item label="主题" prop="subject">
+ <el-input v-model="form.subject" placeholder="请输入主题" />
+ </el-form-item>
+ <el-form-item label="内容" prop="content">
+ <el-input v-model="form.content" type="textarea" :rows="6" placeholder="请输入内容" />
+ </el-form-item>
+ <el-form-item label="附件" prop="attachments">
+ <file-upload v-model="form.attachments" :limit="1" :file-type="['pdf', 'png', 'jpg', 'jpeg', 'gif', 'bmp']"></file-upload>
+ </el-form-item>
+ <el-divider class="mb-10! mt-10!">施工项目部</el-divider>
+ <el-form-item label="项目负责人" prop="contractorLeader">
+ <el-input v-model="form.contractorLeader" placeholder="请输入负责人姓名" />
+ </el-form-item>
+ <el-form-item label="日期" prop="contractorDate">
+ <el-date-picker v-model="form.contractorDate" type="date" placeholder="选择日期" style="width: 100%" />
+ </el-form-item>
+ <el-divider class="mb-10! mt-10!">项目监理机构</el-divider>
+
+ <el-form-item label="总监理工程师" prop="supervisorLeader">
+ <el-input v-model="form.supervisorLeader" placeholder="请输入总监理工程师姓名" />
+ </el-form-item>
+ <el-form-item label="日期" prop="supervisorDate">
+ <el-date-picker v-model="form.supervisorDate" type="date" placeholder="选择日期" style="width: 100%" />
+ </el-form-item>
+ <el-divider class="mb-10! mt-10!">建设单位</el-divider>
+ <el-form-item label="业主代表" prop="ownerRep">
+ <el-input v-model="form.ownerRep" placeholder="请输入业主代表" />
+ </el-form-item>
+ <el-form-item label="日期" prop="ownerDate">
+ <el-date-picker v-model="form.ownerDate" type="date" placeholder="选择日期" style="width: 100%" />
+ </el-form-item>
+ </div>
+ </div>
+ </el-form>
+ <template #footer>
+ <span>
+ <el-button @click="dialogVisible = false">取消</el-button>
+ <el-button type="primary" @click="submitForm">确定</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script setup lang="ts">
+import { useUserStoreHook } from '@/store/modules/user';
+import type { FormInstance, FormRules } from 'element-plus';
+import EngineeringChangeApplicationForm from './components/engineeringChangeApplicationForm.vue';
+import { listContactTypeformtemplate } from '@/api/cory/contactformtemplate';
+import { addContactnotice, delContactnotice, listContactnotice } from '@/api/cory/contactnotice';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wf_business_status } = toRefs(proxy?.useDict('wf_business_status'));
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const thumbnailUrl = ref('');
+const tableData = ref([]);
+const total = ref(0);
+const activeName = ref('1');
+const formRef = ref<FormInstance>();
+const dialogVisible = ref<boolean>(false);
+const showSearch = ref(true);
+const multiple = ref<boolean>(true);
+const addSingle = ref<boolean>(false);
+const single = ref<boolean>(true);
+const ids = ref<Array<string | number>>([]);
+
+const projectTypeOptions = ref<any>([
+ {
+ value: '0',
+ label: '外部联系单'
+ },
+ {
+ value: '1',
+ label: '变更单'
+ },
+ {
+ value: '2',
+ label: '通知单'
+ },
+ {
+ value: '3',
+ label: '回复单'
+ },
+ {
+ value: '4',
+ label: '签证单'
+ }
+]);
+
+const initFormData = {
+ projectType: '',
+ projectName: '',
+ serialNumber: '',
+ to: '',
+ subject: '',
+ content: '',
+ attachments: '',
+ contractorLeader: '',
+ contractorDate: '',
+ supervisorLeader: '',
+ supervisorDate: '',
+ ownerRep: '',
+ ownerDate: '',
+ unitName: '',
+ profession: '',
+ applyDate: '',
+ bookName: '',
+ bookNo: '',
+ hasAttachment: '',
+ changeReasons: [],
+ changeContent: '',
+ costEstimate: ''
+};
+const data = reactive<PageData<any, any>>({
+ form: { ...initFormData },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ projectId: currentProject.value?.id,
+ inspectionType: undefined,
+ inspectionStatus: undefined,
+ teamId: undefined,
+ type: undefined,
+ params: {},
+ // ids: ['1942107830848872449', '1942107931415699457'],
+ projectType: undefined
+ },
+ rules: {
+ projectName: [{ required: true, message: '请输入工程名称', trigger: 'blur' }],
+ projectType: [{ required: true, message: '请选择模板类型', trigger: 'blur' }],
+ serialNumber: [{ required: true, message: '请输入编号', trigger: 'blur' }],
+ to: [{ required: true, message: '请输入接收方', trigger: 'blur' }],
+ subject: [{ required: true, message: '请输入主题', trigger: 'blur' }],
+ content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
+ }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const submitForm = () => {
+ formRef.value?.validate(async (valid) => {
+ if (valid) {
+ let data = {
+ type: queryParams.value.type,
+ projectId: currentProject.value?.id,
+ detail: JSON.stringify(form.value)
+ };
+ console.log('提交表单：', form);
+ const res = await addContactnotice(data);
+ if (res.code == 200) {
+ proxy.$modal.msgSuccess('添加成功');
+ dialogVisible.value = false;
+ formRef.value.resetFields();
+ getList();
+ }
+ }
+ });
+};
+
+const handleAdd = () => {
+ dialogVisible.value = true;
+};
+
+const getList = async () => {
+ if (!queryParams.value.projectType) {
+ const res = await listContactTypeformtemplate(queryParams.value);
+ projectTypeOptions.value = res.data;
+ queryParams.value.projectType = res.data[1].name;
+ thumbnailUrl.value = res.data[1].thumbnail;
+ queryParams.value.type = res.data[1].id as string;
+ }
+ const res = await listContactnotice(queryParams.value);
+ res.rows = res.rows.map((item) => {
+ return {
+ ...item,
+ ...JSON.parse(item.detail),
+ status: item.status
+ };
+ });
+ tableData.value = res.rows;
+ console.log('🚀 ~ getList ~ tableData.value:', tableData.value);
+ total.value = res.total || 0;
+};
+const handleDelete = async (id?: string) => {
+ const _ids = id || ids.value;
+ await proxy?.$modal.confirm('是否确认删除识别记录编号为"' + _ids + '"的数据项？').finally();
+ const res = await delContactnotice(_ids);
+ if (res.code == 200) {
+ proxy.$modal.msgSuccess('删除成功');
+ getList();
+ }
+};
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: any) => {
+ ids.value = selection.map((item) => item.id);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
+};
+
+const selectType = (value: string) => {
+ queryParams.value.projectType = value;
+ thumbnailUrl.value = projectTypeOptions.value.filter((item) => item.name == value)[0].thumbnail;
+ queryParams.value.type = projectTypeOptions.value.filter((item) => item.name == value)[0].id;
+ getList();
+};
+
+const handleClick = (val) => {
+ console.log(val);
+ queryParams.value.projectType = val.props.name;
+ getList();
+};
+const handleAddApp = (row) => {
+ // 添加审批
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/approval/changeContact/indexEdit`,
+ query: {
+ thumbnailUrl: projectTypeOptions.value[1].thumbnail,
+ id: projectTypeOptions.value[1].id,
+ row,
+ type: 'add'
+ }
+ });
+};
+onMounted(() => {
+ getList();
+});
+
+//监听项目id刷新数据
+const listeningProject = watch(
+ () => currentProject.value?.id,
+ (nid, oid) => {
+ queryParams.value.projectId = nid;
+ getList();
+ }
+);
+
+onUnmounted(() => {
+ listeningProject();
+});
+</script>
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index bf8958c..1ac6e80 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -10,6 +10,13 @@
<el-form-item label="资料名称" prop="documentName">
<el-input v-model="queryParams.documentName" placeholder="请输入资料名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
+ <el-form-item label="是否文件上传" prop="isUpload" label-width="110px">
+ <el-select v-model="queryParams.isUpload" placeholder="请选择" clearable @keyup.enter="handleQuery">
+ <el-option value="1" label="是" />
+ <el-option value="0" label="否" />
+ <el-option value="2" label="全部" />
+ </el-select>
+ </el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:volumeCatalog:query']">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery" v-hasPermi="['design:volumeCatalog:query']">重置</el-button>
@@ -154,14 +161,14 @@
<el-form-item v-if="uploadForm.type == '3'" label="蓝图" prop="fileIds">
<file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.fileIds"></file-upload>
</el-form-item>
- <el-form-item v-if="uploadForm.type == '3'" label="通知人">
+ <el-form-item v-if="uploadForm.type == '1'" label="过程图纸" prop="cancellationIds">
+ <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.cancellationIds"></file-upload>
+ </el-form-item>
+ <el-form-item label="通知人">
<el-select multiple filterable clearable v-model="form.userIds" placeholder="请选择通知人">
<el-option :value="item.userId" v-for="item in userCoryList" :key="item.userId" :label="item.nickName + '-' + item.phonenumber" />
</el-select>
</el-form-item>
- <el-form-item v-if="uploadForm.type == '1'" label="过程图纸" prop="cancellationIds">
- <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.cancellationIds"></file-upload>
- </el-form-item>
</el-form>
<span style="font-size: 12px; color: #999999">注意:请上传pdf格式文件</span>
<div style="display: flex; justify-content: flex-end">
@@ -360,7 +367,8 @@ const data = reactive({
designSubitemId: undefined,
volumeNumber: undefined,
documentName: undefined,
- params: {}
+ params: {},
+ isUpload: '2'
},
rules: {
design: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
@@ -585,7 +593,6 @@ const handleUploadSuccess = async (flieList: any, res: any) => {
};
/** 审核蓝图按钮操作 */
const handleAuditLantu = async (row) => {
- proxy.$tab.closePage(proxy.$route);
proxy.$router.push({
path: `/approval/volumeCatalog/blueprintEdit`,
query: {
@@ -596,7 +603,6 @@ const handleAuditLantu = async (row) => {
};
/** 查看蓝图按钮操作 */
const handleAuditViewLantu = async (row) => {
- proxy.$tab.closePage(proxy.$route);
proxy.$router.push({
path: `/approval/volumeCatalog/blueprintEdit`,
query: {
diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue
index b276f4d..00e4bc6 100644
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@@ -82,11 +82,18 @@
</el-row>
</template>
- <el-table v-loading="loading" :data="formalitiesAreConsolidatedList" @selection-change="handleSelectionChange" row-key="id" default-expand-all>
+ <el-table
+ v-loading="loading"
+ :table-layout="'auto'"
+ :data="formalitiesAreConsolidatedList"
+ @selection-change="handleSelectionChange"
+ row-key="id"
+ default-expand-all
+ >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="手续办理清单" align="left" prop="formalitiesName">
<template #default="scope">
- <span style="white-space: nowrap">{{ scope.row.formalitiesName }}</span>
+ {{ scope.row.formalitiesName }}
</template>
</el-table-column>
<el-table-column label="计划开始时间" align="center" prop="planTheStartTime" width="180">
diff --git a/src/views/workflows/task/allTaskWaiting.vue b/src/views/workflows/task/allTaskWaiting.vue
index 9dc0c89..7e86835 100644
--- a/src/views/workflows/task/allTaskWaiting.vue
+++ b/src/views/workflows/task/allTaskWaiting.vue
@@ -13,7 +13,7 @@
<el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="流程定义名称" label-width="100" prop="flowName">
- <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.flowName" placeholder="请输入流程名称" @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -38,8 +38,7 @@
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column>
- <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程名称"></el-table-column>
<el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
<el-table-column align="center" prop="version" label="版本号" width="90">
<template #default="scope"> v{{ scope.row.version }}.0</template>
diff --git a/src/views/workflows/task/myDocument.vue b/src/views/workflows/task/myDocument.vue
index 2f7cfe9..c4be9ca 100644
--- a/src/views/workflows/task/myDocument.vue
+++ b/src/views/workflows/task/myDocument.vue
@@ -24,8 +24,13 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="120px">
- <el-form-item label="流程定义编码" prop="flowCode">
- <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
+ <el-form-item label="流程名称" prop="flowName">
+ <el-input v-model="queryParams.flowName" placeholder="请输入流程名称" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="项目" prop="projectId">
+ <el-select v-model="queryParams.projectId" placeholder="全部" clearable filterable style="width: 150px; margin-right: 20px">
+ <el-option v-for="project in projects" :key="project.id" :label="project.name" :value="project.id" />
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -43,11 +48,10 @@
</template>
<el-table v-loading="loading" border :data="processInstanceList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
<el-table-column v-if="false" align="center" prop="id" label="id"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"> </el-table-column>
- <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程名称"> </el-table-column>
+ <!-- <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column> -->
<el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
<el-table-column align="center" prop="version" label="版本号" width="90">
<template #default="scope"> v{{ scope.row.version }}.0</template>
@@ -68,20 +72,18 @@
<template #default="scope">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'">
- <el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row, 'update')">编辑</el-button>
+ <el-button type="primary" link icon="Edit" @click="handleOpen(scope.row, 'update')">编辑</el-button>
</el-col>
<el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'">
- <el-button type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+ <el-button type="primary" link icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" size="small" icon="View" @click="handleOpen(scope.row, 'view')">查看</el-button>
+ <el-button type="primary" link icon="View" @click="handleOpen(scope.row, 'view')">查看</el-button>
</el-col>
<el-col :span="1.5" v-if="scope.row.flowStatus === 'waiting'">
- <el-button type="primary" size="small" icon="Notification" @click="handleCancelProcessApply(scope.row.businessId)"
- >撤销</el-button
- >
+ <el-button type="primary" link icon="Notification" @click="handleCancelProcessApply(scope.row.businessId)">撤销</el-button>
</el-col>
</el-row>
</template>
@@ -113,7 +115,12 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>();
-
+import { useUserStore } from '@/store/modules/user';
+const userStore = useUserStore();
+const projects = computed(() => [
+ { id: '0', name: '全部项目' }, // 添加空选项
+ ...userStore.projects
+]);
// 遮罩层
const loading = ref(true);
// 选中数组
@@ -135,11 +142,13 @@ const categoryName = ref('');
const tab = ref('running');
// 查询参数
-const queryParams = ref<FlowInstanceQuery>({
+const queryParams = ref({
pageNum: 1,
pageSize: 10,
flowCode: undefined,
- category: undefined
+ category: undefined,
+ projectId: '0',
+ flowName: undefined
});
onMounted(() => {
diff --git a/src/views/workflows/task/taskCopyList.vue b/src/views/workflows/task/taskCopyList.vue
index 776a064..4b776c5 100644
--- a/src/views/workflows/task/taskCopyList.vue
+++ b/src/views/workflows/task/taskCopyList.vue
@@ -7,11 +7,13 @@
<el-form-item label="任务名称" prop="nodeName">
<el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="流程定义名称" label-width="100" prop="flowName">
- <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+ <el-form-item label="流程名称" label-width="100" prop="flowName">
+ <el-input v-model="queryParams.flowName" placeholder="请输入流程名称" @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
- <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
+ <el-form-item label="项目" prop="projectId">
+ <el-select v-model="queryParams.projectId" placeholder="全部" clearable filterable style="width: 150px; margin-right: 20px">
+ <el-option v-for="project in projects" :key="project.id" :label="project.name" :value="project.id" />
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -31,8 +33,7 @@
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column>
- <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程名称"></el-table-column>
<el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
<el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
<el-table-column align="center" label="流程状态" min-width="70">
@@ -43,7 +44,7 @@
<el-table-column align="center" prop="updateTime" label="更新时间" width="150"></el-table-column>
<el-table-column label="操作" align="center" width="200">
<template #default="scope">
- <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+ <el-button type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@@ -64,6 +65,12 @@ import { TaskQuery } from '@/api/workflow/task/types';
import workflowCommon from '@/api/workflow/workflowCommon';
import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
//审批记录组件
+import { useUserStore } from '@/store/modules/user';
+const userStore = useUserStore();
+const projects = computed(() => [
+ { id: '0', name: '全部项目' }, // 添加空选项
+ ...userStore.projects
+]);
const queryFormRef = ref<ElFormInstance>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
@@ -82,8 +89,9 @@ const total = ref(0);
// 模型定义表格数据
const taskList = ref([]);
// 查询参数
-const queryParams = ref<TaskQuery>({
+const queryParams = ref({
pageNum: 1,
+ projectId: '0',
pageSize: 10,
nodeName: undefined,
flowName: undefined,
diff --git a/src/views/workflows/task/taskFinish.vue b/src/views/workflows/task/taskFinish.vue
index 130cce9..87a05dc 100644
--- a/src/views/workflows/task/taskFinish.vue
+++ b/src/views/workflows/task/taskFinish.vue
@@ -4,19 +4,21 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
- <el-form-item>
+ <!-- <el-form-item>
<el-badge :value="userSelectCount" :max="10" class="item">
<el-button type="primary" @click="openUserSelect">选择申请人</el-button>
</el-badge>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="任务名称" prop="nodeName">
<el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="流程定义名称" label-width="100" prop="flowName">
- <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+ <el-form-item label="流程名称" label-width="100" prop="flowName">
+ <el-input v-model="queryParams.flowName" placeholder="请输入流程名称" @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
- <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
+ <el-form-item label="项目" prop="projectId">
+ <el-select v-model="queryParams.projectId" placeholder="全部" clearable filterable style="width: 150px; margin-right: 20px">
+ <el-option v-for="project in projects" :key="project.id" :label="project.name" :value="project.id" />
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -34,10 +36,8 @@
</template>
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
- <el-table-column align="center" prop="flowName" label="流程定义名称"></el-table-column>
- <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+ <el-table-column align="center" prop="flowName" label="流程名称"></el-table-column>
<el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
<el-table-column align="center" prop="version" label="版本号" width="90">
<template #default="scope"> v{{ scope.row.version }}.0</template>
@@ -64,7 +64,7 @@
<el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
<el-table-column label="操作" align="center" width="200">
<template #default="scope">
- <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+ <el-button type="primary" link icon="View" @click="handleView(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@@ -94,7 +94,12 @@ const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
import UserSelect from '@/components/UserSelect';
import { ref } from 'vue';
import { UserVO } from '@/api/system/user/types';
-
+import { useUserStore } from '@/store/modules/user';
+const userStore = useUserStore();
+const projects = computed(() => [
+ { id: '0', name: '全部项目' }, // 添加空选项
+ ...userStore.projects
+]);
const userSelectRef = ref<InstanceType<typeof UserSelect>>();
// 遮罩层
const loading = ref(true);
@@ -111,11 +116,12 @@ const total = ref(0);
// 模型定义表格数据
const taskList = ref([]);
// 查询参数
-const queryParams = ref<TaskQuery>({
+const queryParams = ref({
pageNum: 1,
pageSize: 10,
nodeName: undefined,
flowName: undefined,
+ projectId: '0',
flowCode: undefined,
createByIds: []
});
diff --git a/src/views/workflows/task/taskWaiting.vue b/src/views/workflows/task/taskWaiting.vue
index e678401..a53bf3c 100644
--- a/src/views/workflows/task/taskWaiting.vue
+++ b/src/views/workflows/task/taskWaiting.vue
@@ -12,11 +12,13 @@
<el-form-item label="任务名称" prop="nodeName">
<el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="流程定义名称" label-width="100" prop="flowName">
- <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+ <el-form-item label="流程名称" label-width="100" prop="flowName">
+ <el-input v-model="queryParams.flowName" placeholder="请输入流程名称" @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
- <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
+ <el-form-item label="项目" prop="projectId">
+ <el-select v-model="queryParams.projectId" placeholder="全部" clearable filterable style="width: 150px; margin-right: 20px">
+ <el-option v-for="project in projects" :key="project.id" :label="project.name" :value="project.id" />
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -33,10 +35,8 @@
</el-row>
</template>
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column>
- <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程名称"></el-table-column>
<el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
<el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
<el-table-column align="center" prop="createByName" label="申请人"></el-table-column>
@@ -60,7 +60,7 @@
<el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
<el-table-column label="操作" align="center" width="200">
<template #default="scope">
- <el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">办理</el-button>
+ <el-button type="primary" link icon="Edit" @click="handleOpen(scope.row)">办理</el-button>
</template>
</el-table-column>
</el-table>
@@ -88,7 +88,12 @@ const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'))
import UserSelect from '@/components/UserSelect';
import { ref } from 'vue';
import { UserVO } from '@/api/system/user/types';
-
+import { useUserStore } from '@/store/modules/user';
+const userStore = useUserStore();
+const projects = computed(() => [
+ { id: '0', name: '全部项目' }, // 添加空选项
+ ...userStore.projects
+]);
const userSelectRef = ref<InstanceType<typeof UserSelect>>();
//提交组件
const queryFormRef = ref<ElFormInstance>();
@@ -112,13 +117,14 @@ const selectUserIds = ref<Array<number | string>>([]);
//申请人选择数量
const userSelectCount = ref(0);
// 查询参数
-const queryParams = ref<TaskQuery>({
+const queryParams = ref({
pageNum: 1,
pageSize: 10,
nodeName: undefined,
flowName: undefined,
flowCode: undefined,
- createByIds: []
+ createByIds: [],
+ projectId: '0'
});
onMounted(() => {
getWaitingList();
From 0afefe44cad351c866145de1797c37082b467884 Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Tue, 9 Sep 2025 22:07:43 +0800
Subject: [PATCH 17/29] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/outputApi/index.ts | 43 ++
src/assets/large/actual.png | Bin 0 -> 23951 bytes
src/assets/large/capacity.png | Bin 0 -> 24591 bytes
src/assets/large/delay.png | Bin 0 -> 26203 bytes
src/assets/large/plan.png | Bin 0 -> 26181 bytes
.../components/centerPage.vue | 523 ++++++++++--------
.../components/optionList.ts | 173 ++++--
.../components/rightPage.vue | 433 ++++++++++-----
8 files changed, 751 insertions(+), 421 deletions(-)
create mode 100644 src/api/outputApi/index.ts
create mode 100644 src/assets/large/actual.png
create mode 100644 src/assets/large/capacity.png
create mode 100644 src/assets/large/delay.png
create mode 100644 src/assets/large/plan.png
diff --git a/src/api/outputApi/index.ts b/src/api/outputApi/index.ts
new file mode 100644
index 0000000..8d1a75a
--- /dev/null
+++ b/src/api/outputApi/index.ts
@@ -0,0 +1,43 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 查询项目数据
+ * @param query
+ * @returns {*}
+ */
+
+export const projectProgress = (query?: any): any => {
+ return request({
+ url: '/enterprise/big/screen/projectProgress',
+ method: 'get',
+ params: query
+ });
+};
+
+/**
+ * 产值
+ * @param query
+ * @returns {*}
+ */
+
+export const outpuProgress = (query?: any): any => {
+ return request({
+ url: '/enterprise/big/screen/projectOutputValueComparison',
+ method: 'get',
+ params: query
+ });
+};
+/**
+ * 预警
+ * @param query
+ * @returns {*}
+ */
+
+export const earlyWarning = (query?: any): any => {
+ return request({
+ url: '/enterprise/big/screen/riskEarlyWarning',
+ method: 'get',
+ params: query
+ });
+};
diff --git a/src/assets/large/actual.png b/src/assets/large/actual.png
new file mode 100644
index 0000000000000000000000000000000000000000..c22820fb780e4417e0f571d835db89d2a80f15c1
GIT binary patch
literal 23951
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
literal 0
HcmV?d00001
diff --git a/src/assets/large/capacity.png b/src/assets/large/capacity.png
new file mode 100644
index 0000000000000000000000000000000000000000..d793950cb0317ff0eb75c76b00f7b0077f618ccc
GIT binary patch
literal 24591
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
KMNUMnLSTX@l9}oN
literal 0
HcmV?d00001
diff --git a/src/assets/large/delay.png b/src/assets/large/delay.png
new file mode 100644
index 0000000000000000000000000000000000000000..23f8e0876c8ad226aff733216c82347acefc3f05
GIT binary patch
literal 26203
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
KMNUMnLSTaIjeO4l
literal 0
HcmV?d00001
diff --git a/src/assets/large/plan.png b/src/assets/large/plan.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad09f94b2d68a21997a6056a87235bffc6fc0b61
GIT binary patch
literal 26181
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
literal 0
HcmV?d00001
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue
index 50ab572..c71a8cd 100644
--- a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue
@@ -1,275 +1,328 @@
<template>
<div class="centerPage">
- <div class="topPage">
- <div id="earth" style="width: 100%;height: 100%;"></div>
+ <div class="centerPage_map">
+ <div ref="mapRef" class="map-container" style="width: 100%; height: 100%" />
</div>
- <div class="endPage" :class="{ 'slide-out-down': isHide }">
- <Title title="AI安全巡检">
- <img src="@/assets/projectLarge/robot.svg" alt="" height="20px" width="20px">
+ <div class="centerPage_bottom">
+ <Title title="风险预警">
+ <img src="@/assets/projectLarge/robot.svg" alt="" height="20px" width="20px" />
-
-
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts
index bcdf958..502ddc2 100644
--- a/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts
@@ -1,51 +1,54 @@
export let pieOption = {
// 定义中心文字
graphic: [
- {
- type: 'text',
- left: 'center',
- top: '40%',
- style: {
- // 需要从接口替换
- text: '70%',
- fontSize: 24,
- fontWeight: 'bold',
- fill: '#fff'
- }
- },
- {
- type: 'text',
- left: 'center',
- top: '50%',
- style: {
- text: '总进度',
- fontSize: 14,
- fill: '#fff'
- }
- },
+ // {
+ // type: 'text',
+ // left: 'center',
+ // top: '40%',
+ // style: {
+ // // 需要从接口替换
+ // text: '70%',
+ // fontSize: 24,
+ // fontWeight: 'bold',
+ // fill: '#fff'
+ // }
+ // }
+ // {
+ // type: 'text',
+ // left: 'center',
+ // top: '50%',
+ // style: {
+ // text: '111',
+ // fontSize: 14,
+ // fill: '#fff'
+ // }
+ // }
],
- legend: {
- show: true,
- type: 'plain',
- bottom: 20,
- itemWidth: 12,
- itemHeight: 12,
- textStyle: {
- color: '#fff'
- }
- },
+ // legend: {
+ // show: true,
+ // type: 'plain',
+ // bottom: 20,
+ // itemWidth: 12,
+ // itemHeight: 12,
+ // textStyle: {
+ // color: '#fff'
+ // }
+ // },
series: {
type: 'pie',
data: [],
radius: [50, 80],
center: ['50%', '45%'],
- itemStyle: {
- borderColor: '#fff',
- borderWidth: 1
- },
+ // itemStyle: {
+ // borderColor: '#fff',
+ // borderWidth: 1
+ // },
label: {
alignTo: 'edge',
- formatter: '{name|{b}}\n{percent|{c} %}',
+ formatter: function (params) {
+ // 只显示前三个数据项
+ return `{name|${params.data.name}}\n{percent|${params.data.completionRate}MW}`;
+ },
minMargin: 10,
edgeDistance: 20,
lineHeight: 15,
@@ -62,7 +65,7 @@ export let pieOption = {
},
legend: {
top: 'bottom'
- },
+ }
}
};
@@ -72,16 +75,39 @@ export let barOption = {
itemWidth: 12,
itemHeight: 12,
// 调整文字与图标间距
- data: ['计划流转面积', '已流转面积'],
+ data: ['计划产值', '实际产值'],
top: 0,
- right: 20,
+ right: 10,
+ bottom: 10,
textStyle: {
- color: '#fff',
+ color: '#fff'
}
},
+
+ tooltip: {
+ show: true,
+ backgroundColor: '',
+ trigger: 'axis',
+ // formatter: '{b0}：{c0}万元',
+ formatter: (params: any) => {
+ // params 是数组，对应每条柱子
+ return params
+ .map((p: any) => `${p.seriesName}：${Number(p.value).toFixed(2)} 亿元`)
+
+ .join('
'); + }, + textStyle: { + color: '#fff' + }, + axisPointer: { + type: 'shadow' // 默认为直线，可选为：'line' | 'shadow', + } + // borderColor: 'rgba(252, 217, 18, 1)' + }, xAxis: { type: 'category', - data: ['地块1', '地块2', '地块3', '地块4', '地块5', '地块6'], + data: [], + axisLabel: { color: '#fff' }, @@ -93,34 +119,71 @@ export let barOption = { } }, yAxis: { - name: '单位：m²', + name: '单位：亿元', type: 'value', axisLabel: { formatter: '{value}' + }, + splitLine: { + show: false // 不显示分割线 } }, grid: { - bottom: 0, // 距离容器底部的距离 - containLabel: true // 确保坐标轴标签不被裁剪 + left: '12%', + top: '15%', // 顶部留一点空间给 legend + bottom: '8%', + right: '2%' }, series: [ { - name: '计划流转面积', + name: '计划产值', type: 'bar', data: [], - barWidth: '20%', + barWidth: '10', itemStyle: { - color: 'rgb(29, 253, 253)' - }, + color: { + type: 'linear', + x: 0, + y: 1, // 修改y为1表示从底部开始 + x2: 0, + y2: 0, // 修改y2为0表示渐变到顶部 + colorStops: [ + { + offset: 0, + color: 'rgba(255, 209, 92, 0.1)' // 底部透明度0.1 + }, + { + offset: 1, + color: 'rgba(255, 209, 92, 1)' // 顶部透明度1 + } + ] + } + } }, { - name: '已流转面积', + name: '实际产值', type: 'bar', data: [], - barWidth: '20%', + barWidth: '10', itemStyle: { - color: 'rgb(25, 181, 251)' - }, + color: { + type: 'linear', + x: 0, + y: 1, // 从底部开始 + x2: 0, + y2: 0, // 到顶部结束 + colorStops: [ + { + offset: 0, + color: 'rgba(7, 209, 250, 0.1)' // 底部透明度0.1 + }, + { + offset: 1, + color: 'rgba(7, 209, 250, 1)' // 顶部透明度1 + } + ] + } + } } ] }; @@ -129,7 +192,7 @@ export let mapOption = { geo: { map: 'ch', roam: true, - aspectScale: Math.cos((47 * Math.PI) / 180), + aspectScale: Math.cos((47 * Math.PI) / 180) }, series: [ { @@ -147,7 +210,7 @@ export let mapOption = { { name: 'i', value: [9.085994375000002, 47.55395822835779] }, { name: 'j', value: [8.653968125000002, 47.47709530818285] }, { name: 'k', value: [8.203158125000002, 47.44506909144329] } - ], + ] } ] }; diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue index 0d08c08..e57e5b6 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue @@ -1,13 +1,60 @@
+
+
+
+
+
+
+ 产值金额（业主）
+ {{ ownerOutputSum }}
+
+
+
+
+
+ 产值金额（分包）
+ {{ constructionOutputSum }}
+
-
+
修改
-
+
删除
@@ -119,14 +140,9 @@
-
-
-
-
-
-
-
-
- ![安全巡检]()
-
- {{ item.createTime.slice(5) }}
- {{ item.label }}
-
-
-
-
+
+
+
+
+ {{ safety_inspection_type[scope.row.riskType] }}
+
+
+
+
+ {{ risk_level_type[scope.row.alarmLevel] }}
+
+
+
'); + }, + textStyle: { + color: '#fff' + }, + axisPointer: { + type: 'shadow' // 默认为直线，可选为：'line' | 'shadow', + } + // borderColor: 'rgba(252, 217, 18, 1)' + }, xAxis: { type: 'category', - data: ['地块1', '地块2', '地块3', '地块4', '地块5', '地块6'], + data: [], + axisLabel: { color: '#fff' }, @@ -93,34 +119,71 @@ export let barOption = { } }, yAxis: { - name: '单位：m²', + name: '单位：亿元', type: 'value', axisLabel: { formatter: '{value}' + }, + splitLine: { + show: false // 不显示分割线 } }, grid: { - bottom: 0, // 距离容器底部的距离 - containLabel: true // 确保坐标轴标签不被裁剪 + left: '12%', + top: '15%', // 顶部留一点空间给 legend + bottom: '8%', + right: '2%' }, series: [ { - name: '计划流转面积', + name: '计划产值', type: 'bar', data: [], - barWidth: '20%', + barWidth: '10', itemStyle: { - color: 'rgb(29, 253, 253)' - }, + color: { + type: 'linear', + x: 0, + y: 1, // 修改y为1表示从底部开始 + x2: 0, + y2: 0, // 修改y2为0表示渐变到顶部 + colorStops: [ + { + offset: 0, + color: 'rgba(255, 209, 92, 0.1)' // 底部透明度0.1 + }, + { + offset: 1, + color: 'rgba(255, 209, 92, 1)' // 顶部透明度1 + } + ] + } + } }, { - name: '已流转面积', + name: '实际产值', type: 'bar', data: [], - barWidth: '20%', + barWidth: '10', itemStyle: { - color: 'rgb(25, 181, 251)' - }, + color: { + type: 'linear', + x: 0, + y: 1, // 从底部开始 + x2: 0, + y2: 0, // 到顶部结束 + colorStops: [ + { + offset: 0, + color: 'rgba(7, 209, 250, 0.1)' // 底部透明度0.1 + }, + { + offset: 1, + color: 'rgba(7, 209, 250, 1)' // 顶部透明度1 + } + ] + } + } } ] }; @@ -129,7 +192,7 @@ export let mapOption = { geo: { map: 'ch', roam: true, - aspectScale: Math.cos((47 * Math.PI) / 180), + aspectScale: Math.cos((47 * Math.PI) / 180) }, series: [ { @@ -147,7 +210,7 @@ export let mapOption = { { name: 'i', value: [9.085994375000002, 47.55395822835779] }, { name: 'j', value: [8.653968125000002, 47.47709530818285] }, { name: 'k', value: [8.203158125000002, 47.44506909144329] } - ], + ] } ] }; diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue index 0d08c08..e57e5b6 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue @@ -1,13 +1,60 @@
-
-
+
+
+
+
+
+ 
+
+
+
+
+
+
+ {{ capacityData.gridConnectedCapacity ?? '0' }}
+ MW
+ 井网总容量
+
+
+
+
+
+ 
+
+
+
+
+
+
+ {{ capacityData.plannedCapacity ?? '0' }}
+ MW
+ 计划总容量
+
+
+
+
+
+ 
+
+
+
+
+
+
+ {{ capacityData.delayedProjectCount ?? '0' }}
+ 个
+ 延期项目
+
-
+
+
+
@@ -15,69 +62,40 @@
@@ -383,37 +683,59 @@ onUnmounted(() => {
.endPage {
display: flex;
flex-direction: column;
- align-items: center;
width: 100%;
- padding: 15px 0;
+ height: 250;
border: 1px solid rgba(29, 214, 255, 0.1);
box-sizing: border-box;
}
-
.endPage {
+ height: auto;
flex: 1;
- margin-top: 23px;
+ min-height: 550px;
}
-
.project_attendance_chart {
display: flex;
flex-direction: column;
- align-items: center;
width: 100%;
- padding: 15px 0;
- border: 1px solid rgba(29, 214, 255, 0.1);
- box-sizing: border-box;
+ margin-top: 15px;
+ padding-bottom: 10px;
.chart_title {
font-size: 16px;
color: #e6f7ff;
- margin-bottom: 15px;
+ margin-bottom: 5px;
text-align: left;
}
+
+ .scroll_controls {
+ display: flex;
+ justify-content: flex-end;
+ gap: 10px;
+ margin-bottom: 10px;
+ padding-right: 10px;
+ }
+
+ .control_btn {
+ padding: 5px 15px;
+ background: rgba(10, 24, 45, 0.8);
+ border: 1px solid rgba(29, 214, 255, 0.3);
+ color: #e6f7ff;
+ font-size: 12px;
+ cursor: pointer;
+ border-radius: 4px;
+ transition: all 0.3s ease;
+ }
+
+ .control_btn:hover {
+ background: rgba(29, 214, 255, 0.2);
+ border-color: rgba(29, 214, 255, 0.6);
+ }
+
.chart_content {
width: 100%;
- height: 200px;
+ height: 320px; /* 增加高度以容纳滚动条 */
position: relative;
+ overflow: hidden;
}
}
}
@@ -422,20 +744,20 @@ onUnmounted(() => {
width: 100%;
display: grid;
grid-template-columns: repeat(2, 1fr);
- gap: 15px;
- margin-top: 15px;
- padding: 0 15px;
+ gap: 10px;
+ margin-bottom: 8px;
+ padding: 0 10px;
box-sizing: border-box;
}
.indicator-card {
position: relative;
width: 100%;
- height: 100px;
+ height: 80px;
background: rgba(10, 24, 45, 0.7);
border: 1px solid rgba(29, 214, 255, 0.2);
border-radius: 4px;
- padding: 15px;
+ padding: 10px;
box-sizing: border-box;
display: flex;
flex-direction: column;
@@ -488,53 +810,151 @@ onUnmounted(() => {
object-fit: contain;
}
-.map {
- margin-top: 15px;
-}
-
-.attendance_tag {
+/* 人员总览样式 */
+.people_overview {
width: 100%;
+ margin-top: 5px;
+ box-sizing: border-box;
+ border: 1px solid rgba(29, 214, 255, 0.1);
+ background: rgba(10, 24, 45, 0.3);
+}
+
+.people_overview_title {
+ font-size: 16px;
+ color: #e6f7ff;
+ margin-bottom: 5px;
+ border-bottom: 1px solid rgba(29, 214, 255, 0.1);
+}
+
+.people_overview_content {
display: flex;
- justify-content: space-between;
- padding: 0 30px;
- margin-top: 15px;
-
- .tag_item {
- width: 28%;
- display: flex;
- flex-direction: column;
- align-items: center;
- gap: 10px;
- border: 1px dashed rgba(29, 214, 255, 0.3);
- padding: 10px;
-
- .tag_info {
- font-size: 20px;
- font-weight: 700;
- color: rgba(230, 247, 255, 1);
- text-shadow: 0px 1.24px 6.21px rgba(0, 190, 247, 1);
- }
-
- .tag_title {
- font-size: 14px;
- font-weight: 400;
- color: rgba(230, 247, 255, 1);
- }
- }
+ align-items: center;
}
-.attendance_list {
- padding: 0px 30px;
+.people_image {
+ width: 60px;
+ height: 60px;
+ background: linear-gradient(135deg, rgba(29, 214, 255, 0.1) 0%, rgba(29, 214, 255, 0.05) 100%);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
+}
+
+.placeholder_image {
+ width: 100%;
+ height: 100%;
+ object-fit: contain;
+}
+
+.people_stats {
+ flex: 1;
+ display: flex;
+ justify-content: space-around;
+}
+
+.stat_item {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+
+.stat_label {
font-size: 14px;
-
- .attendance_item {
- display: grid;
- grid-template-columns: 3fr 2fr 2fr 3fr;
- margin-top: 20px;
- }
+ color: #8ab2ff;
+ margin-bottom: 5px;
}
-.subfont {
- color: rgba(138, 149, 165, 1);
+.stat_value {
+ font-size: 28px;
+ font-weight: bold;
+ color: #e6f7ff;
+ text-shadow: 0px 1.24px 6.21px rgba(0, 190, 247, 0.5);
+}
+
+.stat_rate {
+ font-size: 28px;
+ font-weight: bold;
+ color: #00c853;
+ text-shadow: 0px 1.24px 6.21px rgba(0, 200, 83, 0.5);
+}
+
+/* 点阵地图样式 */
+.people_map {
+ width: 100%;
+ height: 120px;
+ margin-top: 8px;
+ background: rgba(10, 24, 45, 0.5);
+ border: 1px solid rgba(29, 214, 255, 0.1);
+ border-radius: 4px;
+ overflow: hidden;
+ position: relative;
+}
+
+.map_background {
+ width: 100%;
+ height: 100%;
+ background-image: radial-gradient(circle, rgba(29, 214, 255, 0.3) 1px, transparent 1px),
+ radial-gradient(circle, rgba(29, 214, 255, 0.3) 1px, transparent 1px);
+ background-size: 40px 40px;
+ background-position:
+ 0,
+ 0,
+ 20px 20px;
+ position: relative;
+}
+
+/* 人员分类统计样式 */
+.people_categories {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 5px;
+}
+
+.category_item {
+ display: flex;
+ flex: 1;
+ margin: 10px, 30px;
+}
+
+.category_icon {
+ margin-left: 15px;
+ margin-top: 10px;
+ width: 30px;
+ height: 30px;
+ background: linear-gradient(135deg, rgba(29, 214, 255, 0.1) 0%, rgba(10, 120, 200, 0.1) 100%);
+ border: 1px solid rgba(29, 214, 255, 0.2);
+ border-radius: 5px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
+}
+
+.category_image {
+ width: 45px;
+ height: 45px;
+ object-fit: contain;
+}
+
+.category_info {
+ display: flex;
+ flex-direction: column;
+ margin-left: 8px;
+ margin-top: 8px;
+ flex: 1;
+}
+
+.category_label {
+ font-size: 12px;
+ color: #8ab2ff;
+ margin-bottom: 1px;
+}
+
+.category_count {
+ font-size: 16px;
+ font-weight: bold;
+ color: #e6f7ff;
+ text-shadow: 0px 1.24px 6.21px rgba(0, 190, 247, 0.3);
}
From f3b7417b4fda97cb4697eb721f66cfb276d6d336 Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Wed, 10 Sep 2025 10:02:04 +0800
Subject: [PATCH 19/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../digitalizationScreen/components/centerPage.vue | 2 +-
.../digitalizationScreen/components/rightPage.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue
index c71a8cd..b710a33 100644
--- a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue
@@ -4,7 +4,7 @@
-
+ <Title title="风险预警" style="font-size: 22px">
<img src="@/assets/projectLarge/robot.svg" alt="" height="20px" width="20px" />
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
index e57e5b6..f4e4be7 100644
--- a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
@@ -1,7 +1,7 @@
-
@@ -53,7 +53,7 @@
-
-
+
@@ -173,7 +173,7 @@ const getInfo = () => {
Object.assign(form.value, res.data);
loading.value = false;
buttonLoading.value = false;
- getSheetName();
+ getListTable();
});
};
const sheets = ref([]);
@@ -203,7 +203,7 @@ const getListTable = async () => {
const res = await getTableList({
projectId: currentProject.value?.id,
versions: form.value.versions,
- sheet: form.value.sheet,
+ // sheet: form.value.sheet,
type: '3'
});
if (res.code == 200) {
diff --git a/vite.config.ts.timestamp-1757474994354-725e853699762.mjs b/vite.config.ts.timestamp-1757474994354-725e853699762.mjs
new file mode 100644
index 0000000..d84c7c1
--- /dev/null
+++ b/vite.config.ts.timestamp-1757474994354-725e853699762.mjs
@@ -0,0 +1,230 @@
+// vite.config.ts
+import { loadEnv, defineConfig } from "file:///D:/YJproject/new_project/node_modules/vite/dist/node/index.js";
+
+// vite/plugins/index.ts
+import vue from "file:///D:/YJproject/new_project/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+
+// vite/plugins/unocss.ts
+import UnoCss from "file:///D:/YJproject/new_project/node_modules/unocss/dist/vite.mjs";
+var unocss_default = () => {
+ return UnoCss({
+ hmrTopLevelAwait: false
+ // unocss默认是true，低版本浏览器是不支持的，启动后会报错
+ });
+};
+
+// vite/plugins/auto-import.ts
+import AutoImport from "file:///D:/YJproject/new_project/node_modules/unplugin-auto-import/dist/vite.js";
+import { ElementPlusResolver } from "file:///D:/YJproject/new_project/node_modules/unplugin-vue-components/dist/resolvers.js";
+import IconsResolver from "file:///D:/YJproject/new_project/node_modules/unplugin-icons/dist/resolver.js";
+var __vite_injected_original_dirname = "D:\\YJproject\\new_project\\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:///D:/YJproject/new_project/node_modules/unplugin-vue-components/dist/vite.js";
+import { ElementPlusResolver as ElementPlusResolver2 } from "file:///D:/YJproject/new_project/node_modules/unplugin-vue-components/dist/resolvers.js";
+import IconsResolver2 from "file:///D:/YJproject/new_project/node_modules/unplugin-icons/dist/resolver.js";
+var __vite_injected_original_dirname2 = "D:\\YJproject\\new_project\\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:///D:/YJproject/new_project/node_modules/unplugin-icons/dist/vite.js";
+var icons_default = () => {
+ return Icons({
+ // 自动安装图标库
+ autoInstall: true
+ });
+};
+
+// vite/plugins/svg-icon.ts
+import { createSvgIconsPlugin } from "file:///D:/YJproject/new_project/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+var __vite_injected_original_dirname3 = "D:\\YJproject\\new_project\\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:///D:/YJproject/new_project/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:///D:/YJproject/new_project/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 = "D:\\YJproject\\new_project";
+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 = \"D:\\\\YJproject\\\\new_project\";const __vite_injected_original_filename = \"D:\\\\YJproject\\\\new_project\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/YJproject/new_project/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 = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\\\\index.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/YJproject/new_project/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 = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\\\\unocss.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/YJproject/new_project/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 = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\\\\auto-import.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/YJproject/new_project/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 = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\\\\components.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/YJproject/new_project/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 = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\\\\icons.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/YJproject/new_project/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 = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\\\\svg-icon.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/YJproject/new_project/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 = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\\\\compression.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/YJproject/new_project/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 = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\YJproject\\\\new_project\\\\vite\\\\plugins\\\\setup-extend.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/YJproject/new_project/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": "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",
  "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"]
}

From c6f38a95937a2a0332cdcb4a7415ec75ae979bc7 Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Wed, 10 Sep 2025 19:22:22 +0800
Subject: [PATCH 22/29] =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=8C=83=E5=9B=B4?=
=?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E7=BA=A7=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
src/views/gis2D/index.vue | 11 +-
src/views/gis2D/index2.vue | 628 ++++++++++++++++++
src/views/project/project/index.vue | 3 +-
.../ProjectScreen/components/newmap.vue | 6 +-
5 files changed, 644 insertions(+), 6 deletions(-)
create mode 100644 src/views/gis2D/index2.vue
diff --git a/.env.development b/.env.development
index 7b0adc1..8b07eb7 100644
--- a/.env.development
+++ b/.env.development
@@ -10,7 +10,7 @@ VITE_APP_ENV = 'development'
# 李陈杰 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.180:8899'
# 罗成
# VITE_APP_BASE_API = 'http://192.168.110.188:8899'
# 朱银
diff --git a/src/views/gis2D/index.vue b/src/views/gis2D/index.vue
index e8b9f35..2b832f0 100644
--- a/src/views/gis2D/index.vue
+++ b/src/views/gis2D/index.vue
@@ -1,7 +1,7 @@
-
{{ projectName }}
+ {{ currentProject.name }}
+
+
+
+
+
+
diff --git a/src/views/project/project/index.vue b/src/views/project/project/index.vue
index dc8ec1b..a6b0007 100644
--- a/src/views/project/project/index.vue
+++ b/src/views/project/project/index.vue
@@ -781,6 +781,7 @@ const handleCheckRules = async (row?: ProjectVO) => {
const _id = row?.id || ids.value[0];
const res = await byProjectIdDetail(_id);
if (res.data) {
+ console.log(res.data);
res.data.weekday = res.data.weekday.split(',');
Object.assign(form.value, res.data);
}
@@ -794,7 +795,7 @@ const ruleSubmit = async () => {
let obj = {
weekday: form.value.weekday.join(','),
projectId: projectId.value,
- id: projectId.value,
+ id: form.value.id,
clockInTime: form.value.clockInTime,
clockOutTime: form.value.clockOutTime,
type: form.value.type
diff --git a/src/views/projectLarge/ProjectScreen/components/newmap.vue b/src/views/projectLarge/ProjectScreen/components/newmap.vue
index 60975ee..6c15ca4 100644
--- a/src/views/projectLarge/ProjectScreen/components/newmap.vue
+++ b/src/views/projectLarge/ProjectScreen/components/newmap.vue
@@ -11,11 +11,13 @@ const data = ref([]);
const deviceId = ref('');
const videoDialogRef = ref(null);
let token = 'Bearer '+ getToken()
-let ws = new ReconnectingWebSocket( import.meta.env.VITE_APP_BASE_WS_API + '?Authorization='+token+'&clientid='+import.meta.env.VITE_APP_CLIENT_ID);
+let ws = new ReconnectingWebSocket( import.meta.env.VITE_APP_BASE_WS_API + '?Authorization='+token+'&clientid='+import.meta.env.VITE_APP_CLIENT_ID+'&projectId='+'1897160897167638529');
// 连接ws
const connectWs = () => {
ws.onopen = (e) => {
- console.log('this.gateWay', e);
+ // let message ={
+ // projectId:'1897160897167638529',
+ // }
// ws.send(JSON.stringify(message));
ws.onmessage = (e) => {
console.log('ws', e);
From a3dd00645fdfeea67994fde6631d4cb8cec4e1ec Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Wed, 10 Sep 2025 19:34:57 +0800
Subject: [PATCH 23/29] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/materials/materialReceive/types.ts | 18 ++++-----
src/api/workflow/task/types.ts | 1 +
src/api/workflow/workflowCommon/index.ts | 3 +-
src/api/workflow/workflowCommon/types.ts | 1 +
src/components/Process/approvalButton.vue | 26 +++++++------
.../biddingLimit/indexEdit.vue | 7 ++--
src/views/contract/bidCost/indexEdit.vue | 1 +
src/views/contract/limitPrice/indexEdit.vue | 8 ++--
src/views/cory/template/indexEdit.vue | 1 +
src/views/cory/workMessage/indexEdit.vue | 1 +
src/views/design/Professional/indexEdit.vue | 1 +
.../design/billofQuantities/indexEdit0.vue | 1 +
.../design/billofQuantities/indexEdit1.vue | 1 +
.../design/billofQuantities/indexEdit2.vue | 1 +
.../design/billofQuantities/indexEdit3.vue | 1 +
src/views/design/condition/indexEdit.vue | 1 +
src/views/design/designChange/indexEdit.vue | 1 +
src/views/design/drawing/indexEdit.vue | 1 +
src/views/design/drawingreview/indexEdit.vue | 1 +
src/views/design/prelimScheme/indexEdit.vue | 1 +
src/views/design/received/indexEdit.vue | 1 +
src/views/design/scheme/indexEdit.vue | 1 +
src/views/design/specialScheme/indexEdit.vue | 1 +
.../design/technicalStandard/indexEdit.vue | 1 +
.../design/volumeCatalog/blueprintEdit.vue | 3 +-
src/views/design/volumeCatalog/indexEdit.vue | 1 +
src/views/materials/batchPlan/indexEdit.vue | 39 ++++++++++++-------
.../materials/cailiaoshebei/indexEdit.vue | 1 +
.../materialReceive/index.vue | 24 ++++++++++++
.../materials/orderEquipment/indexEdit.vue | 1 +
.../overallPlanMaterialSupply/indexEdit.vue | 9 ++++-
src/views/materials/purchaseDoc/indexEdit.vue | 1 +
.../materials/suppliesprice/indexEdit.vue | 1 +
src/views/out/constructionValue/indexEdit.vue | 1 +
src/views/out/designCompletion/indexEdit.vue | 1 +
src/views/out/monthPlan/indexEdit.vue | 1 +
src/views/tender/bidd/indexEdit.vue | 8 ++--
src/views/tender/bidd/indexEdit2.vue | 6 ++-
src/views/tender/supplierInput/indexEdit.vue | 1 +
src/views/workflows/leave/leaveEdit.vue | 1 +
src/views/workflows/task/allTaskWaiting.vue | 1 +
src/views/workflows/task/myDocument.vue | 4 +-
src/views/workflows/task/taskCopyList.vue | 6 ++-
src/views/workflows/task/taskFinish.vue | 6 ++-
src/views/workflows/task/taskWaiting.vue | 4 +-
45 files changed, 146 insertions(+), 55 deletions(-)
diff --git a/src/api/materials/materialReceive/types.ts b/src/api/materials/materialReceive/types.ts
index bcd7850..c277afc 100644
--- a/src/api/materials/materialReceive/types.ts
+++ b/src/api/materials/materialReceive/types.ts
@@ -53,7 +53,6 @@ export interface MaterialReceiveVO {
* 备注
*/
remark: string;
-
}
export interface MaterialReceiveForm extends BaseEntity {
@@ -156,11 +155,13 @@ export interface MaterialReceiveForm extends BaseEntity {
* 备注
*/
remark?: string;
-
+ /**
+ * 附件
+ */
+ attachmentId?: string | number;
}
export interface MaterialReceiveQuery extends PageQuery {
-
/**
* 项目id
*/
@@ -201,11 +202,8 @@ export interface MaterialReceiveQuery extends PageQuery {
*/
supplierUnit?: string;
- /**
- * 日期范围参数
- */
- params?: any;
+ /**
+ * 日期范围参数
+ */
+ params?: any;
}
-
-
-
diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts
index 8698eff..2ea0534 100644
--- a/src/api/workflow/task/types.ts
+++ b/src/api/workflow/task/types.ts
@@ -31,6 +31,7 @@ export interface FlowTaskVO {
version?: string;
applyNode?: boolean;
buttonList?: buttonList[];
+ projectName?: string;
}
export interface buttonList {
diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts
index 254e520..d74d7b8 100644
--- a/src/api/workflow/workflowCommon/index.ts
+++ b/src/api/workflow/workflowCommon/index.ts
@@ -12,7 +12,8 @@ export default {
businessId: routerJumpVo.businessId,
type: routerJumpVo.type,
planMonth: routerJumpVo.planMonth,
- taskId: routerJumpVo.taskId
+ taskId: routerJumpVo.taskId,
+ projectName: routerJumpVo.projectName
}
});
}
diff --git a/src/api/workflow/workflowCommon/types.ts b/src/api/workflow/workflowCommon/types.ts
index 3e7a71d..5b54a55 100644
--- a/src/api/workflow/workflowCommon/types.ts
+++ b/src/api/workflow/workflowCommon/types.ts
@@ -4,6 +4,7 @@ export interface RouterJumpVo {
type: string;
formCustom: string;
formPath: string;
+ projectName?: string;
}
export interface StartProcessBo {
diff --git a/src/components/Process/approvalButton.vue b/src/components/Process/approvalButton.vue
index 545e96a..bccde71 100644
--- a/src/components/Process/approvalButton.vue
+++ b/src/components/Process/approvalButton.vue
@@ -1,15 +1,18 @@
-
- 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�Wzobuuh
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
Hu0mjf6&quY
literal 0
HcmV?d00001
diff --git a/public/assets/demo/bigSnow.png b/public/assets/demo/bigSnow.png
new file mode 100644
index 0000000000000000000000000000000000000000..fed9e8b75ba2bb7561a8f5d85fab3b32758771ef
GIT binary patch
literal 7280
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[mh$`i=Sx07yIiSi2L>cMcpN9fum%WMo}}Weo8)A{H&;v8>@SNNAk0
zO8c(>{tLIJE@ukKX-UGQlKyJK;jQhy&c&0=zz7q;}?r{3-EYW!QMo_@IV{t~n=Vz|E
z73$Sb40Y21wbVa4=l7XqJ5#sw9x|GOkMz4pe~1)2hcY~Vq#Zwrz$0bekD#9gQ2k7+
zY)>YBt`lckhUt0I{2q$v*uyzfQY;WT@>A_N+Us1Cj-O~vM86yA6NtDe<6fxi^}&pU
z;qm=x_EuZ=>9f(=>-&FYmH|F43A#S>X*9SRJ(^9|GwV)h`urLAwaY0xNUw8E%FaOp
zc(gk~0_XwM)X@~t6hhfWGZ)qLB1w0dZ6_YXH+8O}3bB8$+*kB2*vW)dsqat2^9pR;R*8?HdYzExP`ORhUN8z&^
zA-g$JPLL`?stM9@M7WT+((Wplc~O2#Mok$CG@|yP;|_G`w`Y<9O=$d4;DtI9=!tk7Zzoo(*q0J-9xA9pLRg
za2(=7Bmsao@7(dzd-r7jxjX*w4dliv`0KACw{PP|O(O2z6?{|IMXcaf!S|);|5(=k
zrr$rQ9w^-8+|Ygt_~XH;cJqCyvNNeBd(z2}s<@D!|7*K{=D9;YnJ9fX+`v^aY*sA;
zQ4n)fK}H4l?|+Bi{^@@^{MxwaIt)p&u4{=W89pxXB*&8ihcku~_aw*D$-bu@{Cxb#
z)17Ocjqt2XBS?q#!@GUFnXax%Rd2k6w>H>T2IcvHyfFwbJs@A|!=L&6X|^*wUIRW;
z@PF=y`LnCRZ*12q%Q7EDre#_F(~q!5B-r3@*}_Y6Wzb}
zk6x)h9^BGU3r7nNt}Bi4qRRH9oA1kRzAt6obcaDniWnOvyWt+@ToSifiVF>Q1h5>K
zH^qZh1Z+6CE$}Y+{WFBaL(0*kR`4f&t|=G##UJCZM&S1
- 暂存
- 提 交
- 审批
- 流程进度
-
-
- 返回
+
+
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index 3b0c2de..1e1869c 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -13,8 +13,7 @@
搜索
重置
- 新增
+ 新增
@@ -34,8 +33,9 @@
*招标文件
- 查看文件({{ scope.row.annexCount }})
+ 查看文件({{ scope.row.annexCount }})
@@ -47,57 +47,104 @@
*中标文件
- {{ scope.row.bidFileName }}
-
+ {{ scope.row.bidFileName }}
-
+
*计划招标时间
-
-
+
*合同金额
-
- 招标上传
+ 招标上传
- 中标上传
+ 中标上传
- 详情
+ 详情
- 删除
- 确定
+ 删除
+ 确定
-
@@ -119,8 +166,7 @@
-
@@ -133,8 +179,16 @@
-
+
-
@@ -187,9 +248,9 @@
0
? ''
: ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
- (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
- (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
- Number(scope.row.unitPrice),
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
+ Number(scope.row.unitPrice),
false
)
}}
@@ -228,8 +289,15 @@
查看
- 删除
+ 删除
@@ -662,7 +730,7 @@ const delHandlebidd = (row: any) => {
});
biddView(biddViewRow.value);
}
- getList()
+ getList();
});
};
//修改状态
diff --git a/src/views/workflows/task/myDocument.vue b/src/views/workflows/task/myDocument.vue
index 51e0f19..f376274 100644
--- a/src/views/workflows/task/myDocument.vue
+++ b/src/views/workflows/task/myDocument.vue
@@ -28,7 +28,7 @@
-
+
diff --git a/src/views/workflows/task/taskCopyList.vue b/src/views/workflows/task/taskCopyList.vue
index 10ca35d..fd5f26d 100644
--- a/src/views/workflows/task/taskCopyList.vue
+++ b/src/views/workflows/task/taskCopyList.vue
@@ -11,7 +11,7 @@
-
+
diff --git a/src/views/workflows/task/taskFinish.vue b/src/views/workflows/task/taskFinish.vue
index f667764..2d5a13f 100644
--- a/src/views/workflows/task/taskFinish.vue
+++ b/src/views/workflows/task/taskFinish.vue
@@ -16,7 +16,7 @@
-
+
diff --git a/src/views/workflows/task/taskWaiting.vue b/src/views/workflows/task/taskWaiting.vue
index 6d5d29c..4a3579d 100644
--- a/src/views/workflows/task/taskWaiting.vue
+++ b/src/views/workflows/task/taskWaiting.vue
@@ -16,7 +16,7 @@
-
+
From bfbf55eb1987023ef852ac05685721392004331f Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Thu, 11 Sep 2025 17:45:10 +0800
Subject: [PATCH 26/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/assets/demo/beUnder.png | Bin 0 -> 4584 bytes
public/assets/demo/contract.png | Bin 0 -> 4422 bytes
public/assets/demo/todayConstruction.png | Bin 0 -> 4029 bytes
public/assets/demo/totalCapacity.png | Bin 0 -> 1463 bytes
.../digitalizationScreen/components/header.vue | 2 +-
.../digitalizationScreen/components/leftPage.vue | 8 ++++----
6 files changed, 5 insertions(+), 5 deletions(-)
create mode 100644 public/assets/demo/beUnder.png
create mode 100644 public/assets/demo/contract.png
create mode 100644 public/assets/demo/todayConstruction.png
create mode 100644 public/assets/demo/totalCapacity.png
diff --git a/public/assets/demo/beUnder.png b/public/assets/demo/beUnder.png
new file mode 100644
index 0000000000000000000000000000000000000000..e21b397cfa64b0836b3113b9af1d05b1f5db730d
GIT binary patch
literal 4584
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
M07*qoM6N<$f+!j83IG5A
literal 0
HcmV?d00001
diff --git a/public/assets/demo/todayConstruction.png b/public/assets/demo/todayConstruction.png
new file mode 100644
index 0000000000000000000000000000000000000000..720ede298f538f686422e2c79df075354ca7c2a0
GIT binary patch
literal 4029
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
R{;>c6002ovPDHLkV1iLT(02d;
literal 0
HcmV?d00001
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/header.vue b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue
index d911f88..bb8c539 100644
--- a/src/views/enterpriseLarge/digitalizationScreen/components/header.vue
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue
@@ -25,7 +25,7 @@
class="weather-item"
:style="{ transform: `translateY(-${offsetY}px)`, transition: transition }"
>
- ![]()
+ ![]()
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue
index fa16dea..30a5281 100644
--- a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue
@@ -111,28 +111,28 @@ const indicators = ref([
name: '在建项目',
value: '28',
unit: '个',
- iconPath: '/src/assets/images/beUnder.png'
+ iconPath: '/assets/demo/beUnder.png'
},
{
id: '2',
name: '合同总额',
value: '288.88',
unit: '亿元',
- iconPath: '/src/assets/images/contract.png'
+ iconPath: '/assets/demo/contract.png'
},
{
id: '3',
name: '总容量',
value: '158.88',
unit: '个',
- iconPath: '/src/assets/images/totalCapacity.png'
+ iconPath: '/assets/demo/totalCapacity.png'
},
{
id: '4',
name: '今日施工',
value: '18',
unit: '个',
- iconPath: '/src/assets/images/todayConstruction.png'
+ iconPath: '/assets/demo/todayConstruction.png'
}
]);
From 3f04ebcbda1b3f891ee15af98934c2437d1fa004 Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Thu, 11 Sep 2025 18:23:30 +0800
Subject: [PATCH 27/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/assets/demo/Weather.png | Bin 0 -> 9410 bytes
public/assets/demo/bigRain.png | Bin 0 -> 7485 bytes
public/assets/demo/bigSnow.png | Bin 0 -> 7280 bytes
public/assets/demo/cloudy.png | Bin 0 -> 7295 bytes
public/assets/demo/fog.png | Bin 0 -> 1252 bytes
public/assets/demo/haze.png | Bin 0 -> 7057 bytes
public/assets/demo/manyCloud.png | Bin 0 -> 9930 bytes
public/assets/demo/nightSunny.png | Bin 0 -> 5245 bytes
public/assets/demo/rainSnow.png | Bin 0 -> 7336 bytes
public/assets/demo/sandstorm.png | Bin 0 -> 1095 bytes
public/assets/demo/smallRain.png | Bin 0 -> 7312 bytes
public/assets/demo/smallSnow.png | Bin 0 -> 7312 bytes
public/assets/demo/sunny copy.png | Bin 0 -> 4285 bytes
public/assets/demo/thunderstorm.png | Bin 0 -> 8612 bytes
.../digitalizationScreen/components/header.vue | 2 +-
.../ProjectScreen/components/header.vue | 6 +++---
16 files changed, 4 insertions(+), 4 deletions(-)
create mode 100644 public/assets/demo/Weather.png
create mode 100644 public/assets/demo/bigRain.png
create mode 100644 public/assets/demo/bigSnow.png
create mode 100644 public/assets/demo/cloudy.png
create mode 100644 public/assets/demo/fog.png
create mode 100644 public/assets/demo/haze.png
create mode 100644 public/assets/demo/manyCloud.png
create mode 100644 public/assets/demo/nightSunny.png
create mode 100644 public/assets/demo/rainSnow.png
create mode 100644 public/assets/demo/sandstorm.png
create mode 100644 public/assets/demo/smallRain.png
create mode 100644 public/assets/demo/smallSnow.png
create mode 100644 public/assets/demo/sunny copy.png
create mode 100644 public/assets/demo/thunderstorm.png
diff --git a/public/assets/demo/Weather.png b/public/assets/demo/Weather.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ea913e842e381affe0c5850b9f8d9ef3d08f8ec
GIT binary patch
literal 9410
zcmV;zBt6@SP)
+
+
diff --git a/src/views/tender/bidd/index.vue b/src/views/tender/bidd/index.vue
index 5228cf2..20f5dba 100644
--- a/src/views/tender/bidd/index.vue
+++ b/src/views/tender/bidd/index.vue
@@ -71,7 +71,7 @@
{{ scope.row.children.length > 0 ? '' : scope.row.quantity }}
-
+
+
+ 暂存
+ 提 交
+ 审批
+ 流程进度
+
+
+ 返回
+
项目名称：{{ props.projectName }}
{{ item.weather }}{{ item.tempMin }}°/{{ item.tempMax }}°
{{ item.week }}({{ item.date }})