diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index 1f4b78ffc..aafdaa0f7 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -6,7 +6,7 @@
-
+
@@ -466,6 +466,11 @@ export default { height: calc(80vh - 120px); .left { width: 49%; + height: 100%; + .check-boxwr { + height: calc(80vh - 120px); + overflow: auto; + } } .right { flex-shrink: 0; @@ -498,7 +503,7 @@ export default { margin-top: 10px; } .left-h { - + height: 100%; ::v-deep .el-tabs__header.is-left, ::v-deep .el-tabs__nav-wrap.is-left::after { height: calc(80vh - 120px); diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue index df96eb706..e5bbe954b 100644 --- a/src/views/modules/plugins/change/resideath.vue +++ b/src/views/modules/plugins/change/resideath.vue @@ -86,7 +86,7 @@ 迁入死亡人口 + class="div-table-button--detail">新增死亡人口 + - + + item.level === 1) + let level2 = nodes.filter(item => item.level === 2) + console.log('level2----1', level2) + level1.forEach(item => { + console.log('level2----2', level2) + if (item.hasChildren) { + for (let i = level2.length - 1; i >= 0; i--) { + if (level2[i].parent.value === item.value) level2.splice(i, 1) + } + } + }) + this.formData.firstIdList = level1.map(item => item.value) + this.formData.secondIdList = level2.map(item => item.value) + }, handleSelectionChange (val) { this.multipleSelection = []; val.forEach(element => { @@ -692,6 +746,23 @@ export default { this.$message.error(msg); } }, + async getCateOptions() { + const url = "/gov/issue/issueprojectcategorydict/list"; + + const { data, code, msg } = await requestPost(url, {}); + + if (code === 0) { + // this.cateOptions = data.map((item) => { + // item.subCategory.forEach((subitem) => { + // delete subitem.subCategory; + // }); + // return item; + // }); + this.cateOptions = this.deepTree(data, 'subCategory') + } else { + this.$message.error(msg); + } + }, handleSizeChange (val) { @@ -715,12 +786,27 @@ export default { startTime: '', endTime: '', status: '', + firstIdList: [], + secondIdList: [], } + this.eventTypeCheck = [] + - - // this.pageNo = 1 + this.pageNo = 1 + this.getTableData(); // this.loadTable() }, + deepTree(arr, child) { + if (Array.isArray(arr) && arr.length > 0) { + return arr.map(item => { + // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId + return { + ...item, + [child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null + } + }) + } + } }, }; @@ -729,4 +815,10 @@ export default { @import "@/assets/scss/buttonstyle.scss"; @import "@/assets/scss/modules/management/list-main.scss"; @import "@/assets/scss/modules/shequzhili/event-info.scss"; +.div_search { + .item_width_2 { + width: 200px; + } +} + diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue new file mode 100644 index 000000000..40a9e4008 --- /dev/null +++ b/src/views/modules/shequzhili/statics/index.vue @@ -0,0 +1,466 @@ + + + + + + diff --git a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue index 608d5e6dd..b208eda98 100644 --- a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue +++ b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue @@ -1,24 +1,26 @@ @@ -394,12 +369,13 @@ const _form = { status: '', firstIdList: [], secondIdList: [], - staffId: '' + staffId: '', + closedStatus: '' } export default { components: { projectInfo }, - data() { + data () { let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 let nowData = Date.now() if (this.fmData.startTime) { @@ -423,6 +399,16 @@ export default { tableData: [], + resolvedStatus: [ + { + value: "resolved", + label: "已解决", + }, + { + value: "unresolved", + label: "无需解决", + }, + ], optionsStatus: [ { value: "pending", @@ -474,7 +460,7 @@ export default { }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410; @@ -492,13 +478,13 @@ export default { } }, }, - mounted() { + mounted () { this.getTableData(); this.getGridList() this.getCateOptions() }, methods: { - async handleExportModule() { + async handleExportModule () { let url = "/heart/iccommunityselforganization/import-template-download"; let params = {}; @@ -535,18 +521,18 @@ export default { }); }, // 上传大图标成功 - handleExcelSuccess(res, file) { + handleExcelSuccess (res, file) { if (res.code === 0 && res.msg === "success") { console.log("resss---ppp", res); } else { this.$message.error(res.msg); } }, - handleProgress(event, file, fileList) { + handleProgress (event, file, fileList) { console.log("percentage", file.percentage); }, - beforeExcelUpload(file) { + beforeExcelUpload (file) { console.log("file", file); const isType = file.type === "application/vnd.ms-excel"; const isTypeComputer = @@ -563,7 +549,7 @@ export default { } return fileType && isLt1M; }, - async uploadHttpRequest(file) { + async uploadHttpRequest (file) { this.importLoading = true; this.importBtnTitle = "正在上传中..."; this.$message({ @@ -617,19 +603,19 @@ export default { this.importBtnTitle = "导入"; this.$refs.upload.clearFiles(); }, - handleCalscChange(val) { + handleCalscChange (val) { console.log('val-----', val) const arr = val.split('-') this.fmData.orgId = arr[0] this.fmData.orgType = arr[1] === 'grid' ? 'grid' : 'agency' }, - handleCheckbox(val) { + handleCheckbox (val) { const { user } = this.$store.state console.log('val---', val) if (val) this.fmData.staffId = user.id else this.fmData.staffId = '' }, - handleEventType(val) { + handleEventType (val) { // console.log('val-----eee', val) console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes()) const nodes = this.$refs.cascaderEvent.getCheckedNodes() @@ -659,24 +645,24 @@ export default { // this.$refs.cascaderUnit.toggleDropDownVisible(false); }, - handleSizeChange(val) { + handleSizeChange (val) { console.log(`每页 ${val} 条`); this.pageSize = val; window.localStorage.setItem("pageSize", val); this.getTableData(); }, - handleCurrentChange(val) { + handleCurrentChange (val) { console.log(`当前页: ${val}`); this.pageNo = val; this.getTableData(); }, - handleSearch(val) { + handleSearch (val) { console.log(JSON.stringify(this.fmData)); this.pageNo = 1; this.getTableData(); }, - resetForm(formName) { + resetForm (formName) { this.$refs[formName].resetFields(); this.fmData = { ..._form @@ -687,7 +673,7 @@ export default { this.handleSearch(); }, - async handleChu() { + async handleChu () { // const url = "/gov/project/project/project-list-export"; const url = '/gov/project/project/orgprojectexport' const { pageSize, pageNo, fmData } = this; @@ -726,8 +712,8 @@ export default { }); }, - async handleAdd() {}, - async handleWatch(rowIndex) { + async handleAdd () { }, + async handleWatch (rowIndex) { let item = this.tableData[rowIndex]; this.currentProject = { projectId: item.projectId, @@ -735,7 +721,7 @@ export default { this.pageType = "info"; }, - async handleEdit(rowIndex) { + async handleEdit (rowIndex) { let item = this.tableData[rowIndex]; this.currentProject = { projectId: item.projectId, @@ -743,19 +729,19 @@ export default { this.pageType = "edit"; }, - handleClose() { + handleClose () { this.pageType = "list"; this.currentProject = { projectId: "", }; }, - handleEditSuccess() { + handleEditSuccess () { this.handleClose(); this.getTableData(); }, - async handleDel(rowData, rowIndex) { + async handleDel (rowData, rowIndex) { console.log(rowData, rowIndex); const url = "/heart/iccommunityselforganization/delcommunityselforganization"; @@ -773,10 +759,10 @@ export default { } }, - async getTableData() { + async getTableData () { // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list"; // const url = "/gov/project/project/project-list"; - const url ='/gov/project/project/orgprojectlist' + const url = '/gov/project/project/orgprojectlist' const { pageSize, pageNo, fmData } = this; const { data, code, msg } = await requestPost(url, { pageSize, @@ -788,16 +774,16 @@ export default { this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { - return { - ...item, - urlList: item.urlList && item.urlList.map(n => n.url) - }; - }) + return { + ...item, + urlList: item.urlList && item.urlList.map(n => n.url) + }; + }) : []; } else { } }, - async getCateOptions() { + async getCateOptions () { const url = "/gov/issue/issueprojectcategorydict/list"; const { data, code, msg } = await requestPost(url, {}); @@ -814,7 +800,7 @@ export default { this.$message.error(msg); } }, - getGridList() { + getGridList () { const { user } = this.$store.state this.dataListLoading = true const params = { @@ -842,7 +828,7 @@ export default { return this.$message.error('网络错误') }) }, - deepTree(arr, child) { + deepTree (arr, child) { if (Array.isArray(arr) && arr.length > 0) { return arr.map(item => { // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue index 2aed96664..8668aad4b 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue @@ -97,13 +97,13 @@
{{ item.departmentName }}
- +
diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue new file mode 100644 index 000000000..7160f2c66 --- /dev/null +++ b/src/views/modules/worklog/icworklog-add-or-update.vue @@ -0,0 +1,389 @@ + + + + + diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue new file mode 100644 index 000000000..3b50a8e5b --- /dev/null +++ b/src/views/modules/worklog/icworklog.vue @@ -0,0 +1,354 @@ + + + + + +