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

fix:修改学员操作样式

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

28
src/App.vue
View File

@@ -1,27 +1,27 @@
<template> <template>
<div id="container" v-if="!isLogin"> <div id="container" v-if="!isLogin">
<nav-top/> <nav-top />
<div style="display: flex"> <div style="display: flex">
<nav-left/> <nav-left />
<div style="flex: 1; display: flex; flex-direction: column; width: 0"> <div style="flex: 1; display: flex; flex-direction: column; width: 0">
<open-pages/> <open-pages />
<bread-crumb/> <bread-crumb />
<main> <main>
<a-config-provider :locale="zhCN"> <a-config-provider :locale="zhCN">
<router-view/> <router-view />
</a-config-provider> </a-config-provider>
</main> </main>
</div> </div>
</div> </div>
</div> </div>
<div id="container" v-if="isLogin"> <div id="container" v-if="isLogin">
<router-view/> <router-view />
</div> </div>
</template> </template>
<script> <script>
import {computed, defineComponent, ref} from "vue"; import { computed, defineComponent, ref } from "vue";
import {useRouter, useRoute} from "vue-router"; import { useRouter, useRoute } from "vue-router";
import {useStore} from "vuex"; import { useStore } from "vuex";
import NavLeft from "@/components/NavLeft"; import NavLeft from "@/components/NavLeft";
import NavTop from "@/components/NavTop"; import NavTop from "@/components/NavTop";
import OpenPages from "@/components/OpenPages"; import OpenPages from "@/components/OpenPages";
@@ -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);
}); });
@@ -78,7 +78,7 @@ 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));
@@ -94,13 +94,13 @@ export default defineComponent({
if (localStory) { if (localStory) {
list = localStorage.getItem(key); list = localStorage.getItem(key);
if (list) { if (list) {
store.commit("SET_DICT", {key, data: JSON.parse(list)}); store.commit("SET_DICT", { key, data: JSON.parse(list) });
return; return;
} }
} }
list = await getDictList(key); list = await getDictList(key);
localStory && localStorage.setItem(key, JSON.stringify(list)); localStory && localStorage.setItem(key, JSON.stringify(list));
store.commit("SET_DICT", {key, data: list}); store.commit("SET_DICT", { key, data: list });
} }
const getDictList = (param) => const getDictList = (param) =>
@@ -222,7 +222,7 @@ export default defineComponent({
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
} }
.cus-select{ .cus-select {
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
} }

16
src/api/request.js
View File

@@ -1,5 +1,5 @@
import {reactive, ref, toRefs, watch} from "vue"; import { reactive, ref, toRefs, watch } from "vue";
import {getCookie} from "@/api/method"; import { getCookie } from "@/api/method";
import JSONBigInt from 'json-bigint'; import JSONBigInt from 'json-bigint';
const JSONBigIntStr = JSONBigInt({ storeAsString: true }); const JSONBigIntStr = JSONBigInt({ storeAsString: true });
@@ -139,16 +139,16 @@ export async function request(_url, params) {
} }
const body = method !== 'get' ? params || {} : {} const body = method !== 'get' ? params || {} : {}
url = process.env.VUE_APP_BOE_API_URL + url url = process.env.VUE_APP_BOE_API_URL + url
return fetch(url,{ return fetch(url, {
method, method,
headers:{ headers: {
token: getCookie('token'), token: getCookie('token'),
...method !== 'get' ? {'Content-Type': 'application/json'} : {} ...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
}, },
...method !== 'get' ? {body: JSON.stringify(body)} : {} ...method !== 'get' ? { body: JSON.stringify(body) } : {}
}).then(res=>{ }).then(res => {
return res.text() return res.text()
}).then(res=>{ }).then(res => {
return JSONBigIntStr.parse(res) return JSONBigIntStr.parse(res)
}) })
// return axios({ // return axios({

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

