Commit 70b9db06 authored by chenqikuai's avatar chenqikuai

fix

parent 999b1bd0
<template> <template>
<div style="background-color: #f9f9f9" class="px-10 flex editTool">
<div <div
style="width: 858px" style="background-color: #f9f9f9"
class="flex-shrink-0 flex-grow h-full flex flex-col" class="px-10 flex editTool justify-center"
>
<syScrollBar height="100%">
<div
style="width: calc(100vw - 600px)"
class="flex-shrink-0 h-full flex flex-col"
> >
<TraceProofEditHeader <TraceProofEditHeader
class="flex-shrink-0" class="flex-shrink-0"
:title="title" :title="title"
@update:title="$emit('update:title', $event)" @update:title="$emit('update:title', $event)"
></TraceProofEditHeader> ></TraceProofEditHeader>
<div class="flex-grow overflow-hidden">
<syScrollBar height="100%">
<div> <div>
<Draggable <Draggable
tag="div" tag="div"
...@@ -42,9 +44,8 @@ ...@@ -42,9 +44,8 @@
@click="showAddRootDialog" @click="showAddRootDialog"
></AddFirstLevelBox> ></AddFirstLevelBox>
</div> </div>
</syScrollBar>
</div>
</div> </div>
</syScrollBar>
<div style="width: 228px; margin-left: 29px" class="flex-shrink-0"> <div style="width: 228px; margin-left: 29px" class="flex-shrink-0">
<SetBar <SetBar
:show-upload="route.name === 'tracingDetail'" :show-upload="route.name === 'tracingDetail'"
......
...@@ -45,7 +45,10 @@ ...@@ -45,7 +45,10 @@
</div> </div>
</ElTooltip> </ElTooltip>
<ElTooltip effect="dark" content="添加下一级" placement="top-start"> <ElTooltip effect="dark" content="添加下一级" placement="top-start">
<div class="cursor-pointer mx-6 mark-addnext" @click="addNextlevel(unit)"> <div
class="cursor-pointer mx-6 mark-addnext"
@click="addNextlevel(unit)"
>
<img src="@/assets/img/addNextLevel.svg" alt="" /> <img src="@/assets/img/addNextLevel.svg" alt="" />
</div> </div>
</ElTooltip> </ElTooltip>
...@@ -282,6 +285,7 @@ export default defineComponent({ ...@@ -282,6 +285,7 @@ export default defineComponent({
<style scoped lang="scss"> <style scoped lang="scss">
.root_unit { .root_unit {
display: flow-root;
.show-border-bottom { .show-border-bottom {
border-bottom: 1px solid #dddddd; border-bottom: 1px solid #dddddd;
} }
......
<template> <template>
<div class="albumTable h-full"> <div class="albumTable h-full">
<ImageDisplay :url="url" v-model:visible="visible"></ImageDisplay>
<Table <Table
ref="tableRef" ref="tableRef"
:columns="columns" :columns="columns"
...@@ -9,9 +10,13 @@ ...@@ -9,9 +10,13 @@
> >
<template #img="slotProps"> <template #img="slotProps">
<img <img
@click="
url = slotProps.url;
visible = true;
"
:src="slotProps.url" :src="slotProps.url"
style="width: 30px; height: 30px; border-radius: 8px" style="width: 30px; height: 30px; border-radius: 8px"
class="object-cover" class="object-cover cursor-pointer"
/> />
</template> </template>
<template #time="slotProps"> <template #time="slotProps">
...@@ -45,12 +50,16 @@ import { formatTime, syMoreOperate } from "cqk-sy-ui"; ...@@ -45,12 +50,16 @@ import { formatTime, syMoreOperate } from "cqk-sy-ui";
import { columns } from "./config"; import { columns } from "./config";
import { useTableScrollListener } from "@/components/Table/hooks"; import { useTableScrollListener } from "@/components/Table/hooks";
import ImageDisplay from "@/components/ImageDisplay/index.vue";
const props = defineProps<{ const props = defineProps<{
data: any[]; data: any[];
loading: boolean; loading: boolean;
}>(); }>();
const url = ref("");
const visible = ref(false);
const dataWithIndex = computed(() => { const dataWithIndex = computed(() => {
return props.data.map((i, index) => ({ ...i, index: index + 1 })); return props.data.map((i, index) => ({ ...i, index: index + 1 }));
}); });
......
...@@ -6,13 +6,14 @@ ...@@ -6,13 +6,14 @@
:errorShowing="isErrorShowing" :errorShowing="isErrorShowing"
placeholder="请输入模板名称" placeholder="请输入模板名称"
/> />
<sySelect v-model="value" placeholder="请选择"> <sySelect
<syOption v-model="value"
v-for="item in MyCategories" placeholder="请选择"
:key="item.value" popper-class="categoryAddSySelect"
:label="item.name" >
:value="item.id" <syOption v-for="item in MyCategories" :key="item.value" :value="item.id">
></syOption> <div class="overflow-hidden text-ellipsis">{{ item.name }}</div>
</syOption>
</sySelect> </sySelect>
</div> </div>
</template> </template>
...@@ -95,6 +96,13 @@ export default defineComponent({ ...@@ -95,6 +96,13 @@ export default defineComponent({
}, },
}); });
</script> </script>
<style lang="scss">
.categoryAddSySelect {
.el-select-dropdown__wrap.el-scrollbar__wrap.el-scrollbar__wrap--hidden-default {
width: 375px;
}
}
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
.category-add { .category-add {
......
<template> <template>
<div class="pl-8 py-8 h-full processList flex flex-col"> <div class="pl-8 py-8 processList flex flex-col">
<div class="processTitle">流程列表</div> <div class="processTitle">流程列表</div>
<syScrollBar @scroll-to-end="$emit('scrollToEnd')"> <syScrollBar @scroll-to-end="$emit('scrollToEnd')">
<StepVertical <StepVertical
...@@ -43,6 +43,8 @@ const computedList = computed(() => { ...@@ -43,6 +43,8 @@ const computedList = computed(() => {
<style scoped lang="scss"> <style scoped lang="scss">
.processList { .processList {
box-sizing: border-box;
height: calc(100vh - 70px);
width: 250px; width: 250px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 2px 10px 0px rgba(240, 240, 240, 0.29); box-shadow: 0px 2px 10px 0px rgba(240, 240, 240, 0.29);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment