+ 
+
+
+
+ {{ 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/12] =?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/12] 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/12] =?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 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 月结算
+ 形象节点
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改收入合同
+
+ 下一步
+
+
+ 修改收入合同
+
+ 上一步
+ 提交
+
+