From f5ebea958b5e95664a2f261177e8ec09c470e33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Tue, 5 Aug 2025 17:19:52 +0800 Subject: [PATCH] =?UTF-8?q?task=2045202=20=E5=A4=A7=E5=B1=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/asset/resource.js | 9 ++++++ .../sanqing/comps/right/bottom/1/index.html | 2 +- .../sanqing/comps/right/bottom/1/index.js | 2 +- src/views/sanqing/index.html | 6 ++-- src/views/sanqing/index.js | 20 ++++++++++++- src/views/sanqing/main-gis/index.js | 29 +++++++++++++++++-- src/views/sanqing/popover/index.html | 6 ++-- src/views/sanqing/popover/index.scss | 2 +- 8 files changed, 64 insertions(+), 12 deletions(-) diff --git a/src/api/asset/resource.js b/src/api/asset/resource.js index 6401ab6..526f471 100644 --- a/src/api/asset/resource.js +++ b/src/api/asset/resource.js @@ -135,3 +135,12 @@ export function exportSortSummary (params) { params: params }); } + +// 查询固定资产详细 +export function attachmentQuery( params ) { + return request({ + url: '/api/system/attachment/query', + method: 'get', + params: params, + }) +} diff --git a/src/views/sanqing/comps/right/bottom/1/index.html b/src/views/sanqing/comps/right/bottom/1/index.html index 9a29b77..439fc82 100644 --- a/src/views/sanqing/comps/right/bottom/1/index.html +++ b/src/views/sanqing/comps/right/bottom/1/index.html @@ -2,7 +2,7 @@
diff --git a/src/views/sanqing/comps/right/bottom/1/index.js b/src/views/sanqing/comps/right/bottom/1/index.js index b400c4e..1e2c228 100644 --- a/src/views/sanqing/comps/right/bottom/1/index.js +++ b/src/views/sanqing/comps/right/bottom/1/index.js @@ -1,5 +1,5 @@ import Pannel from '@/components/pannelNew/index.vue'; -import Bar from '@/components/charts/bar-dimensional/index.vue'; +import Bar from '@/components/charts/bar/index.vue'; export default { components: { diff --git a/src/views/sanqing/index.html b/src/views/sanqing/index.html index 3cf0ab0..42a1e29 100644 --- a/src/views/sanqing/index.html +++ b/src/views/sanqing/index.html @@ -2,15 +2,15 @@
+
+ +
-
- -
diff --git a/src/views/sanqing/index.js b/src/views/sanqing/index.js index a07f219..3f91917 100644 --- a/src/views/sanqing/index.js +++ b/src/views/sanqing/index.js @@ -20,6 +20,7 @@ import { comps } from './data.js' import { getStatistic } from "@/api/index"; import { getInfo } from "@/api/login"; +import {mapGetters} from "vuex"; export default { components: { @@ -43,16 +44,33 @@ export default { return { comps, tab: '1', - allData: {} + allData: {}, + deptIdPage:100 }; }, + watch: { + // year: { + // handler () { + // this.getData(this.deptIdPage); + // }, + // immediate: true, // 立即执行 + // }, + // deptId: { + // handler () { + // this.getData(this.deptIdPage); + // }, + // immediate: true, // 立即执行 + // } + }, computed: { + ...mapGetters(['year', 'deptId']), currentComp: function () { return this.comps[this.tab] } }, created () { getInfo().then(res => { + this.deptIdPage = res.user.deptId; this.getData(res.user.deptId); }) }, diff --git a/src/views/sanqing/main-gis/index.js b/src/views/sanqing/main-gis/index.js index 9d45150..9a1de79 100644 --- a/src/views/sanqing/main-gis/index.js +++ b/src/views/sanqing/main-gis/index.js @@ -5,7 +5,7 @@ import { } from 'ol/proj' import { getPermanentListByDeptId, listPermanent } from "@/api/asset/permanent.js"; import { getInfo } from "@/api/login"; -import { getResourceListByDeptId, listResource } from "@/api/asset/resource.js"; +import { getResourceListByDeptId, listResource, attachmentQuery } from "@/api/asset/resource.js"; import Legend from '@/components/legend/index.vue'; import { attachmentList } from "@/api/common/uploadAttachment.js"; import { treeselect, getDept, listDeptExcludeChild } from "@/api/system/dept"; @@ -98,6 +98,22 @@ export default { showImg:false, }; }, + watch: { + 'queryParams.deptId': { + handler: function () { + this.commitDept(this.queryParams.deptId); + }, + immediate: true, // 立即执行 + + }, + deptLength: { + handler: function () { + //console.log(this.deptLength); + this.commitDeptLength(this.deptLength); + }, + immediate: true, // 立即执行 + } + }, computed: { }, created () { @@ -159,6 +175,15 @@ export default { }, methods: { + commitDept (deptId) { + this.$store.commit('SET_DEPTID', deptId); + }, + commitDeptLength (length) { + this.$store.commit('SET_DEPTIDLENGTH', length); + }, + commitYear (year) { + this.$store.commit('SET_YEAR', year); + }, // 获取村边界的图层名称 getVillageBorderLayerName () { getConfigKey("geoserver.layer.villageBorder").then(response => { @@ -394,7 +419,7 @@ export default { tableName: 't_asset_three', bizPath: 'asset', }; - attachmentList(parmasData).then((res) => { + attachmentQuery(parmasData).then((res) => { if (res.code == 200) { let UattachmentList = res.rows; for (let i = 0; i < UattachmentList.length; i++) { diff --git a/src/views/sanqing/popover/index.html b/src/views/sanqing/popover/index.html index 30f4f87..2c13908 100644 --- a/src/views/sanqing/popover/index.html +++ b/src/views/sanqing/popover/index.html @@ -1,5 +1,5 @@
-

B镇详情×

+

{{data.zcmc}}×

资产编码

{{data.zcdm}}

@@ -74,11 +74,11 @@

备注

-

{{data.bz}}

+

{{data.bz}}

附件

-

+

diff --git a/src/views/sanqing/popover/index.scss b/src/views/sanqing/popover/index.scss index b9d1f88..59c424f 100644 --- a/src/views/sanqing/popover/index.scss +++ b/src/views/sanqing/popover/index.scss @@ -31,7 +31,7 @@ } div{ display: flex; - justify-content: space-between; + //justify-content: space-between; p{ width: 25%; padding: 10px 25px;