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

Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

Browse Source
This commit is contained in:
kclf
2022-12-08 17:29:55 +08:00
parent 827b0cba95 58d80e0f38
commit c2c9974890
15 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本0.9.5------------");
console.log("版本0.9.6------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});

2
src/api/config.js
View File

@@ -56,7 +56,7 @@ http.interceptors.response.use(
return response;
} else {
if (code === 1000) {
// window.open("https://u-pre.boe.com/web/", '_self');
window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self');
}
console.log("api %o", msg);

BIN
src/assets/images/coursewareManage/docpic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/assets/images/coursewareManage/pdfpic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/assets/images/coursewareManage/pngpic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/assets/images/coursewareManage/pptpic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/assets/images/coursewareManage/xlspic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/assets/images/coursewareManage/zippic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

2
src/components/TwoDimensionalCode.vue
View File

@@ -7,7 +7,7 @@
:closable="closableQR"
wrapClassName="codeModal"
style="margin-top: 400px"
:zIndex="999"
:zIndex="9999"
@cancel="qr_exit"
>
<div id="qrcode" class="QR">

4
src/components/drawers/NoticePub.vue
View File

@@ -103,7 +103,7 @@ export default {
return message.warning("请输入公告内容");
} else {
let obj = {
notice: state.noticeContent1,
notice: state.noticeContent,
projectId: props.projectId,
title: "",
};
@@ -147,7 +147,7 @@ export default {
.noticeTitle {
margin-left: 32px;
margin-right: 32px;
// padding-top: 20px;
margin-bottom: 100px;
.notitle {
height: 55px;
border-bottom: 1px solid #ededed;

3
src/components/drawers/ProjectAudit.vue
View File

@@ -116,7 +116,8 @@
</div>
<div class="setc_name"><span>审核意见：</span></div>
<div class="setc_main">
<a-textarea v-model:value="valueSuggest" :rows="4"/>
<a-textarea v-model:value="valueSuggest" :rows="4" show-count
:maxlength="20"/>
</div>
</div>
</div>

46
src/views/courselibrary/CoursewareManage.vue
View File

@@ -1626,8 +1626,16 @@
<a
@click="
() => {
QR_hs = true;
ftsQR_hs = true;
//QR_hs = true;
//ftsQR_hs = true;
codevisible = true;
codeIndex = 0;
codeType = 0;
codeInfo = {
title: '面授课签到',
name: record.name,
url: codeUrl,
};
}
"
>
@@ -1675,8 +1683,16 @@
<a-menu-item
@click="
() => {
QR_hs = true;
vipftQR_hs = true;
//QR_hs = true;
//vipftQR_hs = true;
codevisible = true;
codeIndex = 1;
codeType = 1;
codeInfo = {
title: '面授课二维码',
name: record.name,
url: codeUrl,
};
}
"
>
@@ -2626,6 +2642,15 @@
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="" />
</div>
<!-- 二维码弹窗 -->
<two-dimensional-code
v-model:codevisible="codevisible"
:codeInfo="codeInfo"
:index="codeIndex"
:type="codeType === 1 ? '课程二维码' : '签到二维码'"
/>
<!-- 二维码弹窗 -->
</template>
<script>
import {
@@ -2687,7 +2712,8 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
import SeeModal from "./components/seeModal.vue";
import CourseModal from "./courseModal.vue";
import * as moment from "moment";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import { codeUrl } from "../../api/method";
//列表表格
const columns1 = [
{
@@ -2835,7 +2861,7 @@ const columns1 = [
},
},
{
title: "上线时间",
title: "发布时间",
width: 160,
dataIndex: "pubtime",
key: "10",
@@ -3203,6 +3229,7 @@ export default defineComponent({
// return attrs.vnodes;
// },
addOnlineCourse,
TwoDimensionalCode,
},
setup() {
const CourseModalRef = ref(null);
@@ -3471,6 +3498,9 @@ export default defineComponent({
assessmentId: null,
assessmentName: "",
assessmentVisible: false,
codevisible: false, //二维码弹窗
codeInfo: null, //二维码内容
codeUrl: codeUrl,
});
const showStuAdd = (record) => {
@@ -3977,7 +4007,7 @@ export default defineComponent({
};
// console.log("获取学员信息", obj);
let res = await studentList(obj);
// console.log("获取学员列表", res);
console.log("获取学员列表", res);
const { rows, total, pageNo } = res.data.data;
state.tableDataTotal3 = total;
@@ -4103,6 +4133,7 @@ export default defineComponent({
address: "address",
starttime: "beginTime",
createtime: "createTime",
createName: "createName",
},
true
);
@@ -4110,6 +4141,7 @@ export default defineComponent({
itm.pageNo = pageNo;
});
state.tableData6 = datas;
console.log("state.tableData6", state.tableData6);
};
const options1 = ref([

18
src/views/courselibrary/components/seeModal.vue
View File

@@ -160,7 +160,23 @@
:key="index"
>
<div class="file_img">
<img :src="item.img" />
<img v-if="(item.indexOf('jpg')!==-1 ||item.indexOf('jpeg')!==-1 ||item.indexOf('png')!==-1 )" src="@/assets/images/coursewareManage/pngpic.png" />
<div v-else>
<img v-if="(item.indexOf('doc')!==-1)" src="@/assets/images/coursewareManage/docpic.png" />
<div v-else>
<img v-if="(item.indexOf('xls')!==-1)" src="@/assets/images/coursewareManage/xlspic.png" />
<div v-else>
<img v-if="(item.indexOf('ppt')!==-1)" src="@/assets/images/coursewareManage/pptpic.png" />
<div v-else>
<img v-if="(item.indexOf('pdf')!==-1)" src="@/assets/images/coursewareManage/pdfpic.png" />
<div v-else>
<img v-if="(item.indexOf('zip')!==-1)" src="@/assets/images/coursewareManage/zippic.png" />
<img v-else src="@/assets/images/coursewareManage/docpic.png" />
</div>
</div>
</div>
</div>
</div>
</div>
<div class="file_detail">
<div class="file_name">

3
src/views/examine/CourseReviewedN.vue
View File

@@ -125,7 +125,8 @@
</div>
<div class="left">审核意见：</div>
<div class="rig">
<a-textarea v-model:value="valueSugg" :rows="4" />
<a-textarea v-model:value="valueSugg" :rows="4" show-count
:maxlength="20"/>
</div>
</div>
</div>

2
src/views/learningpath/LevelAdd.vue
View File

@@ -1448,7 +1448,7 @@ export default {
addAuthList: [],
codevisible: false, //二维码是否显示
codeInfo: null, //二维码标题
codeInfo: null, //二维码内容
});
const levelList = reactive({