hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-23 09:46:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
parent 200bd0cff9 86260c8a19
commit f880b1809d
40 changed files with 2635 additions and 3113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

136
package.json
View File

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

50
src/App.vue
View File

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

96
src/api/config.js
View File

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

6
src/api/method.js
View File

@@ -276,7 +276,10 @@ const commonData = {
const organizationalTree = [] 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" const codeUrl = "https://u-pre.boe.com"
export { export {
@@ -292,5 +295,6 @@ export {
commonData, commonData,
organizationalTree, organizationalTree,
iframeUrl, iframeUrl,
studentUrl,
codeUrl, codeUrl,
} }

6
src/components/NavTop.vue
View File

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

16
src/components/drawers/ActiveAttendance.vue
View File

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

5
src/components/drawers/AddDiscuss.vue
View File

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

5
src/components/drawers/AddEval.vue
View File

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

5
src/components/drawers/AddFaceteach.vue
View File

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

16
src/components/drawers/AddGroupMembers.vue
View File

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

197
src/components/drawers/AddInvist.vue
View File

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

90
src/components/drawers/AddProject.vue
View File

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

311
src/components/drawers/AssessmentAll.vue
View File

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

32
src/components/drawers/MemberList.vue
View File

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

6
src/components/project/NameInput.vue
View File

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

2
src/components/project/OrgClass.vue
View File

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

62
src/components/project/ProjectClass.vue
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> <template>
<a-select <a-select
:getPopupContainer=" :getPopupContainer="
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
v-model:value="id" v-model:value="id"
placeholder="请选择分类" placeholder="请选择分类"
style="width: 100%" style="width: 100%"
:options="options" :options="options"
allowClear allowClear
@change="change" @change="change"
:disabled="disabled" :disabled="disabled"
> >
</a-select> </a-select>
</template> </template>
<script setup> <script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue"; import { computed, defineEmits, defineProps } from "vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
const store = useStore(); const store = useStore();
const props = defineProps({ const props = defineProps({
value: String, value: String,
disabled: String disabled: String,
}) });
const emit = defineEmits({}) const emit = defineEmits({});
const options = ref([]) const options = computed(() =>
store.state.projectClass.map((e) => ({
value: parseInt(e.dictCode),
label: e.dictName,
}))
);
const id = computed(() => { const id = computed(() => {
return props.value return props.value;
}) });
onMounted(() => {
options.value = store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
})
function change(key, obj) { function change(key, obj) {
emit('update:name', obj[0]) emit("update:name", obj[0]);
emit('update:value', key) emit("update:value", key);
} }
</script> </script>

62
src/components/project/ProjectLevel.vue
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>
<template v-if="tag"> <template v-if="tag">
<div>{{ options?.find(e => e.value == id)?.label || '' }}</div> <div>{{ options?.find((e) => e.value == id)?.label || "" }}</div>
</template> </template>
<template v-else> <template v-else>
<a-select <a-select
:getPopupContainer=" :getPopupContainer="
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
v-model:value="id" v-model:value="id"
:options="options" :options="options"
style="width: 100%" style="width: 100%"
placeholder="请选择项目级别" placeholder="请选择项目级别"
@change="change" @change="change"
:disabled="disabled" :disabled="disabled"
/> />
</template> </template>
</template> </template>
<script setup> <script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue"; import { computed, defineEmits, defineProps } from "vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
const store = useStore(); const store = useStore();
const props = defineProps({ const props = defineProps({
@@ -29,23 +36,24 @@ const props = defineProps({
disabled: String, disabled: String,
tag: { tag: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}) });
const id = computed(() => { const id = computed(() => {
return props.value || null return props.value || null;
}) });
const emit = defineEmits({}) const emit = defineEmits({});
const options = ref([]) const options = computed(() =>
store.state.projectLevel.map((e) => ({
onMounted(() => { value: parseInt(e.dictCode),
options.value = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName})) label: e.dictName,
}) }))
);
function change(key) { function change(key) {
emit('update:value', key) emit("update:value", key);
} }
</script> </script>

63
src/components/project/TrainClass.vue
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>
<template v-if="tag"> <template v-if="tag">
<div>{{ options.find(e => e.value == id)?.label || '' }}</div> <div>{{ options.find((e) => e.value == id)?.label || "" }}</div>
</template> </template>
<template v-else> <template v-else>
<a-select <a-select
:getPopupContainer=" :getPopupContainer="
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
v-model:value="id" v-model:value="id"
:options="options" :options="options"
style="width: 100%" style="width: 100%"
placeholder="请选择分类" placeholder="请选择分类"
@change="change" @change="change"
:disabled="disabled" :disabled="disabled"
/> />
</template> </template>
</template> </template>
<script setup> <script setup>
import {computed, defineEmits, defineProps, onMounted, ref} from "vue"; import { computed, defineEmits, defineProps } from "vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
const store = useStore(); const store = useStore();
@@ -30,24 +37,24 @@ const props = defineProps({
disabled: String, disabled: String,
tag: { tag: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}) });
const id = computed(() => { const id = computed(() => {
return props.value return props.value;
}) });
const emit = defineEmits({}) const emit = defineEmits({});
const options = ref([]) const options = computed(() =>
store.state.projectSys.map((e) => ({
onMounted(() => { value: parseInt(e.dictCode),
options.value = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName})) label: e.dictName,
}) }))
);
function change(key) { function change(key) {
emit('update:value', key) emit("update:value", key);
} }
</script> </script>

4
src/router/index.js
View File

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

1208
src/views/courselibrary/CoursewareManage.vue
View File

File diff suppressed because it is too large Load Diff

20
src/views/courselibrary/CoursewareManage_Old.vue
View File

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

168
src/views/courselibrary/components/seeModal.vue
View File

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

25
src/views/examine/ProjectReviewedN.vue
View File

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

32
src/views/learningpath/LevelAdd.vue
View File

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

32
src/views/learningpath/LevelAddDetail.vue
View File

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

38
src/views/projectcenter/LibraryAdd.vue
View File

@@ -538,24 +538,6 @@
}}</span> }}</span>
</div> </div>
</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="set_content">
<div class="setc_name"><span>项目级别：</span></div> <div class="setc_name"><span>项目级别：</span></div>
<div class="setc_main"> <div class="setc_main">
@@ -568,14 +550,32 @@
<TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass> <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
</div> </div>
</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="set_content">
<div class="setc_name"><span>是否BOEU实施：</span></div> <div class="setc_name"><span>是否BOEU实施：</span></div>
<div class="setc_main"> <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 ><span style="color: #333333">BOEU实施</span></a-radio
> >
</div> </div>
</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>
</div> </div>
</a-tab-pane> </a-tab-pane>

254
src/views/projectcenter/ProjectAdd.vue
View File

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

1277
src/views/projectcenter/ProjectManage.vue
View File

File diff suppressed because it is too large Load Diff

1119
src/views/projectcenter/SonProject.vue
View File

File diff suppressed because it is too large Load Diff

109
src/views/projectcenter/TaskPage.vue
View File

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

5
src/views/projectcenter/TemplateLibrary.vue
View File

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

222
src/views/projectcenter/templateAdd.vue
View File

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

12
src/views/research/ManagePage.vue
View File

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

32
vue.config.js
View File

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