diff --git a/.env.development b/.env.development index b3e49ab5..b23cea2c 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,9 @@ NODE_ENV=development # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api VUE_APP_API_SERVER = http://192.168.1.140/api -# VUE_APP_API_SERVER = http://192.168.51.36:8080/api + +#家中开发连级的后端服务 +# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_NODE_ENV=dev #项目根路径 diff --git a/public/index.html b/public/index.html index 840ae8cc..ebeef610 100644 --- a/public/index.html +++ b/public/index.html @@ -40,8 +40,8 @@ <% } %> diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss index 438c0e30..e341f70f 100644 --- a/src/assets/scss/modules/visual/distributionAnalyze.scss +++ b/src/assets/scss/modules/visual/distributionAnalyze.scss @@ -28,7 +28,7 @@ display: block; display: flex; align-items: center; - margin-top: 20px; + .second-title-label { position: relative; padding-left: 40px; @@ -117,11 +117,11 @@ flex-direction: row; // flex-wrap: wrap; justify-content: space-between; - height: calc(100vh - 230px); + height: calc(100vh - 190px); .g-l { width: 40%; - height: calc(100vh - 240px); + height: calc(100vh - 200px); .echart-line { margin-left: 30px; @@ -135,16 +135,25 @@ width: 100%; height: 90%; } + + > img { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: auto; + } } } .g-r { width: 55%; - height: calc(100vh - 250px); + height: calc(100vh - 210px); .r-map { position: relative; - height: calc(100vh - 250px - 50px); + height: calc(100vh - 210px - 50px); width: 100%; .map { diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss index 43f77201..e4672951 100644 --- a/src/assets/scss/modules/visual/issue-info.scss +++ b/src/assets/scss/modules/visual/issue-info.scss @@ -74,7 +74,7 @@ display: flex; padding-left: 15px; .info-title-2 { - width: 90px; + width: 100px; flex: 0 0 1; font-size: 14px; } diff --git a/src/assets/scss/modules/visual/resibuzz.scss b/src/assets/scss/modules/visual/resibuzz.scss index 91ff7705..8ea3f5ee 100644 --- a/src/assets/scss/modules/visual/resibuzz.scss +++ b/src/assets/scss/modules/visual/resibuzz.scss @@ -52,9 +52,10 @@ } } .status-select { - position: absolute; - top: 20px; - right: 10px; + margin-left: 10px; + // position: absolute; + // top: 20px; + // right: 10px; } .second-select:last-child { margin-left: 0; diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue index 66453605..9c7b5a18 100644 --- a/src/views/modules/communityParty/elegant/index.vue +++ b/src/views/modules/communityParty/elegant/index.vue @@ -120,7 +120,7 @@ + + + 查看 - 修改 @@ -199,6 +210,7 @@ @dialogCancle="addFormCancle" @dialogOk="addFormOk"> + - - - - + + + - - - - - - 至 - - - - 删除 + + + + + + + 至 + + + +
+ + + + + +
（事项封面，图片小于1M）
+ + 删除 +
- 添加 + 添加
@@ -266,6 +294,9 @@ let loading; // 加载动画 export default { data() { return { + uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2", + customerId: "", + formType: "add", //表单操作类型 add新增，edit编辑，detail详情 btnDisable: false, @@ -342,14 +373,39 @@ export default { watch: {}, async mounted() { + this.customerId = localStorage.getItem("customerId"); this.initMap(); }, methods: { + handleImgSuccess(index, res, file) { + if (res.code === 0 && res.msg === "success") { + console.log("res.data.url", res.data.url); + this.dataForm.matterList[index].matterImg = res.data.url; + } else { + this.$message.error(res.msg); + } + }, + + beforeImgUpload(file) { + const isLt1M = file.size / 1024 / 1024 < 1; + + if (!isLt1M) { + this.$message.error("上传图片大小不能超过 1MB!"); + } + return isLt1M; + }, + handleAddStaff() { this.dataForm.matterList = [ ...this.dataForm.matterList, - { matterName: "", appointmentType: "", startTime: "", endTime: "" }, + { + matterName: "", + appointmentType: "", + matterImg: "", + startTime: "", + endTime: "", + }, ]; }, handleDelStaff(index) { @@ -482,9 +538,28 @@ export default { this.dataForm.partyServiceCenterId = this.partyServiceCenterId; } + const matterList = this.dataForm.matterList.filter( + (item) => !item.matterId + ); + if ( + matterList.some( + (item) => + !item.matterImg || + !item.matterName || + !item.appointmentType || + !item.startTime || + !item.endTime + ) + ) { + return this.$message({ + type: "warning", + message: "请补充完整可预约事项信息", + }); + } + const { data, code, msg } = await requestPost(url, { ...this.dataForm, - matterList: this.dataForm.matterList.filter((item) => !item.matterId), + matterList, }); if (code === 0) { @@ -580,9 +655,48 @@ export default { width: 650px; .item { - display: flex; - justify-content: space-around; - margin-bottom: 7px; + .item-info { + display: flex; + justify-content: space-around; + margin-bottom: 7px; + } + .item-pic { + display: flex; + align-items: center; + .hint { + font-size: 14px; + color: #999999; + margin-left: 10px; + } + .avatar-uploader { + ::v-deep .el-upload { + cursor: pointer; + position: relative; + overflow: hidden; + } + img { + object-fit: cover; + } + .el-upload:hover { + border-color: #409eff; + } + .avatar { + width: 50px; + height: 50px; + display: block; + } + .avatar-uploader-icon { + border: 1px dashed #d9d9d9; + border-radius: 6px; + font-size: 28px; + color: #8c939d; + width: 50px; + height: 50px; + line-height: 50px; + text-align: center; + } + } + } } .item-add { } diff --git a/src/views/modules/communityService/dqfwzx/cpts/order.vue b/src/views/modules/communityService/dqfwzx/cpts/order.vue index 6452dc55..501266fd 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/order.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/order.vue @@ -31,13 +31,22 @@ label-width="150px" style="display: block" > - - + --> + + + - +
{{ item.time }} - +
item.selected); + let endIndex = list.findIndex((item, index) => { + return ( + item.selected && + (index == list.length - 1 || !list[index + 1].selected) + ); + }); + // console.log(startIndex, endIndex); + if (startIndex == -1) { + list[index].selected = !list[index].selected; + } else if (startIndex == endIndex) { + let big = Math.max(startIndex, index); + let little = Math.min(startIndex, index); + if (big == little) { + list[index].selected = !list[index].selected; + } else { + for (let i = little; i <= big; i++) { + // console.log(i); + if (!list[i].isAppointment) { + this.$message({ + type: "warning", + message: "请选择连续的时间", + }); + return false; + } + list[i].selected = true; + } + } + } else { + if (index == startIndex || index == endIndex) { + list[index].selected = !list[index].selected; + } else if (list[index].selected) { + let big = index; + let little = index; + if (startIndex - index < index - endIndex) { + big = endIndex; + } else { + little = startIndex; + } + for (let i = little; i <= big; i++) { + list[i].selected = false; + } + } else { + let big = index; + let little = index; + if (index < startIndex) { + big = startIndex; + } else { + little = endIndex; + } + for (let i = little; i <= big; i++) { + // console.log(i); + if (!list[i].isAppointment) { + this.$message({ + type: "warning", + message: "请选择连续的时间", + }); + return false; + } + list[i].selected = true; + } + } + } + console.log(list); + this.timeList = list; + return false; + }, + + async getDateList() { + let url = "/gov/org/icpartyservicecenter/appointmenttime"; + + const { + dataForm: { matterId }, + } = this; + if (!matterId) return; + + const { data, code, msg } = await requestPost(url, { + matterId, + date: dateFormat(new Date(), "yyyy-MM-dd"), + }); + + if (code === 0) { + this.dateList = data.dateList || []; + // this.dataForm.appointmentDate = data.dateList[0]; + } else { } }, @@ -219,8 +332,11 @@ export default { }); if (code === 0) { - this.timeList = data.timeDetail || []; - } else { + let timeList = data.timeDetail || []; + this.timeList = timeList.map((item) => { + item.selected = false; + return item; + }); } }, diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue index b26a50a3..0544cbf9 100644 --- a/src/views/modules/communityService/dqfwzx/index.vue +++ b/src/views/modules/communityService/dqfwzx/index.vue @@ -191,9 +191,7 @@ export default { }, async mounted() { await this.loadAgency(); - await this.getTableData(); - this.initMap(); - this.setMap(); + // await this.getTableData(); }, methods: { // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 @@ -324,6 +322,7 @@ export default { }, async getTableData() { + const oldLen = this.tableData.length; const url = "/gov/org/icpartyservicecenter/partyservicecenterlist"; const { data, code, msg } = await requestPost(url, { orgId: this.agencyId, @@ -333,7 +332,12 @@ export default { console.log("列表请求成功！！！！！！！！！！！！！！"); this.tableData = data; - } else { + + if (data.length > 0 && oldLen == 0) { + await nextTick(100); + this.initMap(); + this.setMap(); + } } }, diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 8da78a93..66af8c1e 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -137,32 +137,45 @@ size="small" @click="handleAppoint(scope.row, 'appoint')" >指派 - 完成情况 - + + + {{ form.cancelTime }} -