diff --git a/.env.test b/.env.test new file mode 100644 index 000000000..2bb94e86a --- /dev/null +++ b/.env.test @@ -0,0 +1,5 @@ +NODE_ENV=test +VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api +VUE_APP_BIPASS_API_SERVER = https://epmet-test.elinkservice.cn/linkdata/linkdata-gateway/route +VUE_APP_NODE_ENV=test +VUE_APP_PUBLIC_PATH=epmet-work-pc \ No newline at end of file diff --git a/package.json b/package.json index 9ecdd713d..1bb574cc2 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "build:uat": "vue-cli-service build --mode production.uat", "build:preview": "vue-cli-service build --mode preview", "build:prod": "vue-cli-service build --mode production", + "build:test": "vue-cli-service build --mode test", "build:shibei_prod": "vue-cli-service build --mode shibei_production", "lint": "vue-cli-service lint", "et": "node_modules/.bin/et", @@ -62,7 +63,9 @@ "vue-quill-editor": "^3.0.6", "vue-router": "^3.0.7", "vuex": "^3.1.1", - "xlsx": "^0.17.1" + "xlsx": "^0.17.1", + "increase-memory-limit": "^1.0.7", + "dayjs": "^1.11.7" }, "devDependencies": { "@antv/f2": "^3.8.10-beta.1", @@ -81,6 +84,7 @@ "script-loader": "^0.7.2", "style-loader": "^3.3.3", "tinymce": "5.8.2", + "increase-memory-limit": "^1.0.7", "vue-template-compiler": "^2.6.11" }, "eslintConfig": { diff --git a/src/assets/scss/modules/shequzhili/event-info-visiual.scss b/src/assets/scss/modules/shequzhili/event-info-visiual.scss index be5b15fe9..60db7a3a0 100644 --- a/src/assets/scss/modules/shequzhili/event-info-visiual.scss +++ b/src/assets/scss/modules/shequzhili/event-info-visiual.scss @@ -275,7 +275,8 @@ .m-process { width: 400px; - + padding-left:2px; + box-sizing: border-box; .process-title { margin-bottom: 25px; margin-left: -5px; diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index f4a97f58d..188069ef2 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/src/assets/scss/modules/shequzhili/event-info.scss @@ -159,8 +159,17 @@ margin-left: 20px; } } +.flex{ + display: flex; + flex-flow: wrap; + width: 100%; + .item{ + margin-right: 10px; + } +} + .cell-width-1{ - width: 250px + width: 210px } .cell-width-long{ width: 450px @@ -176,6 +185,9 @@ margin-left: 10px; width: 150px; } +.item_width_4 { + width: 140px; +} .process-form{ margin-top:20px; @@ -359,10 +371,10 @@ margin-top: 15px; margin-left: 15px; width: 400px; - height: 400px; - overflow: auto; - padding-top: 10px; - + overflow: auto; + padding-top: 10px; + padding-left: 2px; + box-sizing: border-box; .process-title { margin-bottom: 25px; margin-left: -5px; @@ -521,7 +533,24 @@ .m-top { display: flex; } +.m-top1 { + display: flex; + flex-direction: row; + justify-content: space-between; + .top-one{ + display: flex; + flex-direction: row; + justify-content:flex-start; + .top-one-left{ + padding: 6px; + display: flex; + flex-direction: column; + } + +} + +} .m-chart { min-height: 220px; } @@ -575,4 +604,20 @@ width: 250px; } - +.uploadList{ + width: 99%; + display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: wrap; + >div{ + display: flex; + color: #606266; + align-items: center; + justify-content: space-between; + width: 100%; + &:hover{ + background-color: #f5f7fa; + } + } +} \ No newline at end of file diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js index 2fb8f7966..568381f21 100644 --- a/src/js/columns/constants/index.js +++ b/src/js/columns/constants/index.js @@ -33,6 +33,16 @@ export const binaryOptionList = [ value: 0 } ] +export const binaryOptionListReverse = [ + { + label: '是', + value: 0 + }, + { + label: '否', + value: 1 + } +] export const politicsStatusList = [ { label: '中国共产党党员', @@ -115,4 +125,61 @@ export const completeList = [ label: '已完成并取消风险标记', value: 2 } -] \ No newline at end of file +] +export const nonComplianceType = [ + { + label: '已进入信访程序', + value: 0 + }, + { + label: '已进入诉讼、仲裁、纪检监察、行政、复议政府信息公开等程序', + value: 1 + }, + { + label: '不符合法律、法规、规章及政策规定', + value: 2 + }, + { + label: '涉及国家秘密、工作秘密、商业秘密、个人隐私', + value: 3 + }, + { + label: '违反社会工序良俗等其他情况', + value: 4 + } +] +export const satisfactionType = [ + { + label: '满意', + value: 'perfect' + }, + { + label: '基本满意', + value: 'good' + }, + { + label: '不满意', + value: 'bad' + } +] +export const noSatisfactionType = [ + { + label: '未回复', + value: 0 + }, { + label: '服务态度差', + value: 1 + }, + { + label: '推诿扯皮', + value: 2 + }, + { + label: '处理不及时', + value: 3 + }, + { + label: '其他', + value: 4 + } +] \ No newline at end of file diff --git a/src/main.js b/src/main.js index 06b3688d0..d6aa150ef 100644 --- a/src/main.js +++ b/src/main.js @@ -48,6 +48,7 @@ import PopTips from "@/components/PopTips/index.vue"; import PopHomeTip from "@/components/PopHomeTip/index.vue"; import NameSplit from "@/components/NameSplit/index.vue"; import RelationGraph from "relation-graph"; +import dayjs from 'dayjs' // import AddNodeJw from "@/components/JwTree/addNode.vue"; //按钮 @@ -103,7 +104,7 @@ Vue.directive("fixed", { // 挂载全局 Vue.prototype.$http = http; Vue.prototype.$sensitive = desensitization; - +Vue.prototype.$dayjs = dayjs // el-uploader的header配置 Vue.prototype.$getElUploadHeaders = () => ({ Authorization: localStorage.getItem("token") || "", diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index dff365634..5a9aa1396 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -147,6 +147,87 @@ class="u-item-width-daterange u-data-tag" placeholder="结束日期" :picker-options="pickerOptionsEnd"> + + 所属组织: + + + +
+
+ 所属房屋: + + + + + + + + + + + + + + + + +
+
+
@@ -671,7 +752,6 @@ export default { 'agencyId ': 'like' }, sarr: [], - level: '', showSmartSearchForm: false, formType: 'add', @@ -844,13 +924,30 @@ export default { // console.log('formcccc---', this.form) this.getOrgTreeList() this.getEducation() - this.getValiheList() this.getDictList() this.getHousehold() this.getNationality() this.getCareerStatus() if (this.columnName) this.handleChangeForm(this.columnName) }, + mounted(){ + this.$EventBus.$on('handleClickResiTree', async (val) => { + if(val.type === 'agency'){ + this.form.agencyId = val.id; + this.optionsV = []; + this.form.villageId = ''; + this.form.buildId = ''; + await this.getValiheList(); + }else if(val.type === 'neighborHood'){ + this.form.villageId = val.id; + await this.handleChangeV(val.id) + this.form.buildId = ''; + }else if(val.type === 'building'){ + this.form.buildId = val.id; + await this.handleChangeB(val.id) + } + }) + }, methods: { handleCategoryChange(newVal, oldVal) { let formCopy = JSON.parse(JSON.stringify(this.form)); @@ -945,63 +1042,8 @@ export default { else this.form[n] = '' } this.agencyIdArray = [] - // let arr3 = [...arr1, ...arr] this.$emit('search', []) - // this.handleSearch() - // this.orgOptions = []; }, - // handleSearch() { - // if (this.showSmartSearchForm) { - // let refObj = this.$refs['ref_rule'] - // refObj.getRule() - // } else { - // // debugger - // // console.log('formmmmm---', this.form) - // const itemTypes = ['daterange', 'timerange', 'checkbox'] - // let a = this.tempFormList.filter(item => item.itemType != 'inputRange') - // let arr = a.filter(n => n.isChange).map((item) => { - // return { - // queryType: item.queryType, - // tableName: item.tableName, - // columnName: item.columnName, - // columnValue: this.form[item.columnName] && - // (itemTypes.includes(item.queryType) || - // itemTypes.includes(item.itemType) || item.multiSelect == 1 - // ? this.form[item.columnName] - // : [this.form[item.columnName].toString()]) - // } - // }) - // const arr2 = arr.filter(item => item.columnValue.length > 0) - // let arr1 = this.fixedList - // .filter((n) => n.columnValue.length > 0) - // .map((item) => { - // return { - // ...item - // } - // }) - // var arr4 = [] - // var arr3 = [...arr1, ...arr2]; - // if (this.timer.startPickerTime && this.timer.endPickerTime) { - // arr4 = [{ - // queryType: 'daterange', - // tableName: 'ic_resi_user', - // columnName: 'BIRTHDAY', - // columnValue: [this.timer.startPickerTime || '', this.timer.endPickerTime || ''] - // }] - // arr3 = [...arr1, ...arr2, ...arr4] - // } else { - // let i = arr3.findIndex(item => item.columnName == 'BIRTHDAY') - // console.log(i, '标'); - // arr3 = arr3.splice(i,1) - // console.log(arr3); - // } - // this.$emit('search', arr3) - // arr3 = [] - // return arr3 - - // } - - // }, handleAgeChange() { if (this.form.ageStart&&this.form.ageEnd) { if (Number(this.form.ageStart) > Number(this.form.ageEnd)) { @@ -1025,17 +1067,13 @@ export default { } }, handleChangeAgency(val) { - this.sarr = [] - const map = new Map(); this.getLastItem( this.orgOptions, val, "agencyId" ); - this.level = this.sarr[this.sarr.length - 1].level - this.form.level = this.sarr[this.sarr.length - 1].level - + this.form.level = this.sarr[this.sarr.length - 1].level; this.getValiheList() }, getLastItem(list, vals, key) { @@ -1140,24 +1178,10 @@ export default { this.getValiheList(); }, getValiheList() { - const { user } = this.$store.state - var agencyIdTemp = '' - if (this.form.agencyId.length == 0) { - agencyIdTemp = '' - } else { - agencyIdTemp = this.form.agencyId[this.form.agencyId.length - 1] - } - var gridIdQuery = ''; - var agencyIdQuery = this.form.agencyId[0]; - if (this.form.agencyId.length >= 2) { - agencyIdQuery = this.form.agencyId[this.form.agencyId.length - 2]; - gridIdQuery = this.form.agencyId[this.form.agencyId.length - 1]; - } - this.$http .post('/actual/base/communityQuarters/listQuartersOptions', { - gridId: gridIdQuery, - agencyId: agencyIdQuery, + gridId: this.form.agencyId, + agencyId: this.$store.state.user.agencyId, pageNo: this.optionsVPageNo, pageSize: 20 // agencyId: user.agencyId diff --git a/src/views/dataBoardMain/main-content.vue b/src/views/dataBoardMain/main-content.vue index d62d01192..88c853c22 100644 --- a/src/views/dataBoardMain/main-content.vue +++ b/src/views/dataBoardMain/main-content.vue @@ -1,7 +1,7 @@