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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-13 22:01:08 +08:00
parent 68f5a4957e d9608d69e3
commit a093dd629e
14 changed files with 167 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/BreadCrumb.vue
View File

@@ -70,7 +70,7 @@ export default {
href: "/leveladd",
},
{
name: "管理",
name: "关卡",
},
];
}

57
src/components/drawers/ProjCheckPower.vue
View File

@@ -143,32 +143,32 @@
style="overflow-y: auto"
>
<div class="tab2">
<div class="nameinp">
<div class="namee">组织：</div>
<a-input
v-model:value="searchOrgName"
style="width: 230px; height: 40px; border-radius: 8px"
placeholder="请输入组织"
/>
</div>
<div class="btns">
<div class="btn1" @click="searchOrg()">
<div class="img1">
<img
src="../../assets/images/courseManage/search0.png"
/>
</div>
<div class="wz">搜索</div>
</div>
<div class="btn2" @click="resetOrg">
<div class="img2">
<img
src="../../assets/images/courseManage/reset1.png"
/>
</div>
<div class="wz">重置</div>
</div>
</div>
<!-- <div class="nameinp">-->
<!-- <div class="namee">组织：</div>-->
<!-- <a-input-->
<!-- v-model:value="searchOrgName"-->
<!-- style="width: 230px; height: 40px; border-radius: 8px"-->
<!-- placeholder="请输入组织"-->
<!-- />-->
<!-- </div>-->
<!-- <div class="btns">-->
<!-- <div class="btn1" @click="searchOrg()">-->
<!-- <div class="img1">-->
<!-- <img-->
<!-- src="../../assets/images/courseManage/search0.png"-->
<!-- />-->
<!-- </div>-->
<!-- <div class="wz">搜索</div>-->
<!-- </div>-->
<!-- <div class="btn2" @click="resetOrg">-->
<!-- <div class="img2">-->
<!-- <img-->
<!-- src="../../assets/images/courseManage/reset1.png"-->
<!-- />-->
<!-- </div>-->
<!-- <div class="wz">重置</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="t1">
<div class="organize">姓名：</div>
<a-input
@@ -306,7 +306,6 @@
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
:scroll="{ x: 500 }"
@expand="expandTable"
:pagination="false"
:row-selection="{
columnWidth: 30,
@@ -479,7 +478,7 @@
<div
class="chose"
v-for="item in relationpeople"
:key="item.key"
:key="item.id"
>
<div>{{ item.name }}</div>
<div class="ch" @click="deleteChoosePeople2(item)"></div>
@@ -1298,7 +1297,7 @@ export default {
let chooseorganization1 = [];
state.chooseorganization1.map((value) => {
let obj = {
id: value.key,
id: value.id,
name: value.name,
};
chooseorganization1.push(obj);

36
src/components/drawers/SelectTest.vue
View File

@@ -162,43 +162,47 @@ export default {
const tableDataFunc = () => {
{
const columns = [
{
title: "序号",
dataIndex: "paperId",
key: "paperId",
width: 90,
align: "center",
className: "h head",
},
// {
// title: "序号",
// dataIndex: "paperId",
// key: "paperId",
// width: 90,
// align: "center",
// className: "h head",
// },
{
title: "试卷名称",
dataIndex: "testName",
key: "testName",
width: 110,
width: "40%",
align: "center",
className: "h head",
ellipsis: true,
},
{
title: "随机模式",
dataIndex: "paperMode",
key: "paperMode",
width: 110,
width: "20%",
align: "center",
className: "h",
ellipsis: true,
},
{
title: "创建人",
dataIndex: "sysCreateBy",
key: "sysCreateBy",
width: 90,
width: "20%",
align: "center",
className: "h",
ellipsis: true,
},
{
title: "最近更新时间",
dataIndex: "sysUpdateTime",
key: "sysUpdateTime",
width: 150,
ellipsis: true,
width: "20%",
align: "center",
className: "h",
},
@@ -248,7 +252,7 @@ export default {
published: true,
};
api
.queryExaminationList(obj)
.queryExaminationPaperList(obj)
.then((data) => {
// getTableDate(res.data.data);
//** 表格repaint */
@@ -257,10 +261,10 @@ export default {
let obj = {
key: index + 1,
sysCreateBy: value.sysCreateBy,
paperId: index + 1,
paperId:value.id,
testName: value.testName,
paperMode: value.randomMode ? "是" : "否",
sysUpdateTime: value.sysUpdateTime,
paperMode: value.paperMode==1?"固定试卷":"随机",
sysUpdateTime:value.sysUpdateTime,
id:value.id,
};
array.push(obj);

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

@@ -73,7 +73,7 @@ function validateProName() {
display: inline-block;
width: 99%;
min-width: 0;
padding: 0px 17px;
padding: 0px 8px;
color: rgba(0, 0, 0, 0.85);
font-size: 14px;
line-height: 1.5715;