Merge branch 'pre-dev' into 'develop'

Pre dev

See merge request !21
This commit is contained in:
huangshengfa
2022-12-14 17:34:35 +08:00
27 changed files with 2224 additions and 2754 deletions

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-13 15:30:27
* @LastEditTime: 2022-12-14 09:04:31
* @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -56,7 +56,7 @@ http.interceptors.response.use(
return response;
} else {
if (code === 1000) {
window.open("https://u-pre.boe.com/web/", '_self');
// window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self');
}
console.log("api %o", msg);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -24,13 +24,9 @@
v-model:assessmentVisible="assessmentVisible"
v-model:assessmentId="assessmentId"
v-model:assessmentName="assessmentName"
/>
</div>
</div>
</div>
<div class="main_btns">
<button class="btn1" @click="closeDrawer">取消</button>
@@ -138,7 +134,6 @@ export default {
// ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
};
const checkAssDrawer = () => {
state.assessmentVisible = true;
@@ -151,16 +146,19 @@ export default {
state.assessmentId = null;
state.assessmentName = null;
}
};
const updateTask = () => {
console.log("state.assessmentId ",state.assessmentId ,state.assessmentName );
console.log(
"state.assessmentId ",
state.assessmentId,
state.assessmentName
);
if (!state.assessmentId) {
return message.warning("请选择评估");
}
let l_data_id = [];
l_data_id.push(Number(state.assessmentId))
l_data_id.push(Number(state.assessmentId));
console.log("state.assessment", state.assessment, state.assessmentId);
if (props.isLevel == 1) {
if (!props.isactive) {
@@ -174,7 +172,7 @@ export default {
type: 11,
})
.then((res) => {
console.log('shifouchongfu',res)
console.log("shifouchongfu", res);
console.log("路径图中是否包含此评估了", res);
if (res.data.data.length) {
let strdata = res.data.data;
@@ -200,7 +198,9 @@ export default {
})
.then(() => {
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
message.success(
`${props.edit ? "编辑" : "新增"}关卡任务成功`
);
ctx.emit("changeData", false);
closeDrawer();
state.addLoading = false;
@@ -210,19 +210,19 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
}
}).catch(err=>{
console.log(err)
})
.catch((err) => {
console.log(err);
});
} else if (props.isLevel == 2) {
IsExistenceProject({
courseTaskId: l_data_id,
projectId: props.projectId,
stageId: props.chooseStageId || 0,
type: 11,
}).then(res=>{
console.log(res)
})
.then((res) => {
console.log(res);
console.log("项目中是否包含此评估了", res);
if (res.data.data.length) {
let strdata = res.data.data;
@@ -256,10 +256,10 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
});
}
}).catch(err=>{
console.log(err)
})
.catch((err) => {
console.log(err);
});
} else if (props.isLevel == 3) {
IsExistenceProjectTemplate({
courseTaskId: l_data_id,
@@ -267,7 +267,7 @@ export default {
stageId: props.chooseStageId || 0,
type: 11,
}).then((res) => {
console.log(res)
console.log(res);
console.log("项目中是否包含此评估了", res);
if (res.data.data.length) {
let strdata = res.data.data;
@@ -303,7 +303,6 @@ export default {
});
}
});
}
};
@@ -313,7 +312,6 @@ export default {
closeDrawer,
updateTask,
checkAssDrawer,
};
},
};
@@ -339,7 +337,6 @@ export default {
}
}
.contentMain {
.main {
width: 100%;
.main_left {

View File

@@ -1,11 +1,10 @@
<!-- 评估列表 -->
<template>
<div class="main_item">
<div class="fi_input">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 40px; border-radius: 8px;"
style="width: 424px; height: 40px; border-radius: 8px"
placeholder="请输入评估名称"
maxlength="20"
/>
@@ -23,18 +22,14 @@
<div class="mntc_left">
<div class="notice_icon"></div>
<div v-if="assessment == null">
<span class="title"
>已选择 <span class="data">0</span> </span
>
<span class="title">已选择 <span class="data">0</span> </span>
</div>
<div v-else>
<div>
<span class="title">已选择 <span class="data">1</span> ;</span>
<span class="title"
>已选择 <span class="data">1</span> ;</span
>
<span class="title"
>名称 <span class="data">{{ assessment.name }}</span>
</span><!--
>名称 <span class="data">{{ assessment.name }}</span> </span
><!--
<span class="title"
>题数 <span class="data">{{ assessment.essayQuestionVoList?Number(assessment.essayQuestionVoList.length):0
+Number(assessment.multipleStemVoList?assessment.multipleStemVoList.length:0)
@@ -110,12 +105,12 @@
class="pagination"
@change="handelChangePage"
/>
</div></div>
</div>
</div>
</div>
</template>
<script>
import { reactive, toRefs,onMounted } from "vue";
import { reactive, toRefs, onMounted, watch } from "vue";
import * as api from "../../api/indexInvist.js";
import dayjs from "dayjs";
export default {
@@ -154,7 +149,7 @@ export default {
};
//清空所选
const clearLine = () => {
console.log("state.selectedRowKeys",state.selectedRowKeys)
console.log("state.selectedRowKeys", state.selectedRowKeys);
state.selectedRowKeys = [];
state.addOnlineList = [];
};
@@ -168,9 +163,26 @@ export default {
api
.queryAppraiseDetailById({ assessmentId: props.assessmentId })
.then((res) => {
console.log(res);
console.log("查询评估xinxi ", res);
let info = res.data.data;
let obj = {
assessmentId: info.assessmentId,
name: info.assessmentName,
num: info.essayQuestionVoList
? Number(info.essayQuestionVoList.length)
: 0 + info.multipleStemVoList
? Number(info.multipleStemVoList.length)
: 0 + info.scoringQuestionVoList
? Number(info.scoringQuestionVoList.length)
: 0 + info.singleStemVoList
? Number(info.singleStemVoList.length)
: 0,
creator: info.createUser ? info.createUser : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD"),
};
//更新讨论信息
state.assessment = res.data.data;
state.assessment = obj;
state.selectedRowKeys = [info.assessmentId];
// state.assessmentId = res.data.data.assessmentId;
})
.catch(() => {});
@@ -223,8 +235,7 @@ export default {
// ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessment.assessmentId);
ctx.emit("update:assessmentName", state.assessment.name);
}
};
const handelChangePage = (page, pageSize) => {
state.currentPage = page;
@@ -234,21 +245,27 @@ export default {
const getTableDate = (tableData) => {
let data = tableData;
let array = [];
data.map((value, index) => {
data.map((value) => {
let obj = {
key: index,
key: value.assessmentId,
assessmentId: value.assessmentId,
num: value.essayQuestionVoList?Number(value.essayQuestionVoList.length):0
+value.multipleStemVoList?Number(value.multipleStemVoList.length):0
+value.scoringQuestionVoList?Number(value.scoringQuestionVoList.length):0
+value.singleStemVoList?Number(value.singleStemVoList.length):0,
num: value.essayQuestionVoList
? Number(value.essayQuestionVoList.length)
: 0 + value.multipleStemVoList
? Number(value.multipleStemVoList.length)
: 0 + value.scoringQuestionVoList
? Number(value.scoringQuestionVoList.length)
: 0 + value.singleStemVoList
? Number(value.singleStemVoList.length)
: 0,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"),
};
array.push(obj);
});
(state.selectedRowKeys = []), (state.tableData = array);
state.selectedRowKeys = [];
state.tableData = array;
};
//获取全部评估信息接口
const getAllInvistText = () => {
@@ -279,15 +296,34 @@ export default {
};
onMounted(() => {
clearLine();
console.log("state.selectedRowKeys",state.selectedRowKeys)
console.log(
"state.selectedRowKeys",
state.selectedRowKeys,
state.assessmentId
);
if (!state.assessmentId) {
clearLine();
}
queryInfo();
getAllInvistText();
});
watch(
() => props.assessmentId,
() => {
if (!props.assessmentId) {
clearLine();
state.assessment = null;
} else {
queryInfo();
}
console.log("props.assessmentId", props.assessmentId);
},
{
deep: true,
}
);
return {
...toRefs(state),
onSelectChange,
@@ -322,7 +358,6 @@ export default {
}
}
.contentMain {
.main_left {
padding-right: 30px;
margin-top: 32px;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -90,10 +90,8 @@
<div class="search"></div>
<div class="btnText">重置</div>
</div>
</div>
<div class="btns">
<!-- 2022-11-30注释 后面放开 -->
<!-- <div class="btn btn3" @click="openMessage">
<div class="search"></div>
@@ -631,7 +629,7 @@
<span style="margin-right: 14px">授课教师</span>
</div>
<div class="item_inp">
<div class="select" style="width:436px; " >
<div class="select" style="width: 436px">
<ProjectManager
v-model:value="member.value"
v-model:name="member.name"
@@ -815,7 +813,8 @@
]"
>
<div class="fb">
<div class="jc"
<div
class="jc"
@click="
() => {
handleEdit(record, String(record.courseform));
@@ -826,7 +825,8 @@
编辑
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleCopy(record, String(record.courseform));
@@ -893,7 +893,8 @@
<down-outlined />
</a>
</a-dropdown> -->
<div class="jc"
<div
class="jc"
@click="
() => {
handleDelete(record, String(record.courseform));
@@ -921,7 +922,8 @@
]"
>
<div class="fb">
<div class="jc"
<div
class="jc"
@click="
() => {
handleRejectExit(record, String(record.courseform));
@@ -931,7 +933,8 @@
>
撤回
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleCopy(record, String(record.courseform));
@@ -1017,7 +1020,8 @@
]"
>
<div class="fb">
<div class="jc"
<div
class="jc"
@click="
() => {
handleStart(record, String(record.courseform));
@@ -1027,7 +1031,8 @@
>
开课
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleLook(record, String(record.courseform));
@@ -1059,7 +1064,8 @@
>
管理
</div>-->
<div class="jc"
<div
class="jc"
@click="
() => {
handleCopy(record, String(record.courseform));
@@ -1126,7 +1132,8 @@
<down-outlined />
</a>
</a-dropdown> -->
<div class="jc"
<div
class="jc"
@click="
() => {
handleStop(record, String(record.courseform));
@@ -1138,7 +1145,6 @@
</div>
</div>
</div>
</template>
<template
v-if="
@@ -1156,7 +1162,8 @@
]"
>
<div class="fb">
<div class="jc"
<div
class="jc"
@click="
() => {
handleStart(record, String(record.courseform));
@@ -1166,7 +1173,8 @@
>
开课
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleEdit(record, String(record.courseform));
@@ -1198,7 +1206,8 @@
>
管理
</div> -->
<div class="jc"
<div
class="jc"
@click="
() => {
handleCopy(record, String(record.courseform));
@@ -1265,7 +1274,8 @@
<down-outlined />
</a>
</a-dropdown> -->
<div class="jc"
<div
class="jc"
@click="
() => {
handleOpen(record, String(record.courseform));
@@ -1275,7 +1285,8 @@
>
启用
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleDelete(record, String(record.courseform));
@@ -1304,7 +1315,8 @@
]"
>
<div class="fb">
<div class="jc"
<div
class="jc"
@click="
() => {
handleEdit(record, String(record.courseform));
@@ -1314,7 +1326,8 @@
>
编辑
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handleCopy(record, String(record.courseform));
@@ -1381,7 +1394,8 @@
<down-outlined />
</a>
</a-dropdown> -->
<div class="jc"
<div
class="jc"
@click="
() => {
handleDelete(record, String(record.courseform));
@@ -1725,7 +1739,8 @@
<div class="btnText">
<span style="color: #ffffff">新建开课</span>
</div>
</div></div>
</div>
</div>
</div>
<!-- 无数据样式 -->
<div class="notable" v-if="tableData6.length === 0">
@@ -1771,7 +1786,8 @@
签到
</div>
-->
<div class="jc"
<div
class="jc"
@click="
() => {
handelEditStu(record);
@@ -1780,7 +1796,8 @@
>
编辑
</div>
<div class="jc"
<div
class="jc"
@click="
() => {
handelGuan(record);
@@ -1792,7 +1809,7 @@
</div>
<a-dropdown>
<template #overlay>
<a-menu style="margin-left: 20px;">
<a-menu style="margin-left: 20px">
<a-menu-item
@click="
() => {
@@ -1824,11 +1841,12 @@
</a-menu-item> -->
</a-menu>
</template>
<div class="fb" style="margin-left: -20px;">
<div class="fb" style="margin-left: -20px">
<div class="jc">
更多
<down-outlined />
</div></div>
</div>
</div>
</a-dropdown>
</div>
</template>
@@ -1853,8 +1871,6 @@
</div>
</div>
</div>
</a-modal>
<!--开课页面 -->
<!--新建开课页面 -->
@@ -1950,7 +1966,7 @@
</div>
<span style="margin-right: 3px">授课教师</span>
</div>
<div class="select" style="width: 440px;">
<div class="select" style="width: 440px">
<ProjectManager
v-model:value="member.value"
v-model:name="member.name"
@@ -1987,7 +2003,6 @@
</div>
</div>
<div class="cstm_items">
<div class="signbox">
<span style="margin-right: 3px">评估设置</span>
@@ -2099,8 +2114,16 @@
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ item.slice(item.lastIndexOf("/") + 1) }}</span
>
{{
item.indexOf("-") !== -1
? item.slice(
item.lastIndexOf("/") + 1,
item.lastIndexOf("-")
) + item.slice(item.lastIndexOf("."))
: item
}}
</span>
</div>
<!-- 条件渲染 s -->
<!-- <div class="file_size">
@@ -2227,7 +2250,12 @@
<a-input
v-model:value="xygl_inputV1"
placeholder="请输入姓名"
style="width: 400px; height: 40px; border-radius: 8px;margin-right:14px;"
style="
width: 400px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
/>
<div class="btn btn1" @click="handleSearchStu">
<div class="search"></div>
@@ -2284,7 +2312,7 @@
</div> -->
</div>
</div>
<div class="tableBox" style="margin-top:20px;">
<div class="tableBox" style="margin-top: 20px">
<a-table
:columns="columns7"
:data-source="tableData7"
@@ -3246,16 +3274,16 @@ const columns7 = [
return text ? text : "-";
},
},
{
title: "岗位",
width: 300,
dataIndex: "postion",
key: "3",
align: "center",
customRender: ({ text }) => {
return text ? text : "-";
},
},
// {
// title: "岗位",
// width: 300,
// dataIndex: "postion",
// key: "3",
// align: "center",
// customRender: ({ text }) => {
// return text ? text : "-";
// },
// },
{
title: "Band",
width: 200,
@@ -4574,7 +4602,6 @@ export default defineComponent({
return message.warning("请选择课程形式");
}
if (state.valueE1 === 2) {
state.of_hs = false;
// state.ft_hs = true;
@@ -4814,7 +4841,7 @@ export default defineComponent({
.catch();
console.log("res");
console.log(item);
console.log("获取面授课详情", item);
state.xjkkinputV2 = item.address;
state.checked1 = item.applyFlag === 1 ? true : false;
@@ -6001,7 +6028,6 @@ export default defineComponent({
}
}
.tableBox {
margin: 20px 38px 30px;
@@ -7910,7 +7936,6 @@ export default defineComponent({
}
.ant-table-thead > tr > th {
background-color: #eff4fc !important;
}
@@ -7954,7 +7979,6 @@ export default defineComponent({
}
}
}
}
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -211,7 +211,8 @@
/>
</div>
</div>
<div class="name name2">
<div v-if="projectInfo.status == -5" class="name name2">
<div class="namebox">
<div class="inname" style="margin-top: 13px">审核意见</div>
</div>

View File

@@ -924,7 +924,7 @@ export default {
{ value: 1, label: "审核中" },
{ value: 2, label: "审核通过" },
{ value: 3, label: "已发布" },
{value: -2, label: "未通过"},
{ value: -5, label: "未通过" },
{ value: -1, label: "已结束" },
]);
const searchReset = () => {
@@ -976,7 +976,11 @@ export default {
message.warning("项目名称重复,请修改名称!");
return;
} */
const offName = await validateName({name: state.qdms_inputV1, type:1, id:state.projectInfo.projectId}).then(res => {
const offName = await validateName({
name: state.qdms_inputV1,
type: 1,
id: state.projectInfo.projectId,
}).then((res) => {
return res.data.data == 1;
});
if (offName) {
@@ -1324,7 +1328,7 @@ export default {
title: "项目名称",
dataIndex: "name",
key: "name",
width: 480,
width: 380,
// align: "center",
ellipsis: true,
// scopedSlots: { customRender: "action" }, //引入的插槽
@@ -1364,7 +1368,6 @@ export default {
dayjs().isBefore(value.record.end) ? "进行中" : "已结束",
"-1": () => "已结束",
"-5": () => "草稿",
}[value.record.status + ""]() || ""
: "-"}
</div>
@@ -1706,7 +1709,7 @@ export default {
: "",
})
.then((res) => {
console.log(res);
// console.log("搜索", res, state.searchParam);
state.tableDataTotal = Number(res.data.data.total);
const data = res.data.data.rows;
initDataSublist("", data);
@@ -2074,7 +2077,6 @@ export default {
margin: 20px 38px 30px;
.ant-table-thead > tr > th {
background-color: #eff4fc;
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -707,6 +707,8 @@
placeholder="请输入姓名"
/>
</div>
<!-- 2022-11-30注释 后面放开 -->
<!--
<div
style="
display: flex;
@@ -715,14 +717,14 @@
margin-bottom: 10px;
"
>
<div class="groupname">小组名称:</div>
<a-input
v-model:value="valuestugroup"
placeholder="请输入小组名称"
/>
</div>
<!-- 2022-11-30注释 后面放开 -->
<!-- <div
<div
style="
display: flex;
align-items: center;
@@ -1145,9 +1147,25 @@
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目说明</span></div>
<div class="setc_name"><span>项目级别</span></div>
<div class="setc_main">
<span style="color: #999999">{{ remark }}</span>
<span style="color: #999999"
><ProjectLevel
v-model:value="level"
:tag="true"
></ProjectLevel
></span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>培训体系:</span></div>
<div class="setc_main">
<span style="color: #999999"
><TrainClass
v-model:value="systemId"
:tag="true"
></TrainClass
></span>
</div>
</div>
<div class="set_content">
@@ -1160,28 +1178,6 @@
>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目级别:</span></div>
<div class="setc_main">
<span style="color: #999999"
><ProjectLevel
v-model:value="level"
:disabled="true"
></ProjectLevel
></span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>培训体系:</span></div>
<div class="setc_main">
<span style="color: #999999"
><TrainClass
v-model:value="systemId"
:disabled="true"
></TrainClass
></span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>是否BOEU实施</span></div>
<div class="setc_main">
@@ -1190,6 +1186,12 @@
>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目说明:</span></div>
<div class="setc_main">
<span style="color: #999999">{{ remark }}</span>
</div>
</div>
<div class="set_content" v-if="isPass">
<div class="setc_name"><span>审核意见:</span></div>
<div class="setc_main">
@@ -3147,38 +3149,38 @@ export default {
align: "center",
className: "h",
},
{
title: "岗位",
dataIndex: "gangw",
key: "gangw",
// {
// title: "岗位",
// dataIndex: "gangw",
// key: "gangw",
// width: 50,
align: "center",
className: "h",
},
{
title: "所属小组",
dataIndex: "group",
key: "group",
// align: "center",
// className: "h",
// },
// {
// title: "所属小组",
// dataIndex: "group",
// key: "group",
// width: 50,
align: "center",
className: "h",
},
{
title: "进度",
dataIndex: "progress",
key: "progress",
// align: "center",
// className: "h",
// },
// {
// title: "进度",
// dataIndex: "progress",
// key: "progress",
// width: 30,
align: "center",
className: "h",
},
{
title: "证书",
dataIndex: "diploma",
key: "diploma",
// align: "center",
// className: "h",
// },
// {
// title: "证书",
// dataIndex: "diploma",
// key: "diploma",
// width: 30,
align: "center",
className: "h",
},
// align: "center",
// className: "h",
// },
{
title: "最近学习时间",
dataIndex: "stutime",

View File

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

View File

@@ -31,18 +31,6 @@
/>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">分类</div>
</div>
<div class="in select">
<ProjectClass v-model:value="projectInfo.category"></ProjectClass>
</div>
</div>
<div class="name" style="align-items: flex-start">
<div class="namebox" style="margin-top: 10px">
<img
@@ -132,37 +120,6 @@
></OrgClass>
</div>
</div>
<div class="name name2">
<div class="namebox">
<div class="inname" style="margin-top: 13px">模板说明</div>
</div>
<div class="in">
<a-textarea
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
/>
</div>
</div>
<div class="name name2">
<div class="namebox">
<div class="inname">同步学习记录</div>
</div>
<div class="in">
<a-checkbox v-model:checked="projectInfo.courseSyncFlag"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-checkbox
>
</div>
</div>
<div class="name">
<div class="namebox">
<img
@@ -202,6 +159,39 @@
</a-radio-group>
</div>
</div>
<div class="name name2">
<div class="namebox">
<div class="inname">同步学习记录</div>
</div>
<div class="in">
<a-checkbox
v-model:checked="courseSyncFlag"
:disabled="viewDetail ? true : false"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-checkbox
>
</div>
</div>
<div class="name name2">
<div class="namebox">
<div class="inname" style="margin-top: 13px">模板说明</div>
</div>
<div class="in">
<a-textarea
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
/>
</div>
</div>
</div>
</div>
<div class="footer">
@@ -220,7 +210,6 @@ import { ref, onMounted, watch } from "vue";
import {message} from "ant-design-vue";
import {useRouter, useRoute} from "vue-router";
import * as api from "../../api/indexTemplate";
import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManagerNew";
@@ -231,7 +220,7 @@ const router = useRouter();
const store = useStore();
const projectInfo = ref({});
const projectPic = ref([]);
const courseSyncFlag = ref(false)
onMounted(() => {
getDetail();
projectPic.value = store.state.projectPic.map((e) => ({
@@ -255,6 +244,7 @@ const getDetail = () =>
projectInfo.value.beginTime,
projectInfo.value.endTime,
];
projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
});
const backPage = () => {
@@ -290,6 +280,7 @@ const createProject = () => {
return;
}
}
projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
api
.templateEdit({
...projectInfo.value,
@@ -311,6 +302,7 @@ function managerChange(e, l, d, t) {
.active {
border: 2px solid rgba(78, 166, 255, 1);
}
.projectAdd {
width: 100%;
// height: inherit;

View File

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