diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index 72fd63f78..b54b5d07f 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/src/assets/scss/modules/shequzhili/event-info.scss @@ -533,7 +533,24 @@ .m-top { display: flex; } +.m-top1 { + display: flex; + flex-direction: row; + justify-content: space-between; + .top-one{ + display: flex; + flex-direction: row; + justify-content:flex-start; + .top-one-left{ + padding: 6px; + display: flex; + flex-direction: column; + } + +} + +} .m-chart { min-height: 220px; } @@ -587,4 +604,5 @@ width: 250px; } - +.event{ +} \ No newline at end of file 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/Delivery/index.vue b/src/views/modules/shequzhili/Delivery/index.vue index 0c1d83b2c..46166ef8b 100644 --- a/src/views/modules/shequzhili/Delivery/index.vue +++ b/src/views/modules/shequzhili/Delivery/index.vue @@ -1,6 +1,7 @@ @@ -174,32 +182,13 @@ import { requestPost } from "@/js/dai/request"; import nextTick from "dai-js/tools/nextTick"; import { mapGetters } from "vuex"; - +import eventInfo from "../event/cpts/event-info.vue"; import axios from "axios"; export default { data() { - // let endDisabledDate = (time) => { - // //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 - // let nowData = Date.now(); - // if (this.formData.startTime) { - // let startTime = new Date(this.formData.startTime); - // return ( - // time.getTime() > nowData || - // time.getTime() < startTime || - // time.getTime() === startTime - // ); - // } else { - // return time.getTime() > nowData; - // } - // }; - // let startDisabledDate = (time) => { - // //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 - // let nowData = Date.now(); - // return time.getTime() > nowData; - // }; let orgOptionProps = { multiple: false, @@ -212,7 +201,6 @@ export default { return { pageType: "list", // 列表list 新增add 处理dispose 详情info user: {}, - agencyId: "", orgOptions: [], orgOptionProps, @@ -366,6 +354,7 @@ export default { importType: "1" }; }, + components:{eventInfo}, computed: { maxTableHeight() { const h = this.clientHeight - this.searchH - 275 + this.iframeHeight; @@ -516,6 +505,7 @@ export default { }, async handleWatch(row) { + console.log("row",row); this.eventId = row.icEventId; const url = "/governance/icEvent/detail"; const { data, code, msg } = await requestPost(url, { @@ -529,8 +519,19 @@ export default { } }, - async handleDispose(row) { - console.log("row",row); + async handleDispose(row,type) { + console.log(row); + this.eventId = '1817808353882152962'; + const url = "/governance/icEvent/detail"; + const { data, code, msg } = await requestPost(url, { + icEventId: this.eventId, + }); + if (code === 0) { + this.eventDetailData = { ...data }; + this.pageType = type; + } else { + this.$message.error(msg); + } }, //下载模版 async handleExportModule() { diff --git a/src/views/modules/shequzhili/analysis/css/index.scss b/src/views/modules/shequzhili/analysis/css/index.scss new file mode 100644 index 000000000..53e367690 --- /dev/null +++ b/src/views/modules/shequzhili/analysis/css/index.scss @@ -0,0 +1,85 @@ +.dashboard { + display: flex; + gap: 20px; +} + +.card { + width: 280px; + height: 49px; + background: #E6F0FF; + border-radius: 3px; + padding: 20px; + display: flex; + align-items: center; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); +} +.card1 { + width: 284px; + height: 49px; + background: #E6F0FF; + border-radius: 3px; + padding: 20px; + display: flex; + align-items: center; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); +} + + +.card-icon { + width: 40px; + height: 40px; + margin-right: 10px; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; +} + +.card-icon.total { + background-color: #4a90e2; +} + +.card-icon.completed { + background-color: #f5a623; +} + +.card-icon.overdue-contact { + background-color: #7ed321; +} + +.card-icon.overdue-process { + background-color: #d0021b; +} + +.card-content { + display: flex; + flex-direction: column; + align-items: flex-start; +} +.card-content1 { + display: flex; + flex-direction: row; + align-items: flex-start; +} + +.card-title { + font-size: 16px; + font-weight: bold; + margin: 0; +} + +.card-text { + font-size: 14px; + color: #777; + margin: 5px 0 0 0; +} + +.percentage { + font-size: 14px; + color: #777; + margin-left: 5px; +} +.br{ +padding: 20px 0; +border-left: #777 solid 1px; +} \ No newline at end of file diff --git a/src/views/modules/shequzhili/analysis/img/eventNum.png b/src/views/modules/shequzhili/analysis/img/eventNum.png new file mode 100644 index 000000000..a01378de5 Binary files /dev/null and b/src/views/modules/shequzhili/analysis/img/eventNum.png differ diff --git a/src/views/modules/shequzhili/analysis/img/eventSumNum.png b/src/views/modules/shequzhili/analysis/img/eventSumNum.png new file mode 100644 index 000000000..cb16d416b Binary files /dev/null and b/src/views/modules/shequzhili/analysis/img/eventSumNum.png differ diff --git a/src/views/modules/shequzhili/analysis/img/overdue.png b/src/views/modules/shequzhili/analysis/img/overdue.png new file mode 100644 index 000000000..c588f54c0 Binary files /dev/null and b/src/views/modules/shequzhili/analysis/img/overdue.png differ diff --git a/src/views/modules/shequzhili/analysis/img/perp.png b/src/views/modules/shequzhili/analysis/img/perp.png new file mode 100644 index 000000000..9bfbaead9 Binary files /dev/null and b/src/views/modules/shequzhili/analysis/img/perp.png differ diff --git a/src/views/modules/shequzhili/analysis/index.vue b/src/views/modules/shequzhili/analysis/index.vue index a5cdff6ca..3f341dfc2 100644 --- a/src/views/modules/shequzhili/analysis/index.vue +++ b/src/views/modules/shequzhili/analysis/index.vue @@ -1,312 +1,264 @@