diff --git a/src/assets/bdscreenImg/bBg/dtbf.png b/src/assets/bdscreenImg/bBg/dtbf.png new file mode 100644 index 0000000..f825c71 Binary files /dev/null and b/src/assets/bdscreenImg/bBg/dtbf.png differ diff --git a/src/assets/bdscreenImg/bBg/dtbf1.png b/src/assets/bdscreenImg/bBg/dtbf1.png new file mode 100644 index 0000000..1c6a772 Binary files /dev/null and b/src/assets/bdscreenImg/bBg/dtbf1.png differ diff --git a/src/assets/bdscreenImg/bBg/tlbf.png b/src/assets/bdscreenImg/bBg/tlbf.png new file mode 100644 index 0000000..c185bb1 Binary files /dev/null and b/src/assets/bdscreenImg/bBg/tlbf.png differ diff --git a/src/components/BgBcpm/environmentalB/bgcenter/index.vue b/src/components/BgBcpm/environmentalB/bgcenter/index.vue index e82bec3..c2a6cb5 100644 --- a/src/components/BgBcpm/environmentalB/bgcenter/index.vue +++ b/src/components/BgBcpm/environmentalB/bgcenter/index.vue @@ -489,7 +489,8 @@ const goPage = (item) => { width: 1412px; height: 1817px; position: relative !important; - background-image: url("@/assets/bdscreenImg/bBg/map.png"); + //background-image: url("@/assets/bdscreenImg/bBg/map.png"); + background-image: url("@/assets/bdscreenImg/bBg/dtbf.png") !important; background-size: 100%; background-position: center; .point { @@ -792,8 +793,8 @@ const goPage = (item) => { .tl{ position: absolute; width: 322px; - height: 261px; - background-image: url("@/assets/images/tl.png"); + height: 400px; + background-image: url("@/assets/bdscreenImg/bBg/tlbf.png"); right:-344px; bottom: 120px; } diff --git a/src/components/BgBcpm/environmentalB/bgleft/index.vue b/src/components/BgBcpm/environmentalB/bgleft/index.vue index 2703b8b..089d175 100644 --- a/src/components/BgBcpm/environmentalB/bgleft/index.vue +++ b/src/components/BgBcpm/environmentalB/bgleft/index.vue @@ -373,10 +373,10 @@ const getEPPrjistInfo = () => { clearInterval(setTimer.value) console.log(res, '国控制点', Object.values(res.data.gkd)) console.log(res, '控制点111', Object.values(res.data.skd)) - gkd.value = Object.values(res.data.gkd).map(item => { + gkd.value = Object.keys(res.data.gkd).map(item => { return { - text: item, - code: 'gkd' + text: res.data.gkd[item], + code: item } }) console.log(gkd.value, '国控制点1') diff --git a/src/components/BgCcpm/sbd/bgright/index.vue b/src/components/BgCcpm/sbd/bgright/index.vue index 83983e4..3eade6a 100644 --- a/src/components/BgCcpm/sbd/bgright/index.vue +++ b/src/components/BgCcpm/sbd/bgright/index.vue @@ -133,7 +133,7 @@ @@ -236,6 +236,21 @@ + + + + + + + @@ -248,6 +263,40 @@ import useAppStore from "@/store/modules/app.js"; const $store = useAppStore(); import { getPicInfo } from '@/api/pageB/environmental/index' import {prjInfo} from '../../../../api/pageC/sbd' +//物资一本账 +import diyTable from '@/components/common/diytable/index' +let kTitle=ref('物资一本账') +let wzybz=ref(false) +const kgList = ref([]) +const pagionProp = ref({}) +let pageNum=ref(1) +const currentChange = (val) => { + pageNum.value = val + // queryList() +} +const openWzybz=()=>{ + wzybz.value = true; +} +const wzybzClose=()=>{ + wzybz.value=false +} +const wzybzProps = [ + {label: "工程名称", prop: "prjName", minWidth: "180px"}, + {label: "项目编码", prop: "prjCode", minWidth: "120px"}, + {label: "建管单位", prop: "buildOrg", minWidth: "120px"}, + {label: "电压等级", prop: "voltageLevel", minWidth: "100px"}, + {label: "计划开工时间", prop: "plannedCommencementDate", width: "200px"}, + {label: "实际开工时间", prop: "actualCommencementDate", width: "150px"}, + {label: "滞后天数", prop: "number", minWidth: "100px"}, + {label: "状态", prop: "state", minWidth: "70px"}, + {label: "回执状态", prop: "isFeedback", minWidth: "100px"}, +]; +const dialogClose= () => { + wzybz.value = false; +} +//物资一本账---------------------- + + let infoData=ref('') let showStatus=ref(false) const getprjInfo=()=>{ @@ -310,8 +359,6 @@ const showImg=()=>{ } - - //监控 let pageIndex = 0; let currentVideoId = ref(""); diff --git a/vite.config.js b/vite.config.js index d52d2f5..630878d 100644 --- a/vite.config.js +++ b/vite.config.js @@ -63,9 +63,9 @@ export default defineConfig(({ mode, command }) => { //张新 // target: "http://192.168.3.210:20241", //测试 - target: "http://192.168.133.127:20241", + // target: "http://192.168.133.127:20241", // 相斌 - // target: "http://192.168.3.33:20241", + target: "http://192.168.3.33:20241", changeOrigin: true, // target: 'http://192.168.3.114:20241',//广瑞 rewrite: (p) => p.replace(/^\/sgtjzhzxsp-api/, '')