diff --git a/config/index.js b/config/index.js
index 36aac88a..a73616ff 100644
--- a/config/index.js
+++ b/config/index.js
@@ -12,9 +12,9 @@ module.exports = {
proxyTable: {
"/api": {
// 请求的目标主机
- target: 'http://218.59.175.44:8082/nsgk_test/', // 公网测试环境
+ //target: 'http://218.59.175.44:8082/nsgk_test/', // 公网测试环境
// target: `http://192.168.0.116:8091/nsgk_api/`, // 内网测试环境
- //target: 'http://localhost:8080/',
+ target: 'http://localhost:8080/',
//target: 'http://192.168.0.106:8080/',
changeOrigin: true,
pathRewrite: {
diff --git a/src/views/sunVillage_info/fixedAssets.vue b/src/views/sunVillage_info/fixedAssets.vue
index bcfd602c..3f520b52 100644
--- a/src/views/sunVillage_info/fixedAssets.vue
+++ b/src/views/sunVillage_info/fixedAssets.vue
@@ -8,8 +8,12 @@
@@ -85,9 +89,11 @@
} from "@/api/sunVillage_info/fixedAssets";
import request from '@/utils/request'
import MapGisTag from "@/components/Map/MapGisTagDTGCopy";
+ import Selector from "@/components/common/Selector.vue";
export default {
name: "certificateList",
components: {
+ Selector,
MapGisTag
},
data() {
@@ -107,6 +113,7 @@
orderByColumn:'createTime',
isAsc:'desc',
name:'',
+ operationType: null,
},
uploadFiles1:[],
projectId:'',
@@ -117,6 +124,8 @@
listMap:0,
permanentId: null, // 固定资产ID
permanents: [], // 固定资产列表,存储本账套下所有的固定资产信息
+ typeVisible: false,
+ operation_type: [],
};
},
created() {
@@ -129,6 +138,9 @@
this.houseGetDicts("use_type").then((response) => {
this.useTypeOptions = response.data;
});
+ this.houseGetDicts("operation_type").then((response) => {
+ this.operation_type = response.data;
+ });
},
methods: {
openMap(id, theGeom,index){
@@ -288,7 +300,23 @@
goAdd(){
this.$router.push('/sunVillage_info/fixedAssetsAdd')
},
+ openAssetType() {
+ this.typeVisible = true;
+ },
+ refresh() {
+ this.queryParams.pageNum = 1;
+ this.listLength = 0;
+ this.applicationList = [];
+ this.finished = false;
+ this.getList();
+ },
},
+ computed: {
+ searchPlaceholder() {
+ let typeName = this.operation_type.find((x) => x.dictValue == this.queryParams.operationType);
+ return '搜索' + (typeName ? `${typeName.dictLabel}资产` : '');
+ },
+ }
}