Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release

# Conflicts:
#	package.json
#	src/api/config.js
#	src/components/NavTop.vue
#	src/views/projectcenter/templateAdd.vue
#	vue.config.js
This commit is contained in:
dongruihua
2022-12-14 23:31:14 +08:00
40 changed files with 2635 additions and 3113 deletions

8
.env Normal file
View File

@@ -0,0 +1,8 @@
VUE_APP_BASE=/manage
VUE_APP_BASE_API=/manageApi
VUE_APP_PROXY_URL=http://111.231.196.214:30001/
VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading

4
.env.boe Normal file
View File

@@ -0,0 +1,4 @@
VUE_APP_BASE=/manage
VUE_APP_BASE_API=/manageApi

2
.env.prod Normal file
View File

@@ -0,0 +1,2 @@
VUE_APP_BASE=/manage
VUE_APP_BASE_API=/manageApi

7
.env.release Normal file
View File

@@ -0,0 +1,7 @@
VUE_APP_BASE=/manage-release
VUE_APP_BASE_API=/manageApi-release
VUE_APP_LOGIN_URL=https://u.boe.com/web
VUE_APP_IFRAME_URL=https://u.boe.com/pc-release/iframe
VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading

4
.env.test Normal file
View File

@@ -0,0 +1,4 @@
VUE_APP_BASE=/manage
VUE_APP_BASE_API=/manageApi

View File

@@ -1,69 +1,71 @@
{
"name": "fe_manage",
"version": "0.1.0",
"private": true,
"homepage": "http://u-pre.boe.com/manage/",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"dependencies": {
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"ant-design-vue": "^3.2.12",
"axios": "^1.1.3",
"core-js": "^3.8.3",
"dayjs": "^1.11.6",
"element-plus": "^2.2.17",
"element-resize-detector": "^1.2.4",
"html2canvas": "^1.4.1",
"jquery": "^3.6.1",
"mitt": "^3.0.0",
"moment": "^2.29.4",
"qrcode.vue": "^3.3.3",
"qs": "^6.11.0",
"sortablejs": "^1.15.0",
"vue": "^3.2.13",
"vue-router": "^4.0.3",
"vuedraggable": "^4.1.0",
"vuex": "^4.0.0"
},
"devDependencies": {
"@babel/core": "^7.12.16",
"@babel/eslint-parser": "^7.12.16",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-eslint": "~5.0.0",
"@vue/cli-plugin-router": "~5.0.0",
"@vue/cli-plugin-vuex": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.0.3",
"sass": "^1.32.7",
"sass-loader": "^12.0.0"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/vue3-essential",
"eslint:recommended"
],
"parserOptions": {
"parser": "@babel/eslint-parser"
},
"rules": {
"no-console": "off",
"no-debugger": "off",
"no-mixed-spaces-and-tabs": "off"
}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead",
"not ie 11"
]
"name": "fe_manage",
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"build:boe": "vue-cli-service build --mode boe",
"build:release": "vue-cli-service build --mode release",
"build:prod": "vue-cli-service build --mode prod",
"build:test": "vue-cli-service build --mode test"
},
"dependencies": {
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"ant-design-vue": "^3.2.12",
"axios": "^1.1.3",
"core-js": "^3.8.3",
"dayjs": "^1.11.6",
"element-plus": "^2.2.17",
"element-resize-detector": "^1.2.4",
"html2canvas": "^1.4.1",
"jquery": "^3.6.1",
"mitt": "^3.0.0",
"moment": "^2.29.4",
"qrcode.vue": "^3.3.3",
"qs": "^6.11.0",
"sortablejs": "^1.15.0",
"vue": "^3.2.13",
"vue-router": "^4.0.3",
"vuedraggable": "^4.1.0",
"vuex": "^4.0.0"
},
"devDependencies": {
"@babel/core": "^7.12.16",
"@babel/eslint-parser": "^7.12.16",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-eslint": "~5.0.0",
"@vue/cli-plugin-router": "~5.0.0",
"@vue/cli-plugin-vuex": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.0.3",
"sass": "^1.32.7",
"sass-loader": "^12.0.0"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/vue3-essential",
"eslint:recommended"
],
"parserOptions": {
"parser": "@babel/eslint-parser"
},
"rules": {
"no-console": "off",
"no-debugger": "off",
"no-mixed-spaces-and-tabs": "off"
}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead",
"not ie 11"
]
}

View File

