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

This commit is contained in:
wyx
2022-12-10 15:33:33 +08:00
15 changed files with 866 additions and 196 deletions

View File

@@ -626,7 +626,17 @@
<span style="color: #6f6f6f">{{ item.name }}</span>
</div> -->
<div class="file_name">
<span style="color: #6f6f6f;width:140px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.slice(item.lastIndexOf('/')+1) }}</span>
<span
style="
color: #6f6f6f;
width: 140px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ item.slice(item.lastIndexOf("/") + 1) }}</span
>
</div>
<!-- 条件渲染 s -->
<!-- <div class="file_size">
@@ -1281,7 +1291,7 @@
</div>
<div class="pa">
<a-pagination
showSizeChanger="true"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize1"
@@ -1976,7 +1986,17 @@
<div class="file_img"></div>
<div class="file_detail">
<div class="file_name">
<span style="color: #6f6f6f;width:140px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.slice(item.lastIndexOf('/')+1) }}</span>
<span
style="
color: #6f6f6f;
width: 140px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ item.slice(item.lastIndexOf("/") + 1) }}</span
>
</div>
<!-- 条件渲染 s -->
<!-- <div class="file_size">
@@ -3296,7 +3316,6 @@ export default defineComponent({
],
//在线面授管理学习记录
tableData3: [
{
key: 1,
projectName: "刘莉",
@@ -3432,7 +3451,7 @@ export default defineComponent({
value4: "",
//选择线上还是面授
xzinputV1: "",
valueE1:2,
valueE1: 2,
valueE2: "",
//确定面授
ft_eidt: false,
@@ -4279,8 +4298,12 @@ export default defineComponent({
message.destroy();
return message.warning("请输入必填项");
}
console.log("state.bs_hs && state.valueE1 == 2",state.bs_hs , state.valueE1 == 2);
console.log(
"state.bs_hs && state.valueE1 == 2",
state.bs_hs,
state.valueE1 == 2
);
if (state.valueE1 === 2) {
state.of_hs = false;
// state.ft_hs = true;
@@ -5162,7 +5185,7 @@ export default defineComponent({
// size: file.size,
// });
// console.log(state.filesList);
console.log(res.data.data)
console.log(res.data.data);
state.filesList = [res.data.data];
// state.hasImgName = res.data.data;
}