Merge branch 'test' of http://172.19.183.27:3000/z9130/pansoft-plrl into test
Frontend CI/CD / build (web-office) (push) Failing after 9s
Details
Frontend CI/CD / build (web-office) (push) Failing after 9s
Details
This commit is contained in:
commit
26c496f3db
|
@ -3,23 +3,22 @@
|
||||||
<div class="head-top-box flex justify-between mb-3 titlt-top">
|
<div class="head-top-box flex justify-between mb-3 titlt-top">
|
||||||
<div class="flex items-center gap-10">
|
<div class="flex items-center gap-10">
|
||||||
<Badge :count="9" :offset="[6, -3]">
|
<Badge :count="9" :offset="[6, -3]">
|
||||||
<div class="flex items-center gap-1 cursor-pointer">
|
<div class="flex items-center gap-1 cursor-pointer" :class="{'active': selectTodo == 'db'}" @click="selectTodoClick('db')">
|
||||||
<CalendarOutlined />待办
|
<CalendarOutlined />待办
|
||||||
</div>
|
</div>
|
||||||
</Badge>
|
</Badge>
|
||||||
|
<div class="flex items-center gap-1 cursor-pointer" :class="{'active': selectTodo == 'yb'}" @click="selectTodoClick('yb')">
|
||||||
<div class="flex items-center gap-1 cursor-pointer">
|
|
||||||
<CarryOutOutlined />已办
|
<CarryOutOutlined />已办
|
||||||
</div>
|
</div>
|
||||||
<Badge :count="9" :offset="[6, -3]">
|
<Badge :count="9" :offset="[6, -3]">
|
||||||
<div class="flex items-center gap-1 cursor-pointer">
|
<div class="flex items-center gap-1 cursor-pointer" :class="{'active': selectTodo == 'dy'}" @click="selectTodoClick('dy')">
|
||||||
<ExceptionOutlined />待阅
|
<ExceptionOutlined />待阅
|
||||||
</div>
|
</div>
|
||||||
</Badge>
|
</Badge>
|
||||||
<div class="flex items-center gap-1 cursor-pointer">
|
<div class="flex items-center gap-1 cursor-pointer" :class="{'active': selectTodo == 'yy'}" @click="selectTodoClick('yy')">
|
||||||
<FileDoneOutlined />已阅
|
<FileDoneOutlined />已阅
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-1 cursor-pointer">
|
<div class="flex items-center gap-1 cursor-pointer" :class="{'active': selectTodo == 'gz'}" @click="selectTodoClick('gz')">
|
||||||
<StarOutlined />关注
|
<StarOutlined />关注
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -31,10 +30,10 @@
|
||||||
</div>
|
</div>
|
||||||
<ul class="f-btn-box">
|
<ul class="f-btn-box">
|
||||||
<li>
|
<li>
|
||||||
<Button type="primary">全部</Button>
|
<Button :type="selectClass == '全部' ? 'primary' : 'default'" @click="selectedClick('全部')">全部</Button>
|
||||||
</li>
|
</li>
|
||||||
<li v-for="(item) in plainOptions" :key="item">
|
<li v-for="(item) in plainOptions" :key="item" @click="selectedClick(item)">
|
||||||
<Button >{{ item }}</Button>
|
<Button :type="selectClass == item ? 'primary' : 'default'">{{ item }}</Button>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="flex-1 overflow-hidden">
|
<div class="flex-1 overflow-hidden">
|
||||||
|
@ -79,9 +78,9 @@ import { preferences } from '@vben/preferences';
|
||||||
|
|
||||||
watch(() => preferences.theme.mode, (n: any) => {
|
watch(() => preferences.theme.mode, (n: any) => {
|
||||||
VxeUI.setTheme(n)
|
VxeUI.setTheme(n)
|
||||||
},{
|
}, {
|
||||||
deep: true,
|
deep: true,
|
||||||
immediate: true
|
immediate: true
|
||||||
})
|
})
|
||||||
|
|
||||||
interface RowVO {
|
interface RowVO {
|
||||||
|
@ -165,6 +164,17 @@ watch(
|
||||||
state.checkAll = val.length === plainOptions.length;
|
state.checkAll = val.length === plainOptions.length;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let selectClass = ref('全部')
|
||||||
|
|
||||||
|
let selectedClick = (item: string) => {
|
||||||
|
selectClass.value = item
|
||||||
|
}
|
||||||
|
|
||||||
|
let selectTodo = ref('');
|
||||||
|
let selectTodoClick = (item: string) => {
|
||||||
|
selectTodo.value = item
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import 'vxe-table/lib/style.css';
|
@import 'vxe-table/lib/style.css';
|
||||||
|
@ -176,6 +186,7 @@ watch(
|
||||||
overflow-x: auto; //出现水平滚动条
|
overflow-x: auto; //出现水平滚动条
|
||||||
padding-bottom: 3px;
|
padding-bottom: 3px;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
|
|
||||||
li {
|
li {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
|
@ -185,4 +196,9 @@ watch(
|
||||||
.f-btn-box::-webkit-scrollbar {
|
.f-btn-box::-webkit-scrollbar {
|
||||||
height: 5px !important;
|
height: 5px !important;
|
||||||
}
|
}
|
||||||
|
</style>
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.active {
|
||||||
|
color: hsl(var(--primary));
|
||||||
|
}
|
||||||
</style>
|
</style>
|
|
@ -1,19 +1,28 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="custom-card w-[100%] h-[100%] flex flex-col">
|
<div class="custom-card w-[100%] h-[100%] flex flex-col">
|
||||||
<div class="card-name titlt-top">我的应用</div>
|
<div class="card-name titlt-top" v-if="isEdit"><div>我的应用</div><EditOutlined /></div>
|
||||||
|
<div class="card-name titlt-top" v-else >
|
||||||
|
<Input v-model:value="cardName" >
|
||||||
|
<template #addonAfter>
|
||||||
|
<CheckOutlined />
|
||||||
|
</template>
|
||||||
|
</Input></div>
|
||||||
<GridGroup :list="data.childer" class="flex-1"></GridGroup>
|
<GridGroup :list="data.childer" class="flex-1"></GridGroup>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { toRefs } from 'vue'
|
import { toRefs ,ref} from 'vue'
|
||||||
import GridGroup from '../GridGroup/index.vue'
|
import GridGroup from '../GridGroup/index.vue';
|
||||||
|
import { CheckOutlined,EditOutlined} from '@ant-design/icons-vue';
|
||||||
|
import { Input } from 'ant-design-vue';
|
||||||
|
let cardName = ref('我的应用')
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
data: {
|
data: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: {}
|
default: {}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
let isEdit = ref(true)
|
||||||
console.log('propsprops', props.data);
|
console.log('propsprops', props.data);
|
||||||
let { data } = toRefs(props);
|
let { data } = toRefs(props);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue