diff --git a/package.json b/package.json index c9b4cacb3..c9dbfbbb5 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,9 @@ "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve", "serve": "vue-cli-service serve", "build": "vue-cli-service build", - "build:sit": "vue-cli-service build --mode production.sit", + "build:sit": " set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode production.sit", "build:uat": "vue-cli-service build --mode production.uat", + "build:development": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode development", "build:preview": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode preview", "build:prod": "vue-cli-service build --mode production", "build:test": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode test", diff --git a/src/views/modules/base/orgUnitManger/add.vue b/src/views/modules/base/orgUnitManger/add.vue index 1e678db92..999940b0c 100644 --- a/src/views/modules/base/orgUnitManger/add.vue +++ b/src/views/modules/base/orgUnitManger/add.vue @@ -6,25 +6,22 @@ - - - - - + + - - + @@ -33,7 +30,7 @@ - @@ -69,19 +66,19 @@ - + - + - @@ -128,19 +125,21 @@ - -
- - - - -
-
-
-
- + +
+ + + + +
+
+
+
+
取 消 @@ -170,7 +169,16 @@ export default { data() { return { - + placeTypeList:[],//九小场所 + orgOptions: [],//所属组织 + orgOptionProps: { + value: 'agencyId', + label: 'agencyName', + children: 'subAgencyList', + emitPath: false, + multiple: false, + checkStrictly: true + },//所 showdisabled:false, searchOptions:[], fileList:[], @@ -210,9 +218,23 @@ this.formData.latitude = latitude; this.formData.longitude = longitude; this.activityType() + this.loadplaceType() }, methods: { + //场所类型 + async loadplaceType() { + const url = '/sys/dict/data/dictlist'; + let params = { + dictType: "nine_small_places" + }; + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + this.placeTypeList = data; + } else { + this.$message.error(msg); + } + }, async handleMoveCenter(e) { //修改地图中心点 // const { lat, lng } = map.getCenter(); diff --git a/src/views/modules/base/orgUnitManger/index.vue b/src/views/modules/base/orgUnitManger/index.vue index 163791f73..2d7e7624f 100644 --- a/src/views/modules/base/orgUnitManger/index.vue +++ b/src/views/modules/base/orgUnitManger/index.vue @@ -546,7 +546,7 @@ //获取当前组织 getOrgTreeList() { this.$http - .post("/gov/org/customeragency/agencygridtree", {orgTypeFilter:this.orgTypeFilter}) + .post("/gov/org/customerAgencyUnit/page", {page:"",limit:""}) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index 1b50c144f..54ff31a54 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -66,7 +66,7 @@ v-model.trim="formData.ninePlaceVal" placeholder="请选择" clearable> - diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 5c3837141..26a6d6e0b 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -855,7 +855,7 @@ this.getStatistics() const { data, code, msg } = await requestPost(url, { pageSize, pageNo, - categoryCode: this.currentCategoryCode, + categoryCode:"IS_YLFN", }); if (code === 0) { diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index 0064c5419..401b631db 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -1123,9 +1123,7 @@ export default { async getWarningList() { const url = "/epmetuser/icstatsresiwarn/personwarn/leftpie"; let params = {}; - const { data, code, msg } = await requestPost(url, params); - if (code === 0) { this.warningChart.loading = true; this.warningChart.total = data.total; diff --git a/src/views/modules/solicitationSpecial/cpts/add.vue b/src/views/modules/solicitationSpecial/cpts/add.vue index cf7f95402..b7e7390f6 100644 --- a/src/views/modules/solicitationSpecial/cpts/add.vue +++ b/src/views/modules/solicitationSpecial/cpts/add.vue @@ -47,7 +47,7 @@ - @@ -60,55 +60,55 @@
- - - - - - + \ No newline at end of file +} + \ No newline at end of file diff --git a/src/views/modules/solicitationSpecial/index.vue b/src/views/modules/solicitationSpecial/index.vue index 67f3f094d..e83e010ad 100644 --- a/src/views/modules/solicitationSpecial/index.vue +++ b/src/views/modules/solicitationSpecial/index.vue @@ -485,6 +485,7 @@ export default { }, showAddClose(){ this.showSupervise=false + this.getTableData() }, handleEventType(val) { const nodes = this.$refs.cascaderEvent.getCheckedNodes(); diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue index 6f421d4f3..b8a5b5cf4 100644 --- a/src/views/modules/volunteer/activityArchive/add.vue +++ b/src/views/modules/volunteer/activityArchive/add.vue @@ -5,7 +5,7 @@ - diff --git a/src/views/modules/workPc/guidance/add.vue b/src/views/modules/workPc/guidance/add.vue index 6686b07a6..0d1a26dff 100644 --- a/src/views/modules/workPc/guidance/add.vue +++ b/src/views/modules/workPc/guidance/add.vue @@ -121,7 +121,7 @@ export default { keyWords: '', activityId: '', formData: { - orgId: "",//发布组织 + orgId: this.$store.state.user.agencyId,//发布组织 categoryCode: "",//栏目分类 title: "",//文章标题 coverPic: "",//封面图