diff --git a/README.md b/README.md index 0b18b7b4..0fe7fc3a 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,8 @@ pnpm i npm run dev #因海南和冀北技术监督不同 通过修改文件的方式来区分 -#海南打包 需要吧pqs目录下supervise_hn 文件夹改成supervise 原文件改成supervise_jiebi -#海南打包 需要吧pqs目录下supervise_jiebi 文件夹改成supervise 原文件改成supervise_hn +#海南打包 需要吧pqs目录下supervise_hn 文件夹改成supervise 原文件改成supervise_jb +#冀北打包 需要吧pqs目录下supervise_jb 文件夹改成supervise 原文件改成supervise_hn ``` #### 页面编写-示例 diff --git a/package.json b/package.json index c9791300..4613095f 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "screenfull": "^6.0.2", "splitpanes": "^3.1.5", "steady-xml": "0.1.0", + "svg-pan-zoom": "^3.6.2", "use-element-plus-theme": "^0.0.5", "vue": "^3.3.11", "vue-baidu-map-3x": "^1.0.35", diff --git a/src/main.ts b/src/main.ts index a2c51a9c..82dae300 100644 --- a/src/main.ts +++ b/src/main.ts @@ -35,10 +35,10 @@ const setupAll = async () => { const app = createApp(App) //开启离线地图 - // app.use(BaiduMapOffline, { - // offline: true, - // offlineUrl: window.location.origin + '/map/', - // }); + app.use(BaiduMapOffline, { + offline: true, + // offlineUrl: window.location.origin + '/map/', + }); app.use(BaiduMap, { ak: 'Yp57V71dkOPiXjiN8VdcFRsVELzlVNKK', v: '3.0' diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue index f8682dd0..36a19c1c 100644 --- a/src/views/pqs/bearingCapacity/userManagement/index.vue +++ b/src/views/pqs/bearingCapacity/userManagement/index.vue @@ -29,6 +29,7 @@ + item.id == row.userType)[0].code } }, { @@ -209,8 +211,10 @@ const tableStore: any = new TableStore({ dialogVisible.value = true await nextTick title.value = '编辑承载能力预评估用户' + form.value = JSON.parse(JSON.stringify(row)) form.value.regionList = [form.value.province, form.value.city, form.value.region] + userShow.value=uesrList.filter(item => item.id == row.userType)[0].code } }, { diff --git a/src/views/pqs/supervise/home/index.vue b/src/views/pqs/supervise/home/index.vue new file mode 100644 index 00000000..08899711 --- /dev/null +++ b/src/views/pqs/supervise/home/index.vue @@ -0,0 +1,502 @@ + + + diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue index eaeb5e15..b4a7dbf5 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue @@ -151,9 +151,9 @@ :key="index" /> - + { devCapacity: 10, //终端容量 standardCapacity: 10, //基准容量 isGridConnectionPoint: 0, //是否并网点 - isStatistical: 0, // 是否参与统计 + isStatistical: 1, // 是否参与统计 lineId: '', // 监测点编码 lineName: '', // 监测点名称 loadType: '', //干扰源类型 diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue index 4ca5fe7d..b03fac1d 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue @@ -30,7 +30,7 @@ })?.label }} - + {{ detailData.userName }} diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue index aeb47884..e0462d0f 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue @@ -264,7 +264,7 @@ 附件材料 - + @@ -283,6 +283,7 @@ + - + @@ -301,7 +302,7 @@ - + @@ -310,7 +311,7 @@ - + @@ -319,7 +320,7 @@ - + diff --git a/src/views/pqs/supervise/testRun/index.vue b/src/views/pqs/supervise/testRun/index.vue index 50373059..1e72b474 100644 --- a/src/views/pqs/supervise/testRun/index.vue +++ b/src/views/pqs/supervise/testRun/index.vue @@ -28,7 +28,7 @@ defineOptions({ name: 'terminalNetwotk' }) - const activeName = ref('2') + const activeName = ref('1') const route = useRoute() const id = ref('') diff --git a/src/views/pqs/supervise_jb/testRun/testRun.vue b/src/views/pqs/supervise_jb/testRun/testRun.vue index 50373059..1e72b474 100644 --- a/src/views/pqs/supervise_jb/testRun/testRun.vue +++ b/src/views/pqs/supervise_jb/testRun/testRun.vue @@ -28,7 +28,7 @@ defineOptions({ name: 'terminalNetwotk' }) - const activeName = ref('2') + const activeName = ref('1') const route = useRoute() const id = ref('') diff --git a/src/views/pqs/voltageSags/Region/transientList/addForm.vue b/src/views/pqs/voltageSags/Region/transientList/addForm.vue index a002526a..4ef00e7a 100644 --- a/src/views/pqs/voltageSags/Region/transientList/addForm.vue +++ b/src/views/pqs/voltageSags/Region/transientList/addForm.vue @@ -3,15 +3,15 @@ - + - + - + - + @@ -40,8 +40,8 @@ const form: any = reactive({ verifyReasonDetail: '' }) const rules = { - verifyReasonDetail: [{ required: true, message: '请输入暂降原因详情', trigger: 'blur' },], - verifyReason: [{ required: true, message: '请输入暂降原因', trigger: 'blur' },], + verifyReasonDetail: [{ required: true, message: '请输入暂降核实原因详情', trigger: 'blur' },], + verifyReason: [{ required: true, message: '请输入暂降核实原因', trigger: 'blur' },], } const open = (row: any) => { diff --git a/src/views/pqs/voltageSags/Region/transientList/index.vue b/src/views/pqs/voltageSags/Region/transientList/index.vue index 96effbe6..f6fbd701 100644 --- a/src/views/pqs/voltageSags/Region/transientList/index.vue +++ b/src/views/pqs/voltageSags/Region/transientList/index.vue @@ -58,6 +58,18 @@ :value="item.id"> + + + + + + + +