diff --git a/src/assets/styles/custom.scss b/src/assets/styles/custom.scss index 5814f7ee..09af51dc 100644 --- a/src/assets/styles/custom.scss +++ b/src/assets/styles/custom.scss @@ -425,17 +425,20 @@ } .quick-link-wrapper { - padding: 12px; + padding: 3px; display: block; text-align: center; - text-decoration: none; - color: inherit; + // text-decoration: none; + // color: inherit; + text-decoration: underline; + // color: #b12e29; + color: #00213c; } .quick-link-wrapper .quick-link-title { font-size: 14px; - font-weight: 500; + font-weight: 400; } .quick-link-box .icon { diff --git a/src/views/emis/dashboard.vue b/src/views/emis/dashboard.vue index b143a81e..7a920530 100644 --- a/src/views/emis/dashboard.vue +++ b/src/views/emis/dashboard.vue @@ -71,58 +71,133 @@ - + - + - + + + + + + @@ -130,23 +205,23 @@ - + - + + /> - + --> @@ -157,25 +232,25 @@ -->
-
Hi,{{nickName}},欢迎使用！
+
Hi,{{ownerSiteName}} {{nickName}},欢迎您！
-
+ + @@ -197,7 +272,7 @@ @@ -229,6 +304,9 @@ const lineChartData = { } } import { GridLayout, GridItem } from 'vue-grid-layout' +import { listSimpleAction } from "@/api/system/sysActionStats"; +import { getQueryStatInfoMap } from "@/api/emis/emisWaybill"; +import {timeDiffTime,timeFormat} from '@/utils/dateUtils' import CardWithHeader from '@/components/CardWithHeader/index.vue'; import RaddarChart from './common/RaddarChart.vue'; @@ -249,6 +327,9 @@ export default { return { loading: false, lineChartData: lineChartData.newVisitis, + quickActionList:[], + queryStatInfoMap:null, + dateRange:[], layout: [ { x: 0, y: 0, w: 3, h: 2, i: '1', static: false }, { x: 6, y: 0, w: 3, h: 2, i: '2', static: false }, @@ -257,12 +338,69 @@ export default { } }, computed: { - ...mapGetters(['avatar', 'nickName']), + ...mapGetters(['avatar', 'nickName','ownerSiteName']), }, created() { - + this.initQuickActionList(); + this.initOrderStatData(); }, methods: { + initQuickActionList() { + let queryParams={ + pageNum: 1, + pageSize: 12, + }; + listSimpleAction(queryParams).then(response => { + this.quickActionList = response.rows; + }); + }, + + initOrderStatData(){ + + // 查询统计 + let qParam={ + sendSiteCode:null, + params:{ + sendSiteCode:null + } + } + + if(this.$store.getters.ownerSiteCode!='88888'){ + qParam.sendSiteCode=this.$store.getters.ownerSiteCode; + } + + const end = new Date() + const start = new Date() + start.setHours(0,0,0,0) + end.setHours(23,59,59,0) + this.dateRange=[timeFormat(start), timeFormat(end)] + let extQParam={...qParam}; + // let extQParam=this.addDateRange(qParam, this.dateRange,"sendDate"); + + getQueryStatInfoMap(extQParam).then(response => { + this.queryStatInfoMap = response.data; + }); + }, + ishttp(url) { + return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1 + }, + change(val) { + const path = val.path; + if(this.ishttp(val.path)) { + // http(s):// 路径新窗口打开 + const pindex = path.indexOf("http"); + window.open(path.substr(pindex, path.length), "_blank"); + } else { + this.$router.push(val.path) + } + this.search = '' + this.options = [] + this.$nextTick(() => { + this.show = false + }) + this.initQuickActionList(); + }, + layoutUpdatedEvent(newLayout) { this.layout = newLayout; }, diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue index db8a741b..99611ef6 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue @@ -352,6 +352,10 @@ {{scope.row.waybillDetail.freight}} + + + +