diff --git a/src/components/Map/MapGisLine.vue b/src/components/Map/MapGisLine.vue
index a07b9dd0..cdef8457 100644
--- a/src/components/Map/MapGisLine.vue
+++ b/src/components/Map/MapGisLine.vue
@@ -12,7 +12,7 @@
-
备注信息:绿色地块表示该地块,蓝色表示本账套已标记的其他地块
+ 备注:绿色地块表示该地块,蓝色表示本账套已标记的其他地块
diff --git a/src/views/sunVillage_info/fixedAssetsEdit.vue b/src/views/sunVillage_info/fixedAssetsEdit.vue
index 33f54874..dceb7f2c 100644
--- a/src/views/sunVillage_info/fixedAssetsEdit.vue
+++ b/src/views/sunVillage_info/fixedAssetsEdit.vue
@@ -260,7 +260,7 @@
-
+
@@ -321,7 +321,6 @@
showUseType:false,
useType:'自用',
//资产状态
- assetStatusOptions:[],
showAssetStatus:false,
assetStatus:'正常',
//资产状态
diff --git a/src/views/sunVillage_info/three.vue b/src/views/sunVillage_info/three.vue
index 812e5d63..175e06cd 100644
--- a/src/views/sunVillage_info/three.vue
+++ b/src/views/sunVillage_info/three.vue
@@ -6,15 +6,18 @@
-
-
-
-
-
-
+
共{{listLength}}个资产
-
{
+ this.threeAssetTypeOptions = response.data;
+ });
},
methods: {
saveGeom(){
@@ -260,13 +270,26 @@
goAdd(){
this.$router.push('/sunVillage_info/threeAdd')
},
+ openThreeAssetType() {
+ this.typeVisible = true;
+ },
+ refresh() {
+ this.queryParams.pageNum = 1;
+ this.listLength = 0;
+ this.applicationList = [];
+ this.finished = false;
+ this.getList();
+ },
},
+ computed: {
+ searchPlaceholder() {
+ let typeName = this.threeAssetTypeOptions.find((x) => x.dictValue == this.queryParams.threeAssetType);
+ return '搜索' + (typeName ? typeName.dictLabel : '');
+ },
+ }
}