odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 修复细节

Browse Source
This commit is contained in:
odjbin
2024-05-12 14:44:04 +08:00
parent 416fa2ed53
commit eeab66d8fb
6 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/project-demand/index.js
View File

@@ -41,9 +41,9 @@ export const addRequirement = (data) => {
data: data
});
};
export const deleteFile = (path) => {
export const deleteFile = (id) => {
return request({
url: '/process/file/delete/'+ path,
url: `/process/file/delete/${id}`,
method: "delete"
});
};

16
src/components/FileUpload.vue
View File

@@ -91,6 +91,8 @@ const beforeUpload = (file) => {
const handleUploadSuccess = (res, file) => {
if (res.code !== 1000) {
ElMessage.error("上传失败")
}else {
ElMessage.success("上传成功")
}
showTable.value=true
let data = res.data
@@ -116,14 +118,12 @@ const handleRemoveAttachment = (file) => {
}
const handleRemove = (row) => {
console.log('fil对对对e',row,fileList.value)
// "http://43.138.199.198:8888//group1/M00/00/00/CgAICGY_pZKAFiruAAAAAAAAAAA88.docx"
// deleteFile(file.id).then(res => {
// if (res.code === 1000) {
// ElMessage.success("删除成功");
// fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1);
// }
// });
deleteFile(row.id).then(res => {
if (res.code === 1000) {
ElMessage.success("删除成功");
// fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1);
}
});
};
const handleRemove1=()=>{
console.log('handleRemove1vdvd')

1
src/views/home/index.vue
View File

@@ -46,7 +46,6 @@
<span>常用网站</span>
</div>
<el-divider/>
</div>
</div>
</el-col>

10
src/views/projectdemand/demandcollection/index.vue
View File

@@ -4,9 +4,7 @@
</template>
<script setup lang="jsx">
import fvSelect from '@/fvcomponents/fvSelect/index.vue'
import Tag from '@/components/Tag.vue'
import {getDemandInfo} from "@/api/project-demand";
const router = useRouter()
const searchConfig = reactive([
@@ -16,7 +14,9 @@ const searchConfig = reactive([
component: 'el-input',
props: {
placeholder: '请输入名称查询',
clearable: true
clearable: true,
filterable: true,
checkStrictly: true
}
},
{
@@ -25,7 +25,9 @@ const searchConfig = reactive([
component: 'el-input',
props: {
placeholder: '请输入名称查询',
clearable: true
clearable: true,
filterable: true,
checkStrictly: true
}
}
])

39
src/views/workflow/process/common/AvatarEllipsis.vue
View File

@@ -5,8 +5,11 @@
<slot name="pre"></slot>
<div style="display: flex;flex-wrap: wrap;">
<div v-for="(user,index) in userInfo" :key="index" class="avatar_name">
<el-avatar size="large"
:src="user.avatar"></el-avatar>
<div class="circle-user">
<el-tooltip class="item" effect="dark" :content="user.name" placement="bottom-start">
<span class="item_name">{{ user.name }}</span>
</el-tooltip>
</div>
<div v-if="user.icon"
class="el-timeline-item__node" :style="{
backgroundColor: user.color
@@ -15,17 +18,15 @@
<component :is="user.icon"/>
</el-icon>
</div>
<el-tooltip class="item" effect="dark" :content="user.name" placement="bottom-start">
<span class="item_name">{{ user.name }}</span>
</el-tooltip>
</div>
</div>
</div>
</template>
<script setup>
import {Loading,Close,CircleCheckFilled,MoreFilled} from '@element-plus/icons-vue'
import {Loading, Close, CircleCheckFilled, MoreFilled} from '@element-plus/icons-vue'
import {defineProps} from "vue";
const props = defineProps({
row: {
type: Number,
@@ -74,7 +75,7 @@ const initUser = (user) => {
user["icon"] = Close
user["color"] = "#f56c6c"
}
if (state === 'PASS'){
if (state === 'PASS') {
user["icon"] = MoreFilled
user["color"] = "#c0c4cc"
}
@@ -84,7 +85,27 @@ const initUser = (user) => {
init()
</script>
<style scoped>
<style scoped lang="scss">
.circle-user {
width: 50px;
height: 50px;
display: flex;
justify-content: center;
align-items: center;
border-radius: 50%;
border: 1px solid #ACACAC;
position: relative;
.circle-icon {
width: 10px;
height: 10px;
position: absolute;
top: auto !important;
bottom: -9px;
right: 15px !important;
}
}
.avatar_name {
display: flex;
flex-direction: column;
@@ -96,7 +117,7 @@ init()
.el-timeline-item__node {
position: absolute;
bottom: 20px;
bottom: 0;
right: 1px;
}

35
src/views/workflow/process/nodes/Node.vue
View File

@@ -23,22 +23,11 @@
</template>
<template v-else-if="showAvatar">
<span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
<avatar-ellipsis :row="3" v-if="userInfo.length > 0" :mode="mode" :user-info="userInfo"/>
<!-- <div v-else v-for="item in userInfo" class="circle-user">-->
<!-- <span>{{ item.name }}</span>-->
<!-- <el-button v-if="item.state==='RUNNING'" type="warning" loading circle class="circle-icon"></el-button>-->
<!-- <el-button v-else-if="item.state==='UNACTIVATED'" type="info" :icon="More" circle-->
<!-- class="circle-icon"></el-button>-->
<!-- <el-button v-else type="success" :icon="Check" circle class="circle-icon"></el-button>-->
<!-- </div>-->
<!-- <avatar-ellipsis :row="3" :user-info="userInfo"/>-->
<avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo"/>
</template>
<template v-else>
<span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
<ellipsis :row="3" :content="content" :mode="mode" v-else/>
<ellipsis :row="3" :content="content" :mode="mode" v-else/>
</template>
</div>
<div class="node-error" v-if="showError">
@@ -194,26 +183,6 @@ const init = () => {
</script>
<style lang="scss" scoped>
.circle-user {
width: 50px;
height: 50px;
display: flex;
justify-content: center;
align-items: center;
border-radius: 50%;
border: 1px solid #ACACAC;
position: relative;
.circle-icon {
width: 10px;
height: 10px;
position: absolute;
top: auto !important;
bottom: -9px;
right: 15px !important;
}
}
.root {
&:before {
display: none !important;