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 (step.value == 1) {
- return formData.value.info ? "编辑投票任务" : "添加投票";
+ return formData.value.id ? "编辑投票任务" : "添加投票";
} else if (step.value == 2) {
return "创建投票题干";
}
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..d63c8ced
--- /dev/null
+++ b/src/views/report/growthpathmap.vue
@@ -0,0 +1,761 @@
+
+
+
+
+
+
+
+
+
+

+
+
导出列表信息
+
+
+
+

+
+
导出详细信息
+
+
+
+
+
+
+
+
+
+ {{
+ record.publishTime &&
+ dayjs(record.publishTime).format("YYYY-MM-DD HH:mm:ss")
+ }}
+
+ {{
+ record.publishTime &&
+ dayjs(record.publishTime).format("YYYY-MM-DD HH:mm:ss")
+ }}
+
+
+
+ {{
+ record.status == "0"
+ ? "草稿"
+ : record.status == "1"
+ ? "已发布"
+ : record.status == "-1"
+ ? "停用"
+ : ""
+ }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file