diff --git a/src/assets/img/shuju/measure/zhuhu_orange.png b/src/assets/img/shuju/measure/zhuhu_orange.png new file mode 100644 index 00000000..0656dcc3 Binary files /dev/null and b/src/assets/img/shuju/measure/zhuhu_orange.png differ diff --git a/src/assets/img/shuju/measure/zhuhu_red.png b/src/assets/img/shuju/measure/zhuhu_red.png new file mode 100644 index 00000000..9fa8c1bd Binary files /dev/null and b/src/assets/img/shuju/measure/zhuhu_red.png differ diff --git a/src/assets/img/shuju/measure/zhuhu_yellow.png b/src/assets/img/shuju/measure/zhuhu_yellow.png new file mode 100644 index 00000000..00bc496e Binary files /dev/null and b/src/assets/img/shuju/measure/zhuhu_yellow.png differ diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index 1b95d188..b8b9c929 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -354,25 +354,23 @@ export default { }, async handelAdd () { - if (this.pageTypeCopy === 'add') { - this.$refs.ref_add.getEventInfo() - if (this.$refs.ref_add.okflag) { - this.eventInfoData = this.$refs.ref_add.formData - } else { - return false - } + this.$refs.ref_add.getEventInfo() + if (this.$refs.ref_add.okflag) { - console.log('eventInfo', this.eventInfoData) + this.eventInfoData = this.$refs.ref_add.formData + } else { + return false } + console.log('eventInfo', this.eventInfoData) + this.$refs.ref_processinfo_add.getProcessInfo() if (this.$refs.ref_processinfo_add.okflag) { this.formData.operationType = this.$refs.ref_processinfo_add.operationType this.eventInfoData.operationType = this.$refs.ref_processinfo_add.operationType - - this.eventInfoData.categoryList = this.$refs.ref_processinfo_add.categoryList + // this.eventInfoData.categoryList = this.$refs.ref_processinfo_add.categoryList if (this.formData.operationType === '0') { this.project = {} @@ -403,8 +401,6 @@ export default { console.log('demond', this.demand) } - } else { - return false } this.formData = { @@ -475,6 +471,8 @@ export default { console.log('demond', this.demand) let url = '/gov/project/icEvent/icEventToDemand' await this.submitDispose(url, this.demand) + } else { + this.$message.info("请选择一种处理方式"); } } else { diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index 23176b40..77f6d0cc 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -5,7 +5,19 @@ :model="formData" :rules="dataRule" label-width="100px"> - + + + - @@ -40,7 +52,7 @@ - 0) { + if (childs[i].subCategory) { + if (childs[i].subCategory.length) { + this.filterTree(childs[i].subCategory) + } else { + delete childs[i].subCategory + } + } + } + return arr + }, + async getDemandOptions () { const url = "/heart/icresidemanddict/demandoption" let params = {} @@ -404,6 +476,7 @@ export default { this.formData.categoryCode = val[1]; } }, + handleServiceChange (type, val) { if (val === "social_org") { if (type === "add") this.getServiceuserList(val, "add_demand"); diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue index 3e8a6632..50642082 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue @@ -5,6 +5,18 @@ :model="formData" :rules="dataRule" label-width="100px"> + + + 0) { + if (childs[i].subCategory) { + if (childs[i].subCategory.length) { + this.filterTree(childs[i].subCategory) + } else { + delete childs[i].subCategory + } + } + } + return arr + }, async loadGrid () { const url = "/gov/org/customergrid/gridoption" @@ -396,7 +470,7 @@ export default { const url = "/gov/issue/issueprojecttagdict/list"; const { data, code, msg } = await requestPost(url, { - // categoryList: this.projectCate, + }); if (code === 0) { @@ -409,7 +483,6 @@ export default { } }, - handleTagChange (val) { console.log(val); }, diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue index 67810030..c46476c6 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue @@ -6,6 +6,18 @@ :model="formData" :rules="dataRule" class="form"> + + + 0) { + if (childs[i].subCategory) { + if (childs[i].subCategory.length) { + this.filterTree(childs[i].subCategory) + } else { + delete childs[i].subCategory + } + } + } + return arr + }, async getReplayInfo () { this.okflag = false this.$refs["ref_form1"].validate((valid, messageObj) => { @@ -98,11 +176,20 @@ export default { app.util.validateRule(messageObj); } else { + debugger if (this.status) { + + if (!this.selCateObj || !this.selCateObj.id) { + this.$message.info("请填写事件分类"); + return false + } this.formData.status = 'closed_case' } else { this.formData.status = 'processing' } + this.formData.categoryId = this.selCateObj.id + this.formData.categoryList = [] + this.formData.categoryList.push(this.selCateObj) this.okflag = true } diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue index 6ab88929..8adf8fc1 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form.vue @@ -6,26 +6,14 @@ :inline="false" :rules="dataRule" class="form"> - - - + 回复 立项 - 转需求 + 转服务 @@ -70,24 +58,20 @@ export default { data () { return { - casOptions: [], iscascaderShow: 0, - selCategoryArray: [ - - ], + selCategoryArray: [], selCateObj: {}, optionProps: { multiple: false, value: 'id', label: 'name', children: 'subCategory', - }, - operationType: '0', + operationType: '', + - categoryList: [], replayInfo: {}, demand: {}, project: {}, @@ -105,9 +89,7 @@ export default { computed: { dataRule () { return { - categoryList: [ - { required: true, message: "分类不能为空", trigger: "blur" }, - ], + operationType: [ { required: true, message: "处理方式不能为空", trigger: "blur" }, ], @@ -149,117 +131,39 @@ export default { async mounted () { const { user } = this.$store.state this.agencyId = user.agencyId - await this.getCategoryList() + if (this.eventId) { this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); - if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) { - this.selCategoryArray = [] - this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId) - this.selCategoryArray.push(this.eventDetailCopy.categoryId) - - this.selCateObj = { - name: this.eventDetailCopy.categoryName, - id: this.eventDetailCopy.categoryId - } - } - } - + } }, methods: { - - - async getCategoryList () { - const url = "/gov/issue/issueprojectcategorydict/list" - - let params = {} - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - - let treeDataNew = this.filterTree(data) - - //组织级联数据 - ++this.iscascaderShow - this.casOptions = [] - - - this.casOptions = treeDataNew - - } else { - this.$message.error(msg) - } - - }, - - handleChangeCate () { - console.log(this.$refs["myCascader"].getCheckedNodes()[0].data) - this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data - - }, - - //重构树，去除网格 - filterTree (arr) { - let childs = arr - for (let i = childs.length; i--; i > 0) { - if (childs[i].subCategory) { - if (childs[i].subCategory.length) { - this.filterTree(childs[i].subCategory) - } else { - delete childs[i].subCategory - } - } - } - return arr - }, - async getProcessInfo () { - this.okflag = false - if (this.selCategoryArray.length === 0) { - this.$message({ - type: "error", - message: "请选择分类", - }); - - this.okflag = false - return false - } - this.categoryList = [] - - this.categoryList.push(this.selCategoryArray[1]) + // this.categoryList = [] + // this.categoryList.push(this.selCategoryArray[1]) if (this.operationType === '0') { this.$refs.ref_process_form_replay.getReplayInfo() if (this.$refs.ref_process_form_replay.okflag) { - this.replayInfo = this.$refs.ref_process_form_replay.formData - this.replayInfo.categoryId = this.categoryList[0] - this.replayInfo.categoryList = this.categoryList - this.okflag = true } else { return false } - } else if (this.operationType === '1') { this.$refs.ref_process_form_project.getProjectInfo() if (this.$refs.ref_process_form_project.okflag) { this.project = this.$refs.ref_process_form_project.formData - this.project.categoryList = [] - this.project.categoryList.push(this.selCateObj) - - //赋值分类信息 this.okflag = true diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue index 6adb7112..d2cf2695 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue @@ -146,6 +146,7 @@ :userTag="'(报事人)'" :singleList="yanPan.singleList" :hasEvent="yanPan.hasEvent" + :bcLimit="yanPan.resiReportEventCount" @user="toUserInfo" />
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue index d9db3c59..84ee8006 100644 --- a/src/views/modules/visual/cpts/analyse.vue +++ b/src/views/modules/visual/cpts/analyse.vue @@ -19,7 +19,26 @@
-
+
+
{{userName}}
+
{{userTag}}
+
+
+
{{userName}}
+
{{userTag}}
+
+
+
{{userName}}
+
{{userTag}}
+
+
{{userName}}
{{userTag}}
@@ -270,6 +289,10 @@ export default { type: Boolean, default: false }, + bcLimit: { //中间报事人的背景颜色限制 + type: Number, + default: 1 + }, singleList: Array, // 默认，必传 单个来源或多个来源 }, @@ -396,6 +419,19 @@ export default { } } + .analys-person-orange { + background: url("../../../../assets/img/shuju/measure/zhuhu_orange.png") + no-repeat center; + } + .analys-person-yellow { + background: url("../../../../assets/img/shuju/measure/zhuhu_yellow.png") + no-repeat center; + } + .analys-person-red { + background: url("../../../../assets/img/shuju/measure/zhuhu_red.png") + no-repeat center; + } + .analys-cate { display: flex; flex-direction: column;