feat:合并

This commit is contained in:
lixg
2022-12-03 19:57:20 +08:00
24 changed files with 1361 additions and 986 deletions

View File

@@ -29,6 +29,7 @@ import BreadCrumb from "@/components/BreadCrumb";
import zhCN from "ant-design-vue/es/locale/zh_CN"; import zhCN from "ant-design-vue/es/locale/zh_CN";
import * as api from "./api/index1"; import * as api from "./api/index1";
import * as api1 from "@/api/index1"; import * as api1 from "@/api/index1";
import * as api2 from "@/api/index";
export default defineComponent({ export default defineComponent({
components: { components: {
@@ -59,6 +60,7 @@ export default defineComponent({
function init() { function init() {
console.log(store); console.log(store);
getUserInfo();
initDict("faceclassPic"); initDict("faceclassPic");
initDict("faceclassClass"); initDict("faceclassClass");
initDict("faceclassScene"); initDict("faceclassScene");
@@ -70,6 +72,11 @@ export default defineComponent({
getOrgTree(); getOrgTree();
} }
async function getUserInfo() {
const userInfo = await api2.userInfo()
store.commit("SET_USER", userInfo);
}
async function initDict(key) { async function initDict(key) {
let list = localStorage.getItem(key); let list = localStorage.getItem(key);
if (list) { if (list) {

View File

@@ -76,4 +76,5 @@ export const getTemplateDetail = (obj) => http.get('/admin/project/template/deta
export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', {params: {projectId: projectId}}) export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', {params: {projectId: projectId}})
export const login = (obj) => http.post('/admin/CheckUser/userLogin', obj) export const login = (obj) => http.post('/admin/CheckUser/userLogin', obj)
export const userInfo = () => http.get('/admin/CheckUser/userInfo')

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 785 B

View File

@@ -61,6 +61,7 @@
import {reactive, toRefs} from "vue"; import {reactive, toRefs} from "vue";
import DownLoad from "../components/drawers/DownLoad"; import DownLoad from "../components/drawers/DownLoad";
import * as api from "../api/index1"; import * as api from "../api/index1";
export default { export default {
name: "NavTop", name: "NavTop",
components: { components: {
@@ -118,6 +119,14 @@ export default {
getUser(); getUser();
const logOut = () => { const logOut = () => {
localStorage.removeItem('faceclassPic');
localStorage.removeItem('faceclassClass');
localStorage.removeItem('faceclassScene');
localStorage.removeItem('projectLevel');
localStorage.removeItem('projectSys');
localStorage.removeItem('pathmapPic');
localStorage.removeItem('projectClass');
localStorage.removeItem('projectPic');
window.open("https://u-pre.boe.com/web/", "_self"); window.open("https://u-pre.boe.com/web/", "_self");
}; };
return { return {
@@ -142,9 +151,11 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
.navTopRight { .navTopRight {
display: flex; display: flex;
} }
.role { .role {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -154,6 +165,7 @@ export default {
line-height: 36px; line-height: 36px;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
.roleArrow { .roleArrow {
width: 13px; width: 13px;
height: 7px; height: 7px;
@@ -161,6 +173,7 @@ export default {
background-image: url(../assets/images/navtop/down.png); background-image: url(../assets/images/navtop/down.png);
background-size: 100%; background-size: 100%;
} }
.roleItems { .roleItems {
width: 109px; width: 109px;
height: 90px; height: 90px;
@@ -174,22 +187,27 @@ export default {
display: none; display: none;
z-index: 100; z-index: 100;
} }
.roleItem { .roleItem {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(79, 81, 86, 1); color: rgba(79, 81, 86, 1);
line-height: 36px; line-height: 36px;
} }
.roleItem:hover { .roleItem:hover {
color: #4ea6ff; color: #4ea6ff;
} }
} }
.role:hover .roleItems { .role:hover .roleItems {
display: block; display: block;
} }
.role:hover .roleArrow { .role:hover .roleArrow {
background-image: url(../assets/images/navtop/up.png); background-image: url(../assets/images/navtop/up.png);
} }
.user { .user {
margin-left: 37px; margin-left: 37px;
display: flex; display: flex;
@@ -199,12 +217,14 @@ export default {
color: #b3bdc4; color: #b3bdc4;
line-height: 36px; line-height: 36px;
} }
.signOutMain { .signOutMain {
cursor: pointer; cursor: pointer;
margin-right: 29px; margin-right: 29px;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.signOut { .signOut {
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;

View File

@@ -0,0 +1,9 @@
<template>
<div>12312</div>
</template>
<script setup>
import {reactive} from "vue";
const options = reactive([]);
</script>

View File

@@ -47,7 +47,11 @@
expandRowByClick="true" expandRowByClick="true"
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="false"
:row-selection="rowSelection" :row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
type: 'radio',
}"
filterMultiple:false filterMultiple:false
/> />
@@ -101,9 +105,10 @@ export default {
tableDataTotal: 0, tableDataTotal: 0,
tableData: [], tableData: [],
selectedRowKeys: [], selectedRowKeys: [],
assessmentId:null, assessmentId:null
}); });
const closeDrawer = () => { const closeDrawer = () => {
state.selectedRowKeys = [];
ctx.emit("update:assessmentVisible", false); ctx.emit("update:assessmentVisible", false);
ctx.emit("update:titleTag", true); ctx.emit("update:titleTag", true);
@@ -165,6 +170,19 @@ export default {
// state.selectedRowKeys = selectedRowKeys; // state.selectedRowKeys = selectedRowKeys;
// }; // };
const onSelectChange = (selectedRowKeys, selectRow) => {
console.log("selectedRowKeys changed: ", selectedRowKeys, selectRow);
state.selectedRowKeys = selectedRowKeys;
state.selectedRows = selectRow;
console.log(selectRow)
state.assessment =selectRow[0];
state.assessmentId = selectRow[0].assessmentId;
ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessmentId);
state.selectedRowKeys = [];
closeDrawer();
};
const handelChangePage = (page, pageSize) => { const handelChangePage = (page, pageSize) => {
state.currentPage = page; state.currentPage = page;
state.pageSize = pageSize; state.pageSize = pageSize;
@@ -222,6 +240,7 @@ export default {
getAllInvistText, getAllInvistText,
resetInvist, resetInvist,
handelChangePage, handelChangePage,
onSelectChange
}; };
}, },
}; };

View File

@@ -57,7 +57,8 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-checkbox v-model:checked="checkedC1" @change="checkRadio" <a-checkbox v-model:checked="checkedC1" @change="checkRadio"
>允许评论</a-checkbox >允许评论
</a-checkbox
> >
</div> </div>
</div> </div>
@@ -77,6 +78,7 @@ import * as apiTask from "../../api/indexTaskadd";
import {RouterEditTask} from "@/api/indexTask"; import {RouterEditTask} from "@/api/indexTask";
import {message} from "ant-design-vue"; import {message} from "ant-design-vue";
import {addTempTask} from "../../api/indexTaskadd"; import {addTempTask} from "../../api/indexTaskadd";
export default { export default {
name: "AddDiscuss", name: "AddDiscuss",
props: { props: {
@@ -178,7 +180,8 @@ export default {
state.checkedC1 = state.checkedC1 =
res.data.data.discussSettings == "true" ? true : false; res.data.data.discussSettings == "true" ? true : false;
}) })
.catch(() => {}); .catch(() => {
});
} }
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
@@ -186,9 +189,9 @@ export default {
queryDiscuss(); queryDiscuss();
} }
}; };
const updateTask = (res) => { const updateTask = async (res) => {
if (props.isLevel == 1) { if (props.isLevel == 1) {
RouterEditTask({ await RouterEditTask({
chapterId: props.isactive, chapterId: props.isactive,
courseId: res.data.data.discussId, courseId: res.data.data.discussId,
name: res.data.data.discussName, name: res.data.data.discussName,
@@ -203,7 +206,7 @@ export default {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
}); });
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
apiTask await apiTask
.addTask({ .addTask({
courseId: res.data.data.discussId, courseId: res.data.data.discussId,
name: res.data.data.discussName, name: res.data.data.discussName,
@@ -293,6 +296,7 @@ export default {
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important; background-color: #fafafa !important;
} }
.addrefDrawer { .addrefDrawer {
.drawerMain { .drawerMain {
.header { .header {
@@ -302,6 +306,7 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
flex-shrink: 0; flex-shrink: 0;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
@@ -310,35 +315,43 @@ export default {
margin-left: 24px; margin-left: 24px;
} }
} }
.contentMain { .contentMain {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.main_left { .main_left {
margin-top: 32px; margin-top: 32px;
padding-right: 30px; padding-right: 30px;
flex: 1; flex: 1;
border-right: 1px solid #e8e8e8; border-right: 1px solid #e8e8e8;
.main_item { .main_item {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 32px; margin-top: 32px;
margin-bottom: 32px; margin-bottom: 32px;
.signbox { .signbox {
width: 120px; width: 120px;
display: flex; display: flex;
justify-content: end; justify-content: end;
align-items: center; align-items: center;
.sign { .sign {
margin-right: 5px; margin-right: 5px;
} }
} }
.btnbox { .btnbox {
display: flex; display: flex;
flex: 1; flex: 1;
align-items: center; align-items: center;
.ant-input { .ant-input {
height: 100%; height: 100%;
} }
.xkbtn { .xkbtn {
cursor: pointer; cursor: pointer;
width: 130px; width: 130px;
@@ -351,32 +364,40 @@ export default {
} }
} }
} }
.main_item2 { .main_item2 {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
margin-bottom: 32px; margin-bottom: 32px;
.signbox { .signbox {
width: 120px; width: 120px;
display: flex; display: flex;
justify-content: end; justify-content: end;
align-items: center; align-items: center;
.sign { .sign {
margin-right: 5px; margin-right: 5px;
} }
} }
.textarea { .textarea {
width: 423px; width: 423px;
.ant-input { .ant-input {
width: 100%; width: 100%;
} }
.ant-input-textarea-show-count { .ant-input-textarea-show-count {
position: relative; position: relative;
} }
.ant-input-textarea-show-count::after { .ant-input-textarea-show-count::after {
position: absolute; position: absolute;
right: 10px; right: 10px;
bottom: 0px; bottom: 0px;
} }
.ant-input { .ant-input {
border-radius: 8px; border-radius: 8px;
} }
@@ -384,6 +405,7 @@ export default {
} }
} }
} }
.main_btns { .main_btns {
height: 72px; height: 72px;
width: 100%; width: 100%;
@@ -393,6 +415,7 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 { .btn1 {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -402,6 +425,7 @@ export default {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;

View File

@@ -287,7 +287,7 @@ export default {
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.success("创建测评失败"); message.error("创建测评失败");
}); });
} }
//创建测评信息 //创建测评信息
@@ -324,7 +324,7 @@ export default {
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.success("创建测评失败"); message.error("创建测评失败");
}); });
}; };

View File

@@ -28,11 +28,15 @@
</div> </div>
<span style="margin-right: 3px">选择课程</span> <span style="margin-right: 3px">选择课程</span>
</div> </div>
<div class="btnbox" @click="showDrawerSelFacet"> <div class="btnbox">
<button class="xkbtn"> <button class="xkbtn" @click="showDrawerSelFacet">
{{ chooseCourse == null ? "选择" : "修改" }}面授课 <!--
{{ chooseCourse == null ? "选择" : chooseCourseName }}面授课
</button> -->
{{ chooseCourse == null ? "选择" : "重选" }}面授课
</button> </button>
<div v-if="chooseCourse > 0"> <div v-if="chooseCourse">
<a-tag closable color="processing" @close="logC"> <a-tag closable color="processing" @close="logC">
<span style="font-size:14px;line-height: 33px;">删除课程</span> <span style="font-size:14px;line-height: 33px;">删除课程</span>
</a-tag> </a-tag>
@@ -41,7 +45,7 @@
</div> </div>
<!-- 选择面授侧弹窗 --> <!-- 选择面授侧弹窗 -->
<div> <div>
<sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse"/> <sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse" v-model:chooseCourseName="chooseCourseName"/>
</div> </div>
<!-- 选择面授侧弹窗 --> <!-- 选择面授侧弹窗 -->
</div> </div>
@@ -61,8 +65,9 @@
<span style="margin-right: 3px">授课教师</span> <span style="margin-right: 3px">授课教师</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px" <!-- <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"-->
:options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete> <!-- :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>-->
<ProjectManager v-model:value="memberValue.value" v-model:name="memberValue.label"></ProjectManager>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -278,6 +283,7 @@ import dayjs from "dayjs";
import AssessmentList from "../drawers/ AssessmentList.vue"; import AssessmentList from "../drawers/ AssessmentList.vue";
// import { toDate } from "../../api/method";、 // import { toDate } from "../../api/method";、
import {addTempTask} from "../../api/indexTaskadd"; import {addTempTask} from "../../api/indexTaskadd";
import ProjectManager from "@/components/project/ProjectManager";
export default { export default {
name: "AddFaceteach", name: "AddFaceteach",
@@ -286,6 +292,7 @@ export default {
AddHomework, AddHomework,
AddTest, AddTest,
AssessmentList, AssessmentList,
ProjectManager,
}, },
props: { props: {
addfaceteachVisible: { addfaceteachVisible: {
@@ -368,6 +375,7 @@ export default {
chooseTime: [], chooseTime: [],
fileList: [], fileList: [],
chooseCourse: null, //选择的在线课程 chooseCourse: null, //选择的在线课程
chooseCourseName: null, //选择的在线课程
assessmentId: null, assessmentId: null,
EditTestId: null, EditTestId: null,
EditWorkId: null, EditWorkId: null,
@@ -416,6 +424,7 @@ export default {
const logC = e => { const logC = e => {
state.chooseCourse = null; state.chooseCourse = null;
state.chooseCourseName = null;
console.log(e); console.log(e);
}; };
const logW = e => { const logW = e => {

View File

@@ -54,7 +54,7 @@
> >
<span class="title" <span class="title"
>名称 >名称
<span class="data">{{ assessment1.createName }}</span> <span class="data">{{ assessment1.assessmentName }}</span>
</span> </span>
<span class="title" <span class="title"
>题数 >题数
@@ -184,6 +184,8 @@ export default {
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:addinvistVisible", false); ctx.emit("update:addinvistVisible", false);
ctx.emit("update:edit", false); ctx.emit("update:edit", false);
state.assessment = null;
state.assessment1 = null;
state.inputV1 = ""; state.inputV1 = "";
// ctx.emit("changeData", false); // ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
@@ -205,6 +207,7 @@ export default {
api api
.queryAppraiseDetailById({ assessmentId: props.EditInvistId }) .queryAppraiseDetailById({ assessmentId: props.EditInvistId })
.then((res) => { .then((res) => {
console.log(res)
//更新讨论信息 //更新讨论信息
state.assessment1 = res.data.data; state.assessment1 = res.data.data;
}) })

View File

@@ -106,18 +106,8 @@
<span style="margin-right: 3px">授课老师</span> <span style="margin-right: 3px">授课老师</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-auto-complete <ProjectManager v-model:value="memberValue.value"
:value="memberValue.label" v-model:name="memberValue.label"></ProjectManager>
show-search
:not-found-content="fetching ? undefined : null"
placeholder="Select a teacher"
style="width: 364px"
:options="options"
@focus="handleFocus"
@change="handleChange2"
@popupScroll="templateScroll"
@search="handleSearch"
></a-auto-complete>
</div> </div>
</div> </div>
<div class="mbl_items2"> <div class="mbl_items2">
@@ -173,7 +163,7 @@
<span style="margin-right: 3px">回放设置</span> <span style="margin-right: 3px">回放设置</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-switch v-model:checked="switchC1" @click="PlayBack" /> <a-switch v-model:checked="switchC1"/>
</div> </div>
</div> </div>
<div v-if="switchC1"> <div v-if="switchC1">
@@ -198,7 +188,8 @@
<a-checkbox <a-checkbox
v-model:checked="needEval" v-model:checked="needEval"
@click="needEval = !needEval" @click="needEval = !needEval"
>需要评估</a-checkbox >需要评估
</a-checkbox
> >
</div> </div>
</div> </div>
@@ -206,8 +197,8 @@
<div class="signbox"></div> <div class="signbox"></div>
<div class="btnbox"> <div class="btnbox">
<button class="xkbtn" @click="showAssessment">选择评估</button> <button class="xkbtn" @click="showAssessment">选择评估</button>
<div v-if="assessmentId > 0"> <div v-if="(assessmentId !== '0')">
<a-tag closable color="processing" @close="logA"> <a-tag closable @close="removePG" color="processing">
<span style="font-size: 14px; line-height: 33px" <span style="font-size: 14px; line-height: 33px"
>删除评估</span >删除评估</span
> >
@@ -226,7 +217,9 @@
</div> </div>
<div class="kqszbox"> <div class="kqszbox">
<div class="qdqtbox"> <div class="qdqtbox">
<div class="qdbtn"><div class="btntext">签到</div></div> <div class="qdbtn">
<div class="btntext">签到</div>
</div>
</div> </div>
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
@@ -308,7 +301,8 @@
<a-checkbox <a-checkbox
v-model:checked="switchC2" v-model:checked="switchC2"
@onclick="switchC2 = !switchC2" @onclick="switchC2 = !switchC2"
>学员请假后记为任务完成</a-checkbox >学员请假后记为任务完成
</a-checkbox
> >
</div> </div>
</div> </div>
@@ -334,16 +328,20 @@ import dayjs from "dayjs";
import {fileUp} from "../../api/indexEval"; import {fileUp} from "../../api/indexEval";
import AssessmentList from "../drawers/ AssessmentList.vue"; import AssessmentList from "../drawers/ AssessmentList.vue";
import {debounce} from "lodash-es"; import {debounce} from "lodash-es";
import ProjectManager from "@/components/project/ProjectManager";
// import { useRouter } from "vue-router"; // import { useRouter } from "vue-router";
function getBase64(img, callback) { function getBase64(img, callback) {
const reader = new FileReader(); const reader = new FileReader();
reader.addEventListener("load", () => callback(reader.result)); reader.addEventListener("load", () => callback(reader.result));
reader.readAsDataURL(img); reader.readAsDataURL(img);
} }
export default { export default {
name: "AddLive", name: "AddLive",
components: { components: {
AssessmentList, AssessmentList,
ProjectManager,
}, },
props: { props: {
addliveVisible: { addliveVisible: {
@@ -482,6 +480,7 @@ export default {
api api
.getLiveBroadcastInfor({liveId: d}) .getLiveBroadcastInfor({liveId: d})
.then((res) => { .then((res) => {
console.log("获取的数据",res)
state.inputV1 = res.data.data.liveName; state.inputV1 = res.data.data.liveName;
state.time = [ state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"), dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"),
@@ -500,7 +499,10 @@ export default {
//state.= res.data.data //state.= res.data.data
state.assessmentId = res.data.data.assessmentId; state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover; state.imageUrl = res.data.data.liveCover;
state.switchC1 = res.data.data.livePlayback === '1' ? true : false;
state.switchC2 = res.data.data.otherSettings == 1 ? true : false; state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
state.needEval = res.data.data.isEvaluate == '1' ? true : false;
state.memberValue = {value: res.data.data.liveTeacherId || '', label: res.data.data.liveTeacherName || ''};
}) })
.catch(() => { .catch(() => {
//message.error(`查询失败`); //message.error(`查询失败`);
@@ -621,34 +623,39 @@ export default {
state.obj = { state.obj = {
afterSignIn: state.inputV6, afterSignIn: state.inputV6,
beforeSignIn: state.inputV7, beforeSignIn: state.inputV7,
assessmentId: state.assessmentId == null ? 0 : state.assessmentId, assessmentId: state.assessmentId == null || state.assessmentId == "" ? 0 : Number(state.assessmentId),
liveCover: state.imageUrl, //直播封面 liveCover: state.imageUrl, //直播封面
liveDuration: state.inputV2, liveDuration: Number(state.inputV2),
liveEndTime: endTime, liveEndTime: endTime,
liveStartTime: startTime, liveStartTime: startTime,
liveExplain: state.textV1, liveExplain: state.textV1,
liveFlag: "", liveFlag: "",
liveId: props.edit ? props.EditLiveId : 0, liveId: props.edit ? Number(props.EditLiveId) : 0,
liveLink: state.inputV4, liveLink: state.inputV4,
liveName: state.inputV1, liveName: state.inputV1,
livePlayback: state.switchC1 ? "1" : "0", livePlayback: state.switchC1 ? "1" : "0",
livePlaybackLink: state.switchC1 ? state.inputV5 : "", livePlaybackLink: state.switchC1 ? state.inputV5 : "",
liveTeacherId: state.inputV3, liveTeacherId: Number(state.memberValue.value),
liveTeacherName: state.memberValue.label,
otherSettings: state.switchC2 ? "1" : "0", //1或0 otherSettings: state.switchC2 ? "1" : "0", //1或0
signOutTime: state.inputV8, signOutTime: state.inputV8,
standardSettings: state.radioV1, //1或2 standardSettings: state.radioV1, //1或2
isEvaluate: state.needEval ? "1" : "0", isEvaluate: state.needEval ? "1" : "0",
}; };
console.log('我是要更新的数据',state.obj )
if (props.edit) { if (props.edit) {
api api
.updateLiveBroadcastMessage(state.obj) .updateLiveBroadcastMessage(state.obj)
.then(async (res) => { .then(async (res) => {
console.log(res)
message.destroy(); message.destroy();
message.success("提交成功"); message.success("提交成功");
await updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
}) })
.catch(() => {}); .catch((err) => {
console.log(err)
});
} else { } else {
api api
.createLiveBroadcast(state.obj) .createLiveBroadcast(state.obj)
@@ -658,7 +665,8 @@ export default {
await updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
}) })
.catch(() => {}); .catch(() => {
});
} }
}; };
const beforeUpload = (file) => { const beforeUpload = (file) => {
@@ -762,6 +770,14 @@ export default {
state.discussSettings = "false"; state.discussSettings = "false";
} }
}; };
// 删除评估
const removePG = () => {
console.log("11111")
state.assessmentId = "";
state.isEvaluate = "0";
}
return { return {
...toRefs(state), ...toRefs(state),
afterVisibleChange, afterVisibleChange,
@@ -778,6 +794,7 @@ export default {
templateScroll, templateScroll,
handleSearch, handleSearch,
showAssessment, showAssessment,
removePG
}; };
}, },
}; };
@@ -786,6 +803,7 @@ export default {
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important; background-color: #fafafa !important;
} }
.addliveDrawer { .addliveDrawer {
.drawerMain { .drawerMain {
.header { .header {
@@ -795,6 +813,7 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
flex-shrink: 0; flex-shrink: 0;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
@@ -803,32 +822,39 @@ export default {
margin-left: 24px; margin-left: 24px;
} }
} }
.contentMain { .contentMain {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.main_left { .main_left {
padding-right: 30px; padding-right: 30px;
flex: 1; flex: 1;
border-right: 1px solid #e8e8e8; border-right: 1px solid #e8e8e8;
margin-top: 32px; margin-top: 32px;
.main_item { .main_item {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 32px; margin-top: 32px;
margin-bottom: 32px; margin-bottom: 32px;
.signbox { .signbox {
width: 120px; width: 120px;
display: flex; display: flex;
justify-content: end; justify-content: end;
align-items: center; align-items: center;
.sign { .sign {
margin-right: 5px; margin-right: 5px;
} }
} }
.btnbox { .btnbox {
display: flex; display: flex;
flex: 1; flex: 1;
align-items: center; align-items: center;
.xkbtn { .xkbtn {
cursor: pointer; cursor: pointer;
width: 130px; width: 130px;
@@ -841,24 +867,29 @@ export default {
} }
} }
} }
.main_item2 { .main_item2 {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
margin-bottom: 32px; margin-bottom: 32px;
.signbox { .signbox {
width: 120px; width: 120px;
display: flex; display: flex;
justify-content: end; justify-content: end;
align-items: center; align-items: center;
.sign { .sign {
margin-right: 5px; margin-right: 5px;
} }
} }
.kqszbox { .kqszbox {
.qdqtbox { .qdqtbox {
margin-left: 5px; margin-left: 5px;
cursor: pointer; cursor: pointer;
} }
.qdbtn, .qdbtn,
.qtbtn { .qtbtn {
width: 75px; width: 75px;
@@ -869,15 +900,18 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.btntext { .btntext {
color: #387df7; color: #387df7;
} }
} }
.setbox { .setbox {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 10px; margin-top: 10px;
margin-bottom: 24px; margin-bottom: 24px;
.timerbox { .timerbox {
margin-top: 6px; margin-top: 6px;
margin-right: 32px; margin-right: 32px;
@@ -887,10 +921,12 @@ export default {
} }
} }
} }
.btnbox2 { .btnbox2 {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
.xkbtn { .xkbtn {
cursor: pointer; cursor: pointer;
width: 130px; width: 130px;
@@ -905,20 +941,24 @@ export default {
} }
} }
} }
.mbl_items2 { .mbl_items2 {
display: flex; display: flex;
align-items: start; align-items: start;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
.i_bottom { .i_bottom {
margin-bottom: 30px; margin-bottom: 30px;
} }
.item_nam { .item_nam {
width: 100px; width: 100px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
white-space: nowrap; white-space: nowrap;
.asterisk_icon { .asterisk_icon {
width: 10px; width: 10px;
height: 10px; height: 10px;
@@ -926,13 +966,16 @@ export default {
margin-top: -15px; margin-top: -15px;
} }
} }
.item_inp { .item_inp {
flex: 1; flex: 1;
.i_upload_img { .i_upload_img {
width: 100px; width: 100px;
height: 100px; height: 100px;
border-radius: 8px; border-radius: 8px;
} }
.i_upload { .i_upload {
width: 100px; width: 100px;
height: 100px; height: 100px;
@@ -941,8 +984,10 @@ export default {
text-align: center; text-align: center;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
.addimg { .addimg {
position: relative; position: relative;
.heng { .heng {
position: absolute; position: absolute;
top: 50px; top: 50px;
@@ -950,6 +995,7 @@ export default {
width: 50px; width: 50px;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;
} }
.shu { .shu {
position: absolute; position: absolute;
top: 25px; top: 25px;
@@ -963,6 +1009,7 @@ export default {
} }
} }
} }
.main_btns { .main_btns {
height: 72px; height: 72px;
width: 100%; width: 100%;
@@ -972,6 +1019,7 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 { .btn1 {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -981,6 +1029,7 @@ export default {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;

View File

@@ -114,26 +114,20 @@
</a-menu> </a-menu>
</template> </template>
</a-dropdown> --> </a-dropdown> -->
<span style="margin-left: 10px">
<a-tag <a-tag v-if="paperName != ''" closable color="processing" @close="delTag">
class="tag-style" <span style="font-size:14px;line-height: 33px;">删除考试</span>
v-if="paperName != ''" </a-tag>
:closable="true"
@close="delTag"
>{{ paperName }}</a-tag
>
<!-- <a-tag
class="tag-style"
v-for="item in choosedTestList"
:closable="true"
@close="closeTag(item.key)"
:key="item.key"
>{{ item.value }}</a-tag
> -->
</span>
</a-form-item> </a-form-item>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="btnbox"> <div class="btnbox">
<a-form-item has-feedback label="考试时间" name="choosedTime"> <a-form-item has-feedback label="考试时间" name="choosedTime">
@@ -721,9 +715,13 @@ export default {
scoringModel: formState.scoringModel, scoringModel: formState.scoringModel,
showAnalysis: formState.showAnalysis, showAnalysis: formState.showAnalysis,
showAnswers: formState.showAnswers, showAnswers: formState.showAnswers,
examinationTestId: state.id, examinationTestId: state.paperId,
examinationTestName: state.testName, examinationTestName: state.paperName,
}; };
if(!(state.paperId >0)){
message.destroy();
return message.error("请选择考试");
}
if (props.edit) { if (props.edit) {
// 编辑任务 // 编辑任务
updateExamination(obj) updateExamination(obj)
@@ -732,6 +730,7 @@ export default {
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy();
message.error(`编辑失败`); message.error(`编辑失败`);
}); });
} else { } else {
@@ -742,6 +741,7 @@ export default {
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy();
message.error(`创建失败`); message.error(`创建失败`);
}); });
} }
@@ -852,6 +852,7 @@ export default {
state.id = value.id; state.id = value.id;
state.testName = value.testName; state.testName = value.testName;
}; };
return { return {
formState, formState,
afterVisibleChange, afterVisibleChange,
@@ -876,6 +877,7 @@ export default {
chooseTest, chooseTest,
closeTag, closeTag,
getData, getData,
...toRefs(state), ...toRefs(state),
}; };
}, },

View File

@@ -29,6 +29,7 @@
/> />
</div> </div>
</div> </div>
<!--
<div class="mii_ipt"> <div class="mii_ipt">
<div class="ipt_name">课程状态</div> <div class="ipt_name">课程状态</div>
<div class="select fitems"> <div class="select fitems">
@@ -44,6 +45,7 @@
</a-select> </a-select>
</div> </div>
</div> </div>
-->
</div> </div>
<div class="mi_btns"> <div class="mi_btns">
<div class="btn btn1" @click="search"> <div class="btn btn1" @click="search">
@@ -113,9 +115,9 @@
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
:pagination="false" :pagination="false"
/> />
<div class="pa"> <div class="pa" style="display:flex;justify-content:center;padding:20px;">
<a-pagination <a-pagination
v-if="total > 10" v-if="tableDataTotal > 10"
showSizeChanger="true" showSizeChanger="true"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
@@ -134,9 +136,9 @@
</template> </template>
<script> <script>
//import { ApiFilled } from "@ant-design/icons-vue"; //import { ApiFilled } from "@ant-design/icons-vue";
import { reactive, toRefs, ref } from "vue"; import {reactive, toRefs, computed} from "vue";
// import { planList } from "../../api/indexTaskadd"; // import { planList } from "../../api/indexTaskadd";
import {detail} from "../../api/indexCourse"; // import {detail} from "../../api/indexCourse";
import {list} from "../../api/indexTaskadd"; import {list} from "../../api/indexTaskadd";
import {toDate} from "../../api/method"; import {toDate} from "../../api/method";
@@ -196,6 +198,10 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
chooseCourseName: {
type: String,
default: null,
},
titleTag: { titleTag: {
type: Boolean, type: Boolean,
default: false, default: false,
@@ -225,48 +231,64 @@ export default {
offcourse: null, offcourse: null,
auditStatus: null, auditStatus: null,
name: null, name: null,
courseInfo:[]
}); });
const rowSelection = {
const rowSelection = computed(() => {
console.log(3333333333)
console.log(state.selectedRows)
return {
type: "radio", type: "radio",
selectedRowKeys: state.selectedRows,
onSelect: (selectedRows) => { onSelect: (selectedRows) => {
console.log('select')
state.chooseCourse = selectedRows.num; state.chooseCourse = selectedRows.num;
state.chooseCourseName = selectedRows.name;
console.log(selectedRows, "==========", state.chooseCourse); console.log(selectedRows, "==========", state.chooseCourse);
closeDrawer(); closeDrawer();
}, },
}; onChange: (selectedRows) => {
console.log('onChange')
state.selectedRows = selectedRows
},
}
})
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:selfacetVisible", false); ctx.emit("update:selfacetVisible", false);
ctx.emit("update:chooseCourse", state.chooseCourse); state.chooseCourse && ctx.emit("update:chooseCourse", state.chooseCourse);
state.chooseCourseName && ctx.emit("update:chooseCourseName", state.chooseCourseName);
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
if (bool) { if (bool) {
state.chooseCourse = props.chooseCourse; state.chooseCourse = props.chooseCourse;
state.chooseCourseName = props.chooseCourseName;
state.selectedRows = props.chooseCourse ? [props.chooseCourse] : [];
getClassList(); getClassList();
getFaceInfo(); // getFaceInfo();
} }
}; };
// const showDrawerSelFacet = () => { // const showDrawerSelFacet = () => {
// state.selfacetvisible = true; // state.selfacetvisible = true;
// }; // };
const getFaceInfo =()=>{ // const getFaceInfo = () => {
detail({offcourseId:36}).then((res) => { // detail({offcourseId: 36}).then((res) => {
state.chooseCourse = res.data.data; // state.courseInfo = res.data.data;
}).catch(); // }).catch();
} // }
//获取面授课列表 //获取面授课列表
const getClassList = (obj) => { const getClassList = (obj) => {
let objn = obj || { let objn = obj || {
auditStatus:state.auditStatus, auditStatus:2,
name: state.name, name: state.name,
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize pageSize: state.pageSize
}; };
list(objn) list(objn)
.then((res) => { .then((res) => {
console.log(res.data.data.rows); console.log('面授课列表', res.data.data);
let result = res.data.data; let result = res.data.data;
state.tableDataTotal = result.total; state.tableDataTotal = result.total;
getClassData(result.rows); getClassData(result.rows);
@@ -294,7 +316,7 @@ export default {
}); });
state.classTableData = array; state.classTableData = array;
}; };
/**
const options1 = ref([ const options1 = ref([
{ {
value: 0, value: 0,
@@ -308,11 +330,8 @@ export default {
value: 2, value: 2,
label: "已审核", label: "已审核",
}, },
{
value: -1, ]);*/
label: "审核未通过",
},
]);
const handleChange = (value, option) => { const handleChange = (value, option) => {
console.log("改变了", value, option); console.log("改变了", value, option);
console.log(state.valueContent); console.log(state.valueContent);
@@ -339,7 +358,7 @@ export default {
// showDrawerSelFacet, // showDrawerSelFacet,
afterVisibleChange, afterVisibleChange,
closeDrawer, closeDrawer,
options1,
columns1, columns1,
getClassData, getClassData,
handleChange, handleChange,
@@ -366,6 +385,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
@@ -374,6 +394,7 @@ export default {
margin-left: 24px; margin-left: 24px;
} }
} }
.contentMain { .contentMain {
.main_items { .main_items {
display: flex; display: flex;
@@ -381,23 +402,28 @@ export default {
margin-bottom: 12px; margin-bottom: 12px;
margin-top: 32px; margin-top: 32px;
flex-wrap: wrap; flex-wrap: wrap;
.mi_ipts { .mi_ipts {
display: flex; display: flex;
margin-bottom: 20px; margin-bottom: 20px;
.mii_ipt { .mii_ipt {
display: flex; display: flex;
align-items: center; align-items: center;
margin-right: 24px; margin-right: 24px;
.ipt_name { .ipt_name {
white-space: nowrap; white-space: nowrap;
} }
} }
} }
.mi_btns { .mi_btns {
display: flex; display: flex;
margin-left: 38px; margin-left: 38px;
margin-bottom: 20px; margin-bottom: 20px;
cursor: pointer; cursor: pointer;
.btn { .btn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
@@ -408,9 +434,11 @@ export default {
justify-content: center; justify-content: center;
margin-left: 14px; margin-left: 14px;
flex-shrink: 0; flex-shrink: 0;
.search { .search {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -418,48 +446,61 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
} }
.btn1 { .btn1 {
background: rgb(64, 158, 255); background: rgb(64, 158, 255);
.search { .search {
width: 15px; width: 15px;
height: 17px; height: 17px;
background-image: url("@/assets/images/coursewareManage/search0.png"); background-image: url("@/assets/images/coursewareManage/search0.png");
} }
.btnText { .btnText {
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
} }
} }
.btn2 { .btn2 {
background: rgb(255, 255, 255); background: rgb(255, 255, 255);
.search { .search {
width: 15px; width: 15px;
height: 17px; height: 17px;
background-image: url("@/assets/images/coursewareManage/reset1.png"); background-image: url("@/assets/images/coursewareManage/reset1.png");
} }
.btnText { .btnText {
color: rgb(64, 158, 255); color: rgb(64, 158, 255);
} }
} }
.btn1:hover { .btn1:hover {
background: rgb(255, 255, 255); background: rgb(255, 255, 255);
.search { .search {
background-image: url("@/assets/images/courseManage/search1.png"); background-image: url("@/assets/images/courseManage/search1.png");
} }
.btnText { .btnText {
color: #388be1; color: #388be1;
} }
} }
.btn2:hover { .btn2:hover {
background: rgba(64, 158, 255, 1); background: rgba(64, 158, 255, 1);
.search { .search {
background-image: url("@/assets/images/courseManage/reset0.png"); background-image: url("@/assets/images/courseManage/reset0.png");
} }
.btnText { .btnText {
color: #ffffff; color: #ffffff;
} }
} }
} }
} }
.main_notice { .main_notice {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@@ -467,16 +508,20 @@ export default {
margin-bottom: 32px; margin-bottom: 32px;
height: 40px; height: 40px;
background-color: #e9f6fe; background-color: #e9f6fe;
.mntc_left { .mntc_left {
display: flex; display: flex;
align-items: center; align-items: center;
.title { .title {
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
margin-right: 17px; margin-right: 17px;
} }
.data { .data {
color: #388be1; color: #388be1;
} }
.notice_icon { .notice_icon {
width: 14px; width: 14px;
height: 14px; height: 14px;
@@ -486,6 +531,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.mntc_right { .mntc_right {
cursor: pointer; cursor: pointer;
} }
@@ -501,6 +547,7 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 { .btn1 {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -510,6 +557,7 @@ export default {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;

View File

@@ -1,13 +1,13 @@
<template> <template>
<a-select <a-select
v-model:value="managerArray" v-model:value="managerArray"
placeholder="请选择项目经理" :placeholder="placeholder"
:filterOption="false" :filterOption="false"
style="width: 100%" style="width: 100%"
:options="options" :options="options"
allowClear allowClear
showSearch showSearch
mode="multiple" :mode="mode"
:disabled="disabled" :disabled="disabled"
@popupScroll="memberScroll" @popupScroll="memberScroll"
@search="searchMember" @search="searchMember"
@@ -28,15 +28,26 @@ export default {
props: { props: {
value: { value: {
type: Number, type: String,
default: ''
}, },
name: { name: {
type: Number, type: String,
default: ''
}, },
disabled: { disabled: {
type: Boolean, type: Boolean,
default: false default: false
}, },
placeholder: {
type: String,
default: '请选择'
},
// 'multiple' | 'tags'
mode: {
type: String,
default: 'select'
},
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
@@ -46,9 +57,9 @@ export default {
loading: false, loading: false,
init: false init: false
}); });
const getMemberThrottle = throttle(getMember, 500)
watch(() => state.memberParam, getMemberThrottle) watch(()=>state.memberParam.keyWord , throttle(getMember, 500))
watch(()=>state.memberParam.pageNo , throttle(getPushMember, 500))
watch(props, init) watch(props, init)
onMounted(() => { onMounted(() => {
@@ -62,15 +73,21 @@ export default {
getMemberData() getMemberData()
} }
function getPushMember() {
state.loading = true
getMemberData()
}
function getMemberData() { function getMemberData() {
console.log('getMemberData')
api1.getMemberInfo(state.memberParam).then((res) => { api1.getMemberInfo(state.memberParam).then((res) => {
const list = res.data.data.rows.filter(e => !props.value?.includes(e.id + '')).map(e => ({ const list = res.data.data.rows.filter(e => !(props.value + '')?.includes(e.id + '')).map(e => ({
label: e.realName, label: e.realName,
value: e.id value: e.id
})); }));
if (state.memberParam.pageNo === 1 && props.value) { if (state.memberParam.pageNo === 1 && props.value) {
const arrManagerId = props.value.split(',') const arrManagerId = (props.value + '').split(',')
const arrManager = props.name.split(',') const arrManager = props.name.split(',')
state.options = [...arrManager.map((e, i) => ({label: e, value: arrManagerId[i]})), ...list] state.options = [...arrManager.map((e, i) => ({label: e, value: arrManagerId[i]})), ...list]
} else state.options.push(...list) } else state.options.push(...list)
@@ -93,11 +110,12 @@ export default {
function init() { function init() {
console.log('init--', props) console.log('init--', props)
if (props.value !== state.managerArray.join(',')) { console.log(Array.isArray(state.managerArray))
if ((props.value + '') !== (Array.isArray(state.managerArray) ? state.managerArray.join(',') : (state.managerArray + ''))) {
if (props.value) { if (props.value) {
const arrManager = props.name.split(',') const arrManager = props.name.split(',')
const arrManagerId = props.value.split(',') const arrManagerId = (props.value + '').split(',')
state.managerArray = arrManagerId state.managerArray = props.mode === 'select' ? props.value : arrManagerId;
state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]})) state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
} else { } else {
state.managerArray = [] state.managerArray = []
@@ -115,9 +133,14 @@ export default {
} }
function change(e, l) { function change(e, l) {
console.log('change') console.log('change', l)
ctx.emit('update:value', e.join(',')) if (Array.isArray(l)) {
ctx.emit('update:value', l.map(t => t.value).join(','))
ctx.emit('update:name', l.map(t => t.label).join(',')) ctx.emit('update:name', l.map(t => t.label).join(','))
} else {
ctx.emit('update:value', l.value)
ctx.emit('update:name', l.label)
}
} }
return { return {

View File

@@ -23,6 +23,7 @@ export default createStore({
assessmentName: "", assessmentName: "",
routerId: null, routerId: null,
projectTemplateId: null, projectTemplateId: null,
userInfo: {},
orgtreeList: [], orgtreeList: [],
faceclassPic: null, faceclassPic: null,
faceclassClass: [], faceclassClass: [],
@@ -54,6 +55,9 @@ export default createStore({
SET_DICT(state, {key, data}) { SET_DICT(state, {key, data}) {
state[key] = data state[key] = data
}, },
SET_USER(state, userInfo) {
state.userInfo = userInfo
},
SET_projectTemplateId(state, projectTemplateId) { SET_projectTemplateId(state, projectTemplateId) {
state.projectTemplateId = projectTemplateId; state.projectTemplateId = projectTemplateId;
} }

File diff suppressed because it is too large Load Diff

View File

@@ -390,12 +390,12 @@ export default {
key: "status", key: "status",
align: "center", align: "center",
}, },
{ // {
title: "转审", // title: "转审",
dataIndex: "change", // dataIndex: "change",
key: "change", // key: "change",
align: "center", // align: "center",
}, // },
{ {
title: "创建人", title: "创建人",
dataIndex: "creater", dataIndex: "creater",
@@ -637,12 +637,16 @@ export default {
state.courAuditModal = false; state.courAuditModal = false;
message.destroy(); message.destroy();
message.success("审核提交成功"); message.success("审核提交成功");
state.valueSugg = null;
state.valuepass="1";
getFaceList(); getFaceList();
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
message.destroy(); message.destroy();
message.warning("审核提交失败"); message.warning("审核提交失败");
state.valueSugg = null;
state.valuepass="1";
}); });
}; };
onMounted(async () => { onMounted(async () => {

View File

@@ -161,26 +161,7 @@
</div> </div>
<div class="inname">归属组织</div> <div class="inname">归属组织</div>
<div class="select in"> <div class="select in">
<a-tree-select <OrgClass v-model:value="organizationSelectId" v-model:name="organizationSelectName"></OrgClass>
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="organizationSelectName"
style="width: 270px"
placeholder="请选择组织"
:tree-data="organizationList"
:options="organizationList"
@change="selectorganization"
allowClear
showSearch
:fieldNames="{
children: 'treeChildList',
label: 'name',
value: 'id',
}"
></a-tree-select>
</div> </div>
<!-- <div class="in"> <!-- <div class="in">
<a-input <a-input
@@ -295,26 +276,7 @@
</div> </div>
<div class="inname">归属组织</div> <div class="inname">归属组织</div>
<div class="select in"> <div class="select in">
<a-tree-select <OrgClass v-model:value="organizationSelectId" v-model:name="organizationSelectName"></OrgClass>
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="organizationSelectName"
style="width: 270px"
placeholder="请选择组织"
:options="organizationList"
:tree-data="organizationList"
@change="selectorganization"
allowClear
showSearch
:fieldNames="{
children: 'treeChildList',
label: 'name',
value: 'id',
}"
></a-tree-select>
</div> </div>
<!-- <div class="in"> <!-- <div class="in">
<a-input <a-input
@@ -707,6 +669,7 @@ import {
} from "../../api/method"; } from "../../api/method";
import { storage } from "../../api/storage"; import { storage } from "../../api/storage";
import { useStore } from "vuex"; import { useStore } from "vuex";
import OrgClass from "@/components/project/OrgClass";
export default { export default {
name: "learningPath", name: "learningPath",
components: { components: {
@@ -715,7 +678,7 @@ export default {
// QueryRight, // QueryRight,
// ManageRight, // ManageRight,
ProjOwnerShip, ProjOwnerShip,
OrgClass,
ProjPowerList, ProjPowerList,
ProjCheckShip, ProjCheckShip,
}, },

View File

@@ -415,31 +415,33 @@
> >
<img <img
:src=" :src="
item.type === 1 item.type == 1
? require('../../assets/images/leveladd/zai.png') ? require('../../assets/images/leveladd/zai.png')
: type === 2 : item.type == 2
? require('../../assets/images/leveladd/mian.png') ? require('../../assets/images/leveladd/mian.png')
: item.type === 3 : item.type == 3
? require('../../assets/images/leveladd/an.png') ? require('../../assets/images/leveladd/an.png')
: item.type === 4 : item.type == 4
? require('../../assets/images/leveladd/zuo.png') ? require('../../assets/images/leveladd/zuo.png')
: item.type === 5 : item.type == 5
? require('../../assets/images/leveladd/kao.png') ? require('../../assets/images/leveladd/kao.png')
: item.type === 6 : item.type == 6
? require('../../assets/images/leveladd/zhi.png') ? require('../../assets/images/leveladd/zhi.png')
: item.type === 7 : item.type == 7
? require('../../assets/images/leveladd/wai.png') ? require('../../assets/images/leveladd/wai.png')
: item.type === 8 : item.type == 8
? require('../../assets/images/leveladd/tao.png') ? require('../../assets/images/leveladd/tao.png')
: item.type === 9 : item.type == 9
? require('../../assets/images/leveladd/huo.png') ? require('../../assets/images/leveladd/huo.png')
: item.type === 10 : item.type == 10
? require('../../assets/images/leveladd/ce.png') ? require('../../assets/images/leveladd/ce.png')
: item.type === 11 : item.type == 11
? require('../../assets/images/leveladd/diao.png') ? require('../../assets/images/leveladd/pinggu.png')
: item.type === 12 : item.type == 12
? require('../../assets/images/leveladd/tou.png') ? require('../../assets/images/leveladd/tou.png')
: null : item.type == 13
? require('../../assets/images/leveladd/tou.png')
: require('../../assets/images/leveladd/xiangmu.png')
" "
/> />
</div> </div>
@@ -458,11 +460,11 @@
</div> </div>
<div class="time"> <div class="time">
<div class="timetext">开始时间</div> <div class="timetext">开始时间</div>
<div class="timetext">{{ item.beginTime }}</div> <div class="timetext">{{ item.startTime!==null?item.startTime[0]+'-'+ item.startTime[1]+'-'+item.startTime[2]:''}}</div>
</div> </div>
<div class="progress"> <div class="progress">
<div class="progresstext"> <div class="progresstext">
{{ item.complete }}/{{ item.total }} {{ item.complete?item.complete:0 }}/{{ item.total?item.total:0 }}
</div> </div>
<div style="display: flex"> <div style="display: flex">
<a-progress <a-progress
@@ -472,7 +474,7 @@
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 }}%</span >{{ item.percent?item.percent:0 }}%</span
> >
</div> </div>
</div> </div>
@@ -996,7 +998,7 @@
<div class="header"> <div class="header">
<div class="icon"></div> <div class="icon"></div>
<span>活动管理</span> <span>活动管理</span>
<div class="close_exit" @click="closehuodModal"></div> <!-- <div class="close_exit" @click="closehuodModal"></div> -->
</div> </div>
<div class="body"> <div class="body">
<div><img src="../../assets/images/taskpage/erweima.png" /></div> <div><img src="../../assets/images/taskpage/erweima.png" /></div>
@@ -1886,6 +1888,7 @@ export default {
const getOverview = () => { const getOverview = () => {
getRouterOverview(state.routerId) getRouterOverview(state.routerId)
.then((res) => { .then((res) => {
console.log(res)
Object.keys(res.data.data.routerInfoOverview).forEach((item) => { Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
levelList.routerInfoOverview[item] = levelList.routerInfoOverview[item] =
res.data.data.routerInfoOverview[item] || 0; res.data.data.routerInfoOverview[item] || 0;
@@ -1898,7 +1901,7 @@ export default {
// console.log(r) // console.log(r)
// }) // })
state.addLoading = false; state.addLoading = false;
console.log("项目概览--" + res); console.log("项目概览--", res);
}) })
.catch((err) => { .catch((err) => {
state.addLoading = false; state.addLoading = false;
@@ -1910,6 +1913,7 @@ export default {
const myGetRouterDetail = () => { const myGetRouterDetail = () => {
GetRouterDetail(state.routerId) GetRouterDetail(state.routerId)
.then((res) => { .then((res) => {
console.log('router-list',res)
if (res.data.data.routerInfo.status == 1) { if (res.data.data.routerInfo.status == 1) {
state.nodata = false; state.nodata = false;
} }

View File

@@ -124,7 +124,8 @@
<div class="inname">项目经理</div> <div class="inname">项目经理</div>
</div> </div>
<div class="in"> <div class="in">
<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"></ProjectManager> <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
mode="multiple"></ProjectManager>
</div> </div>
</div> </div>
<div class="name"> <div class="name">
@@ -201,10 +202,10 @@
</div> </div>
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <!-- <img-->
class="nameimg" <!-- class="nameimg"-->
src="../../assets/images/basicinfo/asterisk.png" <!-- src="../../assets/images/basicinfo/asterisk.png"-->
/> <!-- />-->
<div class="inname">是否BOEU实施</div> <div class="inname">是否BOEU实施</div>
</div> </div>
<div class="in"> <div class="in">
@@ -346,6 +347,7 @@ export default {
let obj = { let obj = {
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
status: 1
}; };
api.getTemplate(obj).then((res) => { api.getTemplate(obj).then((res) => {
state.totalPages = Number(res.data.data.pages); state.totalPages = Number(res.data.data.pages);

View File

@@ -47,14 +47,14 @@
showSearch showSearch
></a-select> ></a-select>
</div> </div>
<!-- <div class="select">--> <div class="select">
<!-- <a-date-picker--> <a-range-picker
<!-- v-model:value="searchParam.createTime"--> v-model:value="searchParam.valueDate"
<!-- type="date"--> style="border-radius: 8px; height: 40px; margin-left: 5px"
<!-- placeholder="创建时间"--> :placeholder="[' 开始时间', ' 结束时间']"
<!-- style="width: 270px"--> valueFormat="X"
<!-- />--> />
<!-- </div>--> </div>
<div style="display: flex; margin-bottom: 20px"> <div style="display: flex; margin-bottom: 20px">
<div class="btnn btn1" @click="searchSubmit"> <div class="btnn btn1" @click="searchSubmit">
<div class="search"></div> <div class="search"></div>
@@ -210,6 +210,7 @@
<ProjectManager <ProjectManager
v-model:value="projectInfo.managerId" v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager" v-model:name="projectInfo.manager"
mode="multiple"
></ProjectManager> ></ProjectManager>
</div> </div>
</div> </div>
@@ -735,7 +736,6 @@
</div> </div>
</div> </div>
</a-modal> </a-modal>
<!-- 授权名单抽屉 --> <!-- 授权名单抽屉 -->
<proj-power-list <proj-power-list
v-model:ProjPvisible="ProjPvisible" v-model:ProjPvisible="ProjPvisible"
@@ -749,13 +749,13 @@
classify="project" classify="project"
/> />
<!-- 查看权抽屉 --> <!-- 查看权抽屉 -->
<!-- <proj-check-ship <proj-check-ship
v-model:ProjCheckvisible="ProjCheckvisible" v-model:ProjCheckvisible="ProjCheckvisible"
:selectProjectId="selectProjectId" :selectProjectId="selectProjectId"
v-model:addAuthList="addAuthList" v-model:addAuthList="addAuthList"
:authClassify="authClassify" :authClassify="authClassify"
classify="project" classify="project"
/> --> />
<!-- 管理权抽屉 --> <!-- 管理权抽屉 -->
<proj-check-ship <proj-check-ship
v-model:ProjCheckvisible="ProjCheckvisible" v-model:ProjCheckvisible="ProjCheckvisible"
@@ -780,7 +780,6 @@ import { storage } from "../../api/storage";
import ProjectManager from "@/components/project/ProjectManager"; import ProjectManager from "@/components/project/ProjectManager";
import ProjectClass from "@/components/project/ProjectClass"; import ProjectClass from "@/components/project/ProjectClass";
import OrgClass from "@/components/project/OrgClass"; import OrgClass from "@/components/project/OrgClass";
export default { export default {
name: "projectManage", name: "projectManage",
components: { components: {
@@ -816,23 +815,18 @@ export default {
reminderModal: false, //温馨提示弹窗 reminderModal: false, //温馨提示弹窗
reviewModal: false, //提交审核 reviewModal: false, //提交审核
recallReviewModal: false, //撤回审核 recallReviewModal: false, //撤回审核
ProjOwnervisible: false, ProjOwnervisible: false,
ProjPvisible: false, ProjPvisible: false,
ProjCheckvisible: false, ProjCheckvisible: false,
ProjManagevisible: false, ProjManagevisible: false,
currentProjectId: "", currentProjectId: "",
currentProjectName: "", currentProjectName: "",
currentEdProjectName: "", currentEdProjectName: "",
currentEditChildrensProjectId: "", currentEditChildrensProjectId: "",
dcProjectID: "", dcProjectID: "",
currentPage: 1, //当前页 currentPage: 1, //当前页
tableDataTotal: -1, //学习路径列表总数 tableDataTotal: -1, //学习路径列表总数
pageSize: 10, //每页10条数据 pageSize: 10, //每页10条数据
projectStudentsNum: 0, //发布弹窗-学员人 projectStudentsNum: 0, //发布弹窗-学员人
projectStages: 0, projectStages: 0,
projectTasks: 0, projectTasks: 0,
@@ -846,12 +840,9 @@ export default {
copyProjectId: null, //复制项目id copyProjectId: null, //复制项目id
reviewId: null, //提交审核id reviewId: null, //提交审核id
recallReviewId: null, //撤回审核id recallReviewId: null, //撤回审核id
selectProjectId: null, //选择的授权id selectProjectId: null, //选择的授权id
addAuthList: null, //确定授权列表 addAuthList: null, //确定授权列表
authClassify: null, //显示的是管理权还是查看权 authClassify: null, //显示的是管理权还是查看权
currentPage1: 1, //项目经理分页 currentPage1: 1, //项目经理分页
pageSize1: 10, pageSize1: 10,
projectInfo: {}, projectInfo: {},
@@ -867,10 +858,10 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
}, },
valueDate: [],
}); });
// 数据接入 - start - // 数据接入 - start -
const router = useRouter(); const router = useRouter();
const sProjectStateList = ref([ const sProjectStateList = ref([
{ value: 0, label: "草稿" }, { value: 0, label: "草稿" },
{ value: 1, label: "审核中" }, { value: 1, label: "审核中" },
@@ -878,17 +869,24 @@ export default {
{ value: 3, label: "已发布" }, { value: 3, label: "已发布" },
{ value: -2, label: "未通过" }, { value: -2, label: "未通过" },
]); ]);
const searchReset = () => { const searchReset = () => {
state.searchParam = { pageNo: 1, pageSize: 10 }; state.searchParam = { pageNo: 1, pageSize: 10 };
getTableDate(); getTableDate();
}; };
const searchSubmit = () => { const searchSubmit = () => {
state.searchParam.pageNo = 1; state.searchParam.pageNo = 1;
getTableDate(); getTableDate();
}; };
function timeChange(e) {
console.log(e);
if (e && e.length === 2) {
state.searchParam.beginTime = e[0];
state.searchParam.endTime = e[1];
} else {
state.searchParam.beginTime = "";
state.searchParam.endTime = "";
}
}
function validate(obj, errorMsgs) { function validate(obj, errorMsgs) {
for (let i in errorMsgs) { for (let i in errorMsgs) {
if (!obj[i]) { if (!obj[i]) {
@@ -899,7 +897,6 @@ export default {
} }
return true; return true;
} }
// 创建多层项目 // 创建多层项目
const createStoreyProject = () => { const createStoreyProject = () => {
// 接口需要传递的参数信息 // 接口需要传递的参数信息
@@ -938,7 +935,6 @@ export default {
const closeeditModal2 = () => { const closeeditModal2 = () => {
state.eddoublepro = false; state.eddoublepro = false;
}; };
// 创建单层子项目 (需要传入多层项目的ProjectID) // 创建单层子项目 (需要传入多层项目的ProjectID)
const createChildProject = () => { const createChildProject = () => {
console.log(state.currentProjectId); console.log(state.currentProjectId);
@@ -950,16 +946,13 @@ export default {
}, },
}); });
}; };
// 取消按钮 清空数据 // 取消按钮 清空数据
const closeModal3 = () => { const closeModal3 = () => {
state.doublesonpro = false; state.doublesonpro = false;
}; };
const closeeditModal3 = () => { const closeeditModal3 = () => {
state.eddoublesonpro = false; state.eddoublesonpro = false;
}; };
//打开发布弹窗 //打开发布弹窗
const showProjectPub = (object) => { const showProjectPub = (object) => {
state.projectPub = true; state.projectPub = true;
@@ -1160,7 +1153,6 @@ export default {
console.log("复制失败", err); console.log("复制失败", err);
}); });
}; };
//打开提交审核弹窗 //打开提交审核弹窗
const showReviewModal = (projectId) => { const showReviewModal = (projectId) => {
state.reviewModal = true; state.reviewModal = true;
@@ -1190,7 +1182,6 @@ export default {
const closeReviewModal = () => { const closeReviewModal = () => {
state.reviewModal = false; state.reviewModal = false;
}; };
//打开撤回审核弹窗 //打开撤回审核弹窗
const showRecallReviewModal = (projectId) => { const showRecallReviewModal = (projectId) => {
state.recallReviewModal = true; state.recallReviewModal = true;
@@ -1220,15 +1211,12 @@ export default {
const closeRecallReviewModal = () => { const closeRecallReviewModal = () => {
state.recallReviewModal = false; state.recallReviewModal = false;
}; };
const expandTable = (e, a) => { const expandTable = (e, a) => {
// console.log("惦记了"); // console.log("惦记了");
console.log("e", e, a); console.log("e", e, a);
}; };
// 获取项目列表信息 // 获取项目列表信息
let tableData = ref([]); let tableData = ref([]);
const columns = ref([ const columns = ref([
{ {
title: "项目名称", title: "项目名称",
@@ -1359,7 +1347,7 @@ export default {
编辑 编辑
</span> </span>
) : ( ) : (
<div className="operation1"></div> ""
)} )}
{(value.record.status === 0 || value.record.status === -2) && {(value.record.status === 0 || value.record.status === -2) &&
value.record.type === 3 ? ( value.record.type === 3 ? (
@@ -1560,9 +1548,22 @@ export default {
}, },
}, },
]); ]);
const getTableDate = () => const getTableDate = () =>
api.getProjectList(state.searchParam).then((res) => { api
.getProjectList({
...state.searchParam,
beginTime:
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? state.searchParam.valueDate[0]
: "",
endTime:
state.searchParam.valueDate &&
state.searchParam.valueDate.length === 2
? state.searchParam.valueDate[1]
: "",
})
.then((res) => {
console.log(res); console.log(res);
state.tableDataTotal = Number(res.data.data.total); state.tableDataTotal = Number(res.data.data.total);
const data = res.data.data.rows; const data = res.data.data.rows;
@@ -1571,7 +1572,6 @@ export default {
tableData.value = data; tableData.value = data;
console.log("tableData", tableData); console.log("tableData", tableData);
}); });
function initDataSublist(parentName, data) { function initDataSublist(parentName, data) {
if (data && data.length) { if (data && data.length) {
data.forEach((e) => { data.forEach((e) => {
@@ -1582,22 +1582,18 @@ export default {
}); });
} }
} }
getTableDate(); getTableDate();
// 翻页 // 翻页
const changePagination = (page) => { const changePagination = (page) => {
state.searchParam.pageNo = page; state.searchParam.pageNo = page;
getTableDate(); getTableDate();
}; };
const showModal = () => { const showModal = () => {
state.sonproject = true; state.sonproject = true;
}; };
const closeModal = () => { const closeModal = () => {
state.sonproject = false; state.sonproject = false;
}; };
const showModal1 = () => { const showModal1 = () => {
state.projectInfo = {}; state.projectInfo = {};
state.reminderModal = true; state.reminderModal = true;
@@ -1605,17 +1601,14 @@ export default {
const closeModal1 = () => { const closeModal1 = () => {
state.estabish = false; state.estabish = false;
}; };
const showModal2 = () => { const showModal2 = () => {
state.doublepro = true; state.doublepro = true;
state.estabish = false; state.estabish = false;
}; };
const showModal3 = () => { const showModal3 = () => {
state.doublesonpro = true; state.doublesonpro = true;
state.sonproject = false; state.sonproject = false;
}; };
const showProjOwner = (id) => { const showProjOwner = (id) => {
state.ProjOwnervisible = true; state.ProjOwnervisible = true;
state.selectProjectId = id; state.selectProjectId = id;
@@ -1635,7 +1628,6 @@ export default {
// state.ProjManagevisible = true; // state.ProjManagevisible = true;
state.ProjCheckvisible = true; state.ProjCheckvisible = true;
}; };
const closeReminderModal = () => { const closeReminderModal = () => {
state.reminderModal = false; state.reminderModal = false;
}; };
@@ -1643,7 +1635,6 @@ export default {
state.reminderModal = false; state.reminderModal = false;
state.estabish = true; state.estabish = true;
}; };
//添加权限 //添加权限
watch( watch(
() => state.addAuthList, () => state.addAuthList,
@@ -1676,6 +1667,7 @@ export default {
); );
return { return {
...toRefs(state), ...toRefs(state),
timeChange,
expandTable, expandTable,
showModal, showModal,
closeModal, closeModal,
@@ -1707,7 +1699,6 @@ export default {
showRecallReviewModal, showRecallReviewModal,
recallReviewProject, recallReviewProject,
closeRecallReviewModal, closeRecallReviewModal,
tableData, tableData,
columns, columns,
createStoreyProject, createStoreyProject,
@@ -1734,10 +1725,9 @@ export default {
<style lang="scss"> <style lang="scss">
.projectManage { .projectManage {
width: 100%; width: 100%;
// height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.filter { .filter {
margin-left: 38px; margin-left: 38px;
margin-right: 38px; margin-right: 38px;
@@ -1745,16 +1735,13 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
.filterItems { .filterItems {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.select { .select {
margin-right: 20px; margin-right: 20px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.btn { .btn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
@@ -1767,11 +1754,9 @@ export default {
margin-right: 14px; margin-right: 14px;
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
.search { .search {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -1780,7 +1765,6 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
} }
.btnn { .btnn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
@@ -1793,11 +1777,9 @@ export default {
margin-right: 14px; margin-right: 14px;
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
.search { .search {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -1806,7 +1788,6 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
} }
.btn1 { .btn1 {
.search { .search {
width: 15px; width: 15px;
@@ -1814,7 +1795,6 @@ export default {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
} }
.btn2 { .btn2 {
.search { .search {
width: 16px; width: 16px;
@@ -1822,35 +1802,27 @@ export default {
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset1.png");
} }
} }
.btn1:hover { .btn1:hover {
background: rgba(64, 158, 255, 0.76); background: rgba(64, 158, 255, 0.76);
.search { .search {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
.btnText { .btnText {
color: #ffffff; color: #ffffff;
} }
} }
.btn1:active { .btn1:active {
background: #0982ff; background: #0982ff;
} }
.btn2:hover { .btn2:hover {
background: rgba(64, 158, 255, 0.1); background: rgba(64, 158, 255, 0.1);
} }
.btn2:active { .btn2:active {
background: rgba(64, 158, 255, 0.2); background: rgba(64, 158, 255, 0.2);
} }
} }
.btns { .btns {
display: flex; display: flex;
// flex-wrap: wrap; // flex-wrap: wrap;
.btn { .btn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
@@ -1864,11 +1836,9 @@ export default {
justify-content: center; justify-content: center;
margin-right: 14px; margin-right: 14px;
flex-shrink: 0; flex-shrink: 0;
.search { .search {
background-size: 100%; background-size: 100%;
} }
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -1877,30 +1847,24 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
} }
.btn3 { .btn3 {
margin-right: 0px; margin-right: 0px;
.search { .search {
width: 17px; width: 17px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/add0.png"); background-image: url("../../assets/images/courseManage/add0.png");
} }
} }
.btn3:hover { .btn3:hover {
background: rgba(64, 158, 255, 0.76); background: rgba(64, 158, 255, 0.76);
} }
.btn3:active { .btn3:active {
background: #0982ff; background: #0982ff;
} }
} }
} }
.tableBox { .tableBox {
margin: 20px 38px 30px; margin: 20px 38px 30px;
.ant-table-thead > tr > th { .ant-table-thead > tr > th {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -1910,10 +1874,8 @@ export default {
background-color: #eff4fc; background-color: #eff4fc;
} }
} }
.tableBox { .tableBox {
padding-bottom: 20px; padding-bottom: 20px;
.pa { .pa {
// position: absolute; // position: absolute;
// bottom: 20px; // bottom: 20px;
@@ -1928,33 +1890,28 @@ export default {
// bottom: -40px; // bottom: -40px;
} }
} }
.operation { .operation {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #4ea6ff; color: #4ea6ff;
// line-height: 36px; // line-height: 36px;
.operation1 { .operation1 {
margin-left: 21px; margin-left: 21px;
width: 28px; width: 28px;
display: inline-block; display: inline-block;
} }
.operation3 { .operation3 {
margin-left: 21px; margin-left: 21px;
width: 70px; width: 70px;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
} }
.more { .more {
width: 50px; width: 50px;
display: inline-block; display: inline-block;
margin-left: 21px; margin-left: 21px;
position: relative; position: relative;
text-align: left; text-align: left;
// z-index: 99999; // z-index: 99999;
.moreArrow { .moreArrow {
width: 13px; width: 13px;
@@ -1965,7 +1922,6 @@ export default {
margin: 2px; margin: 2px;
margin-left: 7px; margin-left: 7px;
} }
.moreItems { .moreItems {
width: 80px; width: 80px;
padding: 5px; padding: 5px;
@@ -1981,17 +1937,14 @@ export default {
text-align: center; text-align: center;
} }
} }
.more:hover .moreArrow { .more:hover .moreArrow {
background-image: url("../../assets/images/navtop/up.png"); background-image: url("../../assets/images/navtop/up.png");
} }
.more:hover .moreItems { .more:hover .moreItems {
display: block; display: block;
} }
} }
} }
.doublesonpro { .doublesonpro {
.ant-modal { .ant-modal {
.ant-modal-body { .ant-modal-body {
@@ -2002,15 +1955,12 @@ export default {
rgba(78, 166, 255, 0.2) 100% rgba(78, 166, 255, 0.2) 100%
); );
} }
padding: 0; padding: 0;
.modalMain { .modalMain {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
//align-items: center; //align-items: center;
margin-left: 60px; margin-left: 60px;
.name { .name {
//width: 90%; //width: 90%;
// background-color: lightcoral; // background-color: lightcoral;
@@ -2020,30 +1970,25 @@ export default {
align-items: center; align-items: center;
height: 40px; height: 40px;
// border: 1px solid black; // border: 1px solid black;
.inname { .inname {
color: #000000; color: #000000;
font-size: 14px; font-size: 14px;
margin-left: 7px; margin-left: 7px;
} }
.in { .in {
margin-left: 14px; margin-left: 14px;
width: 80%; width: 80%;
.ant-input { .ant-input {
border-radius: 5px; border-radius: 5px;
// height: 120%; // height: 120%;
width: 80%; width: 80%;
height: 30px; height: 30px;
} }
.ant-select { .ant-select {
border-radius: 5px; border-radius: 5px;
// height: 120%; // height: 120%;
width: 80%; width: 80%;
height: 40px; height: 40px;
.ant-select-selector { .ant-select-selector {
border-radius: 8px; border-radius: 8px;
// height: 120%; // height: 120%;
@@ -2053,12 +1998,10 @@ export default {
} }
} }
} }
.pubtn { .pubtn {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 25px; margin-top: 25px;
//margin-bottom: 29px; //margin-bottom: 29px;
.pubtn1 { .pubtn1 {
width: 100px; width: 100px;
@@ -2073,7 +2016,6 @@ export default {
align-items: center; align-items: center;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
} }
.pubtn2 { .pubtn2 {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -2091,7 +2033,6 @@ export default {
} }
} }
} }
.doublepro { .doublepro {
.ant-modal { .ant-modal {
.ant-modal-body { .ant-modal-body {
@@ -2102,14 +2043,11 @@ export default {
rgba(78, 166, 255, 0.2) 100% rgba(78, 166, 255, 0.2) 100%
); );
} }
padding: 0; padding: 0;
.modalMain { .modalMain {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.name { .name {
width: 78%; width: 78%;
// background-color: lightcoral; // background-color: lightcoral;
@@ -2119,30 +2057,25 @@ export default {
align-items: center; align-items: center;
height: 40px; height: 40px;
// border: 1px solid black; // border: 1px solid black;
.inname { .inname {
color: #000000; color: #000000;
font-size: 14px; font-size: 14px;
margin-left: 7px; margin-left: 7px;
} }
.in { .in {
margin-left: 14px; margin-left: 14px;
width: 81%; width: 81%;
.ant-input { .ant-input {
border-radius: 5px; border-radius: 5px;
// height: 120%; // height: 120%;
width: 100%; width: 100%;
height: 30px; height: 30px;
} }
.ant-select { .ant-select {
border-radius: 5px; border-radius: 5px;
// height: 120%; // height: 120%;
width: 100%; width: 100%;
height: 40px; height: 40px;
.ant-select-selector { .ant-select-selector {
border-radius: 8px; border-radius: 8px;
// height: 120%; // height: 120%;
@@ -2152,12 +2085,10 @@ export default {
} }
} }
} }
.pubtn { .pubtn {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 25px; margin-top: 25px;
//margin-bottom: 29px; //margin-bottom: 29px;
.pubtn1 { .pubtn1 {
width: 100px; width: 100px;
@@ -2172,7 +2103,6 @@ export default {
align-items: center; align-items: center;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
} }
.pubtn2 { .pubtn2 {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -2190,12 +2120,10 @@ export default {
} }
} }
} }
.sonproject { .sonproject {
.ant-modal { .ant-modal {
.ant-modal-body { .ant-modal-body {
padding: 0 !important; padding: 0 !important;
.modalHeader { .modalHeader {
background: linear-gradient( background: linear-gradient(
0deg, 0deg,
@@ -2203,12 +2131,10 @@ export default {
rgba(78, 166, 255, 0.2) 100% rgba(78, 166, 255, 0.2) 100%
); );
} }
.modalMain { .modalMain {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 48px; margin-top: 48px;
//margin-bottom: 40px; //margin-bottom: 40px;
.taskbox { .taskbox {
width: 310px; width: 310px;
@@ -2217,25 +2143,21 @@ export default {
position: relative; position: relative;
margin-bottom: 80px; margin-bottom: 80px;
cursor: pointer; cursor: pointer;
.leftt { .leftt {
position: absolute; position: absolute;
top: 18px; top: 18px;
left: 0; left: 0;
} }
.photo { .photo {
position: absolute; position: absolute;
top: 44px; top: 44px;
left: 40px; left: 40px;
} }
.rightt { .rightt {
position: absolute; position: absolute;
top: 69px; top: 69px;
right: 26px; right: 26px;
} }
.centerbox { .centerbox {
position: absolute; position: absolute;
top: 66px; top: 66px;
@@ -2244,7 +2166,6 @@ export default {
font-weight: 700; font-weight: 700;
//line-height: 36px; //line-height: 36px;
} }
.centermain { .centermain {
color: rgba(135, 139, 146, 1); color: rgba(135, 139, 146, 1);
font-size: 14px; font-size: 14px;
@@ -2257,12 +2178,10 @@ export default {
} }
} }
} }
.estabish { .estabish {
.ant-modal { .ant-modal {
.ant-modal-body { .ant-modal-body {
padding: 0 !important; padding: 0 !important;
.modalHeader { .modalHeader {
background: linear-gradient( background: linear-gradient(
0deg, 0deg,
@@ -2270,13 +2189,11 @@ export default {
rgba(78, 166, 255, 0.2) 100% rgba(78, 166, 255, 0.2) 100%
); );
} }
.modalMain { .modalMain {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-top: 48px; margin-top: 48px;
//margin-bottom: 40px; //margin-bottom: 40px;
.taskbox { .taskbox {
width: 438px; width: 438px;
@@ -2285,25 +2202,21 @@ export default {
position: relative; position: relative;
margin-bottom: 24px; margin-bottom: 24px;
cursor: pointer; cursor: pointer;
.leftt { .leftt {
position: absolute; position: absolute;
top: 18px; top: 18px;
left: 0; left: 0;
} }
.photo { .photo {
position: absolute; position: absolute;
top: 44px; top: 44px;
left: 40px; left: 40px;
} }
.rightt { .rightt {
position: absolute; position: absolute;
top: 69px; top: 69px;
right: 26px; right: 26px;
} }
.centerbox { .centerbox {
position: absolute; position: absolute;
top: 42px; top: 42px;
@@ -2312,7 +2225,6 @@ export default {
font-weight: 500; font-weight: 500;
//line-height: 36px; //line-height: 36px;
} }
.centerbox1 { .centerbox1 {
position: absolute; position: absolute;
top: 32px; top: 32px;
@@ -2321,7 +2233,6 @@ export default {
font-weight: 500; font-weight: 500;
//line-height: 36px; //line-height: 36px;
} }
.centermain { .centermain {
color: rgba(135, 139, 146, 1); color: rgba(135, 139, 146, 1);
font-size: 14px; font-size: 14px;
@@ -2331,7 +2242,6 @@ export default {
left: 120px; left: 120px;
top: 78px; top: 78px;
} }
.centermain1 { .centermain1 {
color: rgba(135, 139, 146, 1); color: rgba(135, 139, 146, 1);
font-size: 14px; font-size: 14px;
@@ -2346,21 +2256,17 @@ export default {
} }
} }
} }
.CopyModal { .CopyModal {
.ant-modal { .ant-modal {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
.ant-modal-content { .ant-modal-content {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
.ant-modal-body { .ant-modal-body {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
padding: 0 !important; padding: 0 !important;
.delete { .delete {
z-index: 999; z-index: 999;
width: 424px; width: 424px;
@@ -2368,7 +2274,6 @@ export default {
background: #ffffff; background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px; border-radius: 4px;
// position: absolute; // position: absolute;
// left: 50%; // left: 50%;
// top: 10%; // top: 10%;
@@ -2382,18 +2287,15 @@ export default {
rgba(78, 166, 255, 0) 100% rgba(78, 166, 255, 0) 100%
); );
} }
.del_main { .del_main {
width: 100%; width: 100%;
position: relative; position: relative;
.header { .header {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 20px; padding-top: 20px;
padding-left: 26px; padding-left: 26px;
font-size: 16px; font-size: 16px;
.icon { .icon {
width: 16px; width: 16px;
height: 16px; height: 16px;
@@ -2401,7 +2303,6 @@ export default {
background-image: url(@/assets/images/coursewareManage/QR.png); background-image: url(@/assets/images/coursewareManage/QR.png);
background-size: 100% 100%; background-size: 100% 100%;
} }
.close_exit { .close_exit {
position: absolute; position: absolute;
right: 42px; right: 42px;
@@ -2412,7 +2313,6 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.body { .body {
width: 100%; width: 100%;
margin: 34px auto 56px auto; margin: 34px auto 56px auto;
@@ -2422,7 +2322,6 @@ export default {
flex-direction: column; flex-direction: column;
// background-color: red; // background-color: red;
position: relative; position: relative;
.back { .back {
position: absolute; position: absolute;
top: 30px; top: 30px;
@@ -2431,12 +2330,10 @@ export default {
color: #666666; color: #666666;
} }
} }
.del_btnbox { .del_btnbox {
display: flex; display: flex;
margin: 30px auto; margin: 30px auto;
justify-content: center; justify-content: center;
.del_btn { .del_btn {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -2445,23 +2342,19 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
line-height: 40px; line-height: 40px;
} }
} }
.btn1 { .btn1 {
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff; color: #4ea6ff;
margin-right: 14px; margin-right: 14px;
} }
.btn2 { .btn2 {
background-color: #4ea6ff; background-color: #4ea6ff;
color: #ffffff; color: #ffffff;
@@ -2473,19 +2366,16 @@ export default {
} }
} }
} }
.projectPub { .projectPub {
.ant-modal { .ant-modal {
.ant-modal-body { .ant-modal-body {
padding: 0; padding: 0;
.modalHeader { .modalHeader {
background: linear-gradient( background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100% rgba(78, 166, 255, 0) 100%
); );
} }
.modalMain { .modalMain {
.projectname { .projectname {
color: rgba(79, 81, 86, 1); color: rgba(79, 81, 86, 1);
@@ -2495,28 +2385,23 @@ export default {
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
} }
.projecttime { .projecttime {
margin-left: 221px; margin-left: 221px;
.timeti { .timeti {
color: rgba(153, 155, 163, 1); color: rgba(153, 155, 163, 1);
font-size: 14px; font-size: 14px;
line-height: 36px; line-height: 36px;
} }
.timeme { .timeme {
color: rgba(79, 81, 86, 1); color: rgba(79, 81, 86, 1);
font-size: 14px; font-size: 14px;
line-height: 36px; line-height: 36px;
} }
} }
.projectbox { .projectbox {
margin-top: 26px; margin-top: 26px;
display: flex; display: flex;
justify-content: center; justify-content: center;
.promessage { .promessage {
width: 280px; width: 280px;
height: 110px; height: 110px;
@@ -2527,7 +2412,6 @@ export default {
); );
border-radius: 10px; border-radius: 10px;
margin-right: 7px; margin-right: 7px;
.messageme { .messageme {
color: rgba(255, 182, 78, 1); color: rgba(255, 182, 78, 1);
font-size: 14px; font-size: 14px;
@@ -2535,14 +2419,12 @@ export default {
margin-top: 17px; margin-top: 17px;
margin-left: 30px; margin-left: 30px;
} }
.messagege { .messagege {
color: rgba(153, 155, 163, 1); color: rgba(153, 155, 163, 1);
font-size: 14px; font-size: 14px;
margin-left: 30px; margin-left: 30px;
} }
} }
.stumessage { .stumessage {
width: 280px; width: 280px;
height: 110px; height: 110px;
@@ -2552,7 +2434,6 @@ export default {
rgba(240, 248, 254, 1) rgba(240, 248, 254, 1)
); );
border-radius: 10px; border-radius: 10px;
.messageme1 { .messageme1 {
color: rgba(78, 166, 255, 1); color: rgba(78, 166, 255, 1);
font-size: 14px; font-size: 14px;
@@ -2560,7 +2441,6 @@ export default {
margin-top: 17px; margin-top: 17px;
margin-left: 30px; margin-left: 30px;
} }
.messagege1 { .messagege1 {
color: rgba(153, 155, 163, 1); color: rgba(153, 155, 163, 1);
font-size: 14px; font-size: 14px;
@@ -2568,32 +2448,26 @@ export default {
} }
} }
} }
.send { .send {
margin-top: 30px; margin-top: 30px;
margin-left: 61px; margin-left: 61px;
.sendtext { .sendtext {
margin-left: 11px; margin-left: 11px;
color: rgba(109, 117, 132, 1); color: rgba(109, 117, 132, 1);
font-size: 14px; font-size: 14px;
} }
} }
.ckb { .ckb {
margin-top: 20px; margin-top: 20px;
margin-left: 62px; margin-left: 62px;
.sendpeo { .sendpeo {
color: rgba(109, 117, 132, 1); color: rgba(109, 117, 132, 1);
font-size: 14px; font-size: 14px;
} }
.ant-checkbox-inner { .ant-checkbox-inner {
border-radius: 4px; border-radius: 4px;
} }
} }
.pubtn { .pubtn {
display: flex; display: flex;
justify-content: center; justify-content: center;
@@ -2612,7 +2486,6 @@ export default {
align-items: center; align-items: center;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
} }
.pubtn2 { .pubtn2 {
width: 100px; width: 100px;
height: 40px; height: 40px;

View File

@@ -383,31 +383,33 @@
> >
<img <img
:src=" :src="
item.type == '1' item.type == 1
? require('../../assets/images/leveladd/zai.png') ? require('../../assets/images/leveladd/zai.png')
: item.type == '2' : item.type == 2
? require('../../assets/images/leveladd/mian.png') ? require('../../assets/images/leveladd/mian.png')
: item.type == '3' : item.type == 3
? require('../../assets/images/leveladd/an.png') ? require('../../assets/images/leveladd/an.png')
: item.type == '4' : item.type == 4
? require('../../assets/images/leveladd/zuo.png') ? require('../../assets/images/leveladd/zuo.png')
: item.type == '5' : item.type == 5
? require('../../assets/images/leveladd/kao.png') ? require('../../assets/images/leveladd/kao.png')
: item.type == '6' : item.type == 6
? require('../../assets/images/leveladd/zhi.png') ? require('../../assets/images/leveladd/zhi.png')
: item.type == '7' : item.type == 7
? require('../../assets/images/leveladd/wai.png') ? require('../../assets/images/leveladd/wai.png')
: item.type == '8' : item.type == 8
? require('../../assets/images/leveladd/tao.png') ? require('../../assets/images/leveladd/tao.png')
: item.type == '9' : item.type == 9
? require('../../assets/images/leveladd/huo.png') ? require('../../assets/images/leveladd/huo.png')
: item.type == '10' : item.type == 10
? require('../../assets/images/leveladd/ce.png') ? require('../../assets/images/leveladd/ce.png')
: item.type == '11' : item.type == 11
? require('../../assets/images/leveladd/diao.png') ? require('../../assets/images/leveladd/pinggu.png')
: item.type == '12' : item.type == 12
? require('../../assets/images/leveladd/tou.png') ? require('../../assets/images/leveladd/tou.png')
: null : item.type == 13
? require('../../assets/images/leveladd/tou.png')
: require('../../assets/images/leveladd/xiangmu.png')
" "
/> />
</div> </div>
@@ -427,11 +429,11 @@
</div> </div>
<div class="time"> <div class="time">
<div class="timetext">开始时间</div> <div class="timetext">开始时间</div>
<div class="timetext">{{ item.createTime }}</div> <div class="timetext">{{item.startTime!==null?item.startTime[0]+'-'+ item.startTime[1]+'-'+item.startTime[2]:''}}</div>
</div> </div>
<div class="progress"> <div class="progress">
<div class="progresstext"> <div class="progresstext">
{{ item.finishStuCnt }}/{{ item.totalStuCnt }} {{ item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 }}/{{ item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0 }}
</div> </div>
<div style="display: flex"> <div style="display: flex">
<a-progress <a-progress
@@ -442,7 +444,7 @@
/> />
<span class="progresstext" style="margin-left: 10px" <span class="progresstext" style="margin-left: 10px"
>{{ >{{
(item.finishStuCnt / item.totalStuCnt) * 100 (item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 / item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0) * 100
}}%</span }}%</span
> >
</div> </div>
@@ -3248,8 +3250,10 @@ export default {
}).then((res) => { }).then((res) => {
console.log("get task", res.data.data); console.log("get task", res.data.data);
let info = res.data.data.projectInfo; let info = res.data.data.projectInfo;
let start = toDate(info.beginTime / 1000, "Y-M-D h:m"); // let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
let end = toDate(info.endTime / 1000, "Y-M-D h:m"); let start = info.beginTime
// let end = toDate(info.endTime / 1000, "Y-M-D h:m");
let end = info.endTime
state.tstartTime = info.beginTime; state.tstartTime = info.beginTime;
state.tendTime = info.endTime; state.tendTime = info.endTime;
state.tsourceBelong = info.sourceBelongId; state.tsourceBelong = info.sourceBelongId;
@@ -3823,6 +3827,7 @@ export default {
templateProject, templateProject,
changeGrouped, changeGrouped,
deFile, deFile,
toDate
}; };
}, },
}; };

View File

@@ -14,8 +14,7 @@ module.exports = defineConfig({
port: 8080, port: 8080,
proxy: { proxy: {
"/manageApi": { "/manageApi": {
// target:"http://192.168.56.245:30001/", target:"http://111.231.196.214:30001/",
target: "http://localhost:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
changeOrigin: true, //表示是否改变原域名 changeOrigin: true, //表示是否改变原域名
// secure: false, // secure: false,
// ws: false, //表示WebSocket协议 // ws: false, //表示WebSocket协议