This commit is contained in:
quhongwei
2022-12-23 09:05:16 +08:00
27 changed files with 854 additions and 945 deletions

View File

@@ -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,31 +104,18 @@ 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"); api.getOrgTreeInfo().then((res) => {
if (orgtreeList) { store.commit("getOrgtreeList", res.data.data);
store.commit("getOrgtreeList", JSON.parse(orgtreeList)); });
return;
}
api
.getOrgInfo({
keyWord: "",
id: -1,
pageNo: 1,
pageSize: 20,
})
.then((res) => {
localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
store.commit("getOrgtreeList", res.data.data);
});
}; };
init(); init();
return { return {
@@ -167,7 +154,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;

View File

@@ -6,7 +6,7 @@
* @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 router from "@/router";
// import { getCookie } from '../api/method' // import { getCookie } from '../api/method'
@@ -14,63 +14,63 @@ import router from "@/router";
// axios.defaults.headers.post["Content-Type"] = // axios.defaults.headers.post["Content-Type"] =
// "application/x-www-form-urlencoded"; // "application/x-www-form-urlencoded";
export const FILE_UPLOAD_URL = process.env.VUE_APP_BASE_API + '/file/upload'
axios.defaults.withCredentials = true; axios.defaults.withCredentials = true;
const http = axios.create({ const http = axios.create({
baseURL: process.env.VUE_APP_BASE_API, 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) {
process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL) process.env.NODE_ENV === 'development' ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
} }
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;

View File

@@ -111,6 +111,7 @@ export const searchUsersByOrgId = (obj) => http.post('/admin/router/searchUsersB
//获取组织信息(修改版) //获取组织信息(修改版)
export const getOrgInfo = (obj) => http.post('/admin/orgStruct/getOrgInfo', obj) export const getOrgInfo = (obj) => http.post('/admin/orgStruct/getOrgInfo', obj)
export const getOrgTreeInfo = (obj) => http.get('/org/initOrg', {params: obj})
//获取员工(修改版) //获取员工(修改版)
export const getMemberInfo = (obj) => http.post('/admin/orgStruct/getMemberInfo', obj) export const getMemberInfo = (obj) => http.post('/admin/orgStruct/getMemberInfo', obj)
//获取受众(修改版) //获取受众(修改版)
@@ -131,6 +132,7 @@ export const addStudentCourse = (obj) => http.post("/admin/offcourse/addStudent"
// 获取组织结构树 // 获取组织结构树
export const orgtree = () => http.get("/org/tree"); export const orgtree = () => http.get("/org/tree");
export const saveStu = obj => http.post("/admin/student/addStudent", obj); export const saveStu = obj => http.post("/admin/student/addStudent", obj);
export const moveStudent = obj => http.post("/admin/student/moveStudent", obj);
export const getStuPage = obj => http.get("/admin/student/getStudent", {params: obj}); export const getStuPage = obj => http.get("/admin/student/getStudent", {params: obj});
export const delStudentList = obj => http.post("/admin/student/delStudent", obj); export const delStudentList = obj => http.post("/admin/student/delStudent", obj);
export const validateName = obj => http.post("/admin/validate/validateName", obj); export const validateName = obj => http.post("/admin/validate/validateName", obj);

View File

@@ -1,7 +1,7 @@
<template> <template>
<a-upload <a-upload
:file-list="files" :file-list="files"
action="/manageApi/file/upload" :action="FILE_UPLOAD_URL"
:show-upload-list="showUploadList" :show-upload-list="showUploadList"
:multiple="multiple" :multiple="multiple"
:before-upload="beforeUpload" :before-upload="beforeUpload"
@@ -16,6 +16,7 @@
<script setup> <script setup>
import {defineProps, defineEmits, defineExpose, ref, watch} from "vue"; import {defineProps, defineEmits, defineExpose, ref, watch} from "vue";
import {message} from "ant-design-vue"; import {message} from "ant-design-vue";
import {FILE_UPLOAD_URL} from "@/api/config";
const props = defineProps({ const props = defineProps({
value: { value: {

View File

@@ -51,7 +51,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker
show-time :show-time="{ format: 'HH:mm' }"
format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
style="width: 400px; height: 40px; border-radius: 8px;" style="width: 400px; height: 40px; border-radius: 8px;"
v-model:value="time" v-model:value="time"

View File

@@ -49,8 +49,8 @@
<span style="margin-right: 3px">有效期</span> <span style="margin-right: 3px">有效期</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker
show-time :show-time="{ format: 'HH:mm' }"
style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="time" format="YYYY-MM-DD HH:mm" style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="time" format="YYYY-MM-DD HH:mm"
:placeholder="[' 开始时间', ' 结束时间']" /> :placeholder="[' 开始时间', ' 结束时间']" />
</div> </div>

View File

@@ -102,7 +102,7 @@
</div> </div>
<div class="select" > <div class="select" >
<a-range-picker style="width: 400px;" <a-range-picker style="width: 400px;"
show-time :show-time="{ format: 'HH:mm' }"
format="YYYY/MM/DD HH:mm" format="YYYY/MM/DD HH:mm"
v-model:value="chooseTime" v-model:value="chooseTime"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
@@ -354,7 +354,7 @@
<div class="btnbox"> <div class="btnbox">
<a-upload <a-upload
@change="handleChange" @change="handleChange"
action="/manageApi/file/upload" :action="FILE_UPLOAD_URL"
v-model:file-list="fileList" v-model:file-list="fileList"
> >
<button class="xkbtn">上传附件</button> <button class="xkbtn">上传附件</button>
@@ -392,6 +392,7 @@ import { detail } from "../../api/indexCourse";
import { queryAppraiseDetailById } from "../../api/indexInvist"; import { queryAppraiseDetailById } from "../../api/indexInvist";
import { queryWorkDetailById } from "@/api/indexWork"; import { queryWorkDetailById } from "@/api/indexWork";
import { queryExaminationDetailById } from "@/api/indexExam"; import { queryExaminationDetailById } from "@/api/indexExam";
import {FILE_UPLOAD_URL} from "@/api/config";
export default { export default {
name: "AddFaceteach", name: "AddFaceteach",
components: { components: {
@@ -841,6 +842,7 @@ export default {
}; };
return { return {
...toRefs(state), ...toRefs(state),
FILE_UPLOAD_URL,
showDrawerSelFacet, showDrawerSelFacet,
showDrawerAddHomework, showDrawerAddHomework,
showDrawerAddTest, showDrawerAddTest,

View File

@@ -45,7 +45,7 @@
<span style="margin-right: 3px">附件</span> <span style="margin-right: 3px">附件</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-upload v-model:file-list="fileList" name="file" action="/manageApi/file/upload" <a-upload v-model:file-list="fileList" name="file" :action="FILE_UPLOAD_URL"
@change="handleChange"> @change="handleChange">
<button class="xkbtn" type="button">上传附件</button> <button class="xkbtn" type="button">上传附件</button>
</a-upload> </a-upload>
@@ -82,6 +82,7 @@ import {
import { ProjectEditTask, RouterEditTask } from "@/api/indexTask"; import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { addTempTask } from "../../api/indexTaskadd"; import { addTempTask } from "../../api/indexTaskadd";
import {FILE_UPLOAD_URL} from "@/api/config";
export default { export default {
name: "AddHomework", name: "AddHomework",
@@ -513,6 +514,7 @@ export default {
disabledDate, disabledDate,
disabledDateTime, disabledDateTime,
afterVisibleChange, afterVisibleChange,
FILE_UPLOAD_URL,
closeDrawer, closeDrawer,
closeDrawer2, closeDrawer2,
handleChange, handleChange,

View File

@@ -70,7 +70,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker
show-time :show-time="{ format: 'HH:mm' }"
style="width: 400px; height: 40px; border-radius: 8px" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="time" v-model:value="time"
format="YYYY/MM/DD HH:mm" format="YYYY/MM/DD HH:mm"

View File

@@ -130,6 +130,26 @@
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
</div> </div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">及格线</span>
</div>
<div class="btnbox">
<a-input
v-model:value="test.passLine"
type="number"
style="width: 400px; height: 40px; border-radius: 8px"
/>
<span style="color: #999999; margin-left: 8px"></span>
</div>
</div>
<div class="main_item2"> <div class="main_item2">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">考试说明</span> <span style="margin-right: 3px">考试说明</span>
@@ -147,7 +167,7 @@
</div> </div>
<div class="main_item2"> <div class="main_item2">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">考试限制</span> <span style="margin-right: 3px;margin-top: 10px;">考试限制</span>
</div> </div>
<div class="kqszbox"> <div class="kqszbox">
<div class="setbox"> <div class="setbox">
@@ -227,64 +247,45 @@
</a-radio-group> </a-radio-group>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <span style="margin-right: 3px">试题排列</span>
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">及格线</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-radio-group
v-model:value="test.passLine" style="margin-right: 12px"
type="number" v-model:value="test.questionArrangement"
style="width: 400px; height: 40px; border-radius: 8px" >
/> <a-radio
v-model:checked="checked"
<span style="color: #999999; margin-left: 8px"></span> :value="1"
</div> @click="cloradio4"
</div> >试题乱序
<div class="main_item"> </a-radio>
<div class="main_item"> <a-radio
<div class="signbox"> v-model:checked="checked"
<span style="margin-right: 3px">试题排列</span> :value="2"
</div> @click="cloradio4"
<div class="btnbox"> >选项乱序
<a-radio-group </a-radio>
style="margin-right: 12px" <a-radio
v-model:value="test.questionArrangement" v-model:checked="checked"
> :value="3"
<a-radio @click="cloradio4"
v-model:checked="checked" >全部乱序
:value="1" </a-radio>
@click="cloradio4" <a-radio
>试题乱序 v-model:checked="checked"
</a-radio> :value="4"
<a-radio @click="cloradio4"
v-model:checked="checked" >不乱序
:value="2" </a-radio>
@click="cloradio4" </a-radio-group>
>选项乱序
</a-radio>
<a-radio
v-model:checked="checked"
:value="3"
@click="cloradio4"
>全部乱序
</a-radio>
<a-radio
v-model:checked="checked"
:value="4"
@click="cloradio4"
>不乱序
</a-radio>
</a-radio-group>
</div>
</div> </div>
</div> </div>
<div class="main_item" style="height: 20px;"></div>
</div> </div>
</div> </div>
<div class="main_btns"> <div class="main_btns">
@@ -811,8 +812,7 @@ export default {
.setbox { .setbox {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 10px;
margin-bottom: 24px;
.timerbox { .timerbox {
margin-top: 6px; margin-top: 6px;

View File

@@ -86,45 +86,23 @@ function validateProName() {
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.in {
.pro { .pro {
.ant-input-affix-wrapper { .ant-input-affix-wrapper {
position: relative;
display: inline-block;
width: 99%;
min-width: 0;
padding: 4px 8px; padding: 4px 8px;
color: rgba(0, 0, 0, 0.85);
font-size: 14px;
line-height: 1.5715;
background-color: #fff;
background-image: none;
border: 1px solid #d9d9d9;
border-radius: 8px; border-radius: 8px;
transition: all 0.3s;
display: inline-flex;
} }
} }
} .road {
.in {
.ant-input-affix-wrapper { .ant-input-affix-wrapper {
position: relative;
display: inline-block;
width: 99%;
min-width: 0;
padding: 0px 8px; padding: 0px 8px;
color: rgba(0, 0, 0, 0.85);
font-size: 14px;
line-height: 1.5715;
background-color: #fff;
background-image: none;
border: 1px solid #d9d9d9;
border-radius: 8px; border-radius: 8px;
transition: all 0.3s;
display: inline-flex;
} }
} }
.b_input, .b_input,
.i1_input { .i1_input {

View File

@@ -2,18 +2,18 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-20 17:00:37 * @Date: 2022-12-20 17:00:37
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-21 17:54:18 * @LastEditTime: 2022-12-20 17:59:40
* @FilePath: /fe-manage/src/components/student/ChangeLevelModal.vue * @FilePath: /fe-manage/src/components/student/ChangeLevelModal.vue
* @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
--> -->
<template> <template>
<a-modal <a-modal
style="padding: 0" style="padding: 0"
:closable="sh" :closable="true"
:visible="visiblene" :visible="visiblene"
:footer="null" :footer="null"
centered="true" centered="true"
wrapClassName="changeModal" wrapClassName="changeModal"
> >
<div class="con"> <div class="con">
<div class="header"> <div class="header">
@@ -28,27 +28,25 @@
<!-- <div class="cur">当前关卡关卡2</div> --> <!-- <div class="cur">当前关卡关卡2</div> -->
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="chapterSelect" v-model:value="selectStage"
style="width: 100%" style="width: 100%"
placeholder="请选择关卡" placeholder="请选择关卡"
:options="chapterList" :options="option"
@change="changeChapter" allowClear
allowClear
showSearch
></a-select> ></a-select>
</div> </div>
<div class="btn"> <div class="btn">
<button <button
class="sameb btn1" class="sameb btn1"
@click="closeChangeModal" @click="closeChangeModal"
style="cursor: pointer" style="cursor: pointer"
> >
取消 取消
</button> </button>
<button <button
class="sameb btn2" class="sameb btn2"
@click="changelevel" @click="changelevel"
style="cursor: pointer" style="cursor: pointer"
> >
确定 确定
</button> </button>
@@ -58,63 +56,47 @@
</div> </div>
</a-modal> </a-modal>
</template> </template>
<script> <script setup>
import { reactive, toRefs, onMounted } from "vue"; import {computed, defineEmits, defineProps, ref} from "vue";
import { message } from "ant-design-vue"; import {moveStudent} from "@/api/index1";
import { GetRouterDetail } from "../../api/indexTask"; import {message} from "ant-design-vue";
export default {
name: "ChangeLevelModal", const props = defineProps({
props: { visiblene: {
visiblene: { type: Boolean,
type: Boolean, default: false,
default: false,
},
id: String,
}, },
setup(props, ctx) { stage: {
const state = reactive({ type: Array,
chapterList: [], default: () => [],
chapterSelect: null, //选择的关卡
chapterSelectId: null, //选择关卡的id
});
const closeChangeModal = () => {
ctx.emit("update:visiblene", false);
state.chapterSelect = null; //选择的关卡
state.chapterSelectId = null; //选择关卡的id
};
const changelevel = () => {
console.log("点击调整关卡");
};
//获取关卡列表
const getDetail = () => {
console.log("props.id", props.id);
GetRouterDetail(props.id)
.then((res) => {
//给level赋初始值
state.chapterList = res.data.data.chapterList;
//增加两个字段
state.chapterList.forEach((item) => {
item["value"] = item.chapterId;
item["label"] = item.name;
});
console.log("路径图详情", res);
})
.catch((err) => {
message.error(err);
});
};
const changeChapter = (e, v) => {
console.log("eeeeeeeeeee", e, v);
};
onMounted(() => {
getDetail();
});
return {
...toRefs(state),
closeChangeModal,
changelevel,
changeChapter,
};
}, },
ids: {
type: Array,
default: () => [],
},
});
const option = computed(() => {
return props.stage.map(e => ({label: e.name, value: e.id}))
})
const selectStage = ref()
const emit = defineEmits({})
const closeChangeModal = () => {
emit("update:visiblene", false);
}; };
const changelevel = () => {
if(!selectStage.value){
message.error("请选择关卡")
return
}
emit("update:visiblene", false);
emit('finash', false)
moveStudent({targetId: selectStage.value, ids: props.ids}).then(()=>{
emit('finash', true)
})
};
//获取关卡列表
</script> </script>

View File

@@ -63,13 +63,12 @@
批量删除 批量删除
</a-button> </a-button>
</a-col> </a-col>
<!-- <a-col :span="1.5" v-if="type === 2">
<a-col :span="1.5" v-if="type == 2">
<a-button class="cus-btn white" @click="showChangeModal"> <a-button class="cus-btn white" @click="showChangeModal">
<template #icon></template> <template #icon></template>
批量调整关卡 批量调整关卡
</a-button> </a-button>
</a-col>--> </a-col>
</a-row> </a-row>
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<a-table <a-table
@@ -81,44 +80,11 @@
:row-selection="stuRowSelection" :row-selection="stuRowSelection"
> >
<template #action="{ record }"> <template #action="{ record }">
<div style="display: flex; justify-content: center"> <div
<!-- <div v-if="type == 2" @click="del(record.id)"
@click="del(record.id)" style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
style=" >
color: #4ea6ff; 删除
font-size: 14px;
text-align: center;
margin-left: 20px;
cursor: pointer;
"
>
查看
</div>
<div
@click="showChangeModal"
style="
color: #4ea6ff;
font-size: 14px;
text-align: center;
margin-left: 20px;
cursor: pointer;
"
>
调整
</div> -->
<div
@click="del(record.id)"
style="
color: #4ea6ff;
font-size: 14px;
text-align: center;
margin-left: 20px;
cursor: pointer;
"
>
删除
</div>
</div> </div>
<!-- <a-row gutter="12"> <!-- <a-row gutter="12">
<a-col> <a-col>
@@ -143,7 +109,7 @@
</div> </div>
</div> </div>
<!-- 批量调整关卡弹窗 --> <!-- 批量调整关卡弹窗 -->
<ChangeLevelModal v-model:visiblene="visiblene" :id="id" /> <ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys" @finash="submitCall"/>
<!-- 批量调整关卡弹窗 --> <!-- 批量调整关卡弹窗 -->
</template> </template>
<script setup> <script setup>
@@ -151,7 +117,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
import { delStudentList, getStuPage } from "@/api/index1"; import { delStudentList, getStuPage } from "@/api/index1";
import CommonStudent from "@/components/student/CommonStudent"; import CommonStudent from "@/components/student/CommonStudent";
import ChangeLevelModal from "./ChangeLevelModal.vue"; import ChangeLevelModal from "./ChangeLevelModal.vue";
import { message } from "ant-design-vue"; import {message} from "ant-design-vue";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
id: String, id: String,
@@ -269,11 +235,12 @@ function getStuList() {
function reset() { function reset() {
tableParam.value.studentName=""; tableParam.value.studentName="";
getStuList();
} }
function bathDel() { function bathDel() {
if( stuSelectKeys.value && if( stuSelectKeys.value &&
stuSelectKeys.value.length == 0){ stuSelectKeys.value.length === 0){
message.destroy(); message.destroy();
return message.warning("请先选中学员"); return message.warning("请先选中学员");
} }
@@ -302,9 +269,13 @@ function submitCall(flag) {
// 调整关卡; // 调整关卡;
const visiblene = ref(false); const visiblene = ref(false);
//const showChangeModal = () => { const showChangeModal = () => {
// visiblene.value = true; if(!stuSelectKeys.value.length){
//}; message.error("请选择学员")
return
}
visiblene.value = true;
};
</script> </script>
<style> <style>
.studentopea1 { .studentopea1 {
@@ -339,5 +310,4 @@ const visiblene = ref(false);
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
} }
</style> </style>

View File

@@ -104,7 +104,7 @@
</div> </div>
<div class="select" > <div class="select" >
<a-range-picker <a-range-picker
show-time :show-time="{ format: 'HH:mm' }"
format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
style="width: 424px" style="width: 424px"
v-model:value="time" v-model:value="time"

View File

@@ -3281,11 +3281,11 @@ const columns7 = [
key: "5", key: "5",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({ record }) => {
switch (String(record.source)) { switch (String(record.status)) {
case "0": case "0":
return "待审核";
case "1":
return "审核通过"; return "审核通过";
case "1":
return "待审核";
case "2": case "2":
return "审核拒绝"; return "审核拒绝";
} }
@@ -3403,11 +3403,11 @@ export default defineComponent({
key: "5", key: "5",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({ record }) => {
switch (String(record.source)) { switch (String(record.status)) {
case "0": case "0":
return "待审核";
case "1":
return "审核通过"; return "审核通过";
case "1":
return "待审核";
case "2": case "2":
return "审核拒绝"; return "审核拒绝";
} }

View File

@@ -49,7 +49,7 @@
placeholder="请输入创建人" placeholder="请输入创建人"
/> />
</div> </div>
<div class="inpbox1"> <div class="inpbox1">
<div class="select addTimeBox"> <div class="select addTimeBox">
@@ -414,7 +414,7 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.projAuditModal { .projAuditModal {
.ant-modal { .ant-modal {
width: 816px !important; width: 816px !important;
min-height: 420px !important; min-height: 420px !important;

View File

@@ -150,7 +150,7 @@
/> />
</div> </div>
<div class="inname">路径图名称</div> <div class="inname">路径图名称</div>
<div class="in"> <div class="in road">
<!-- <a-input--> <!-- <a-input-->
<!-- v-model:value="pathName"--> <!-- v-model:value="pathName"-->
<!-- maxlength="20"--> <!-- maxlength="20"-->

View File

@@ -425,19 +425,19 @@
</div> </div>
<div class="progress"> <div class="progress">
<div class="progresstext"> <div class="progresstext">
{{ item.complete ? item.complete : 0 }}/{{ {{ item.finishStuNum }}/{{
item.total ? item.total : 0 item.totalStuNum
}} }}
</div> </div>
<div style="display: flex"> <div style="display: flex">
<a-progress <a-progress
:showInfo="false" :showInfo="false"
:percent="item.percent" :percent="parseInt(item.finishStuNum / item.totalStuNum * 100)"
strokeColor="#FFC067" strokeColor="#FFC067"
trailColor="rgba(253, 209, 98, 0.2)" trailColor="rgba(253, 209, 98, 0.2)"
/> />
<span class="progresstext" style="margin-left: 10px" <span class="progresstext" style="margin-left: 10px"
>{{ item.percent ? item.percent : 0 }}%</span >{{ parseInt(item.finishStuNum / item.totalStuNum * 100) }}%</span
> >
</div> </div>
</div> </div>

View File

@@ -99,8 +99,8 @@
<div class="in"> <div class="in">
<a-range-picker <a-range-picker
show-time
separator="至" separator="至"
:show-time="{ format: 'HH:mm' }"
: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"
@@ -503,13 +503,8 @@ export default {
}; };
function managerChange(e, l, d, t) { function managerChange(e, l, d, t) {
if (routers.query.parentId) { state.projectInfo.sourceBelongId = d
return; state.projectInfo.sourceBelongName = t
}
!state.projectInfo.sourceBelongId &&
(state.projectInfo.sourceBelongId = d);
!state.projectInfo.sourceBelongName &&
(state.projectInfo.sourceBelongName = t);
} }
return { return {

File diff suppressed because it is too large Load Diff

View File

@@ -89,7 +89,7 @@
<div class="in"> <div class="in">
<a-range-picker <a-range-picker
show-time :show-time="{ format: 'HH:mm' }"
separator="至" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime" v-model:value="projectInfo.rangeTime"
@@ -387,10 +387,8 @@ export default {
}; };
function managerChange(e, l, d, t) { function managerChange(e, l, d, t) {
!state.projectInfo.sourceBelongId && state.projectInfo.sourceBelongId = d
(state.projectInfo.sourceBelongId = d); state.projectInfo.sourceBelongName = t
!state.projectInfo.sourceBelongName &&
(state.projectInfo.sourceBelongName = t);
} }
return { return {

View File

@@ -6,7 +6,7 @@
<div class="tagname">问答题</div> <div class="tagname">问答题</div>
<div class="deleteop" @click="handleTypesDel(3)"> <div class="deleteop" @click="handleTypesDel(3)">
<div><img src="../../../assets/images/projectadd/delete.png" /></div> <div><img src="../../../assets/images/projectadd/delete.png" /></div>
<div class="del_text">删除选项</div> <div class="del_text">删除题目</div>
</div> </div>
</div> </div>
<div class="name"> <div class="name">

View File

@@ -17,6 +17,7 @@
</div> </div>
<div class="delete" @click="handleDel">删除</div> <div class="delete" @click="handleDel">删除</div>
</div> </div>
<!--
<div class="name uploadContent"> <div class="name uploadContent">
<a-upload <a-upload
v-show="!curItem.imgVal" v-show="!curItem.imgVal"
@@ -43,6 +44,7 @@
/> />
</div> </div>
</div> </div>
-->
</div> </div>
</template> </template>
<script> <script>

View File

@@ -6,7 +6,7 @@
<div class="tagname">多选题</div> <div class="tagname">多选题</div>
<div class="deleteop" @click="handleTypesDel(2)"> <div class="deleteop" @click="handleTypesDel(2)">
<div><img src="../../../assets/images/projectadd/delete.png" /></div> <div><img src="../../../assets/images/projectadd/delete.png" /></div>
<div class="del_text">删除选项</div> <div class="del_text">删除题目</div>
</div> </div>
</div> </div>
<div class="name"> <div class="name">

View File

@@ -6,7 +6,7 @@
<div class="tagname">评分题</div> <div class="tagname">评分题</div>
<div class="deleteop" @click="handleTypesDel(4)"> <div class="deleteop" @click="handleTypesDel(4)">
<div><img src="../../../assets/images/projectadd/delete.png" /></div> <div><img src="../../../assets/images/projectadd/delete.png" /></div>
<div class="del_text">删除选项</div> <div class="del_text">删除题目</div>
</div> </div>
</div> </div>
<div class="name"> <div class="name">

View File

@@ -6,7 +6,7 @@
<div class="tagname">单选题</div> <div class="tagname">单选题</div>
<div class="deleteop" @click="handleTypesDel(1)"> <div class="deleteop" @click="handleTypesDel(1)">
<div><img src="../../../assets/images/projectadd/delete.png" /></div> <div><img src="../../../assets/images/projectadd/delete.png" /></div>
<div class="del_text">删除选项</div> <div class="del_text">删除题目</div>
</div> </div>
</div> </div>
<div class="name"> <div class="name">

View File

@@ -2,14 +2,14 @@
* @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-11-21 15:15:30 * @LastEditTime: 2022-12-14 17:38:38
* @FilePath: /fe-manage/vue.config.js * @FilePath: /fe-manage/vue.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
*/ */
const {defineConfig} = require("@vue/cli-service"); const { defineConfig } = require("@vue/cli-service");
module.exports = defineConfig({ module.exports = defineConfig({
publicPath: "/manage", publicPath: "/manage-release",
// transpileDependencies: true, // transpileDependencies: true,
devServer: { devServer: {
port: 8080, port: 8080,