@@ -44,15 +44,15 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本0.9.13------------");
console.log("版本0.9.14------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});
watch(
() => route.path,
() => {
route.path === "/login" && (isLogin.value = true);
}
() => route.path,
() => {
route.path === "/login" && (isLogin.value = true);
}
);
const currentRouteName = computed(() => route.name);
@@ -78,8 +78,8 @@ export default defineComponent({
return;
}
const memberInitInfo = await api1
.getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
.then((res) => res.data.data.rows);
.getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
.then((res) => res.data.data.rows);
store.commit("SET_MEMBER_INFO", memberInitInfo);
localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo));
}
@@ -104,13 +104,13 @@ export default defineComponent({
}
const getDictList = (param) =>
api1
.getDict({
pageNo: 1,
pageSize: 20,
setCode: param,
})
.then((res) => res.data.data.rows);
api1
.getDict({
pageNo: 1,
pageSize: 20,
setCode: param,
})
.then((res) => res.data.data.rows);
//获取组织树
const getOrgTree = () => {
const orgtreeList = localStorage.getItem("orgtreeList");
@@ -119,16 +119,16 @@ export default defineComponent({
return;
}
api
.getOrgInfo({
keyWord: "",
id: -1,
pageNo: 1,
pageSize: 20,
})
.then((res) => {
localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
store.commit("getOrgtreeList", res.data.data);
});
.getOrgInfo({
keyWord: "",
id: -1,
pageNo: 1,
pageSize: 20,
})
.then((res) => {
localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
store.commit("getOrgtreeList", res.data.data);
});
};
init();
return {
@@ -167,7 +167,7 @@ export default defineComponent({
// font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
// sans-serif;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
Microsoft YaHei, Arial, sans-serif;
Microsoft YaHei, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;

View File

@@ -2,12 +2,13 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-13 15:30:27
* @LastEditTime: 2022-12-14 20:56:10
* @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import { message } from "ant-design-vue";
import axios from "axios";
import router from "@/router";
// import { getCookie } from '../api/method'
// const Qs = require("qs");
@@ -16,61 +17,60 @@ import axios from "axios";
axios.defaults.withCredentials = true;
const http = axios.create({
baseURL: "/manageApi-release",
timeout: 1000 * 15,
// headers: { "Content-Type": "multipart/form-data" },
headers: { "Content-Type": "application/json" },
baseURL: process.env.VUE_APP_BASE_API,
timeout: 1000 * 15,
// headers: { "Content-Type": "multipart/form-data" },
headers: { "Content-Type": "application/json" },
});
http.interceptors.request.use(
(config) => {
// console.log("config", config);
// const token = localStorage.getItem("token");
// // const token = getCookie('token')
// // console.log('token', token)
// if (token) {
// config.headers.token = token; //测试1111
// } else {
// console.log("当前请求页面无token,请执行操作!!!");
(config) => {
// console.log("config", config);
// const token = localStorage.getItem("token");
// // const token = getCookie('token')
// // console.log('token', token)
// if (token) {
// config.headers.token = token; //测试1111
// } else {
// console.log("当前请求页面无token,请执行操作!!!");
// // 此处测试默认配置token
// config.headers.token =
// "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7";
// // }
return config;
},
(err) => {
console.log("登陆前拦截", err);
return Promise.reject(err);
}
// // 此处测试默认配置token
// config.headers.token =
// "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7";
// // }
return config;
},
(err) => {
console.log("登陆前拦截", err);
return Promise.reject(err);
}
);
http.interceptors.response.use(
(response) => {
// console.log('response', response)
const {
data: { code, msg },
} = response;
// console.log('code', code)
if (code === 0 || code === 200) {
return response;
} else {
if (code === 1000) {
window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self');
}
console.log("api %o", msg);
(response) => {
// console.log('response', response)
const {
data: { code, msg },
} = response;
// console.log('code', code)
if (code === 0 || code === 200) {
return response;
} else {
if (code === 1000) {
process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
}
console.log("api %o", msg);
}
return response;
},
function (error) {
if (error.message == "timeout of 1ms exceeded") {
message.destroy();
message.error("请求超时");
}
console.log("api error %o", error);
return Promise.reject(error);
}
return response;
},
function (error) {
if (error.message == "timeout of 1ms exceeded") {
message.destroy();
message.error("请求超时");
}
console.log("api error %o", error);
return Promise.reject(error);
}
);
export default http;

View File

@@ -276,7 +276,10 @@ const commonData = {
const organizationalTree = []
//嵌套页面
const iframeUrl = "https://u-pre.boe.com/pc-release/iframe"
const iframeUrl = process.env.VUE_APP_IFRAME_URL
//学员端路由
const studentUrl = process.env.VUE_APP_IFRAME_STUDENT_URL
//二维码
const codeUrl = "https://u-pre.boe.com"
export {
@@ -292,5 +295,6 @@ export {
commonData,
organizationalTree,
iframeUrl,
studentUrl,
codeUrl,
}

View File

@@ -61,7 +61,7 @@
import { reactive, toRefs } from "vue";
import DownLoad from "../components/drawers/DownLoad";
import * as api from "../api/index1";
import { studentUrl } from "../api/method";
export default {
name: "NavTop",
components: {
@@ -76,12 +76,12 @@ export default {
{
id: 1,
name: "管理员",
go: "/manage-release/learningpath",
go: "/learningpath",
},
{
id: 2,
name: "学员",
go: "https://u.boe.com/pc-release/uc/study/courses",
go: studentUrl,
},
],

View File

@@ -513,14 +513,14 @@ export default {
align: "center",
className: "h",
},
{
title: "所在岗位",
dataIndex: "gang",
key: "gang",
width: 50,
align: "center",
className: "h",
},
// {
// title: "所在岗位",
// dataIndex: "gang",
// key: "gang",
// width: 50,
// align: "center",
// className: "h",
// },
{
title: "签到时间",
dataIndex: "cur",

View File

@@ -191,11 +191,12 @@ export default {
}
};
const updateTask = async (res) => {
if(!props.isactive){
if (props.isLevel == 1) {
if(!props.isactive){
message.destroy();
return message.warning("请先选中关卡");
}
if (props.isLevel == 1) {
await RouterEditTask({
chapterId: props.isactive,
courseId: res.data.data.discussId,

View File

@@ -177,11 +177,12 @@ export default {
};
//向关卡或阶段渲染
const updateTask = async (value) => {
if(!props.isactive){
if (props.isLevel == 1) {
if(!props.isactive){
message.destroy();
return message.warning("请先选中关卡");
}
if (props.isLevel == 1) {
await RouterEditTask({
chapterId: props.isactive,
courseId: Number(value.evaluationId),

View File

@@ -702,11 +702,12 @@ export default {
// 新增编辑或新增项目任务
const updateTask = async (res) => {
console.log("props.isLevel=====", props.isLevel);
if(!props.isactive){
if (props.isLevel == 1) {
if(!props.isactive){
message.destroy();
return message.warning("请先选中关卡");
}
if (props.isLevel == 1) {
let editObj1 = {
chapterId: props.isactive,
courseId: res.data.data.offcoursePlanId,

View File

@@ -155,14 +155,14 @@ export default {
align: "center",
className: "h",
},
{
title: "岗位",
dataIndex: "gangw",
key: "gangw",
width: 60,
align: "center",
className: "h",
},
// {
// title: "岗位",
// dataIndex: "gangw",
// key: "gangw",
// width: 60,
// align: "center",
// className: "h",
// },
// {
// title: "进度",
// dataIndex: "progress",

View File

@@ -21,21 +21,17 @@
<div class="main">
<div class="main_left">
<AssessmentAll
v-model:assessmentVisible="assessmentVisible"
v-model:assessmentId="assessmentId"
v-model:assessmentName="assessmentName"
/>
v-model:assessmentVisible="assessmentVisible"
v-model:assessmentId="assessmentId"
v-model:assessmentName="assessmentName"
/>
</div>
</div>
</div>
<div class="main_btns">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="updateTask">确定</button>
</div>
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="updateTask">确定</button>
</div>
</div>
</a-drawer>
</template>
@@ -119,16 +115,16 @@ export default {
assessmentName: "",
assessment: null,
assessment1: null,
assessmentVisible:false,
assessmentVisible: false,
titleTag: false,
});
// const getCheckedAss = (ass) => {
// state.assessmentId = ass.assessmentId;
// state.assessment = ass;
// console.log("state.assessment1",state.assessment);
//
// };
// const getCheckedAss = (ass) => {
// state.assessmentId = ass.assessmentId;
// state.assessment = ass;
// console.log("state.assessment1",state.assessment);
//
// };
const closeDrawer = () => {
ctx.emit("update:addinvistVisible", false);
ctx.emit("update:edit", false);
@@ -138,43 +134,45 @@ export default {
// ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
};
const checkAssDrawer = () => {
state.assessmentVisible = true;
};
const afterVisibleChange = (bool) => {
if(bool && props.EditInvistId >0){
if (bool && props.EditInvistId > 0) {
state.assessmentVisible = true;
state.assessmentId = props.EditInvistId;
}else{
state.assessmentId =null;
state.assessmentName =null;
} else {
state.assessmentId = null;
state.assessmentName = null;
}
};
const updateTask = () => {
console.log("state.assessmentId ",state.assessmentId ,state.assessmentName );
console.log(
"state.assessmentId ",
state.assessmentId,
state.assessmentName
);
if (!state.assessmentId) {
return message.warning("请选择评估");
}
let l_data_id = [];
l_data_id.push(Number(state.assessmentId))
console.log("state.assessment",state.assessment,state.assessmentId);
l_data_id.push(Number(state.assessmentId));
console.log("state.assessment", state.assessment, state.assessmentId);
if (props.isLevel == 1) {
if(!props.isactive){
if (!props.isactive) {
message.destroy();
return message.warning("请先选中关卡");
}
IsExistence({
chapterId: Number(props.isactive),
courseTaskId:l_data_id,
courseTaskId: l_data_id,
routerId: props.routerId,
type: 11,
})
.then((res) => {
console.log('shifouchongfu',res)
console.log("shifouchongfu", res);
console.log("路径图中是否包含此评估了", res);
if (res.data.data.length) {
let strdata = res.data.data;
@@ -200,7 +198,9 @@ export default {
})
.then(() => {
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
message.success(
`${props.edit ? "编辑" : "新增"}关卡任务成功`
);
ctx.emit("changeData", false);
closeDrawer();
state.addLoading = false;
@@ -210,20 +210,20 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
}
}).catch(err=>{
console.log(err)
})
.catch((err) => {
console.log(err);
});
} else if (props.isLevel == 2) {
IsExistenceProject({
courseTaskId: l_data_id,
projectId: props.projectId,
stageId: props.chooseStageId || 0,
type: 11,
}).then(res=>{
console.log(res)
console.log("项目中是否包含此评估了", res);
})
.then((res) => {
console.log(res);
console.log("项目中是否包含此评估了", res);
if (res.data.data.length) {
let strdata = res.data.data;
let tipStr = "";
@@ -239,71 +239,70 @@ export default {
return;
} else {
apiTask
.addTask({
courseId: state.assessmentId,
name: state.assessmentName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 11,
})
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
});
.addTask({
courseId: state.assessmentId,
name: state.assessmentName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 11,
})
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
});
}
}).catch(err=>{
console.log(err)
})
})
.catch((err) => {
console.log(err);
});
} else if (props.isLevel == 3) {
IsExistenceProjectTemplate({
courseTaskId: l_data_id,
projectTemplateId: props.projectTemplateId,
stageId: props.chooseStageId || 0,
type: 11,
}).then((res)=>{
console.log(res)
}).then((res) => {
console.log(res);
console.log("项目中是否包含此评估了", res);
if (res.data.data.length) {
let strdata = res.data.data;
let tipStr = "";
for (let i = 0; i < strdata.length; i++) {
if (i == strdata.length - 1) {
tipStr += strdata[i].courseName;
} else {
tipStr += strdata[i].courseName + "/";
}
if (res.data.data.length) {
let strdata = res.data.data;
let tipStr = "";
for (let i = 0; i < strdata.length; i++) {
if (i == strdata.length - 1) {
tipStr += strdata[i].courseName;
} else {
tipStr += strdata[i].courseName + "/";
}
message.destroy();
message.warning("评估(" + tipStr + ")重复添加");
return;
}else{
addTempTask({
courseId: state.assessmentId,
name: state.assessmentName,
projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 11,
})
.then(() => {
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
});
}
message.destroy();
message.warning("评估(" + tipStr + ")重复添加");
return;
} else {
addTempTask({
courseId: state.assessmentId,
name: state.assessmentName,
projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 11,
})
.then(() => {
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
});
}
});
}
};
@@ -313,7 +312,6 @@ export default {
closeDrawer,
updateTask,
checkAssDrawer,
};
},
};
@@ -339,7 +337,6 @@ export default {
}
}
.contentMain {
.main {
width: 100%;
.main_left {
@@ -348,7 +345,7 @@ export default {
.main_item {
display: flex;
align-items: center;
.fi_input {
margin-right: 20px;
}
@@ -410,7 +407,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom:3px;
margin-bottom: 3px;
height: 40px;
background-color: #e9f6fe;
.mntc_left {
@@ -439,11 +436,11 @@ export default {
}
}
}
.main_btns {
height: 72px;
width: 100%;
bottom: 0;
left: 0;
display: flex;

View File

@@ -54,7 +54,7 @@
</div>
</div>
</div>
<div class="mi_btns" style="margin-left:0px;">
<div class="mi_btns" style="margin-left: 0px">
<div class="btn btn1">
<div class="search"></div>
<div class="btnText" @click="searchProjectList()">搜索</div>
@@ -141,11 +141,11 @@
</div>
</div>
</div>
<div class="main_table">
<div class="drawerbox">
<!-- 添加的时候显示多选的表 -->
<!-- 编辑的时候显示单选的表 -->
<a-table
:columns="tableDataFunc()"
@@ -166,7 +166,7 @@
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
@@ -225,8 +225,9 @@
import { reactive, toRefs } from "vue";
import { RouterEditTask } from "@/api/indexTask";
import { message } from "ant-design-vue";
import * as apiProj from "../../api/index.js";
// import * as apiProj from "../../api/index.js";
import dayjs from "dayjs";
import * as indexAudit from "../../api/indexAudit";
export default {
name: "AddProject",
@@ -309,28 +310,28 @@ export default {
title: "项目名称",
dataIndex: "name",
key: "projectName",
width:"40%",
width: "40%",
ellipsis: true,
},
{
title: "项目经理",
dataIndex: "manager",
key: "manager",
width:"20%",
width: "20%",
align: "center",
},
{
title: "创建人",
dataIndex: "creater",
key: "creater",
width:"20%",
width: "20%",
align: "center",
},
{
title: "创建时间",
dataIndex: "time",
key: "time",
width:"20%",
width: "20%",
align: "center",
},
];
@@ -400,8 +401,8 @@ export default {
// TODO 这里后续需要给接口或者改动
// 获取所有,确定分页位置
const getCurrentPage = () => {
apiProj
.getProjectList({
indexAudit
.auditlist({
createName: state.inputV1,
manager: state.inputV2,
name: state.inputV3,
@@ -450,8 +451,8 @@ export default {
status: 3,
});
apiProj
.getProjectList({
indexAudit
.auditlist({
createName: state.inputV3,
manager: state.inputV2,
name: state.inputV1,
@@ -551,7 +552,7 @@ export default {
const updateTask = async (res) => {
if (props.isLevel == 1) {
if(!props.isactive){
if (!props.isactive) {
message.destroy();
return message.warning("请先选中关卡");
}
@@ -849,7 +850,7 @@ export default {
}
}
}
.main_item2 {
display: flex;
align-items: flex-start;
@@ -930,36 +931,36 @@ export default {
}
}
.main_table {
position: relative;
padding-bottom: 80px;
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 5px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
position: relative;
padding-bottom: 80px;
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 5px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
}
.main_btns {
height: 72px;
width: 100%;
@@ -991,7 +992,6 @@ export default {
color: #fff;
}
}
}
}
</style>

View File

@@ -1,59 +1,54 @@
<!-- 评估列表 -->
<template>
<div class="main_item">
<div class="fi_input">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 40px; border-radius: 8px;"
placeholder="请输入评估名称"
maxlength="20"
/>
</div>
<div class="btns" @click="getAllInvistText">
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
<div class="btnsn" @click="resetInvist">
<div class="search"></div>
<div class="btnText">重置</div>
</div>
<div class="main_item">
<div class="fi_input">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 40px; border-radius: 8px"
placeholder="请输入评估名称"
maxlength="20"
/>
</div>
<div class="main_notice">
<div class="mntc_left">
<div class="notice_icon"></div>
<div v-if="assessment == null">
<span class="title"
>已选择 <span class="data">0</span> </span
>
</div>
<div v-else>
<div >
<span class="title"
>已选择 <span class="data">1</span> ;</span
>
<span class="title"
>名称 <span class="data">{{ assessment.name }}</span>
</span><!--
<div class="btns" @click="getAllInvistText">
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
<div class="btnsn" @click="resetInvist">
<div class="search"></div>
<div class="btnText">重置</div>
</div>
</div>
<div class="main_notice">
<div class="mntc_left">
<div class="notice_icon"></div>
<div v-if="assessment == null">
<span class="title">已选择 <span class="data">0</span> </span>
</div>
<div v-else>
<div>
<span class="title">已选择 <span class="data">1</span> ;</span>
<span class="title"
>名称 <span class="data">{{ assessment.name }}</span> </span
><!--
<span class="title"
>题数 <span class="data">{{ assessment.essayQuestionVoList?Number(assessment.essayQuestionVoList.length):0
+Number(assessment.multipleStemVoList?assessment.multipleStemVoList.length:0)
+Number(assessment.scoringQuestionVoList?assessment.scoringQuestionVoList.length:0)
+Number(assessment.singleStemVoList?assessment.singleStemVoList.length:0) }}</span>
</span>-->
<span class="title"
>题数 <span class="data">{{ assessment.num }}</span>
</span>
<span class="title"
>创建人
<span class="data">{{ assessment.creator }}</span>
</span>
<span class="title"
>创建时间
<span class="data">{{ assessment.time }}</span>
</span>
</div>
<!--
<span class="title"
>题数 <span class="data">{{ assessment.num }}</span>
</span>
<span class="title"
>创建人
<span class="data">{{ assessment.creator }}</span>
</span>
<span class="title"
>创建时间
<span class="data">{{ assessment.time }}</span>
</span>
</div>
<!--
<div v-else>
<span class="title"
>已选择 <span class="data">1</span> ;</span
@@ -78,27 +73,27 @@
</span>
</div>
-->
</div>
</div>
</div>
<div class="main_table">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:pagination="false"
:row-selection="{
type: 'radio',
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
filterMultiple:false
/>
<div class="tableBox">
</div>
</div>
<div class="main_table">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:pagination="false"
:row-selection="{
type: 'radio',
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
filterMultiple:false
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -110,12 +105,12 @@
class="pagination"
@change="handelChangePage"
/>
</div></div>
</div>
</div>
</div>
</template>
<script>
import { reactive, toRefs,onMounted } from "vue";
import { reactive, toRefs, onMounted, watch } from "vue";
import * as api from "../../api/indexInvist.js";
import dayjs from "dayjs";
export default {
@@ -127,11 +122,11 @@ export default {
type: Boolean,
default: false,
},
assessmentId:{
assessmentId: {
type: Number,
default: null,
},
assessmentName:{
assessmentName: {
type: String,
default: null,
},
@@ -145,38 +140,55 @@ export default {
pageSize: 10,
tableDataTotal: 0,
tableData: [],
selectedRowKeys:[],
assessmentId:null,
assessmentName:null,
selectedRowKeys: [],
assessmentId: null,
assessmentName: null,
});
const closeDrawer = () => {
ctx.emit("update:assessmentVisible", false);
};
//清空所选
const clearLine = () => {
console.log("state.selectedRowKeys",state.selectedRowKeys)
//清空所选
const clearLine = () => {
console.log("state.selectedRowKeys", state.selectedRowKeys);
state.selectedRowKeys = [];
state.addOnlineList = [];
};
const queryInfo = () => {
//if (props.edit) {
// state.titleTg = false;
//编辑讨
console.log("查询评估",props.assessmentId);
if(props.assessmentId){
api
// state.titleTg = false;
//编辑讨
console.log("查询评估", props.assessmentId);
if (props.assessmentId) {
api
.queryAppraiseDetailById({ assessmentId: props.assessmentId })
.then((res) => {
console.log(res);
console.log("查询评估xinxi ", res);
let info = res.data.data;
let obj = {
assessmentId: info.assessmentId,
name: info.assessmentName,
num: info.essayQuestionVoList
? Number(info.essayQuestionVoList.length)
: 0 + info.multipleStemVoList
? Number(info.multipleStemVoList.length)
: 0 + info.scoringQuestionVoList
? Number(info.scoringQuestionVoList.length)
: 0 + info.singleStemVoList
? Number(info.singleStemVoList.length)
: 0,
creator: info.createUser ? info.createUser : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD"),
};
//更新讨论信息
state.assessment = res.data.data;
// state.assessmentId = res.data.data.assessmentId;
state.assessment = obj;
state.selectedRowKeys = [info.assessmentId];
// state.assessmentId = res.data.data.assessmentId;
})
.catch(() => {});
}
// }
}
// }
};
const tableDataFunc = () => {
const columns = [
@@ -219,13 +231,12 @@ export default {
state.addOnlineList = selectedRows;
console.log(selectedRowKeys, selectedRows);
state.assessment = selectedRows[0];
console.log("selectedRows=======", state.assessment);
// ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessment.assessmentId);
ctx.emit("update:assessmentName", state.assessment.name);
}
console.log("selectedRows=======", state.assessment);
// ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessment.assessmentId);
ctx.emit("update:assessmentName", state.assessment.name);
};
const handelChangePage = (page, pageSize) => {
state.currentPage = page;
state.pageSize = pageSize;
@@ -234,21 +245,27 @@ export default {
const getTableDate = (tableData) => {
let data = tableData;
let array = [];
data.map((value, index) => {
data.map((value) => {
let obj = {
key: index,
key: value.assessmentId,
assessmentId: value.assessmentId,
num: value.essayQuestionVoList?Number(value.essayQuestionVoList.length):0
+value.multipleStemVoList?Number(value.multipleStemVoList.length):0
+value.scoringQuestionVoList?Number(value.scoringQuestionVoList.length):0
+value.singleStemVoList?Number(value.singleStemVoList.length):0,
num: value.essayQuestionVoList
? Number(value.essayQuestionVoList.length)
: 0 + value.multipleStemVoList
? Number(value.multipleStemVoList.length)
: 0 + value.scoringQuestionVoList
? Number(value.scoringQuestionVoList.length)
: 0 + value.singleStemVoList
? Number(value.singleStemVoList.length)
: 0,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"),
};
array.push(obj);
});
(state.selectedRowKeys = []), (state.tableData = array);
state.selectedRowKeys = [];
state.tableData = array;
};
//获取全部评估信息接口
const getAllInvistText = () => {
@@ -279,15 +296,34 @@ export default {
};
onMounted(() => {
clearLine();
console.log("state.selectedRowKeys",state.selectedRowKeys)
if(!state.assessmentId){
console.log(
"state.selectedRowKeys",
state.selectedRowKeys,
state.assessmentId
);
if (!state.assessmentId) {
clearLine();
}
queryInfo();
getAllInvistText();
});
watch(
() => props.assessmentId,
() => {
if (!props.assessmentId) {
clearLine();
state.assessment = null;
} else {
queryInfo();
}
console.log("props.assessmentId", props.assessmentId);
},
{
deep: true,
}
);
return {
...toRefs(state),
onSelectChange,
@@ -322,14 +358,13 @@ export default {
}
}
.contentMain {
.main_left {
padding-right: 30px;
margin-top: 32px;
.main_item {
display: flex;
align-items: center;
.fi_input {
margin-right: 20px;
}
@@ -398,36 +433,36 @@ export default {
}
}
.main_table {
position: relative;
padding-bottom: 80px;
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 5px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
position: relative;
padding-bottom: 80px;
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 5px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
}
.main_btns {
height: 72px;
width: 100%;

View File

@@ -231,22 +231,22 @@ export default {
align: "center",
className: "h",
},
{
title: "岗位",
dataIndex: "gangw",
key: "gangw",
width: 60,
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "progress",
key: "progress",
width: 60,
align: "center",
className: "h",
},
// {
// title: "岗位",
// dataIndex: "gangw",
// key: "gangw",
// width: 60,
// align: "center",
// className: "h",
// },
// {
// title: "进度",
// dataIndex: "progress",
// key: "progress",
// width: 60,
// align: "center",
// className: "h",
// },
{
title: "操作",
dataIndex: "operations",

View File

@@ -12,7 +12,7 @@
<div style="color:red;font-size: 10px" v-if="value && !validate">名称重复请重新输入</div>
</template>
<script setup>
import {defineProps, defineEmits, watch, ref} from "vue";
import {defineProps, defineEmits, watch, ref, onMounted} from "vue";
import {validateName} from "@/api/index1";
const props = defineProps({
@@ -47,6 +47,10 @@ const emit = defineEmits({})
const modelV = ref()
onMounted(()=>{
modelV.value = props.value
})
watch(() => props.value, () => {
if (props.value !== modelV.value) {
modelV.value = props.value

View File

@@ -23,7 +23,7 @@
</a-tree-select>
</template>
<script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
import {computed, defineEmits, defineProps} from "vue";
import {useStore} from "vuex";
const store = useStore();

View File

@@ -1,46 +1,54 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-14 15:46:36
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-14 15:47:48
* @FilePath: /fe-manage/src/components/project/ProjectClass.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<!-- 评估管理-创建评估页面 -->
<template>
<a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="id"
placeholder="请选择分类"
style="width: 100%"
:options="options"
allowClear
@change="change"
:disabled="disabled"
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="id"
placeholder="请选择分类"
style="width: 100%"
:options="options"
allowClear
@change="change"
:disabled="disabled"
>
</a-select>
</template>
<script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
import {useStore} from "vuex";
import { computed, defineEmits, defineProps } from "vue";
import { useStore } from "vuex";
const store = useStore();
const props = defineProps({
value: String,
disabled: String
})
const emit = defineEmits({})
disabled: String,
});
const emit = defineEmits({});
const options = ref([])
const options = computed(() =>
store.state.projectClass.map((e) => ({
value: parseInt(e.dictCode),
label: e.dictName,
}))
);
const id = computed(() => {
return props.value
})
onMounted(() => {
options.value = store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
return props.value;
});
function change(key, obj) {
emit('update:name', obj[0])
emit('update:value', key)
emit("update:name", obj[0]);
emit("update:value", key);
}
</script>

View File

@@ -1,27 +1,34 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-14 15:46:36
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-14 15:47:21
* @FilePath: /fe-manage/src/components/project/ProjectLevel.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<template v-if="tag">
<div>{{ options?.find(e => e.value == id)?.label || '' }}</div>
<div>{{ options?.find((e) => e.value == id)?.label || "" }}</div>
</template>
<template v-else>
<a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="id"
:options="options"
style="width: 100%"
placeholder="请选择项目级别"
@change="change"
:disabled="disabled"
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="id"
:options="options"
style="width: 100%"
placeholder="请选择项目级别"
@change="change"
:disabled="disabled"
/>
</template>
</template>
<script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
import {useStore} from "vuex";
import { computed, defineEmits, defineProps } from "vue";
import { useStore } from "vuex";
const store = useStore();
const props = defineProps({
@@ -29,23 +36,24 @@ const props = defineProps({
disabled: String,
tag: {
type: Boolean,
default: false
}
})
default: false,
},
});
const id = computed(() => {
return props.value || null
})
return props.value || null;
});
const emit = defineEmits({})
const emit = defineEmits({});
const options = ref([])
onMounted(() => {
options.value = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
const options = computed(() =>
store.state.projectLevel.map((e) => ({
value: parseInt(e.dictCode),
label: e.dictName,
}))
);
function change(key) {
emit('update:value', key)
emit("update:value", key);
}
</script>

View File

@@ -1,27 +1,34 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-14 15:46:36
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-14 15:47:46
* @FilePath: /fe-manage/src/components/project/TrainClass.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<template v-if="tag">
<div>{{ options.find(e => e.value == id)?.label || '' }}</div>
<div>{{ options.find((e) => e.value == id)?.label || "" }}</div>
</template>
<template v-else>
<a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="id"
:options="options"
style="width: 100%"
placeholder="请选择分类"
@change="change"
:disabled="disabled"
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="id"
:options="options"
style="width: 100%"
placeholder="请选择分类"
@change="change"
:disabled="disabled"
/>
</template>
</template>
<script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
import {useStore} from "vuex";
import { computed, defineEmits, defineProps } from "vue";
import { useStore } from "vuex";
const store = useStore();
@@ -30,24 +37,24 @@ const props = defineProps({
disabled: String,
tag: {
type: Boolean,
default: false
}
})
default: false,
},
});
const id = computed(() => {
return props.value
})
return props.value;
});
const emit = defineEmits({})
const emit = defineEmits({});
const options = ref([])
onMounted(() => {
options.value = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
const options = computed(() =>
store.state.projectSys.map((e) => ({
value: parseInt(e.dictCode),
label: e.dictName,
}))
);
function change(key) {
emit('update:value', key)
emit("update:value", key);
}
</script>

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-09 09:26:26
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-14 17:38:53
* @LastEditTime: 2022-11-21 17:42:59
* @FilePath: /fe-manage/src/router/index.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -17,7 +17,7 @@ const routes = [
...routesConfig
]
const router = createRouter({
history: createWebHistory("/manage-release/"),
history: createWebHistory(process.env.VUE_APP_BASE),
routes,
})

File diff suppressed because it is too large Load Diff

View File

@@ -3529,16 +3529,16 @@ const columns7 = [
return text ? text : "-";
},
},
{
title: "岗位",
width: 300,
dataIndex: "postion",
key: "3",
align: "center",
customRender: ({ text }) => {
return text ? text : "-";
},
},
// // {
// title: "岗位",
// width: 300,
// dataIndex: "postion",
// key: "3",
// align: "center",
// customRender: ({ text }) => {
// return text ? text : "-";
// },
// },
{
title: "Band",
width: 200,

View File

@@ -156,7 +156,7 @@
<div class="mbl_items12">
<div
class="i12_box1"
style="position:relative;"
style="position: relative"
v-for="(item, index) in detail.attach"
:key="index"
>
@@ -207,21 +207,43 @@
<div class="file_detail">
<div class="file_name">
<!-- http://111.231.196.214:12016/7.231.196.214:12016/7-1670486854017.jpg -->
<span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:absolute;top:4px;left:72px;">
{{ item.indexOf('-')!==-1?item.slice(item.lastIndexOf('/')+1,item.indexOf('-')) + item.slice(item.lastIndexOf('.')) :item }}
<span
style="
color: #6f6f6f;
width: 200px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
position: absolute;
top: 4px;
left: 72px;
"
>
{{
item.indexOf("-") !== -1
? item.slice(
item.lastIndexOf("/") + 1,
item.lastIndexOf("-")
) + item.slice(item.lastIndexOf("."))
: item
}}
</span>
</div>
<div class="file_updata">
<div class="updatabox">
<div class="updatacolor"></div>
<div class="updataxq" style="right:-62px;">上传完成</div>
<div class="updataxq" style="right: -62px">
上传完成
</div>
</div>
<div class="upjd">
<span style="margin: auto 5px">100%</span>
</div>
</div>
</div>
<a :href="item" style="margin-left: 5px">下载</a>
</div>
</div>
</div>
@@ -262,134 +284,140 @@ export default defineComponent({
},
},
setup(props, { emit }) {
console.log(props);
console.log("props", props);
const state = reactive({
imgList: [],
options2222: [
{
title: '领导力',
value: '100',
selectable:false,
title: "领导力",
value: "100",
selectable: false,
children: [
{
title: '领导业务',
value: '1001',
title: "领导业务",
value: "1001",
},
{
title: '领导团队',
value: '1002',
title: "领导团队",
value: "1002",
},
{
title: '领导自我',
value: '1003',
title: "领导自我",
value: "1003",
},
],
},
{
title: '专业力',
value: '200',
selectable:false,
title: "专业力",
value: "200",
selectable: false,
children: [
{
title: '研发',
value: '2001',
title: "研发",
value: "2001",
},
{
title: '产品和解决方案',
value: '2002',
title: "产品和解决方案",
value: "2002",
},
{
title: '生产技术与制造',
value: '2003',
title: "生产技术与制造",
value: "2003",
},
{
title: '供应链',
value: '2004',
title: "供应链",
value: "2004",
},
{
title: '营销',
value: '2005',
title: "营销",
value: "2005",
},
{
title: '品质',
value: '2006',
title: "品质",
value: "2006",
},
{
title: '战略与企划',
value: '2007',
title: "战略与企划",
value: "2007",
},
{
title: '流程管理',
value: '2008',
title: "流程管理",
value: "2008",
},
{
title: '业绩管理',
value: '2009',
title: "业绩管理",
value: "2009",
},
{
title: '项目管理',
value: '20010',
title: "项目管理",
value: "20010",
},
{
title: '信息技术',
value: '20011',
title: "信息技术",
value: "20011",
},
{
title: '环境与安全',
value: '20012',
title: "环境与安全",
value: "20012",
},
{
title: '人力资源',
value: '20013',
title: "人力资源",
value: "20013",
},
{
title: '企业文化',
value: '20014',
title: "企业文化",
value: "20014",
},
{
title: '品牌',
value: '20015',
title: "品牌",
value: "20015",
},
{
title: '财务',
value: '20016',
title: "财务",
value: "20016",
},
{
title: '法务',
value: '20017',
title: "法务",
value: "20017",
},
{
title: '行政',
value: '20018',
title: "行政",
value: "20018",
},
{
title: '医工',
value: '20019',
}
title: "医工",
value: "20019",
},
],
},
{
title: '通用力',
value: '300',
selectable:false,
title: "通用力",
value: "300",
selectable: false,
children: [
{
title: '职业操守与道德',
value: '3001',
title: "职业操守与道德",
value: "3001",
},
{
title: '职业素养与技能',
value: '3002',
title: "职业素养与技能",
value: "3002",
},
{
title: '规章制度',
value: '3003',
title: "规章制度",
value: "3003",
},
],
}
]
],
},
],
ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx",
ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx",
});
// item.slice(
// item.lastIndexOf("/") + 1,
// item.indexOf("-")
// ) + item.slice(item.lastIndexOf("."))
const filterTxt = (txt) => {
if (txt) {
return txt;
@@ -400,8 +428,8 @@ export default defineComponent({
const filterClassTxt = (txt) => {
let str = "-";
if (txt) {
for(let i =0; i<options2.value.length;i++){
for(let j=0;j<options2.value[i].children.length;j++){
for (let i = 0; i < options2.value.length; i++) {
for (let j = 0; j < options2.value[i].children.length; j++) {
if (String(options2.value[i].children[j].value) === String(txt)) {
str = options2.value[i].children[j].title;
}

View File

@@ -151,14 +151,23 @@ export default {
ellipsis: true,
width:"20%",
},
// todo 根项目保存
// {
// title: "所属项目",
// dataIndex: "sourceBelongName",
// key: "sourceBelongName",
// align: "center",
// width: "11%",
// },
{
title: "所属项目",
dataIndex: "topName",
key: "topName",
align: "center",
ellipsis: true,
width:"20%",
customRender: ({ record: { gaName, faName, name } }) => (
<div>
{faName
? gaName !== null
? gaName + "/" + faName
: faName
: name}
</div>
),
},
{
title: "项目经理",
dataIndex: "manager",

View File

@@ -1483,14 +1483,14 @@ export default {
align: "center",
className: "h",
},
{
title: "岗位",
dataIndex: "gang",
key: "gang",
width: 110,
align: "center",
className: "h",
},
// {
// title: "岗位",
// dataIndex: "gang",
// key: "gang",
// width: 110,
// align: "center",
// className: "h",
// },
{
title: "当前关卡",
dataIndex: "cur",
@@ -1499,14 +1499,14 @@ export default {
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "jin",
key: "jin",
width: 110,
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "jin",
key: "jin",
width: 110,
align: "center",
className: "h",
},
{
title: "开始时间",
dataIndex: "time",

View File

@@ -1531,14 +1531,14 @@ export default {
align: "center",
className: "h",
},
{
title: "岗位",
dataIndex: "gang",
key: "gang",
width: 110,
align: "center",
className: "h",
},
// {
// title: "岗位",
// dataIndex: "gang",
// key: "gang",
// width: 110,
// align: "center",
// className: "h",
// },
{
title: "当前关卡",
dataIndex: "cur",
@@ -1547,14 +1547,14 @@ export default {
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "jin",
key: "jin",
width: 110,
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "jin",
key: "jin",
width: 110,
align: "center",
className: "h",
},
{
title: "开始时间",
dataIndex: "time",

View File

@@ -538,24 +538,6 @@
}}</span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目说明</span></div>
<div class="setc_main">
<span style="color: #999999">{{
projectInfo.remark
}}</span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>同步学习记录</span></div>
<div class="setc_main">
<a-radio v-model:checked="projectInfo.courseSyncFlag"
><span style="color: #333333"
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-radio
>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目级别</span></div>
<div class="setc_main">
@@ -568,14 +550,32 @@
<TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>同步学习记录</span></div>
<div class="setc_main">
<a-radio v-model:checked="projectInfo.courseSyncFlag" :disabled="true"
><span style="color: #333333"
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-radio
>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>是否BOEU实施</span></div>
<div class="setc_main">
<a-radio v-model:checked="projectInfo.boeFlag"
<a-radio v-model:checked="projectInfo.boeFlag" :disabled="true"
><span style="color: #333333">BOEU实施</span></a-radio
>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目说明</span></div>
<div class="setc_main">
<span style="color: #999999">{{
projectInfo.remark
}}</span>
</div>
</div>
</div>
</div>
</a-tab-pane>

View File

@@ -3,13 +3,13 @@
<div class="projectAdd">
<div class="header">
<span class="title"
>{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
>{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
>
<div
@click="backPage"
style="cursor: pointer"
to="/projectmanage"
class="goback"
@click="backPage"
style="cursor: pointer"
to="/projectmanage"
class="goback"
>
<span class="return"></span><span class="returntext">返回</span>
</div>
@@ -19,8 +19,8 @@
<div class="name" v-if="projectInfo.parentName">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目归属</div>
</div>
@@ -33,29 +33,36 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目名称</div>
<div class="inname">
{{ ptojectType == 3 ? "班级名称" : "项目名称" }}
</div>
</div>
<div class="in">
<NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name"
v-model:validate="projectInfo.validate" :maxlength="30" show-count
:id="projectInfo.projectId"></NameInput>
<NameInput
placeholder="请输入项目名称"
v-model:value="projectInfo.name"
v-model:validate="projectInfo.validate"
:maxlength="30"
show-count
:id="projectInfo.projectId"
></NameInput>
</div>
</div>
<div class="name flex-top">
<div class="namebox" style="margin-top: 10px">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">封面图</div>
</div>
<div class="in select" style="flex: 1; display: flex">
<div
:class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
style="
:class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
style="
width: 100px;
height: 100px;
border-radius: 5px;
@@ -63,19 +70,19 @@
position: relative;
overflow: hidden;
"
v-for="(src, index) in projectPic"
:key="index"
@click="() => (projectInfo.picUrl = src.value)"
v-for="(src, index) in projectPic"
:key="index"
@click="() => (projectInfo.picUrl = src.value)"
>
<img
style="
style="
width: 100px;
height: 100px;
margin-bottom: 4px;
margin-right: 4px;
"
:src="src.value"
alt="avatar"
:src="src.value"
alt="avatar"
/>
</div>
</div>
@@ -83,63 +90,63 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目时间</div>
</div>
<div class="in">
<a-range-picker
show-time
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss"
@change="timeChange"
:disabled="viewDetail ? true : false"
show-time
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss"
@change="timeChange"
:disabled="viewDetail ? true : false"
/>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目经理</div>
</div>
<div class="in">
<ProjectManager
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
@onChange="managerChange"
mode="multiple"
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
@onChange="managerChange"
mode="multiple"
></ProjectManager>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">资源归属</div>
</div>
<div class="in select">
<OrgClass
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
></OrgClass>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目级别</div>
</div>
@@ -150,8 +157,8 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">培训分类</div>
</div>
@@ -162,15 +169,15 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">是否BOEU实施</div>
</div>
<div class="in">
<a-radio-group
v-model:value="projectInfo.boeFlag"
:disabled="viewDetail ? true : false"
v-model:value="projectInfo.boeFlag"
:disabled="viewDetail ? true : false"
>
<a-radio :style="radioStyle" :value="1"></a-radio>
<a-radio :style="radioStyle" :value="0"></a-radio>
@@ -183,16 +190,16 @@
</div>
<div class="in">
<a-checkbox
v-model:checked="courseSyncFlag"
:disabled="viewDetail ? true : false"
><span
v-model:checked="courseSyncFlag"
:disabled="viewDetail ? true : false"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-checkbox
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-checkbox
>
</div>
</div>
@@ -202,21 +209,22 @@
</div>
<div class="in">
<a-textarea
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
:disabled="viewDetail ? true : false"
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
:disabled="viewDetail ? true : false"
/>
</div>
</div>
<div class="name name2">
<div v-if="projectInfo.status == -5" class="name name2">
<div class="namebox">
<div class="inname" style="margin-top: 13px">审核意见</div>
</div>
<div class="description">
{{auditDescription}}
{{ auditDescription }}
</div>
</div>
</div>
@@ -225,18 +233,18 @@
<div class="inname" style="width: 50px">模版</div>
<div class="in select" style="margin-left: 2px">
<a-select
:getPopupContainer="
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
placeholder="请选择模版"
:size="size"
style="width: 100%"
:options="classifyList5"
@change="classificationChange5"
@popupScroll="templateScroll"
:fieldNames="{
placeholder="请选择模版"
:size="size"
style="width: 100%"
:options="classifyList5"
@change="classificationChange5"
@popupScroll="templateScroll"
:fieldNames="{
label: 'name',
value: 'projectTemplateId',
}"
@@ -250,33 +258,32 @@
<div class="btn">
<a-button @click="backPage" class="btn2">取消</a-button>
<a-button
v-on:click="createProject"
type="primary"
class="btn1"
style="margin-left: 20px"
>确定
</a-button
>
v-on:click="createProject"
type="primary"
class="btn1"
style="margin-left: 20px"
>确定
</a-button>
</div>
</div>
</div>
</template>
<script>
import {onMounted, reactive, toRefs, watch} from "vue";
import {message} from "ant-design-vue";
import {useRoute, useRouter} from "vue-router";
import { onMounted, reactive, toRefs, watch } from "vue";
import { message } from "ant-design-vue";
import { useRoute, useRouter } from "vue-router";
import * as api from "../../api/index";
import {useStore} from "vuex";
import { useStore } from "vuex";
// import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManagerNew";
import NameInput from "@/components/project/NameInput";
import ProjectLevel from "@/components/project/ProjectLevel";
import {changeOwnership, scrollLoad} from "@/api/method";
import {storage} from "../../api/storage";
import { changeOwnership, scrollLoad } from "@/api/method";
import { storage } from "../../api/storage";
import * as api2 from "../../api/indexAudit";
import {validateName} from "@/api/index1";
import { validateName } from "@/api/index1";
export default {
name: "projectAdd",
@@ -307,7 +314,7 @@ export default {
},
classifyList5: [],
courseSyncFlag: false,
auditDescription:"",
auditDescription: "",
});
// 封面图选择
@@ -323,6 +330,8 @@ export default {
state.viewDetail = routers.query.viewDetail;
getProjectInfo();
getTemplate();
state.ptojectType = routers.query.ptojectType;
// console.log("routers.query.ptojectType", routers.query.ptojectType);
});
watch(routers.query, () => {
@@ -336,10 +345,10 @@ export default {
state.projectInfo.parentId = routers.query.parentId;
state.projectInfo.projectId = routers.query.projectId;
(state.projectInfo.projectId || state.projectInfo.parentId) &&
api
api
.getProjectDetail({
projectId:
state.projectInfo.projectId || state.projectInfo.parentId,
state.projectInfo.projectId || state.projectInfo.parentId,
})
.then((res) => {
state.projectInfo = {
@@ -352,23 +361,24 @@ export default {
];
state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
if (Number(state.projectInfo.status) === -5) {
let obj = {
project_id: state.projectInfo.projectId,
type: 1,
pageNo: 1,
pageSize: 1,
};
api2.auditList(obj).then((d) => {
if (d.data.code === 200) {
let res =d.data.data;
if (res.rows && res.rows.length > 0) {
let i = res.rows.length;
state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
let obj = {
project_id: state.projectInfo.projectId,
type: 1,
pageNo: 1,
pageSize: 1,
};
api2.auditList(obj).then((d) => {
if (d.data.code === 200) {
let res = d.data.data;
if (res.rows && res.rows.length > 0) {
let i = res.rows.length;
state.auditDescription = res.rows[i - 1].description
? res.rows[i - 1].description
: "-";
}
}
}
});
}
});
}
});
}
@@ -445,7 +455,7 @@ export default {
return true;
}
const createProject = async() => {
const createProject = async () => {
console.log("保存", state.projectInfo);
if (!validate(state.projectInfo, errorMsgs)) {
return;
@@ -456,26 +466,30 @@ export default {
message.warning('项目名称重复,请修改名称!');
return;
}*/
const offName = await validateName({name:state.projectInfo.name, type:1, id:state.projectInfo.projectId}).then(res => {
return res.data.data == 1;
});
if(offName){
message.destroy();
return message.warning("项目名称重复,请重新填写");
}
const offName = await validateName({
name: state.projectInfo.name,
type: 1,
id: state.projectInfo.projectId,
}).then((res) => {
return res.data.data == 1;
});
if (offName) {
message.destroy();
return message.warning("项目名称重复,请重新填写");
}
state.projectInfo.type = 3;
state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
api.createProject(state.projectInfo).then((res) => {
state.projectInfo.projectId ||
changeOwnership("project", res.data.data.projectId, [
{id: res.data.data.createId, name: res.data.data.createName},
]);
changeOwnership("project", res.data.data.projectId, [
{ id: res.data.data.createId, name: res.data.data.createName },
]);
message.destroy();
message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
// router.back();
router.push({
path: "/taskpage",
query: {projectId: res.data.data.projectId},
query: { projectId: res.data.data.projectId },
});
storage.set("projectId", res.data.data.projectId);
});
@@ -483,9 +497,9 @@ export default {
function managerChange(e, l, d, t) {
!state.projectInfo.sourceBelongId &&
(state.projectInfo.sourceBelongId = d);
(state.projectInfo.sourceBelongId = d);
!state.projectInfo.sourceBelongName &&
(state.projectInfo.sourceBelongName = t);
(state.projectInfo.sourceBelongName = t);
}
return {
@@ -700,7 +714,7 @@ export default {
.name2 {
display: flex;
align-items: flex-start;
.description{
.description {
margin-top: 14px;
margin-left: 11px;
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -707,6 +707,8 @@
placeholder="请输入姓名"
/>
</div>
<!-- 2022-11-30注释 后面放开 -->
<!--
<div
style="
display: flex;
@@ -715,14 +717,14 @@
margin-bottom: 10px;
"
>
<div class="groupname">小组名称:</div>
<a-input
v-model:value="valuestugroup"
placeholder="请输入小组名称"
/>
</div>
<!-- 2022-11-30注释 后面放开 -->
<!-- <div
<div
style="
display: flex;
align-items: center;
@@ -1144,22 +1146,6 @@
<span style="color: #999999">{{ sourceBelong }}</span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目说明:</span></div>
<div class="setc_main">
<span style="color: #999999">{{ remark }}</span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>同步学习记录:</span></div>
<div class="setc_main">
<a-radio v-model:checked="checkedSty" :disabled="true"
><span style="color: #333333"
>同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)</span
></a-radio
>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目级别:</span></div>
<div class="setc_main">
@@ -1182,6 +1168,16 @@
></span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>同步学习记录:</span></div>
<div class="setc_main">
<a-radio v-model:checked="checkedSty" :disabled="true"
><span style="color: #333333"
>同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)</span
></a-radio
>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>是否BOEU实施</span></div>
<div class="setc_main">
@@ -1190,6 +1186,12 @@
>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目说明:</span></div>
<div class="setc_main">
<span style="color: #999999">{{ remark }}</span>
</div>
</div>
<div class="set_content" v-if="isPass">
<div class="setc_name"><span>审核意见:</span></div>
<div class="setc_main">
@@ -3106,7 +3108,7 @@ export default {
title: "姓名",
dataIndex: "name",
key: "name",
// width: 30,
width:"20%",
align: "left",
className: "h",
// scopedSlots: { customRender: "action" }, //引入的插槽
@@ -3143,47 +3145,49 @@ export default {
title: "部门",
dataIndex: "bum",
key: "bum",
// width: 50,
width:"10%",
align: "center",
className: "h",
ellipsis: true,
},
{
title: "岗位",
dataIndex: "gangw",
key: "gangw",
// {
// title: "岗位",
// dataIndex: "gangw",
// key: "gangw",
// width: 50,
align: "center",
className: "h",
},
{
title: "所属小组",
dataIndex: "group",
key: "group",
// align: "center",
// className: "h",
// },
// {
// title: "所属小组",
// dataIndex: "group",
// key: "group",
// width: 50,
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "progress",
key: "progress",
// align: "center",
// className: "h",
// },
{
title: "进度",
dataIndex: "progress",
key: "progress",
width:"10%",
align: "center",
className: "h",
ellipsis: true,
},
// {
// title: "证书",
// dataIndex: "diploma",
// key: "diploma",
// width: 30,
align: "center",
className: "h",
},
{
title: "证书",
dataIndex: "diploma",
key: "diploma",
// width: 30,
align: "center",
className: "h",
},
// align: "center",
// className: "h",
// },
{
title: "最近学习时间",
dataIndex: "stutime",
key: "stutime",
// width: 50,
width:"20%",
align: "center",
className: "h",
// sorter: {
@@ -3195,15 +3199,16 @@ export default {
title: "加入方式",
dataIndex: "putin",
key: "putin",
// width: 40,
width:"10%",
align: "center",
className: "h",
ellipsis: true,
},
{
title: "操作",
dataIndex: "operation",
key: "operation",
// width: 60,
width:"20%",
align: "center",
className: "h",
scopedSlots: { customRender: "action" }, //引入的插槽

View File

@@ -11,8 +11,9 @@
height: 40px;
border-radius: 8px;
margin-right: 14px;
" placeholder="请输入项目名称" />
" placeholder="请输入模板名称" />
</div>
<!--
<div class="inpbox1">
<span>创建时间</span>
<a-date-picker v-model:value="time" type="date" placeholder="创建时间" style="
@@ -22,6 +23,8 @@
margin-right: 14px;
" />
</div>
-->
</div>
</div>
<div class="tmplh_btn">

View File

@@ -4,10 +4,10 @@
<div class="header">
<span class="title">创建/编辑单层模板</span>
<div
@click="backPage"
style="cursor: pointer"
to="/manage-release/libraryAdd"
class="goback"
@click="backPage"
style="cursor: pointer"
to="/libraryAdd"
class="goback"
>
<span class="return"></span><span class="returntext">返回</span>
</div>
@@ -17,44 +17,32 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">模板名称</div>
</div>
<div class="in">
<a-input
v-model:value="projectInfo.name"
placeholder="请输入模板名称"
show-count
:maxlength="30"
v-model:value="projectInfo.name"
placeholder="请输入模板名称"
show-count
:maxlength="30"
/>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">分类</div>
</div>
<div class="in select">
<ProjectClass v-model:value="projectInfo.category"></ProjectClass>
</div>
</div>
<div class="name" style="align-items: flex-start">
<div class="namebox" style="margin-top: 10px">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">封面图</div>
</div>
<div class="in select" style="display: flex">
<div
:class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
style="
:class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
style="
width: 100px;
height: 100px;
border-radius: 5px;
@@ -62,19 +50,19 @@
position: relative;
overflow: hidden;
"
v-for="(src, index) in projectPic"
:key="index"
@click="() => (projectInfo.picUrl = src.value)"
v-for="(src, index) in projectPic"
:key="index"
@click="() => (projectInfo.picUrl = src.value)"
>
<img
style="
style="
width: 100px;
height: 100px;
margin-bottom: 4px;
margin-right: 4px;
"
:src="src.value"
alt="avatar"
:src="src.value"
alt="avatar"
/>
</div>
</div>
@@ -82,92 +70,61 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目时间</div>
</div>
<div class="in">
<a-range-picker
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss"
@change="timeChange"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss"
@change="timeChange"
/>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目经理</div>
</div>
<div class="in">
<ProjectManager
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
@onChange="managerChange"
mode="multiple"
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
@onChange="managerChange"
mode="multiple"
></ProjectManager>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">资源归属</div>
</div>
<div class="in select">
<OrgClass
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
></OrgClass>
</div>
</div>
<div class="name name2">
<div class="namebox">
<div class="inname" style="margin-top: 13px">模板说明</div>
</div>
<div class="in">
<a-textarea
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
/>
</div>
</div>
<div class="name name2">
<div class="namebox">
<div class="inname">同步学习记录</div>
</div>
<div class="in">
<a-checkbox v-model:checked="projectInfo.courseSyncFlag"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-checkbox
>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目级别</div>
</div>
@@ -178,8 +135,8 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">培训体系</div>
</div>
@@ -190,8 +147,8 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">是否BOEU实施</div>
</div>
@@ -202,12 +159,45 @@
</a-radio-group>
</div>
</div>
<div class="name name2">
<div class="namebox">
<div class="inname">同步学习记录</div>
</div>
<div class="in">
<a-checkbox
v-model:checked="courseSyncFlag"
:disabled="viewDetail ? true : false"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-checkbox
>
</div>
</div>
<div class="name name2">
<div class="namebox">
<div class="inname" style="margin-top: 13px">模板说明</div>
</div>
<div class="in">
<a-textarea
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
/>
</div>
</div>
</div>
</div>
<div class="footer">
<div class="btn">
<a-button v-on:click="createProject" type="primary" class="btn1"
>确定
>确定
</a-button>
<a-button @click="backPage" class="btn2">取消</a-button>
</div>
@@ -215,12 +205,11 @@
</div>
</template>
<script setup>
import { useStore } from "vuex";
import { ref, onMounted, watch } from "vue";
import { message } from "ant-design-vue";
import { useRouter, useRoute } from "vue-router";
import {useStore} from "vuex";
import {ref, onMounted, watch} from "vue";
import {message} from "ant-design-vue";
import {useRouter, useRoute} from "vue-router";
import * as api from "../../api/indexTemplate";
import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManagerNew";
@@ -231,7 +220,7 @@ const router = useRouter();
const store = useStore();
const projectInfo = ref({});
const projectPic = ref([]);
const courseSyncFlag = ref(false)
onMounted(() => {
getDetail();
projectPic.value = store.state.projectPic.map((e) => ({
@@ -241,21 +230,22 @@ onMounted(() => {
});
watch(
() => route.query.projectTemplateId,
() => {
getDetail();
}
() => route.query.projectTemplateId,
() => {
getDetail();
}
);
const getDetail = () =>
route.query.projectTemplateId &&
api.templateDetail(route.query.projectTemplateId).then((res) => {
projectInfo.value = res.data.data.projectTemplateInfo;
projectInfo.value.rangeTime = [
projectInfo.value.beginTime,
projectInfo.value.endTime,
];
});
route.query.projectTemplateId &&
api.templateDetail(route.query.projectTemplateId).then((res) => {
projectInfo.value = res.data.data.projectTemplateInfo;
projectInfo.value.rangeTime = [
projectInfo.value.beginTime,
projectInfo.value.endTime,
];
projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
});
const backPage = () => {
router.back();
@@ -290,16 +280,17 @@ const createProject = () => {
return;
}
}
projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
api
.templateEdit({
...projectInfo.value,
courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
})
.then(() => {
message.destroy();
message.success("编辑成功");
router.back();
});
.templateEdit({
...projectInfo.value,
courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
})
.then(() => {
message.destroy();
message.success("编辑成功");
router.back();
});
};
function managerChange(e, l, d, t) {
@@ -311,6 +302,7 @@ function managerChange(e, l, d, t) {
.active {
border: 2px solid rgba(78, 166, 255, 1);
}
.projectAdd {
width: 100%;
// height: inherit;

View File

@@ -150,12 +150,12 @@ export default {
dataIndex: "department",
key: "department",
},
{
width: 50,
title: "岗位",
dataIndex: "post",
key: "post",
},
// {
// width: 50,
// title: "岗位",
// dataIndex: "post",
// key: "post",
// },
{
title: "项目",
width: 50,

View File

@@ -11,22 +11,18 @@ const { defineConfig } = require("@vue/cli-service");
module.exports = defineConfig({
publicPath: "/manage-release",
// transpileDependencies: true,
// devServer: {
// port: 8080,
// proxy: {
// "/manageApi": {
// target: "http://localhost:30001/",
// changeOrigin: true, //表示是否改变原域名
// // secure: false,
// // ws: false, //表示WebSocket协议
// pathRewrite: {
// "^/manageApi": "",
// },
// },
// "/userbasic": {
// target: "https://u-pre.boe.com",
// changeOrigin: true,
// },
// },
// },
devServer: {
port: 8080,
proxy: {
"/manageApi": {
target: process.env.VUE_APP_PROXY_URL,
changeOrigin: true, //表示是否改变原域名
// secure: false,
// ws: false, //表示WebSocket协议
pathRewrite: {
"^/manageApi": "",
},
},
},
},
});