fix:修改学员操作样式

This commit is contained in:
lixg
2022-12-19 17:33:25 +08:00
parent ca49ab9dfc
commit ff2a15ae1f
6 changed files with 443 additions and 406 deletions

View File

@@ -44,7 +44,7 @@ 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.16------------"); console.log("版本0.9.17------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });

View File

@@ -7,9 +7,10 @@
:validate="validate" :validate="validate"
@blur="validateProName" @blur="validateProName"
@change="validateProName" @change="validateProName"
/> />
<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, onMounted } from "vue"; import { defineProps, defineEmits, watch, ref, onMounted } from "vue";
@@ -21,7 +22,7 @@ const props = defineProps({
}, },
validate: { validate: {
type: Boolean, type: Boolean,
default:true default: true,
}, },
id: { id: {
type: String, type: String,
@@ -31,49 +32,54 @@ const props = defineProps({
}, },
type: { type: {
type: Number, type: Number,
default: 1 default: 1,
}, },
maxlength: { maxlength: {
type: Number, type: Number,
default: 30 default: 30,
}, },
showCount: { showCount: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}) });
const emit = defineEmits({}) const emit = defineEmits({});
const modelV = ref() const modelV = ref();
onMounted(() => { onMounted(() => {
modelV.value = props.value 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;
} }
}) }
);
watch(modelV, () => { watch(modelV, () => {
emit('update:value', modelV.value) emit("update:value", modelV.value);
}) });
function validateProName() { function validateProName() {
emit('update:finished', false); emit("update:finished", false);
props.value && validateName({name: props.value, type: props.type, id: props.id}).then(res => { props.value &&
validateName({ name: props.value, type: props.type, id: props.id }).then(
(res) => {
console.log("resresresres", res);
if (props.value == "") { if (props.value == "") {
emit('update:validate', res.data.data === 1) emit("update:validate", res.data.data === 1);
} else { } else {
emit('update:validate', res.data.data !== 1) emit("update:validate", res.data.data !== 1);
emit('update:finished', true); emit("update:finished", true);
} }
})
} }
);
}
</script> </script>
<style lang="scss"> <style lang="scss">
.in { .in {
@@ -116,8 +122,8 @@ function validateProName() {
} }
} }
.b_input,.i1_input{ .b_input,
.i1_input {
.ant-input-affix-wrapper { .ant-input-affix-wrapper {
position: relative; position: relative;
display: inline-block; display: inline-block;
@@ -135,5 +141,4 @@ function validateProName() {
display: inline-flex; display: inline-flex;
} }
} }
</style> </style>

View File

@@ -66,7 +66,13 @@
:row-selection="stuRowSelection" :row-selection="stuRowSelection"
> >
<template #action="{ record }"> <template #action="{ record }">
<a-row gutter="12"> <div
@click="del(record.id)"
style="color: #4ea6ff; font-size: 14px; text-align: center"
>
删除
</div>
<!-- <a-row gutter="12">
<a-col> <a-col>
<slot name="extension" v-bind:data="{ record }"></slot> <slot name="extension" v-bind:data="{ record }"></slot>
</a-col> </a-col>
@@ -76,8 +82,14 @@
<div @click="del(record.id)">删除</div> <div @click="del(record.id)">删除</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
<div
@click="del(record.id)"
style="color: #4ea6ff; font-size: 14px; text-align: center"
>
删除
</div>
</a-col> </a-col>
</a-row> </a-row> -->
</template> </template>
</a-table> </a-table>
</div> </div>

View File

@@ -2036,7 +2036,9 @@
<div class="cstm_items main_item"> <div class="cstm_items main_item">
<div class="signbox"></div> <div class="signbox"></div>
<div class="btnbox"> <div class="btnbox">
<button class="xkbtn" @click="showDrawerAddHomework">配置作业</button> <button class="xkbtn" @click="showDrawerAddHomework">
配置作业
</button>
<div v-if="EditWorkId > 0"> <div v-if="EditWorkId > 0">
<a-tag closable @close="logW" color="processing"> <a-tag closable @close="logW" color="processing">
<span style="font-size: 14px; line-height: 33px"> <span style="font-size: 14px; line-height: 33px">
@@ -3303,38 +3305,38 @@ const columns7 = [
} }
}, },
}, },
{ // {
title: "签到状态", // title: "签到状态",
width: 200, // width: 200,
dataIndex: "signstatus", // dataIndex: "signstatus",
key: "7", // key: "7",
align: "center", // align: "center",
customRender: ({ record }) => { // customRender: ({ record }) => {
switch (String(record.signStatus)) { // switch (String(record.signStatus)) {
case "0": // case "0":
return "未签到"; // return "未签到";
case "1": // case "1":
return "已签到"; // return "已签到";
case "2": // case "2":
return "请假"; // return "请假";
} // }
}, // },
}, // },
{ // {
title: "评估状态", // title: "评估状态",
width: 200, // width: 200,
dataIndex: "evastatus", // dataIndex: "evastatus",
key: "8", // key: "8",
align: "center", // align: "center",
customRender: ({ record }) => { // customRender: ({ record }) => {
switch (String(record.evalStatus)) { // switch (String(record.evalStatus)) {
case "0": // case "0":
return "未评估"; // return "未评估";
case "1": // case "1":
return "已评估"; // return "已评估";
} // }
}, // },
}, // },
// { // {
// title: "结业状态", // title: "结业状态",
// width: 100, // width: 100,
@@ -3395,7 +3397,7 @@ export default defineComponent({
stuColumns: [ stuColumns: [
{ {
title: "报名状态", title: "报名状态",
width: '10%', width: "10%",
dataIndex: "status", dataIndex: "status",
key: "5", key: "5",
align: "center", align: "center",
@@ -3412,7 +3414,7 @@ export default defineComponent({
}, },
{ {
title: "加入方式", title: "加入方式",
width: '10%', width: "10%",
dataIndex: "join", dataIndex: "join",
key: "6", key: "6",
align: "center", align: "center",
@@ -3425,38 +3427,38 @@ export default defineComponent({
} }
}, },
}, },
{ // {
title: "签到状态", // title: "签到状态",
width: '10%', // width: '10%',
dataIndex: "signstatus", // dataIndex: "signstatus",
key: "7", // key: "7",
align: "center", // align: "center",
customRender: ({ record }) => { // customRender: ({ record }) => {
switch (String(record.signStatus)) { // switch (String(record.signStatus)) {
case "0": // case "0":
return "未签到"; // return "未签到";
case "1": // case "1":
return "已签到"; // return "已签到";
case "2": // case "2":
return "请假"; // return "请假";
} // }
}, // },
}, // },
{ // {
title: "评估状态", // title: "评估状态",
width: '10%', // width: '10%',
dataIndex: "evastatus", // dataIndex: "evastatus",
key: "8", // key: "8",
align: "center", // align: "center",
customRender: ({ record }) => { // customRender: ({ record }) => {
switch (String(record.evalStatus)) { // switch (String(record.evalStatus)) {
case "0": // case "0":
return "未评估"; // return "未评估";
case "1": // case "1":
return "已评估"; // return "已评估";
} // }
}, // },
}, // },
], ],
shipType: 1, shipType: 1,
addLoading: false, addLoading: false,
@@ -4035,7 +4037,6 @@ export default defineComponent({
let startTime = ""; let startTime = "";
let endTime = ""; let endTime = "";
if (state.projectTime) { if (state.projectTime) {
startTime = toDate( startTime = toDate(
new Date(state.projectTime[0].$d).getTime() / 1000, new Date(state.projectTime[0].$d).getTime() / 1000,
"Y-M-D" "Y-M-D"
@@ -4044,7 +4045,6 @@ export default defineComponent({
new Date(state.projectTime[1].$d).getTime() / 1000, new Date(state.projectTime[1].$d).getTime() / 1000,
"Y-M-D" "Y-M-D"
); );
} }
let res = await list({ let res = await list({
pageNo: state.currentPage1, pageNo: state.currentPage1,
@@ -4924,11 +4924,12 @@ export default defineComponent({
}); });
} }
if (item.testId) { if (item.testId) {
queryExaminationDetailById({ examinationId: item.testId }).then((res)=>{ queryExaminationDetailById({ examinationId: item.testId }).then(
(res) => {
state.testName = res.data.data.examinationName; state.testName = res.data.data.examinationName;
});
} }
);
}
console.log("res"); console.log("res");
console.log("获取面授课详情", item); console.log("获取面授课详情", item);

View File

@@ -100,12 +100,20 @@
<div class="name"> <div class="name">
<div class="inname">评估名称</div> <div class="inname">评估名称</div>
<div class="in"> <div class="in">
<a-input <!-- <a-input
v-model:value="assessmentName" v-model:value="assessmentName"
show-count show-count
:maxlength="15" :maxlength="15"
style="border-radius: 8px" style="border-radius: 8px"
/> /> -->
<NameInput
placeholder="请输入路径名称"
v-model:value="assessmentName"
v-model:validate="validate"
:maxlength="15"
show-count
:type="4"
></NameInput>
</div> </div>
</div> </div>
<div class="btn"> <div class="btn">
@@ -184,9 +192,12 @@ import { useRouter } from "vue-router";
import { toDate } from "../../api/method.js"; import { toDate } from "../../api/method.js";
import store from "@/store"; import store from "@/store";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import NameInput from "@/components/project/NameInput";
export default { export default {
name: "learningPath", name: "learningPath",
components: {
NameInput,
},
setup() { setup() {
const router = useRouter(); const router = useRouter();
const state = reactive({ const state = reactive({
@@ -295,6 +306,8 @@ export default {
copy_hs: false, copy_hs: false,
back_hs: false, back_hs: false,
pub_hs: false, pub_hs: false,
validate: true,
}); });
const tableDataFunc = () => { const tableDataFunc = () => {
const columns = [ const columns = [
@@ -577,6 +590,11 @@ export default {
message.error("请输入评估名称"); message.error("请输入评估名称");
return false; return false;
} }
if (!state.validate) {
message.destroy();
message.warning("评估名称重复");
return;
}
store.commit("SET_assessmentName", state.assessmentName); store.commit("SET_assessmentName", state.assessmentName);
router.push("/researchadd"); router.push("/researchadd");
handleCancel(); handleCancel();
@@ -677,6 +695,7 @@ export default {
// 复制 // 复制
if (state.copy_hs) { if (state.copy_hs) {
let resultPost = restData(state.copyItem); let resultPost = restData(state.copyItem);
resultPost.assessmentName = resultPost.assessmentName + "(1)";
console.log("resultPost"); console.log("resultPost");
console.log(resultPost); console.log(resultPost);
createResearch(resultPost).then((res) => { createResearch(resultPost).then((res) => {