diff --git a/src/views/resources/main-gis/asset-details/api.js b/src/views/resources/main-gis/asset-details/api.js
new file mode 100644
index 0000000..df0e0e9
--- /dev/null
+++ b/src/views/resources/main-gis/asset-details/api.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 河南资源一张图-预警分析-左上-资源处置预警(分页)
+export function zyDetail (id) {
+ return request({
+ url: `api/home/xixia/resource/zyDetail/${id}`,
+ method: 'get'
+ })
+}
\ No newline at end of file
diff --git a/src/views/resources/main-gis/asset-details/close.png b/src/views/resources/main-gis/asset-details/close.png
new file mode 100644
index 0000000..0a8337d
Binary files /dev/null and b/src/views/resources/main-gis/asset-details/close.png differ
diff --git a/src/views/resources/main-gis/asset-details/index.html b/src/views/resources/main-gis/asset-details/index.html
new file mode 100644
index 0000000..fd34566
--- /dev/null
+++ b/src/views/resources/main-gis/asset-details/index.html
@@ -0,0 +1,69 @@
+
+
+
+
{{resourceDetail.name}}
+
+
+
+
+
资源编码
+
{{resourceDetail.code}}
+
+
+
资源名称
+
{{resourceDetail.name}}
+
+
+
资源类型
+
{{resourceDetail.resourceSort}}
+
+
+
总面积(亩)
+
{{resourceDetail.totalArea}}
+
+
+
资产状态
+
{{resourceDetail.status}}
+
+
+
使用情况
+
{{resourceDetail.useType}}
+
+
+
坐落位置
+
{{resourceDetail.location}}
+
+
+
东至
+
{{resourceDetail.east}}
+
+
+
西至
+
{{resourceDetail.west}}
+
+
+
南至
+
{{resourceDetail.south}}
+
+
+
北至
+
{{resourceDetail.north}}
+
+
+
备注
+
{{resourceDetail.remark}}
+
+
+
附件
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/resources/main-gis/asset-details/index.js b/src/views/resources/main-gis/asset-details/index.js
new file mode 100644
index 0000000..3d28186
--- /dev/null
+++ b/src/views/resources/main-gis/asset-details/index.js
@@ -0,0 +1,29 @@
+
+import { zyDetail } from "./api.js";
+export default {
+ props: {
+ data: {}
+ },
+ data () {
+ return {
+ isLoad: false,
+ resourceDetail: {}
+ };
+ },
+ computed: {
+ },
+ created () {
+ this.isLoad = false
+ zyDetail(this.data).then(res => {
+ this.resourceDetail = res.data;
+ this.isLoad = true
+ })
+ },
+ mounted () {
+ },
+ methods: {
+ close () {
+ this.$emit('close')
+ }
+ }
+};
diff --git a/src/views/resources/main-gis/asset-details/index.scss b/src/views/resources/main-gis/asset-details/index.scss
new file mode 100644
index 0000000..5e98e8a
--- /dev/null
+++ b/src/views/resources/main-gis/asset-details/index.scss
@@ -0,0 +1,170 @@
+.gl_pop_cash {
+ background: rgba(10, 25, 47, 0.8);
+ position: absolute;
+ padding: 0 10px;
+ z-index: 11;
+
+ .head_main {
+ height: 40px;
+ display: flex;
+ align-items: center;
+ position: relative;
+ justify-content: space-between;
+
+ .title {
+ color: #ffad00;
+ font-size: 16px !important;
+ }
+
+ .close {
+ background: url('./close.png') no-repeat;
+ background-size: 100% 100%;
+ width: 20px;
+ height: 20px;
+ cursor: pointer;
+ }
+
+ .xs_main {
+ height: 30px;
+ position: absolute;
+ width: 100%;
+ display: flex;
+ align-items: center;
+
+ .block {
+ width: 20px;
+ display: flex;
+
+ .point {
+ width: .55vh;
+ height: .55vh;
+ margin-right: 0.36vw;
+
+ &.p1 {
+ background: rgba(53, 125, 250, 1)
+ }
+
+ &.p2 {
+ background: rgba(53, 125, 250, .7)
+ }
+
+ &.p3 {
+ background: rgba(53, 125, 250, .4)
+ }
+ }
+
+ }
+
+ .xs_x {
+ height: 1px;
+ flex: 1;
+ background: #214284;
+ }
+ }
+ }
+
+ .echarts_main {
+ height: 600px;
+ overflow-y: auto;
+
+ div {
+ font-size: 10px;
+ // height: 40px;
+ line-height: 20px;
+
+ p {
+ // white-space: nowrap;
+ }
+ }
+
+ .headers {
+ height: 30px;
+ font-size: 14px;
+ color: #0befca;
+ text-align: center;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-right: 0.53vw;
+ background: rgba(11, 239, 202, .2);
+ margin-bottom: 0.9vh
+ }
+
+ .desc_main {
+ overflow-y: scroll;
+ padding-right: 0.33vw;
+
+ .analysisTable_list {
+ margin: 0;
+ padding: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+
+ .flex_item {
+ cursor: pointer;
+ list-style: none;
+ margin: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ color: #fff;
+ font-size: 12px;
+ position: relative;
+ height: 30px;
+
+ &:nth-child(2n) {
+ background: rgba(53, 125, 250, .1);
+ }
+ }
+ }
+ }
+ }
+
+}
+
+.pop_statistical_desc {
+ width: 600px;
+ margin: 0;
+ left: 480px !important;
+ top: 180px !important;
+ padding-bottom: 1.04vw !important;
+
+ .head_main {
+ .title {
+ color: #fff;
+ }
+ }
+
+ .echarts_main {
+ overflow-y: auto;
+ margin-top: 16px;
+
+ div {
+ display: flex;
+ align-items: center;
+
+ &:nth-child(even) {
+ background: rgba(32, 89, 188, 0.2);
+ }
+
+ p {
+ &:nth-child(1) {
+ width: 8vw;
+ padding-left: 1vw;
+ flex-shrink: 0;
+ }
+
+ &:nth-child(2) {
+ color: #ffad00;
+ }
+
+ margin: 0;
+ color: #ffffff;
+ font-size:1.33vh;
+ line-height: 3.92vh;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/views/resources/main-gis/asset-details/index.vue b/src/views/resources/main-gis/asset-details/index.vue
new file mode 100644
index 0000000..5ac9224
--- /dev/null
+++ b/src/views/resources/main-gis/asset-details/index.vue
@@ -0,0 +1,4 @@
+
+
+
diff --git a/src/views/resources/main-gis/index.html b/src/views/resources/main-gis/index.html
index b53f70b..ac86f7c 100644
--- a/src/views/resources/main-gis/index.html
+++ b/src/views/resources/main-gis/index.html
@@ -7,82 +7,8 @@
-
-
-
{{resourceDetail.name}}详情
-
-
-
-
-
-
资源编码
-
{{resourceDetail.code}}
-
-
-
资源名称
-
{{resourceDetail.name}}
-
-
-
资源类型
-
{{resourceDetail.resourceSort}}
-
-
-
总面积(亩)
-
{{resourceDetail.totalArea}}
-
-
-
资产状态
-
{{resourceDetail.status}}
-
-
-
使用情况
-
{{resourceDetail.useType}}
-
-
-
坐落位置
-
{{resourceDetail.location}}
-
-
-
东至
-
{{resourceDetail.east}}
-
-
-
西至
-
{{resourceDetail.west}}
-
-
-
南至
-
{{resourceDetail.south}}
-
-
-
北至
-
{{resourceDetail.north}}
-
-
-
备注
-
{{resourceDetail.remark}}
-
-
-
附件
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/views/resources/main-gis/index.js b/src/views/resources/main-gis/index.js
index d6dfbbb..5fe1236 100644
--- a/src/views/resources/main-gis/index.js
+++ b/src/views/resources/main-gis/index.js
@@ -11,13 +11,19 @@ import { attachmentList } from "@/api/common/uploadAttachment.js";
import { treeselect, getDept, listDeptExcludeChild } from "@/api/system/dept";
import { getConfigKey } from "@/api/system/config";
import { treeselectByDeptId } from "@/api/system/dept";
+import AssetDetails from './asset-details/index.vue';
let gis = null;
export default {
components: {
+ AssetDetails,
Legend
},
data () {
return {
+ showPermanentDetail: {
+ show: false,
+ id: ''
+ },
yellowIcon: require('./icon/yellow.png'),
//三务公开请求参数
queryParams: {
@@ -260,15 +266,6 @@ export default {
});
})
- // treeselect().then((resp) => {
- // this.addrOptions = resp.data
- // getInfo().then(res => {
- // this.initMap(res.user.loginDeptId);
- // // 加载地图
- // })
- // });
-
-
},
methods: {
// 获取村边界的图层名称
@@ -457,7 +454,7 @@ export default {
//资源信息详情弹窗
this.showResourceDetail = false;
//资产信息详情弹窗
- this.showPermanentDetail = false;
+ this.showPermanentDetail.show = false;
//农业补贴详情弹窗
this.showSubsidyFundsDetail = false;
//重大事项详情弹窗
@@ -486,7 +483,7 @@ export default {
//资源信息详情弹窗
this.showResourceDetail = false;
//资产信息详情弹窗
- this.showPermanentDetail = false;
+ this.showPermanentDetail.show = false;
//农业补贴详情弹窗
this.showSubsidyFundsDetail = false;
//重大事项详情弹窗
@@ -499,47 +496,11 @@ export default {
},
openResourceDialog (data) {
- data.fileList = [];
- let parmasData = {
- tableId: data.id,
- tableName: 't_asset_resource',
- bizPath: 'asset',
- };
- attachmentList(parmasData).then((res) => {
- if (res.code == 200) {
- let UattachmentList = res.rows;
- for (let i = 0; i < UattachmentList.length; i++) {
- let fileName = UattachmentList[i].fileName;
- let subIndex = fileName.lastIndexOf(".");
- let ext = fileName.substring(subIndex + 1, fileName.length);
- let urls = "";
- let type = "";
- if (ext == "xlsx" || ext == "xls") {
- urls = require("@/assets/images/icon_excel.jpg");
- type = 'excel';
- } else if (ext == "doc" || ext == "docx") {
- urls = require("@/assets/images/icon_word.jpg");
- type = 'word';
- } else if (ext == "pdf") {
- urls = require("@/assets/images/icon_pdf.jpg");
- type = 'pdf';
- } else if (ext == "zip") {
- urls = require("@/assets/images/icon_zip.jpg");
- type = 'zip';
- } else {
- urls = '/api' + UattachmentList[i].fileUrl;
- type = 'image';
- }
- data.fileList.push({
- url: urls,
- urlApi: '/api' + UattachmentList[i].fileUrl,
- type: type
- })
- }
- this.showResourceDetail = true;
- this.resourceDetail = data;
- }
- });
+ let id = data.id;
+ this.showPermanentDetail = {
+ id,
+ show: true
+ }
},
// 创建矢量数据源
addDeptLayer (nextDeptSet, locationIcon) {