diff --git a/src/main.js b/src/main.js index d6aa150ef..3acc99f47 100644 --- a/src/main.js +++ b/src/main.js @@ -48,7 +48,7 @@ import PopTips from "@/components/PopTips/index.vue"; import PopHomeTip from "@/components/PopHomeTip/index.vue"; import NameSplit from "@/components/NameSplit/index.vue"; import RelationGraph from "relation-graph"; -import dayjs from 'dayjs' +// import dayjs from 'dayjs' // import AddNodeJw from "@/components/JwTree/addNode.vue"; //按钮 @@ -104,7 +104,7 @@ Vue.directive("fixed", { // 挂载全局 Vue.prototype.$http = http; Vue.prototype.$sensitive = desensitization; -Vue.prototype.$dayjs = dayjs +// Vue.prototype.$dayjs = dayjs // el-uploader的header配置 Vue.prototype.$getElUploadHeaders = () => ({ Authorization: localStorage.getItem("token") || "", diff --git a/src/views/modules/shequzhili/analysis/TableRow.vue b/src/views/modules/shequzhili/analysis/TableRow.vue index 4e6bfe879..bbdbdc467 100644 --- a/src/views/modules/shequzhili/analysis/TableRow.vue +++ b/src/views/modules/shequzhili/analysis/TableRow.vue @@ -1,65 +1,41 @@ - - - - \ No newline at end of file + }; + \ No newline at end of file diff --git a/src/views/modules/shequzhili/analysis/index.vue b/src/views/modules/shequzhili/analysis/index.vue index aa93cb1f2..558c2e114 100644 --- a/src/views/modules/shequzhili/analysis/index.vue +++ b/src/views/modules/shequzhili/analysis/index.vue @@ -68,7 +68,7 @@
-

{{analysisList.illegalResolveTotal}}{{analysisList.illegalResolveRate?analysisList.illegalResolveRate:"--"}} {{analysisList.illegalResolveRate?analysisList.illegalResolveRate:"--"}}%

+

{{analysisList.illegalResolveTotal}} {{analysisList.illegalResolveRate}}%

办理超期事件数

@@ -86,6 +86,20 @@ 事件数量 同级占比 + + {{ item.categoryName }} + + {{ item.categoryName }} + + {{ item.categoryName }} + + {{ item.categoryName }} + {{ item.eventCount }} + {{ item.proportion }} + + {{ item.eventCount }} + {{item.proportion}} + @@ -273,6 +287,7 @@ export default { components: {TableRow}, data() { return { + level:1, tableList:[], communityList:[], departmentList:[], @@ -281,7 +296,7 @@ export default { queryDateStart: "", queryDateEnd: "", }, - + agencyLevel:'', orgData: { @@ -613,7 +628,13 @@ export default { await this.initEcharts(); }, methods: { - + calculateRowspan(item) { + + if (!item.children || !item.children.length) { + return 1; + } + + }, initEcharts() { if(this.categoryCountShow){