@@ -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/design/volumeCatalog/indexEdit.vue b/src/views/design/volumeCatalog/indexEdit.vue
index 095104c..33d1068 100644
--- a/src/views/design/volumeCatalog/indexEdit.vue
+++ b/src/views/design/volumeCatalog/indexEdit.vue
@@ -11,6 +11,7 @@
:id="form.id"
:status="form.auditStatus"
:pageType="routeParams.type"
+ :projectName="routeParams.projectName"
/>
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue
new file mode 100644
index 0000000..b710a33
--- /dev/null
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue
@@ -0,0 +1,328 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ safety_inspection_type[scope.row.riskType] }}
+
+
+
+
+
+
+
+ {{ risk_level_type[scope.row.alarmLevel] }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/header.vue b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue
new file mode 100644
index 0000000..d8fe781
--- /dev/null
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue
@@ -0,0 +1,327 @@
+
+
+
+
+
+
+
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue
new file mode 100644
index 0000000..30a5281
--- /dev/null
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue
@@ -0,0 +1,960 @@
+
+
+
+
+
+
+
+
{{ indicator.value }}
+
{{ indicator.unit }}
+
+
{{ indicator.name }}
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
出勤人数
+
{{ attendanceCount }}
+
+
+
出勤率
+
{{ attendanceRate }}%
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+

+
+
+
施工人员
+
{{ constructionPersonnelCount }}
+
+
+
+
+
+

+
+
+
分包人员
+
{{ subcontractorsCount }}
+
+
+
+
+
+

+
+
+
管理人员
+
{{ managersCount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts
new file mode 100644
index 0000000..502ddc2
--- /dev/null
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts
@@ -0,0 +1,216 @@
+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: '111',
+ // 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: function (params) {
+ // 只显示前三个数据项
+ return `{name|${params.data.name}}\n{percent|${params.data.completionRate}MW}`;
+ },
+ 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: 10,
+ bottom: 10,
+ textStyle: {
+ 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: [],
+
+ axisLabel: {
+ color: '#fff'
+ },
+ axisLine: {
+ show: false
+ },
+ splitLine: {
+ show: false
+ }
+ },
+ yAxis: {
+ name: '单位:亿元',
+ type: 'value',
+ axisLabel: {
+ formatter: '{value}'
+ },
+ splitLine: {
+ show: false // 不显示分割线
+ }
+ },
+ grid: {
+ left: '12%',
+ top: '15%', // 顶部留一点空间给 legend
+ bottom: '8%',
+ right: '2%'
+ },
+ series: [
+ {
+ name: '计划产值',
+ type: 'bar',
+ data: [],
+ barWidth: '10',
+ itemStyle: {
+ 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: '实际产值',
+ type: 'bar',
+ data: [],
+ barWidth: '10',
+ itemStyle: {
+ 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
+ }
+ ]
+ }
+ }
+ }
+ ]
+};
+
+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/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
new file mode 100644
index 0000000..f4e4be7
--- /dev/null
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue
@@ -0,0 +1,392 @@
+
+
+
+
+
+
+
+
+

+
+
+
+
+
{{ capacityData.gridConnectedCapacity ?? '0' }}
+
MW
+
+
井网总容量
+
+
+
+
+
+

+
+
+
+
+
{{ capacityData.plannedCapacity ?? '0' }}
+
MW
+
+
计划总容量
+
+
+
+
+
+

+
+
+
+
+
{{ capacityData.delayedProjectCount ?? '0' }}
+
个
+
+
延期项目
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/title.vue b/src/views/enterpriseLarge/digitalizationScreen/components/title.vue
new file mode 100644
index 0000000..36d226d
--- /dev/null
+++ b/src/views/enterpriseLarge/digitalizationScreen/components/title.vue
@@ -0,0 +1,46 @@
+
+
+
+

+

