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

This commit is contained in:
zhangyc
2022-12-18 22:43:27 +08:00
12 changed files with 5453 additions and 5063 deletions

View File

@@ -57,12 +57,10 @@
</div>
</div>
</div>
<UploadImg v-model="fileList" ref="uploadRef">
<UploadImg v-model:value="fileList" ref="uploadRef">
<button
class="shangchuan"
style="cursor: pointer"
@mousemove="showFileList = 1"
@mouseout="showFileList = 0"
>
上传
</button>
@@ -197,6 +195,9 @@
"
>
{{ value.workUploadContent }}
<span style="margin-left: 10px">
<el-link target="_blank" type="primary" :href="value.workUploadAddress?.split(',')[0] || ''">{{value.workUploadAddress?.split(',')[0].split('/').at(-1)|| ''}}</el-link>
</span>
</div>
</div>
</div>
@@ -274,7 +275,7 @@
</template>
<script setup>
import { reactive, ref, toRefs } from "vue";
import {computed, reactive, ref, toRefs} from "vue";
import { request, useRequest } from "@/api/request";
import {
TASK_WORK_COMMIT,
@@ -293,7 +294,6 @@ import {ElMessage} from "element-plus";
const fileList = ref([]);
const uploadRef = ref();
const showFileList = ref(0);
const centerDialogVisible =ref(false);
const sbValue = ref({
content: "",
@@ -312,15 +312,15 @@ const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId });
const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, {
workerId: workId,
});
const handleClose=()=> {
router.back();
};
const open=()=>{
centerDialogVisible.value = true
};
const showFileList = computed(()=>{
return fileList.value.length
})
const handleClick = () => {
console.log(sbValue.value);
console.log(fileList);
if(!sbValue.value.content){
return ElMessage.warning("请输入作业内容");
@@ -337,6 +337,7 @@ const handleClick = () => {
open();
});
sbValue.value.content = "";
fileList.value = [];
};
function remove(i) {
@@ -485,8 +486,8 @@ function reUpload(i) {
}
.square {
width: 475px;
height: 243px;
padding-bottom: 40px;
width: 600px;
background: #ffffff;
box-shadow: 0px 1px 24px 0px rgba(0, 0, 0, 0.11);
border-radius: 8px;