@@ -7,13 +7,14 @@
: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";
import {validateName} from "@/api/index1"; import { validateName } from "@/api/index1";
const props = defineProps({ const props = defineProps({
value: { value: {
@@ -21,7 +22,7 @@ const props = defineProps({
}, },
validate: { validate: {
type: Boolean, type: Boolean,
default:true default: true,
}, },
id: { id: {
type: String, type: String,
@@ -31,53 +32,58 @@ 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 &&
if(props.value==""){ validateName({ name: props.value, type: props.type, id: props.id }).then(
emit('update:validate', res.data.data === 1) (res) => {
}else{ console.log("resresresres", res);
emit('update:validate', res.data.data !== 1) if (props.value == "") {
emit('update:finished', true); emit("update:validate", res.data.data === 1);
} else {
emit("update:validate", res.data.data !== 1);
emit("update:finished", true);
} }
}
}) );
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.in{ .in {
.pro{ .pro {
.ant-input-affix-wrapper { .ant-input-affix-wrapper {
position: relative; position: relative;
display: inline-block; display: inline-block;
@@ -97,7 +103,7 @@ function validateProName() {
} }
} }
.in{ .in {
.ant-input-affix-wrapper { .ant-input-affix-wrapper {
position: relative; position: relative;
display: inline-block; display: inline-block;
@@ -113,11 +119,11 @@ function validateProName() {
border-radius: 8px; border-radius: 8px;
transition: all 0.3s; transition: all 0.3s;
display: inline-flex; display: inline-flex;
} }
} }
.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;
@@ -133,7 +139,6 @@ function validateProName() {
border-radius: 8px; border-radius: 8px;
transition: all 0.3s; transition: all 0.3s;
display: inline-flex; display: inline-flex;
}
} }
}
</style> </style>

16
src/components/student/TableStudent.vue
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>

489
src/views/courselibrary/CoursewareManage.vue
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">
@@ -2277,167 +2279,167 @@
</div> </div>
<div class="stmm_i5"> <div class="stmm_i5">
<TableStudent :type="3" :id="offcourseId" :columns="stuColumns"> <TableStudent :type="3" :id="offcourseId" :columns="stuColumns">
<!-- <template #extension = "data">--> <!-- <template #extension = "data">-->
<!-- <div style="display: flex">--> <!-- <div style="display: flex">-->
<!-- <button @click="handlJoinStu(data)">成绩录入</button>--> <!-- <button @click="handlJoinStu(data)">成绩录入</button>-->
<!-- </div>--> <!-- </div>-->
<!-- </template>--> <!-- </template>-->
</TableStudent> </TableStudent>
</div> </div>
<div class="tableBox" style="margin-top: 20px"> <div class="tableBox" style="margin-top: 20px">
<!-- <a-table--> <!-- <a-table-->
<!-- :columns="columns7"--> <!-- :columns="columns7"-->
<!-- :data-source="tableData7"--> <!-- :data-source="tableData7"-->
<!-- :loading="tableDataTotal3 === -1 ? true : false"--> <!-- :loading="tableDataTotal3 === -1 ? true : false"-->
<!-- :scroll="{ x: 800 }"--> <!-- :scroll="{ x: 800 }"-->
<!-- expandRowByClick="true"--> <!-- expandRowByClick="true"-->
<!-- @expand="expandTable"--> <!-- @expand="expandTable"-->
<!-- :pagination="false"--> <!-- :pagination="false"-->
<!-- :row-selection="{--> <!-- :row-selection="{-->
<!-- selectedRowKeys: selectedRowKeys7,--> <!-- selectedRowKeys: selectedRowKeys7,-->
<!-- onChange: onSelectChange7,--> <!-- onChange: onSelectChange7,-->
<!-- }"--> <!-- }"-->
<!-- >--> <!-- >-->
<!-- <template #bodyCell="{ record, column }">--> <!-- <template #bodyCell="{ record, column }">-->
<!-- &lt;!&ndash; 操作1 &ndash;&gt;--> <!-- &lt;!&ndash; 操作1 &ndash;&gt;-->
<!-- <template--> <!-- <template-->
<!-- v-if="--> <!-- v-if="-->
<!-- (String(record.applyStatus) === '0' ||--> <!-- (String(record.applyStatus) === '0' ||-->
<!-- record.status === '待审核') &&--> <!-- record.status === '待审核') &&-->
<!-- column.key === 'overstatus'--> <!-- column.key === 'overstatus'-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- <span class="table-operation">-</span>--> <!-- <span class="table-operation">-</span>-->
<!-- </template>--> <!-- </template>-->
<!-- <template--> <!-- <template-->
<!-- v-if="--> <!-- v-if="-->
<!-- (String(record.applyStatus) === '-1' ||--> <!-- (String(record.applyStatus) === '-1' ||-->
<!-- record.status === '已拒绝') &&--> <!-- record.status === '已拒绝') &&-->
<!-- column.key === 'overstatus'--> <!-- column.key === 'overstatus'-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- <span class="table-operation">-</span>--> <!-- <span class="table-operation">-</span>-->
<!-- </template>--> <!-- </template>-->
<!-- <template--> <!-- <template-->
<!-- v-if="--> <!-- v-if="-->
<!-- (String(record.applyStatus) === '1' ||--> <!-- (String(record.applyStatus) === '1' ||-->
<!-- record.status === '已通过') &&--> <!-- record.status === '已通过') &&-->
<!-- column.key === 'overstatus'--> <!-- column.key === 'overstatus'-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- <span class="table-operation">--> <!-- <span class="table-operation">-->
<!-- <a--> <!-- <a-->
<!-- @click="--> <!-- @click="-->
<!-- () => {--> <!-- () => {-->
<!-- handlJoinStu(record);--> <!-- handlJoinStu(record);-->
<!-- }--> <!-- }-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- 成绩录入--> <!-- 成绩录入-->
<!-- </a>--> <!-- </a>-->
<!-- <a--> <!-- <a-->
<!-- @click="--> <!-- @click="-->
<!-- () => {--> <!-- () => {-->
<!-- handleOverStu(record);--> <!-- handleOverStu(record);-->
<!-- }--> <!-- }-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- 结业--> <!-- 结业-->
<!-- </a>--> <!-- </a>-->
<!-- </span>--> <!-- </span>-->
<!-- </template>--> <!-- </template>-->
<!-- &lt;!&ndash; 操作2 &ndash;&gt;--> <!-- &lt;!&ndash; 操作2 &ndash;&gt;-->
<!-- <template--> <!-- <template-->
<!-- v-if="--> <!-- v-if="-->
<!-- (String(record.applyStatus) === '0' ||--> <!-- (String(record.applyStatus) === '0' ||-->
<!-- record.status === '待审核') &&--> <!-- record.status === '待审核') &&-->
<!-- column.key === 'operation'--> <!-- column.key === 'operation'-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- <span class="table-operation">--> <!-- <span class="table-operation">-->
<!-- <a--> <!-- <a-->
<!-- @click="--> <!-- @click="-->
<!-- () => {--> <!-- () => {-->
<!-- handleSucessStu(record);--> <!-- handleSucessStu(record);-->
<!-- }--> <!-- }-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- 通过--> <!-- 通过-->
<!-- </a>--> <!-- </a>-->
<!-- <a--> <!-- <a-->
<!-- @click="--> <!-- @click="-->
<!-- () => {--> <!-- () => {-->
<!-- handleRejectStu(record);--> <!-- handleRejectStu(record);-->
<!-- }--> <!-- }-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- 拒绝--> <!-- 拒绝-->
<!-- </a>--> <!-- </a>-->
<!-- <a--> <!-- <a-->
<!-- @click="--> <!-- @click="-->
<!-- () => {--> <!-- () => {-->
<!-- handleDeleteStu(record);--> <!-- handleDeleteStu(record);-->
<!-- }--> <!-- }-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- 删除--> <!-- 删除-->
<!-- </a>--> <!-- </a>-->
<!-- </span>--> <!-- </span>-->
<!-- </template>--> <!-- </template>-->
<!-- <template--> <!-- <template-->
<!-- v-if="--> <!-- v-if="-->
<!-- (String(record.applyStatus) === '1' ||--> <!-- (String(record.applyStatus) === '1' ||-->
<!-- record.status === '已通过') &&--> <!-- record.status === '已通过') &&-->
<!-- column.key === 'operation'--> <!-- column.key === 'operation'-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- <span class="table-operation">--> <!-- <span class="table-operation">-->
<!-- <a--> <!-- <a-->
<!-- @click="--> <!-- @click="-->
<!-- () => {--> <!-- () => {-->
<!-- handleDeleteStu(record);--> <!-- handleDeleteStu(record);-->
<!-- }--> <!-- }-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- 删除--> <!-- 删除-->
<!-- </a>--> <!-- </a>-->
<!-- </span>--> <!-- </span>-->
<!-- </template>--> <!-- </template>-->
<!-- <template--> <!-- <template-->
<!-- v-if="--> <!-- v-if="-->
<!-- (String(record.applyStatus) === '-1' ||--> <!-- (String(record.applyStatus) === '-1' ||-->
<!-- record.status === '已拒绝') &&--> <!-- record.status === '已拒绝') &&-->
<!-- column.key === 'operation'--> <!-- column.key === 'operation'-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- <span class="table-operation">--> <!-- <span class="table-operation">-->
<!-- <a--> <!-- <a-->
<!-- @click="--> <!-- @click="-->
<!-- () => {--> <!-- () => {-->
<!-- handleDeleteStu(record);--> <!-- handleDeleteStu(record);-->
<!-- }--> <!-- }-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- 删除--> <!-- 删除-->
<!-- </a>--> <!-- </a>-->
<!-- </span>--> <!-- </span>-->
<!-- </template>--> <!-- </template>-->
<!-- </template>--> <!-- </template>-->
<!-- </a-table>--> <!-- </a-table>-->
<!-- <div class="tableBox" style="margin-top: 50px">--> <!-- <div class="tableBox" style="margin-top: 50px">-->
<!-- <div class="pa">--> <!-- <div class="pa">-->
<!-- <a-pagination--> <!-- <a-pagination-->
<!-- :showSizeChanger="false"--> <!-- :showSizeChanger="false"-->
<!-- showQuickJumper="true"--> <!-- showQuickJumper="true"-->
<!-- hideOnSinglePage="true"--> <!-- hideOnSinglePage="true"-->
<!-- :pageSize="pageSize3"--> <!-- :pageSize="pageSize3"-->
<!-- :current="currentPage3"--> <!-- :current="currentPage3"-->
<!-- :total="tableDataTotal3"--> <!-- :total="tableDataTotal3"-->
<!-- class="pagination"--> <!-- class="pagination"-->
<!-- @change="handelChangePage3"--> <!-- @change="handelChangePage3"-->
<!-- />--> <!-- />-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
</div> </div>
</div> </div>
</div> </div>
@@ -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,
@@ -3392,10 +3394,10 @@ export default defineComponent({
const CourseModalRef = ref(null); const CourseModalRef = ref(null);
const state = reactive({ const state = reactive({
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,
@@ -3678,7 +3680,7 @@ export default defineComponent({
imageUrl: "", imageUrl: "",
imgList: [], imgList: [],
validate:true, validate: true,
pageSize2: 10, pageSize2: 10,
currentPage2: 0, currentPage2: 0,
@@ -3717,16 +3719,16 @@ export default defineComponent({
addStudentList: null, //选中列表 addStudentList: null, //选中列表
newCourseName: null, //新建开课名称 newCourseName: null, //新建开课名称
EditWorkId:null, EditWorkId: null,
assessment: {}, assessment: {},
assessmentId: null, assessmentId: null,
workName:null, workName: null,
EditTestId:null, EditTestId: null,
testName:null, testName: null,
assessmentName: "", assessmentName: "",
assessmentVisible: false, assessmentVisible: false,
addhomeworkvisible:false, addhomeworkvisible: false,
addtestvisible:false, addtestvisible: false,
codevisible: false, //二维码弹窗 codevisible: false, //二维码弹窗
codeInfo: null, //二维码内容 codeInfo: null, //二维码内容
codeUrl: codeUrl, codeUrl: codeUrl,
@@ -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,
@@ -4863,7 +4863,7 @@ export default defineComponent({
beginTime: startTime, beginTime: startTime,
completeType: type, completeType: type,
endTime: endTime, endTime: endTime,
evalFlag: Number(state.assessmentId) >0 &&state.checked4 ? 1 : 0, evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0,
evaluateId: Number(state.assessmentId), evaluateId: Number(state.assessmentId),
testId: state.EditTestId, testId: state.EditTestId,
homeWorkId: state.EditWorkId, homeWorkId: state.EditWorkId,
@@ -4910,25 +4910,26 @@ export default defineComponent({
if (res.data.code === 200) return res.data.data; if (res.data.code === 200) return res.data.data;
}); });
if(item.evaluateId){ if (item.evaluateId) {
api api
.queryAppraiseDetailById({assessmentId: item.evaluateId}) .queryAppraiseDetailById({ assessmentId: item.evaluateId })
.then((res) => { .then((res) => {
state.assessmentName = res.data.data.assessmentName; state.assessmentName = res.data.data.assessmentName;
}) })
.catch(); .catch();
} }
if(item.homeWorkId){ if (item.homeWorkId) {
queryWorkDetailById({workId:item.homeWorkId}).then((res)=>{ queryWorkDetailById({ workId: item.homeWorkId }).then((res) => {
state.workName = res.data.data.workName; state.workName = res.data.data.workName;
}); });
} }
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);

41
src/views/research/ResearchManage.vue
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 = [
@@ -314,7 +327,7 @@ export default {
title: "名称", title: "名称",
dataIndex: "manager", dataIndex: "manager",
key: "manager", key: "manager",
width:"30%", width: "30%",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
className: "h", className: "h",
@@ -326,7 +339,7 @@ export default {
title: "状态", title: "状态",
dataIndex: "state", dataIndex: "state",
key: "state", key: "state",
width:"10%", width: "10%",
align: "center", align: "center",
className: "h", className: "h",
customRender: ({ record }) => { customRender: ({ record }) => {
@@ -344,7 +357,7 @@ export default {
title: "创建人", title: "创建人",
dataIndex: "creater", dataIndex: "creater",
key: "creater", key: "creater",
width:"10%", width: "10%",
align: "center", align: "center",
className: "h", className: "h",
customRender: ({ text }) => { customRender: ({ text }) => {
@@ -355,7 +368,7 @@ export default {
title: "发布时间", title: "发布时间",
dataIndex: "pubtime", dataIndex: "pubtime",
key: "pubtime", key: "pubtime",
width:"10%", width: "10%",
align: "center", align: "center",
className: "h", className: "h",
customRender: ({ text }) => { customRender: ({ text }) => {
@@ -366,7 +379,7 @@ export default {
title: "创建时间", title: "创建时间",
dataIndex: "cretime", dataIndex: "cretime",
key: "cretime", key: "cretime",
width:"10%", width: "10%",
align: "center", align: "center",
className: "h", className: "h",
customRender: ({ text }) => { customRender: ({ text }) => {
@@ -378,7 +391,7 @@ export default {
className: "h", className: "h",
dataIndex: "opacation", dataIndex: "opacation",
key: "opacation", key: "opacation",
width:"20%", width: "20%",
align: "center", align: "center",
fixed: "right", fixed: "right",
}, },
@@ -433,7 +446,7 @@ export default {
<div class="operation"> <div class="operation">
{value.state === "2" ? ( {value.state === "2" ? (
<div class="fb"> <div class="fb">
{ /** {/**
<div class="jc" <div class="jc"
onClick={() => { onClick={() => {
handleToManagepage(value, "/managepage"); handleToManagepage(value, "/managepage");
@@ -441,7 +454,7 @@ export default {
> >
管理 管理
</div> </div>
*/ } */}
<div <div
class="jc" class="jc"
onClick={() => { onClick={() => {
@@ -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) => {