diff --git a/dist.rar b/dist.rar deleted file mode 100644 index 07b1259..0000000 Binary files a/dist.rar and /dev/null differ diff --git a/src/layout/default/components/header/menuLi.vue b/src/layout/default/components/header/menuLi.vue index ed6525d..1eba659 100644 --- a/src/layout/default/components/header/menuLi.vue +++ b/src/layout/default/components/header/menuLi.vue @@ -20,10 +20,12 @@ import { getUserInfo } from "@/api/user" import useUserStore from '@/stores/modules/user' import { useWatchRoute } from '@/hooks/useWatchRoute' +import { useRouter } from "vue-router" const userStore = useUserStore() const menuList = reactive([]) const menuName = ref('') +const router = useRouter() const menuClick = async (item) => { userStore.getUserInfoByID(item.id) @@ -31,6 +33,13 @@ const menuClick = async (item) => { await nextTick() menuName.value = item.name + + item.id == 173 ? router.push('/sys/consumer/lists') : + router.push('/' + item.paths + '/' + item.children[0].paths) + + + + } getUserInfo().then(res => { diff --git a/src/views/cost_approved_projects/index.vue b/src/views/cost_approved_projects/index.vue index 43e124a..620dad0 100644 --- a/src/views/cost_approved_projects/index.vue +++ b/src/views/cost_approved_projects/index.vue @@ -32,19 +32,9 @@ - - - - - - - + 查询 重置 - + { } }) break - case '2': - router.push({ - path: '/management/manage_basic/manage_project', - query: { - contractId: data.id, - contractName: data.contract_name - } - }) - break - case '3': - router.push({ - path: '/consult/consult_basic/consult_project', - query: { - contractId: data.id, - contractName: data.contract_name - } - }) - break + case '2': + router.push({ + path: '/management/manage_basic/manage_project', + query: { + contractId: data.id, + contractName: data.contract_name + } + }) + break + case '3': + router.push({ + path: '/consult/consult_basic/consult_project', + query: { + contractId: data.id, + contractName: data.contract_name + } + }) + break case '4': router.push({ path: '/cost_consultation/cost_consultation_project/cost_project', diff --git a/src/views/statistic_cw/index.vue b/src/views/statistic_cw/index.vue index 19aa430..b583377 100644 --- a/src/views/statistic_cw/index.vue +++ b/src/views/statistic_cw/index.vue @@ -133,7 +133,6 @@ const getData2 = () => { // 清空echarts 数据 visitorOption.xAxis.data = [] visitorOption.series = [] - console.log(res) visitorOption.xAxis.data = Object.keys(res[0].value) res.forEach((item, index) => { diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue index a5f633a..73ff787 100644 --- a/src/views/workbench/index.vue +++ b/src/views/workbench/index.vue @@ -6,11 +6,9 @@ 概况
时间筛选: - + 查询 - 重置 + 重置
@@ -33,7 +31,6 @@
趋势 -
@@ -77,7 +74,9 @@ const visitorOption: any = reactive({ color: 'red' }, tooltip: { - trigger: 'axis' + trigger: 'axis', + confine: true, + }, series: [ { @@ -118,12 +117,12 @@ function getLastMonthRange() { const startEndTime = ref([new Date(), new Date()]); -const startEndTime2 = ref(getLastMonthRange()); - +const startEndTime2 = ref(); +console.log(new Date().getFullYear()) const getData2 = () => { let date = ''; - if (startEndTime2.value[0] && startEndTime2.value[1]) date = moment(startEndTime2.value[0]).format('YYYY/MM/DD') + '-' + moment(startEndTime2.value[1]).format('YYYY/MM/DD'); + date = (moment(startEndTime2.value).format('YYYY') + '/01/31') + '-' + (moment(startEndTime2.value).format('YYYY') + '/12/31'); getWorkbench({ date: date }).then(res => { diff --git a/stats.html b/stats.html index 6233e89..996b2ba 100644 --- a/stats.html +++ b/stats.html @@ -4822,7 +4822,7 @@ var drawChart = (function (exports) {