diff --git a/src/assets/img/shuju/measure/jgzs@2x.png b/src/assets/img/shuju/measure/jgzs.png similarity index 100% rename from src/assets/img/shuju/measure/jgzs@2x.png rename to src/assets/img/shuju/measure/jgzs.png diff --git a/src/assets/img/shuju/measure/ly@2x.png b/src/assets/img/shuju/measure/lxdj.png similarity index 100% rename from src/assets/img/shuju/measure/ly@2x.png rename to src/assets/img/shuju/measure/lxdj.png diff --git a/src/assets/img/shuju/measure/lxdj@2x.png b/src/assets/img/shuju/measure/lxzz.png similarity index 100% rename from src/assets/img/shuju/measure/lxdj@2x.png rename to src/assets/img/shuju/measure/lxzz.png diff --git a/src/assets/img/shuju/measure/xq@2x.png b/src/assets/img/shuju/measure/qydw.png similarity index 100% rename from src/assets/img/shuju/measure/xq@2x.png rename to src/assets/img/shuju/measure/qydw.png diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss index 509dc2aa7..af3001983 100644 --- a/src/assets/scss/modules/visual/personCategory.scss +++ b/src/assets/scss/modules/visual/personCategory.scss @@ -14,7 +14,8 @@ display: flex; // justify-content: space-around; justify-content: flex-start; - flex-wrap: wrap; + flex-wrap: nowrap; + // overflow-y: auto; min-height: 190px; .top-item-active { @@ -22,8 +23,9 @@ } .top-item { + flex: 0 0 280px; box-sizing: border-box; - width: 280px; + // width: 280px; height: 190px; padding: 10px 22px 14px 21px; // background: rgba(255, 255, 255, 0); diff --git a/src/views/components/scoreRecord.vue b/src/views/components/scoreRecord.vue index 128e06c0d..95f9c9aed 100644 --- a/src/views/components/scoreRecord.vue +++ b/src/views/components/scoreRecord.vue @@ -11,6 +11,7 @@ { - this.$refs.ref_score.initForm(row) + this.$refs.ref_score.initForm(row.id) }) }, diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index ac413f23c..509e0d99d 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -781,7 +781,8 @@ export default { this.form.score = 5 } if (addType == 'appoint' && row.serviceType) { - await this.getServiceuserList(row.serviceType) + const type = row.serviceType == 'social_org' ? 'add_demand' : '' + await this.getServiceuserList(row.serviceType, type) } if (addType == 'edit') { await this.getDemandUserList() diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue index 36adc798c..bd6fa8e5f 100644 --- a/src/views/modules/communityService/shzz/index.vue +++ b/src/views/modules/communityService/shzz/index.vue @@ -2,19 +2,20 @@
- - + +
组织名称
-
- +
+
@@ -23,14 +24,13 @@
负责人
-
- +
+
@@ -39,14 +39,13 @@
联系电话
-
- +
+
@@ -56,15 +55,14 @@
服务时间
-
- +
+
@@ -73,9 +71,9 @@ - 查询 + 查询 @@ -83,109 +81,117 @@
- 新增 - - {{ + 新增 + + {{ importBtnTitle }} - excel导出 + excel导出
- - - + + + - + - + - - - + + +
- +
- - + + + + + + +
@@ -196,10 +202,11 @@ import nextTick from "dai-js/tools/nextTick"; import { mapGetters } from "vuex"; import editForm from "./cpts/edit"; import axios from "axios"; +import scoreRecord from '../../../components/scoreRecord.vue' export default { - components: { editForm }, - data() { + components: { editForm, scoreRecord }, + data () { return { openSearch: false, @@ -223,10 +230,14 @@ export default { importBtnTitle: "excel导入", importLoading: false, + + //积分记录 + scoreDiaTitle: '积分记录', + scoreDiaShow: false, }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.clientHeight - 450; }, ...mapGetters(["clientHeight"]), @@ -242,23 +253,23 @@ export default { } }, }, - mounted() { + mounted () { this.getTableData(); }, methods: { // 上传大图标成功 - 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 = @@ -275,7 +286,7 @@ export default { } return fileType && isLt1M; }, - uploadHttpRequest(file) { + uploadHttpRequest (file) { this.importLoading = true; this.importBtnTitle = "正在上传中..."; const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 @@ -304,35 +315,35 @@ export default { this.$refs.upload.clearFiles(); }, - 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(); }, - handleClose() { + handleClose () { this.formShow = false; }, - handleSearch(val) { + handleSearch (val) { console.log(this.fmData); this.pageNo = 1; this.getTableData(); }, - async handleAdd() { + async handleAdd () { this.formShow = true; await nextTick(); console.log(this.$refs); this.$refs.eleEditForm.initForm("add"); }, - async handleChu() { + async handleChu () { const url = "/heart/societyorg/export"; const { pageSize, pageNo, fmData } = this; axios({ @@ -367,23 +378,23 @@ export default { }); }, - async handleWatch(rowIndex) { + async handleWatch (rowIndex) { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]); }, - async handleEdit(rowIndex) { + async handleEdit (rowIndex) { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]); }, - handleEditSuccess() { + handleEditSuccess () { this.handleClose(); this.getTableData(); }, - async handleDel(rowData, rowIndex) { + async handleDel (rowData, rowIndex) { console.log(rowData, rowIndex); const url = "/heart/societyorg/del"; const { tableData } = this; @@ -400,7 +411,7 @@ export default { } }, - async getTableData() { + async getTableData () { const url = "/heart/societyorg/getlist"; const { pageSize, pageNo, fmData } = this; const { data, code, msg } = await requestPost(url, { @@ -413,14 +424,27 @@ export default { this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { - item.serviceTime = - item.serviceStartTime + "至" + item.serviceEndTime; - return item; - }) + item.serviceTime = + item.serviceStartTime + "至" + item.serviceEndTime; + return item; + }) : []; } else { } }, + + //积分记录 + handleScore (row) { + this.scoreDiaShow = true + this.$nextTick(() => { + this.$refs.ref_score.initForm(row.societyId) + }) + }, + + diaClose () { + + this.scoreDiaShow = false + }, }, }; diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index d22fbafa4..66ad452ff 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -2,19 +2,20 @@
- - + +
组织名称
-
- +
+
@@ -22,15 +23,14 @@
创建时间
-
- +
+
@@ -39,9 +39,9 @@ - 查询 + 查询 @@ -49,111 +49,120 @@
- 新增 - - {{ + 新增 + + {{ importBtnTitle }} - excel导出 + excel导出
- - - + + + - + - - - + + + - + - +
- +
- - + + + + + + +
@@ -164,10 +173,11 @@ import nextTick from "dai-js/tools/nextTick"; import { mapGetters } from "vuex"; import editForm from "./cpts/edit"; import axios from "axios"; +import scoreRecord from '../../../components/scoreRecord.vue' export default { - components: { editForm }, - data() { + components: { editForm, scoreRecord }, + data () { return { openSearch: false, @@ -189,10 +199,14 @@ export default { importBtnTitle: "excel导入", importLoading: false, + + //积分记录 + scoreDiaTitle: '积分记录', + scoreDiaShow: false, }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.clientHeight - 410; }, ...mapGetters(["clientHeight"]), @@ -208,23 +222,23 @@ export default { } }, }, - mounted() { + mounted () { this.getTableData(); }, methods: { // 上传大图标成功 - 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 = @@ -241,7 +255,7 @@ export default { } return fileType && isLt1M; }, - uploadHttpRequest(file) { + uploadHttpRequest (file) { this.importLoading = true; this.importBtnTitle = "正在上传中..."; const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 @@ -272,35 +286,35 @@ export default { this.$refs.upload.clearFiles(); }, - 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(); }, - handleClose() { + handleClose () { this.formShow = false; }, - handleSearch(val) { + handleSearch (val) { console.log(this.fmData); this.pageNo = 1; this.getTableData(); }, - async handleAdd() { + async handleAdd () { this.formShow = true; await nextTick(); console.log(this.$refs); this.$refs.eleEditForm.initForm("add"); }, - async handleChu() { + async handleChu () { const url = "/heart/iccommunityselforganization/exportcommunityselforganization"; const { pageSize, pageNo, fmData } = this; @@ -336,23 +350,23 @@ export default { }); }, - async handleWatch(rowIndex) { + async handleWatch (rowIndex) { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]); }, - async handleEdit(rowIndex) { + async handleEdit (rowIndex) { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]); }, - handleEditSuccess() { + handleEditSuccess () { this.handleClose(); this.getTableData(); }, - async handleDel(rowData, rowIndex) { + async handleDel (rowData, rowIndex) { console.log(rowData, rowIndex); const url = "/heart/iccommunityselforganization/delcommunityselforganization"; @@ -370,7 +384,7 @@ export default { } }, - async getTableData() { + async getTableData () { const url = "/heart/iccommunityselforganization/communityselforganizationlist"; const { pageSize, pageNo, fmData } = this; @@ -384,12 +398,25 @@ export default { this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { } }, + + //积分记录 + handleScore (row) { + this.scoreDiaShow = true + this.$nextTick(() => { + this.$refs.ref_score.initForm(row.orgId) + }) + }, + + diaClose () { + + this.scoreDiaShow = false + }, }, }; diff --git a/src/views/modules/visual/basicinfo/cpts/topic-info.vue b/src/views/modules/visual/basicinfo/cpts/topic-info.vue index bccd5855e..159f4b545 100644 --- a/src/views/modules/visual/basicinfo/cpts/topic-info.vue +++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue @@ -7,7 +7,8 @@ 话题详情
-
+
@@ -15,12 +16,10 @@
话题内容
{{ info.topicContent }}
- +
发布时间： @@ -37,65 +36,57 @@
-
+
-
+
{{ item.label }}
-
+
-
+
- + 加载中
-
- +
+
-
- +
+
-
+
议题标题： @@ -113,7 +104,8 @@ 议题发起人： {{ issueInfo.issueInitiator }}
-
+
议题来源： {{ issueInfo.topicInfo.groupName }}
@@ -143,22 +135,20 @@
- +
-
- +
+
-
+
项目标题： @@ -176,33 +166,36 @@ 当前处理部门： {{ projectInfo.departmentNameList.join("、") }}
-
+
分类： -
+
{{ item.name }}
-
+
标签： -
+
{{ item.name }}
-
+
处理进展
-
+
{{ item.processName }}
@@ -215,20 +208,16 @@
{{ item.departmentName }}
-
+
说 明：
{{ item.publicReply }}
-
+
内部备注：
{{ @@ -238,12 +227,10 @@
- + {{ att.name }} @@ -253,11 +240,10 @@
-
- +
+
@@ -276,7 +262,7 @@ import analyse from "@/views/modules/visual/cpts/analyse"; import foldText from "@/views/components/foldText"; import dateFormat from "dai-js/tools/dateFormat"; -function iniData() { +function iniData () { return { groupList: [ { label: "研判分析" }, @@ -434,7 +420,7 @@ export default { computed: {}, watch: { - topicId() { + topicId () { let data = iniData(); Object.keys(data).forEach((k) => { this[k] = data[k]; @@ -443,16 +429,16 @@ export default { }, }, - mounted() { + mounted () { this.getApiData(); }, methods: { - watchImg(src) { + watchImg (src) { window.open(src); }, - addStartGroupIndex() { + addStartGroupIndex () { const { startGroupIndex, groupList } = this; if (startGroupIndex < groupList.length - 9) { this.startGroupIndex = startGroupIndex + 1; @@ -460,7 +446,7 @@ export default { this.startGroupIndex = groupList.length - 9; } }, - subStartGroupIndex() { + subStartGroupIndex () { const { startGroupIndex, groupList } = this; if (startGroupIndex > 0) { this.startGroupIndex = startGroupIndex - 1; @@ -468,11 +454,11 @@ export default { this.startGroupIndex = 0; } }, - handleClose() { + handleClose () { this.$emit("close"); }, - async getApiData() { + async getApiData () { this.getComment(); await this.getInfo(); await this.getIssueInfo(); @@ -484,7 +470,7 @@ export default { }, //加载组织数据 - async getInfo() { + async getInfo () { const url = "/resi/group/topic/gettopicdetail"; const { data, code, msg } = await requestPost(url, { @@ -499,7 +485,7 @@ export default { }, //加载组织数据 - async getComment() { + async getComment () { const url = "/resi/group/comment/getcommentlistoftopic"; const { data, code, msg } = await requestPost(url, { @@ -526,7 +512,7 @@ export default { } }, - checkTopicCommentImg(index) { + checkTopicCommentImg (index) { const { comment: { srcList }, } = this; @@ -536,7 +522,7 @@ export default { }, //加载组织数据 - async getIssueInfo() { + async getIssueInfo () { const { info: { issueId }, } = this; @@ -555,7 +541,7 @@ export default { }, //加载组织数据 - async getIssueTrend() { + async getIssueTrend () { const { info: { issueId }, } = this; @@ -592,7 +578,7 @@ export default { }, //加载组织数据 - async getProjectProcess() { + async getProjectProcess () { const { issueInfo } = this; if (!issueInfo || !issueInfo.projectId) return; const url = "/gov/project/trace/processlist-v2"; @@ -615,7 +601,7 @@ export default { }, //加载组织数据 - async getProjectInfo() { + async getProjectInfo () { const { issueInfo } = this; if (!issueInfo || !issueInfo.projectId) return; const url = "/gov/project/trace/projectdetail"; @@ -631,7 +617,7 @@ export default { } }, - async getProjectCate() { + async getProjectCate () { const { issueInfo } = this; if (!issueInfo || !issueInfo.projectId) return; const url = "/gov/project/projectcategory/categorytaglist"; @@ -649,7 +635,7 @@ export default { }, //加载组织数据 - async getYanPan() { + async getYanPan () { const url = "/gov/project/project/topic-research-analysis"; if (!this.issueInfo.projectId) return; @@ -685,13 +671,13 @@ export default { } }, - toUserInfo(item) { + toUserInfo (item) { this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`, }); }, - toProjectInfo(item) { + toProjectInfo (item) { console.log(item); this.topicId = item.topicId; }, diff --git a/src/views/modules/visual/basicinfo/personCategory/components/screen-loading/index.vue b/src/views/modules/visual/basicinfo/personCategory/components/screen-loading/index.vue deleted file mode 100644 index cc8bda6fe..000000000 --- a/src/views/modules/visual/basicinfo/personCategory/components/screen-loading/index.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - diff --git a/src/views/modules/visual/basicinfo/personCategory/index.vue b/src/views/modules/visual/basicinfo/personCategory/index.vue index 807d66c32..6ae43934c 100644 --- a/src/views/modules/visual/basicinfo/personCategory/index.vue +++ b/src/views/modules/visual/basicinfo/personCategory/index.vue @@ -1,5 +1,6 @@