Browse Source

bug#373 转议题时间分类可以修改

feature
mk 2 years ago
parent
commit
481501447b
  1. 33
      src/views/modules/communityService/measure/info.vue
  2. 14
      src/views/modules/shequzhili/issue/cpts/issue-detail.vue
  3. 11
      src/views/modules/visual/cpts/line-chart.vue

33
src/views/modules/communityService/measure/info.vue

@ -306,9 +306,9 @@
>
<el-option
v-for="item in serviceOptiondList"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
@ -622,10 +622,11 @@ export default {
}
},
handleServiceChange(type, val) {
console.log(val);
if (val === "social_org") {
if (type === "add") this.getServiceuserList(val, "add_demand");
else this.getServiceuserList(val, "query_demand");
} else this.getServiceuserList(val, "");
} else this.getServiceuserList(val,this.form.categoryCode);
},
async handleGridChange(val) {
console.log("网格改变了", val);
@ -641,12 +642,6 @@ export default {
}
},
handleServiceChange(type, val) {
if (val === "social_org") {
if (type === "add") this.getServiceuserList(val, "add_demand");
else this.getServiceuserList(val, "query_demand");
} else this.getServiceuserList(val, "");
},
handleAdd(addType) {
this.addType = addType;
@ -660,7 +655,6 @@ export default {
async formatRowForm(addType) {
this.addType = addType;
const { form: row } = this;
if (addType == "look") {
this.finishServiceTime =
(row.serviceStartTime && [
@ -680,7 +674,7 @@ export default {
this.form.score = 5;
}
if (addType == "appoint" && row.serviceType) {
const type = row.serviceType == "social_org" ? "add_demand" : "";
const type = row.categoryCode || ""
await this.getServiceuserList(row.serviceType, type);
}
if (addType == "edit") {
@ -936,22 +930,21 @@ export default {
},
async getServiceuserList(serviceType, query) {
if (!serviceType) return false;
if (!serviceType) return;
const { demandUserId } = this.form;
const params = {
serviceName: "",
serviceType: serviceType,
queryPurpose: query,
serviceTypeId: query,
serverOrgType: serviceType,
businessType: "resi_service",
};
await this.$http
.post("/governance/userdemand/servicelist", params)
.post("/actual/base/serviceitem/listServerOrg", params)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
this.serviceOptiondList = res.data.filter(
(item) => item.value != demandUserId
);
this.serviceOptiondList.push(...res.data)
console.log( this.serviceOptiondList );
}
})
.catch(() => {

14
src/views/modules/shequzhili/issue/cpts/issue-detail.vue

@ -14,7 +14,9 @@
/>
</h3>
<div class="m-detail-main">
<div class="m-info">
<el-row>
<el-col :span="11">
<div class="m-info">
<div
:class="[
'm-info-prop',
@ -230,8 +232,8 @@
<div class="line" @click="handleToEvaluation">查看全部</div>
</div>
</div>
<div class="m-line">
</el-col>
<el-col :span="13"> <div class="m-line">
<div class="stat">
<div class="stat-item">
<!-- <div>
@ -268,7 +270,11 @@
<div v-if="issueChartData.length > 0" class="m-chart">
<line-chart :list="issueChartData" />
</div>
</div>
</div></el-col>
</el-row>
</div>
<!--
显示关闭

11
src/views/modules/visual/cpts/line-chart.vue

@ -43,6 +43,7 @@ export default {
return {
iniLoading: false,
id,
myChart:{}
};
},
watch: {
@ -80,7 +81,7 @@ export default {
initCharts(date, data, data1) {
console.log(this.id);
let div = document.getElementById(this.id);
let myChart = echarts.init(div);
this.myChart = echarts.init(div);
var option = {
tooltip: {
trigger: "axis",
@ -166,10 +167,14 @@ export default {
},
],
};
myChart.setOption(option);
window.addEventListener("resize", () => myChartPieLeft.resize(), false);
this.myChart.setOption(option);
window.addEventListener("resize", () => this.myChart.resize());
},
},
beforeDestroy() {
window.removeEventListener('resize', this.myChart.resize);
}
};
</script>

Loading…
Cancel
Save