diff --git a/src/api/configGrowth.js b/src/api/configGrowth.js index 2f010b28..ab3fedbe 100644 --- a/src/api/configGrowth.js +++ b/src/api/configGrowth.js @@ -18,8 +18,8 @@ import { boeRequest } from "@/api/request"; // "application/x-www-form-urlencoded"; axios.defaults.withCredentials = true; const http = axios.create({ - baseURL: '/growth', - // baseURL: process.env.VUE_APP_BASE_API_GROWTH, + // baseURL: '/growth', + baseURL: process.env.VUE_APP_BASE_API_GROWTH, timeout: 1000 * 15, // headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "application/json" }, diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 06c610e2..2f7dbdb5 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -760,6 +760,19 @@ } ]; } + if (n.indexOf("/growthpathmap") !== -1 || n.indexOf("/growthPathMap") !== -1) { + state.list = [ + { + name: "报表中心", + }, + { + name:'板块详细数据' + }, + { + name:'专业力必修' + } + ]; + } if (n.indexOf("/reportproject") !== -1 || n.indexOf("/ReportProject") !== -1) { state.list = [ { diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index b50be88c..d3c2bb85 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -668,6 +668,15 @@
+ { if (res.data.code == 200) { @@ -238,6 +238,10 @@ defineExpose({ openDrawer }); } .growth-homework { + .ant-spin-container, + .ant-spin-nested-loading { + height: 100%; + } .drawerMain { .header { height: 73px; @@ -262,7 +266,7 @@ defineExpose({ openDrawer }); .main_left { flex: 1; - border-right: 1px solid #e8e8e8; + // border-right: 1px solid #e8e8e8; margin-top: 0px; padding-right: 0px; diff --git a/src/components/growthpath/GrowthLive.vue b/src/components/growthpath/GrowthLive.vue index 63d5e9cb..b35e77ea 100644 --- a/src/components/growthpath/GrowthLive.vue +++ b/src/components/growthpath/GrowthLive.vue @@ -612,7 +612,7 @@ const beforeUpload = (file) => { .contentMain { .main_left { flex: 1; - border-right: 1px solid #e8e8e8; + // border-right: 1px solid #e8e8e8; margin-top: 0px; .main_item { diff --git a/src/components/growthpath/GrowthRef.vue b/src/components/growthpath/GrowthRef.vue index 85994915..8cecbebe 100644 --- a/src/components/growthpath/GrowthRef.vue +++ b/src/components/growthpath/GrowthRef.vue @@ -191,6 +191,10 @@ defineExpose({ openDrawer }); } .growth-ref { + .ant-spin-container, + .ant-spin-nested-loading { + height: 100%; + } .drawerMain { .header { height: 73px; @@ -216,7 +220,7 @@ defineExpose({ openDrawer }); .main_left { padding-right: 30px; flex: 1; - border-right: 1px solid #e8e8e8; + // border-right: 1px solid #e8e8e8; margin-top: 0px; .main_item { diff --git a/src/components/growthpath/GrowthVote.vue b/src/components/growthpath/GrowthVote.vue index a9b295ea..d0c75772 100644 --- a/src/components/growthpath/GrowthVote.vue +++ b/src/components/growthpath/GrowthVote.vue @@ -138,7 +138,7 @@ const props = defineProps({ // 弹框标题 const title = computed(() => { if (step.value == 1) { - return formData.value.info ? "编辑投票任务" : "添加投票"; + return formData.value.id ? "编辑投票任务" : "添加投票"; } else if (step.value == 2) { return "创建投票题干"; } @@ -277,7 +277,12 @@ defineExpose({ openDrawer }); .ant-table-striped :deep(.table-striped) td { background-color: #fafafa !important; } - +::v-deep.ant-spin-nested-loading { + height: 100%; + .ant-spin-container { + height: 100%; + } +} .growth-vote { .drawerMain { .header { @@ -304,7 +309,7 @@ defineExpose({ openDrawer }); .main_left { padding-right: 30px; flex: 1; - border-right: 1px solid #e8e8e8; + // border-right: 1px solid #e8e8e8; margin-top: 0px; .main_item { diff --git a/src/views/growthpath/PathManage.vue b/src/views/growthpath/PathManage.vue index 12e7b20b..441919eb 100644 --- a/src/views/growthpath/PathManage.vue +++ b/src/views/growthpath/PathManage.vue @@ -1131,7 +1131,7 @@ export default { codeUrl = window.location.protocol + process.env.VUE_APP_EXAM_DETAIL_URL + - item.info.examinationPaperId; + item.info.examinationTestId; } } // 直播结束时间 diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index 5061be14..c673753b 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -3,55 +3,78 @@
-
- - - -
-
- - -
-
- - -
+ + +
+
+ + +
+
+ + +
+ +
@@ -75,7 +98,7 @@ :class="currentTab === index ? 'tabActive' : 'tabItem'" @click="tabClick(index)" > - + @@ -306,7 +329,7 @@ import axios from "axios"; import dayjs from "dayjs"; import { message } from "ant-design-vue"; import Cookies from "vue-cookies"; -import {useStore} from "vuex"; +import { useStore } from "vuex"; export default { name: "OvervoeW", setup() { @@ -323,17 +346,19 @@ export default { selectedRowKeys: [], // 选中的列 option: [], resetOrgId: [], + stdPositionDesr: null, // 标准岗位 + qualsLevelDesr: "", //任职资格 allowClear: true, type: null, publishTime: [], // 创建时间 }); // 获取tab数据 const getTabData = async () => { - console.log("getTabData 111111:",state.type); - console.log("getTabData 222222:",store.state.userInfo.roleList); + console.log("getTabData 111111:", state.type); + console.log("getTabData 222222:", store.state.userInfo.roleList); var manageFlag = false; - for(let i=0;i { var manageFlag = false; - for(let i=0;i { return { @@ -721,8 +813,14 @@ export default { teachingName: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", - endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", + startTime: + typeof state.publishTime[0] === "undefined" + ? null + : state.publishTime[0] + " 00:00:01", + endTime: + typeof state.publishTime[1] === "undefined" + ? null + : state.publishTime[1] + " 23:59:59", }); const list = res.data.result.rows?.map((item) => { return { @@ -740,8 +838,14 @@ export default { routerName: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", - endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", + startTime: + typeof state.publishTime[0] === "undefined" + ? null + : state.publishTime[0] + " 00:00:01", + endTime: + typeof state.publishTime[1] === "undefined" + ? null + : state.publishTime[1] + " 23:59:59", }); const list = res.data.result.rows?.map((item) => { return { @@ -759,8 +863,14 @@ export default { orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, projectName: state.name, - startCreateTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", - endCreateTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", + startCreateTime: + typeof state.publishTime[0] === "undefined" + ? null + : state.publishTime[0] + " 00:00:01", + endCreateTime: + typeof state.publishTime[1] === "undefined" + ? null + : state.publishTime[1] + " 23:59:59", }); if (res) { const fun = (arr) => { @@ -1086,7 +1196,7 @@ export default { width: 120, align: "center", }, - + { title: "通过人数", dataIndex: "numOfPass", @@ -1561,12 +1671,12 @@ export default { } else if (index === 6) { columns.value = [ { - title: "专业力必修名称", + title: "专业力必修", dataIndex: "growthName", key: "growthName", - width: 120, + width: 200, ellipsis: true, - align: "left", + align: "center", fixed: "left", }, { @@ -1637,14 +1747,6 @@ export default { width: 120, align: "center", }, - { - title: "归属人名称", - dataIndex: "attrPersonName", - ellipsis: true, - key: "attrPersonName", - width: 120, - align: "center", - }, { title: "状态", dataIndex: "publishedStatus", @@ -1652,6 +1754,11 @@ export default { key: "publishedStatus", width: 120, align: "center", + customRender: ({ record: { publishedStatus } }) => + ({ + 1: "已发布", + 0: "未发布", + }[publishedStatus]), }, ]; } diff --git a/src/views/report/growthpathmap.vue b/src/views/report/growthpathmap.vue new file mode 100644 index 00000000..91aa65e9 --- /dev/null +++ b/src/views/report/growthpathmap.vue @@ -0,0 +1,694 @@ + + + diff --git a/vue.config.js b/vue.config.js index fb18ed6d..326395b2 100644 --- a/vue.config.js +++ b/vue.config.js @@ -18,16 +18,16 @@ module.exports = defineConfig({ overlay: false,// 解决代码抛出异常 }, proxy: { - // "/professional": { - // target: 'http://192.168.31.211:32002', - // // target: 'http://192.168.50.195:32002', - // // target: 'http://192.168.86.195:32002', - // changeOrigin: true, - // }, - "/growth": { - target: 'https:' + process.env.VUE_APP_BOE_API_URL, + "/professional": { + target: 'http://192.168.31.211:32002', + // target: 'http://192.168.50.195:32002', + // target: 'http://192.168.86.195:32002', changeOrigin: true, }, + // "/growth": { + // target: 'https:' + process.env.VUE_APP_BOE_API_URL, + // changeOrigin: true, + // }, "/manageApi": { target: 'https:' + process.env.VUE_APP_PROXY_URL, changeOrigin: true, //表示是否改变原域名 @@ -53,6 +53,13 @@ module.exports = defineConfig({ // "^/manageApi": "", }, }, + // "/report": { + // target: 'http://192.168.31.211:18878', + // changeOrigin: true, //表示是否改变原域名 + // pathRewrite: { + // "^/report": "", + // }, + // }, "/activityApi": { target: 'https:' + process.env.VUE_APP_BOE_API_URL, changeOrigin: true,