+
+
+
+
+
{{ title }}
+
+
+
+
+
+
diff --git a/src/views/ProjectScreen/index.vue b/src/views/enterpriseLarge/digitalizationScreen/index.vue
similarity index 97%
rename from src/views/ProjectScreen/index.vue
rename to src/views/enterpriseLarge/digitalizationScreen/index.vue
index f58a18f..fead15c 100644
--- a/src/views/ProjectScreen/index.vue
+++ b/src/views/enterpriseLarge/digitalizationScreen/index.vue
@@ -22,11 +22,10 @@ import leftPage from './components/leftPage.vue';
import centerPage from './components/centerPage.vue';
import rightPage from './components/rightPage.vue';
import { useUserStoreHook } from '@/store/modules/user';
-
const userStore = useUserStoreHook();
const projectId = computed(() => userStore.selectedProject.id);
-const isFull = ref(false)
-const isHideOther = ref(false)
+const isFull = ref(false);
+const isHideOther = ref(false);
/**
* 切换中心页面全屏
@@ -41,7 +40,7 @@ const handleChangePage = () => {
isFull.value = true;
isHideOther.value = true;
}
-}
+};
diff --git a/src/views/materials/batchPlan/indexEdit.vue b/src/views/materials/batchPlan/indexEdit.vue
index 8e3a50d..a745ba4 100644
--- a/src/views/materials/batchPlan/indexEdit.vue
+++ b/src/views/materials/batchPlan/indexEdit.vue
@@ -3,13 +3,19 @@
-
+
-
+
物资设备批次需求计划
@@ -20,8 +26,7 @@
-
+
@@ -50,8 +55,14 @@
-
+
请选择要启动的流程:
@@ -60,10 +71,12 @@
diff --git a/src/views/materials/cailiaoshebei/indexEdit.vue b/src/views/materials/cailiaoshebei/indexEdit.vue
index 91dd128..b024a23 100644
--- a/src/views/materials/cailiaoshebei/indexEdit.vue
+++ b/src/views/materials/cailiaoshebei/indexEdit.vue
@@ -11,6 +11,7 @@
:id="form.id"
:status="form.approvalDesign"
:pageType="routeParams.type"
+ :projectName="routeParams.projectName"
/>
diff --git a/src/views/materials/materialOutbound/component/outbound.vue b/src/views/materials/materialOutbound/component/outbound.vue
index c182cee..4d396e5 100644
--- a/src/views/materials/materialOutbound/component/outbound.vue
+++ b/src/views/materials/materialOutbound/component/outbound.vue
@@ -8,27 +8,35 @@
{{ scope.row.residue }}
-
+
-
+
{{ scope.row.number }}
-
+
-
+
{{ scope.row.recipient }}
-
+
-
+
{{ scope.row.shipper }}
-
+
-
+
{{ scope.row.operator }}
diff --git a/src/views/materials/materialsEquipment/materialReceive/index.vue b/src/views/materials/materialsEquipment/materialReceive/index.vue
index 90f6d3d..ed4f7f5 100644
--- a/src/views/materials/materialsEquipment/materialReceive/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/index.vue
@@ -70,6 +70,13 @@
+
+
+ {{
+ scope.row.attachmentName
+ }}
+
+
+
+
+
+
+
+
+
+
+
@@ -228,8 +246,13 @@ const getMaterialsListData = async () => {
label: item.materialsName + '_' + item.createTime,
children: []
}));
- queryParams.value.materialsId = TreeData.value[0].id;
- getList();
+ if (TreeData.value.length > 0) {
+ queryParams.value.materialsId = TreeData.value[0].id;
+ getList();
+ } else {
+ queryParams.value.materialsId = '';
+ getList();
+ }
}
};
@@ -453,7 +476,7 @@ const listeningProject: WatchStopHandle = watch(
Object.values(childRowStates.value).forEach((state) => {
state.queryParams.projectId = newId;
});
- getList();
+ getMaterialsListData();
}
);
@@ -468,3 +491,53 @@ onMounted(() => {
getMaterialsListData();
});
+
diff --git a/src/views/materials/orderEquipment/indexEdit.vue b/src/views/materials/orderEquipment/indexEdit.vue
index fc1c9e5..19034d4 100644
--- a/src/views/materials/orderEquipment/indexEdit.vue
+++ b/src/views/materials/orderEquipment/indexEdit.vue
@@ -11,6 +11,7 @@
:id="form.id"
:status="form.approvalOrder"
:pageType="routeParams.type"
+ :projectName="routeParams.projectName"
/>
diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index 930bbd8..a0e8afc 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -38,7 +38,6 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
diff --git a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
index 56c849b..cb25c50 100644
--- a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
+++ b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
@@ -11,6 +11,7 @@
:id="form.id"
:status="form.status"
:pageType="routeParams.type"
+ :projectName="routeParams.projectName"
/>
@@ -73,12 +74,12 @@
-->
-
-
-
-
-
-
+
+
+
+
+
+
@@ -214,7 +215,7 @@ const getInfo = () => {
console.log('res.data', masterDataRes);
Object.assign(form.value, masterDataRes?.data[0]);
// console.log('form', form.value);
- tableData.value = res.rows.reverse();//翻转
+ tableData.value = res.rows; //正序显示
loading.value = false;
buttonLoading.value = false;
});
diff --git a/src/views/materials/purchaseDoc/indexEdit.vue b/src/views/materials/purchaseDoc/indexEdit.vue
index 62555ad..dddfb43 100644
--- a/src/views/materials/purchaseDoc/indexEdit.vue
+++ b/src/views/materials/purchaseDoc/indexEdit.vue
@@ -11,6 +11,7 @@
:id="form.id"
:status="form.status"
:pageType="routeParams.type"
+ :projectName="routeParams.projectName"
/>
diff --git a/src/views/materials/suppliesprice/indexEdit.vue b/src/views/materials/suppliesprice/indexEdit.vue
index 9a13997..a34432f 100644
--- a/src/views/materials/suppliesprice/indexEdit.vue
+++ b/src/views/materials/suppliesprice/indexEdit.vue
@@ -11,6 +11,7 @@
:id="form.id"
:status="form.approvalPlan"
:pageType="routeParams.type"
+ :projectName="routeParams.projectName"
/>
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/out/constructionValue/index.vue b/src/views/out/constructionValue/index.vue
index b6d49e0..dc3bf88 100644
--- a/src/views/out/constructionValue/index.vue
+++ b/src/views/out/constructionValue/index.vue
@@ -19,9 +19,9 @@
-
+
@@ -39,8 +39,16 @@
-
-
+
+
+ {{ proxy.formatPrice(scope.row.outValue) }}
+
+
+
+
+ {{ proxy.formatPrice(scope.row.ownerValue) }}
+
+
diff --git a/src/views/out/constructionValue/indexEdit.vue b/src/views/out/constructionValue/indexEdit.vue
index 6baeeac..34761ab 100644
--- a/src/views/out/constructionValue/indexEdit.vue
+++ b/src/views/out/constructionValue/indexEdit.vue
@@ -11,6 +11,7 @@
:id="form.id"
:status="form.auditStatus"
:pageType="routeParams.type"
+ :projectName="routeParams.projectName"
/>
diff --git a/src/views/out/designCompletion/index.vue b/src/views/out/designCompletion/index.vue
index 92f6638..fe4a233 100644
--- a/src/views/out/designCompletion/index.vue
+++ b/src/views/out/designCompletion/index.vue
@@ -24,9 +24,21 @@
-
-
-
+
+
+ {{ proxy.formatPrice(scope.row.planValue) }}
+
+
+
+
+ {{ proxy.formatPrice(scope.row.completeValue) }}
+
+
+
+
+ {{ proxy.formatPrice(scope.row.differenceValue) }}
+
+
对甲
diff --git a/src/views/out/designCompletion/indexEdit.vue b/src/views/out/designCompletion/indexEdit.vue
index 5fbc3bb..159c304 100644
--- a/src/views/out/designCompletion/indexEdit.vue
+++ b/src/views/out/designCompletion/indexEdit.vue
@@ -11,6 +11,7 @@
:id="form.id"
:status="form.completeAuditStatus"
:pageType="routeParams.type"
+ :projectName="routeParams.projectName"
/>
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) }}
+
+
@@ -104,7 +116,7 @@
+
+
diff --git a/src/views/project/constructionUser/index.vue b/src/views/project/constructionUser/index.vue
index ddd80d5..1336d6f 100644
--- a/src/views/project/constructionUser/index.vue
+++ b/src/views/project/constructionUser/index.vue
@@ -148,7 +148,7 @@
- {{ scope.row.salary ? scope.row.salary : scope.row.standardSalary }}
+ {{ proxy.formatPrice(scope.row.salary ? scope.row.salary : scope.row.standardSalary) }}
()
{{ scope.row.salary ? '取消变更' : '变更' }}
@@ -516,7 +516,7 @@ import { AttendanceMonthVO } from '@/api/project/attendance/types';
import { parseTime } from '@/utils/ruoyi';
const calendar = ref();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type } = toRefs(
proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type')
);
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
index 931ce16..b5f2346 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
@@ -22,7 +22,7 @@
租金
- {{ detailInfo.rentSum / 1000 }} 万元
+ {{ proxy.formatPrice(detailInfo.rentSum) / 1000 }} 万元
@@ -74,18 +74,30 @@
-
+
-
-
+
+
{{ scope.row.transferArea && scope.row.designArea ? ((scope.row.transferArea / scope.row.designArea) * 100).toFixed(2) : '0.00' }}
-
-
-
+
+
+ {{ proxy.formatPrice(scope.row.landRentAll) }}
+
+
+
+ {{ proxy.formatPrice(scope.row.seedlingCompensationAll) }}
+
+
+
+ {{ proxy.formatPrice(scope.row.totalAmountAll) }}
+
@@ -120,7 +132,7 @@
- 已流转面积
+ 已流转面积(亩)
{{ sonSummaryInfo.totalTransferArea }} 亩
@@ -129,7 +141,7 @@
- 不流转面积
+ 不流转面积(亩)
{{ sonSummaryInfo.totalNonTransferArea }} 亩
@@ -138,7 +150,7 @@
- 未流转面积
+ 未流转面积(亩)
{{ sonSummaryInfo.remainingArea }} 亩
@@ -168,9 +180,21 @@
-
-
-
+
+
+ {{ proxy.formatPrice(scope.row.landRent) }}
+
+
+
+ {{ proxy.formatPrice(scope.row.seedlingCompensation) }}
+
+
+
+ {{ proxy.formatPrice(scope.row.totalAmount) }}
+
@@ -180,7 +204,7 @@
不流转
-
+
@@ -221,8 +245,8 @@
-
-
+
+
@@ -292,7 +316,7 @@
- {{ sonForm.areaValue && sonForm.transferStatus == '1' ? `提示:已流转面积不能超过设计面积 ${sonForm.designArea} 亩` : '' }}
+ {{ sonForm.areaValue && sonForm.transferStatus == '1' ? `提示:当前剩余${sonSummaryInfo.remainingArea} 亩` : '' }}
@@ -325,11 +349,11 @@
- {{ sonForm.areaValue && sonForm.transferStatus == '2' ? `提示:不流转面积不能超过设计面积 ${sonForm.designArea} 亩` : '' }}
+ {{ sonForm.areaValue && sonForm.transferStatus == '2' ? `提示:当前剩余 ${sonSummaryInfo.remainingArea} 亩` : '' }}
-
+
@@ -557,7 +581,7 @@ interface PageData {
rules: Record;
}
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
@@ -751,6 +775,16 @@ const sonRules = {
projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
parentId: [{ required: true, message: '父级ID不能为空', trigger: 'blur' }],
landType: [{ required: true, message: '土地类型不能为空', trigger: 'change' }],
+ landRent: [{ required: true, message: '土地租金不能为空', trigger: 'blur' }],
+ seedlingCompensation: [{ required: true, message: '青苗赔偿不能为空', trigger: 'blur' }],
+ totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }],
+ statusDescription: [{ required: true, message: '状态说明不能为空', trigger: 'blur' }],
+ issueSummary: [{ required: true, message: '问题总结不能为空', trigger: 'blur' }],
+ nextStrategy: [{ required: true, message: '下一步策略不能为空', trigger: 'blur' }],
+ noContractArea: [{ required: true, message: '不签约面积不能为空', trigger: 'blur' }],
+ noSurveyArea: [{ required: true, message: '不测量面积不能为空', trigger: 'blur' }],
+ noContractReason: [{ required: true, message: '不签约原因不能为空', trigger: 'blur' }],
+ nonTransferReason: [{ required: true, message: '不流转原因不能为空', trigger: 'blur' }],
transferRatio: [
{
required: true,
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
index ff53174..0dbad37 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
@@ -50,9 +50,21 @@
-
-
-
+
+
+ {{ proxy.formatPrice(scope.row.landRent) }}
+
+
+
+ {{ proxy.formatPrice(scope.row.seedlingCompensation) }}
+
+
+
+ {{ proxy.formatPrice(scope.row.totalAmount) }}
+
+
@@ -162,7 +174,7 @@ import { listEnterRoad } from '@/api/system/landTransfer/enterRoad';
import { LandTransferLedgerVO, LandTransferLedgerQuery, LandTransferLedgerForm } from '@/api/system/landTransfer/landTransferLedger/types';
import { useUserStoreHook } from '@/store/modules/user';
import { listLandBlock } from '@/api/system/landTransfer/landBlock';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
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/project/projectUser/index.vue b/src/views/project/projectUser/index.vue
index 25df7e4..6e101c3 100644
--- a/src/views/project/projectUser/index.vue
+++ b/src/views/project/projectUser/index.vue
@@ -152,7 +152,7 @@
- {{ scope.row.salary ? scope.row.salary : scope.row.standardSalary }}
+ {{ proxy.formatPrice(scope.row.salary ? scope.row.salary : scope.row.standardSalary) }}
()
{{ scope.row.salary ? '取消变更' : '变更' }}
@@ -217,12 +217,12 @@
-
+
-
+
@@ -284,7 +284,7 @@
-
+
@@ -551,7 +551,7 @@ import { AttendanceMonthVO } from '@/api/project/attendance/types';
import { parseTime } from '@/utils/ruoyi';
const calendar = ref
();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type, user_post_type } = toRefs(
proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type', 'user_post_type')
);
@@ -731,7 +731,35 @@ const uploadPath = computed(() => {
console.log(list);
return list;
});
-
+//身份证正面上传成功
+const handleUploadSuccess = (data: any) => {
+ console.log('上传成功返回的数据:', data);
+ // 这里可以处理返回的数据
+ form.value.userName = data.name;
+ form.value.sex = data.gender == '男' ? 2 : 3;
+ form.value.nation = data.nation;
+ form.value.sfzNumber = data.citizenIdentification;
+ form.value.sfzSite = data.address;
+ form.value.sfzBirth = formatDate(data.birth);
+};
+//身份证反面面上传成功
+const handleUploadSuccessBack = (data: any) => {
+ console.log('上传成功返回的数据:', data);
+ form.value.sfzStart = formatDate(data.issuingDate);
+ form.value.sfzEnd = formatDate(data.expiryDate);
+};
+//银行卡上传成功
+const handleUploadSuccessBank = (data: any) => {
+ console.log('上传成功返回的数据:', data);
+ form.value.yhkNumber = data.bankCardNumber;
+};
+//格式化时间
+const formatDate = (date: any) => {
+ const year = date.substring(0, 4);
+ const month = date.substring(4, 6);
+ const day = date.substring(6, 8);
+ return `${year}-${month}-${day}`;
+};
// 获取项目列表
const getProjectList = async () => {
const res = await ProjectList({});
diff --git a/src/views/project/salaryExcel/index.vue b/src/views/project/salaryExcel/index.vue
index 325f845..3bc4c76 100644
--- a/src/views/project/salaryExcel/index.vue
+++ b/src/views/project/salaryExcel/index.vue
@@ -16,7 +16,7 @@
金额:{{ totalMoney }}元金额:{{ totalMoney ? proxy.formatPrice(totalMoney) : 0 }}元
@@ -25,7 +25,9 @@
-
+
+ {{ proxy.formatPrice(scope.row.money) }}
+
- {{ scope.row.salary ? scope.row.salary : scope.row.standardSalary }}
+ {{ proxy.formatPrice(scope.row.salary ? scope.row.salary : scope.row.standardSalary) }}
()
{{ scope.row.salary ? '取消变更' : '变更' }}
@@ -513,7 +513,7 @@ import { AttendanceMonthVO } from '@/api/project/attendance/types';
import { parseTime } from '@/utils/ruoyi';
const calendar = ref();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type } = toRefs(
proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type')
);
diff --git a/src/views/project/subcontract/index.vue b/src/views/project/subcontract/index.vue
index f3d658a..28a9c25 100644
--- a/src/views/project/subcontract/index.vue
+++ b/src/views/project/subcontract/index.vue
@@ -59,7 +59,11 @@
-
+
+
+ {{ proxy.formatPrice(scope.row.contractAmount) }}
+
+
{{ parseTime(scope.row.contractTime, '{y}-{m}-{d}') }}
@@ -133,7 +137,7 @@ import { SubcontractVO, SubcontractQuery, SubcontractForm } from '@/api/project/
import { listContractor } from '@/api/project/contractor';
import { useUserStoreHook } from '@/store/modules/user';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
// 获取用户 store
const userStore = useUserStoreHook();
const currentProject = computed(() => userStore.selectedProject);
diff --git a/src/views/project/workWage/index.vue b/src/views/project/workWage/index.vue
index d6ea71e..caecbf2 100644
--- a/src/views/project/workWage/index.vue
+++ b/src/views/project/workWage/index.vue
@@ -71,7 +71,11 @@
{{ scope.row.wageCalculationType == 1 ? '计时' : '计件' }}
-
+
+
+ {{ proxy.formatPrice(scope.row.wage) }}
+
+
@@ -141,7 +145,7 @@ import { listWorkWage, getWorkWage, delWorkWage, addWorkWage, updateWorkWage } f
import { WorkWageVO, WorkWageQuery, WorkWageForm, SpecialType } from '@/api/project/workWage/types';
import { useUserStoreHook } from '@/store/modules/user';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
const { type_of_work, wage_measure_unit_type } = toRefs(proxy?.useDict('type_of_work', 'wage_measure_unit_type'));
console.log(type_of_work);
diff --git a/src/views/ProjectScreen/components/centerPage.vue b/src/views/projectLarge/ProjectScreen/components/centerPage.vue
similarity index 98%
rename from src/views/ProjectScreen/components/centerPage.vue
rename to src/views/projectLarge/ProjectScreen/components/centerPage.vue
index 28a266a..977ec74 100644
--- a/src/views/ProjectScreen/components/centerPage.vue
+++ b/src/views/projectLarge/ProjectScreen/components/centerPage.vue
@@ -1,7 +1,7 @@
@@ -35,7 +35,7 @@ import { ref, onMounted, toRefs, getCurrentInstance } from "vue"
import Title from './title.vue'
import { ArrowLeft, ArrowRight } from '@element-plus/icons-vue'
import { getScreenSafetyInspection } from '@/api/projectScreen'
-
+import newMap from "./newmap.vue"
const { proxy } = getCurrentInstance();
const { violation_level_type } = toRefs(proxy?.useDict('violation_level_type'));
@@ -150,7 +150,6 @@ const loadBaseMap = (viewer) => {
onMounted(() => {
getInspectionList()
- createEarth()
if (swiperContent.value && swiperContent.value.children.length > 0) {
swiperItemWidth.value = swiperContent.value.children[0].clientWidth + 20
}
diff --git a/src/views/ProjectScreen/components/header.vue b/src/views/projectLarge/ProjectScreen/components/header.vue
similarity index 82%
rename from src/views/ProjectScreen/components/header.vue
rename to src/views/projectLarge/ProjectScreen/components/header.vue
index 993e417..8cfdc63 100644
--- a/src/views/ProjectScreen/components/header.vue
+++ b/src/views/projectLarge/ProjectScreen/components/header.vue
@@ -11,17 +11,21 @@
-
XXX项目
-
施工现场数智化管理
+
新能源项目级管理平台
+
Coal Science Construction Management - New Energy Project Level Management Platform