Merge pull request 'fix: 尧勇军,一键查重bug修复' (#41) from fix/updatecontent into test

Reviewed-on: #41
pull/50/head
yaoshuli 1 year ago
commit d375045c40

3
components.d.ts vendored

@ -22,10 +22,12 @@ declare module 'vue' {
NDivider: typeof import('naive-ui')['NDivider']
NDropdown: typeof import('naive-ui')['NDropdown']
NEllipsis: typeof import('naive-ui')['NEllipsis']
NEllipsis: typeof import('naive-ui')['NEllipsis']
NEmpty: typeof import('naive-ui')['NEmpty']
NForm: typeof import('naive-ui')['NForm']
NFormItem: typeof import('naive-ui')['NFormItem']
NGi: typeof import('naive-ui')['NGi']
NGi: typeof import('naive-ui')['NGi']
NGrid: typeof import('naive-ui')['NGrid']
NGridItem: typeof import('naive-ui')['NGridItem']
NImage: typeof import('naive-ui')['NImage']
@ -35,6 +37,7 @@ declare module 'vue' {
NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
NotPassed: typeof import('./src/components/NotPassed.vue')['default']
NPopconfirm: typeof import('naive-ui')['NPopconfirm']
NPopconfirm: typeof import('naive-ui')['NPopconfirm']
NPopover: typeof import('naive-ui')['NPopover']
NPopselect: typeof import('naive-ui')['NPopselect']
NProgress: typeof import('naive-ui')['NProgress']

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="65px" height="65px" viewBox="0 0 65 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 11</title>
<g id="图审审批" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="3.0生成成功提示" transform="translate(-599.000000, -429.000000)" fill="#507AFD">
<g id="编组-28" transform="translate(518.000000, 322.000000)">
<g id="编组-19" transform="translate(80.000000, 107.000000)">
<g id="编组-11" transform="translate(1.000000, 0.000000)">
<circle id="椭圆形" fill-opacity="0.1" cx="32.5" cy="32.5" r="32.5"></circle>
<g id="图文详情" transform="translate(18.000000, 18.000000)" fill-rule="nonzero">
<rect id="矩形" opacity="0" x="0" y="0" width="28" height="28"></rect>
<path d="M7.084,8.288 C7.644,8.288 8.12466667,8.48866667 8.526,8.89 C8.92733333,9.29133333 9.128,9.78133333 9.128,10.36 C9.128,10.92 8.92733333,11.4006667 8.526,11.802 C8.12466667,12.2033333 7.644,12.404 7.084,12.404 C6.50533333,12.404 6.02,12.2033333 5.628,11.802 C5.236,11.4006667 5.04,10.92 5.04,10.36 C5.04,9.78133333 5.236,9.29133333 5.628,8.89 C6.02,8.48866667 6.50533333,8.288 7.084,8.288 Z M23.632,1.568 C24.416,1.568 25.046,1.82933333 25.522,2.352 C25.998,2.87466667 26.236,3.472 26.236,4.144 L26.236,19.208 C26.236,19.6373333 26.082,20.0013333 25.774,20.3 C25.466,20.5986667 25.0973333,20.748 24.668,20.748 L22.736,20.748 L22.736,17.36 L23.94,17.36 C24.1453333,17.36 24.3226667,17.2853333 24.472,17.136 C24.6213333,16.9866667 24.696,16.8 24.696,16.576 C24.696,16.3706667 24.6213333,16.1933333 24.472,16.044 C24.3226667,15.8946667 24.1453333,15.82 23.94,15.82 L22.736,15.82 L22.736,13.636 L23.94,13.636 C24.1453333,13.636 24.3226667,13.5613333 24.472,13.412 C24.6213333,13.2626667 24.696,13.0853333 24.696,12.88 C24.696,12.6746667 24.6213333,12.4926667 24.472,12.334 C24.3226667,12.1753333 24.1453333,12.096 23.94,12.096 L22.736,12.096 L22.736,10.108 L23.94,10.108 C24.1453333,10.108 24.3226667,10.0333333 24.472,9.884 C24.6213333,9.73466667 24.696,9.548 24.696,9.324 C24.696,9.11866667 24.6213333,8.94133333 24.472,8.792 C24.3226667,8.64266667 24.1453333,8.568 23.94,8.568 L22.736,8.568 L22.736,6.216 C22.736,5.17066667 22.4933333,4.43333333 22.008,4.004 C21.5226667,3.57466667 20.7013333,3.36 19.544,3.36 L8.764,3.36 L8.764,3.108 C8.764,2.67866667 8.918,2.31466667 9.226,2.016 C9.534,1.71733333 9.90266667,1.568 10.332,1.568 L23.632,1.568 Z M18.928,5.04 C19.656,5.04 20.1833333,5.25 20.51,5.67 C20.8366667,6.09 21,6.636 21,7.308 L21,22.764 C21,23.1933333 20.8226667,23.59 20.468,23.954 C20.1133333,24.318 19.6746667,24.5 19.152,24.5 L3.5,24.5 C3.052,24.5 2.65066667,24.3133333 2.296,23.94 C1.94133333,23.5666667 1.764,23.128 1.764,22.624 L1.764,6.888 C1.764,6.34666667 1.91333333,5.90333333 2.212,5.558 C2.51066667,5.21266667 2.90266667,5.04 3.388,5.04 L18.928,5.04 L18.928,5.04 Z M19.236,7.98 C19.236,7.66266667 19.138,7.38733333 18.942,7.154 C18.746,6.92066667 18.4333333,6.804 18.004,6.804 L4.648,6.804 C4.57333333,6.804 4.47066667,6.818 4.34,6.846 C4.20933333,6.874 4.07866667,6.92066667 3.948,6.986 C3.81733333,7.05133333 3.70533333,7.14 3.612,7.252 C3.51866667,7.364 3.472,7.504 3.472,7.672 L3.472,15.176 C3.62133333,15.344 3.83133333,15.5446667 4.102,15.778 C4.37266667,16.0113333 4.69,16.226 5.054,16.422 C5.418,16.618 5.824,16.786 6.272,16.926 C6.72,17.066 7.20533333,17.136 7.728,17.136 C8.512,17.136 9.198,17.01 9.786,16.758 C10.374,16.506 10.92,16.1886667 11.424,15.806 C11.928,15.4233333 12.4226667,15.0126667 12.908,14.574 C13.3933333,14.1353333 13.93,13.72 14.518,13.328 C15.106,12.936 15.778,12.6046667 16.534,12.334 C17.29,12.0633333 18.1906667,11.9093333 19.236,11.872 L19.236,7.98 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.9 KiB

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="65px" height="65px" viewBox="0 0 65 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 33</title>
<g id="图审审批" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="3.0生成成功提示" transform="translate(-788.000000, -429.000000)">
<g id="编组-28" transform="translate(518.000000, 322.000000)">
<g id="编组-30" transform="translate(269.000000, 107.000000)">
<g id="编组-33" transform="translate(1.000000, 0.000000)">
<circle id="椭圆形备份" fill="#EDF1FE" cx="32.5" cy="32.5" r="32.5"></circle>
<g id="审批" transform="translate(17.000000, 18.000000)" fill="#507AFD" fill-rule="nonzero">
<rect id="矩形" opacity="0" x="0" y="0" width="30" height="30"></rect>
<path d="M15.7625,22.2125 L16.775,20.95 C16.1125,20.15 15.7125,19.125 15.7125,18.025 C15.7125,15.5 17.775,13.4375 20.3125,13.4375 C21.675,13.4375 22.9125,14.0375 23.75,14.975 L23.75,3.96249999 C23.75,3.13749999 23.075,2.46249999 22.25,2.46249999 L6,2.46249999 C5.175,2.46249999 4.5,3.13749999 4.5,3.96249999 L4.5,23.4625 C4.5,24.2875 5.175,24.9625 6,24.9625 L13.2125,24.9625 C13.525,23.65 14.5,22.6 15.7625,22.2125 Z M9.8875,6 L18.3875,6 C18.9375,6 19.3875,6.45 19.3875,7 C19.3875,7.54999998 18.9375,8 18.3875,8 L9.8875,8 C9.3375,8 8.8875,7.55000001 8.8875,7 C8.8875,6.44999997 9.32499999,6 9.8875,6 Z M9.8875,10.5 L18.3875,10.5 C18.9375,10.5 19.3875,10.95 19.3875,11.5 C19.3875,12.05 18.9375,12.5 18.3875,12.5 L9.8875,12.5 C9.3375,12.5 8.8875,12.05 8.8875,11.5 C8.8875,10.95 9.32499999,10.5 9.8875,10.5 Z M8.8875,16 C8.8875,15.45 9.3375,15 9.8875,15 L13.3875,15 C13.9375,15 14.3875,15.45 14.3875,16 C14.3875,16.55 13.9375,17 13.3875,17 L9.8875,17 C9.32499999,17 8.8875,16.55 8.8875,16 Z" id="形状"></path>
<path d="M23.7625,27.5 L16.85,27.5 C15.9,27.5 15.125,26.725 15.125,25.775 C15.125,24.825 15.9,24.05 16.85,24.05 L19.6875,20.525 C18.55,20.25 17.7125,19.2375 17.7125,18.025 C17.7125,16.6 18.875,15.4375 20.3125,15.4375 C21.75,15.4375 22.9125,16.6 22.9125,18.025 C22.9125,19.2375 22.075,20.25 20.9375,20.525 L23.775,24.05 C24.725,24.05 25.5,24.825 25.5,25.775 C25.5,26.725 24.725,27.5 23.7625,27.5 L23.7625,27.5 Z" id="路径"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 500 KiB

@ -3,6 +3,7 @@ import { computed, inject, onMounted, ref } from "vue";
import { useRoute, useRouter } from "vue-router";
import { useUser } from "@/store/modules/user";
import { getImgUrl } from "@/utils/urlUtils";
import defaultAvatar from '@/assets/icons/avatar.svg';
const emit = defineEmits<{
(e: "logout"): void;
@ -107,7 +108,7 @@ const options = computed(() => {
<div class="container">
<div class="header">
<n-avatar
:src="getImgUrl(useInfo.usericon)"
:src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatar"
round
style="width: 53px; height: 53px"
/>

@ -12,6 +12,7 @@ import { asideMap } from '@/config/aside'
import type { AsideConfig } from '/#/api'
import emitter from '@/utils/mitt'
import { getFilterList } from '@/api/home/main'
import dayjs from 'dayjs'
const configStore = useConfig()
@ -105,13 +106,29 @@ configStore.$subscribe(() => {
Object.keys(customObjRef.value).map(key => {
if(asideMap.hasOwnProperty(key)) {
const str = key.toLowerCase()
console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
if(str == "izsimilarity" && typeof customObjRef.value[str] == "string") {
customObjRef.value[str] = customObjRef.value[str].split(',');
asideValue[key] = customObjRef.value[str];//
}else if(str == "izyear" && typeof customObjRef.value[str] == "string") {
let time = customObjRef.value[str].split('-');
time[0] = (new Date(time[0])).getTime();
time[1] = (new Date(time[1])).getTime();
customObjRef.value[str] = time;
asideValue[key] = customObjRef.value[str];//
console.log("时间2222222222", customObjRef.value[str]);
}else if((str != 'izsimilarity' && str != "izyear") && customObjRef.value[str]) {
console.log("customObjRef.value[str]222222", customObjRef.value[str]);
let list = customObjRef.value[str].split(',');
console.log("list222222", list);
asideValue[key] = customObjRef.value[str];//
}else {
asideValue[key] = "";
}
// asideMap[str].defaultValue = customObjRef.value[str];//
asideValue[key] = customObjRef.value[str];//
}
});
}
// console.log("showKeys", showKeys);
const items = showKeys.reduce((acc, key) => {
@ -178,6 +195,7 @@ function editFilter(filter: any) {
}
watch(asideValue, (newVal) => {
console.log("asideValue处理后", newVal);
configStore.setAsideValue(newVal)
}, { deep: true })
</script>

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzcustomlevelList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchizcustomnameList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzCustomtypeList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -37,7 +37,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzCustomtypeList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzproductnameList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -32,7 +32,12 @@ const labStyle = {
fontWeight: 'bold',
color: '#333333'
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzProjectList()
options.value = list

@ -1,7 +1,8 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { onUpdated } from 'vue';
const props = defineProps<{
value: string[] | null
@ -31,7 +32,13 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
console.log("formValue.value.plans", formValue.value.plans);
}
})
onBeforeMount(async () => {
const list = await configStore.fetchizizprojecttypeList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -37,7 +37,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzSearchList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -37,7 +37,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzsSearchManagerList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzShowList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchizstatusListt()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchizvisitcityList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -37,7 +37,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzfiled17List()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -37,7 +37,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzfiled2List()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -37,7 +37,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzfiled2List()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -37,7 +37,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzfiled6List()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzfirmList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import { type FormItemRule, type FormRules, faIR } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIztaskrromList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIztaskstatusList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const list = await configStore.fetchIzvisitproList()
options.value = list

@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
@ -31,7 +31,12 @@ const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
}
onMounted(() => {
if(props.value) {
let list = props.value.split(',');
formValue.value.plans = list;
}
})
onBeforeMount(async () => {
const planList = await configStore.fetchPlanList()
planOptons.value = planList

@ -1,7 +1,24 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, onMounted, onUpdated, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
let asideValue = configUseStore.getAsideValue;
console.log("asideValue", asideValue);
if(asideValue['izupuser']) {
setTimeout(() => {
let list = asideValue['izupuser'].split(',');
formValue.value.users = list;
console.log("formValue.value.users1111111111", formValue.value.users);
}, 1000);
}else {
formValue.value.users = [];
}
});
const props = defineProps<{
value: string[] | null
@ -15,7 +32,11 @@ const emit = defineEmits<{
const formValue = ref({
users: props.value,
})
if(typeof formValue.value.users == "string") {
let list = formValue.value.users.split(',');
formValue.value.users = list;
}
console.log("formValue.value.users2222222222222", formValue.value.users);
const rules: FormRules = {
users: [
{

@ -1,5 +1,6 @@
<script lang="ts" setup>
import dayjs from 'dayjs';
import { onUpdated, watch } from 'vue';
import { onMounted, ref } from 'vue';
const props = defineProps<{
@ -17,17 +18,29 @@ function onChange(value: [number, number]) {
emit('update:value', value)
}
onMounted(() => {
//
const currentDate = dayjs();
//
const endDate = currentDate.toDate();
const startDate = currentDate.subtract(3, 'month').toDate();
//
time.value = [startDate.getTime(), endDate.getTime()];
setTimeout(() => {
onChange([startDate.getTime(), endDate.getTime()])
},300)
if(!props.value) {
//
const currentDate = dayjs();
//
const endDate = currentDate.toDate();
const startDate = currentDate.subtract(3, 'month').toDate();
//
time.value = [startDate.getTime(), endDate.getTime()];
console.log('time init', startDate.getTime(), endDate.getTime());
setTimeout(() => {
onChange([startDate.getTime(), endDate.getTime()])
},300)
}
})
watch(() => props.value,
(newVal, oldVal) => {
time.value = newVal
console.log("newVal", newVal, time.value);
}, {
deep: true
}
);
</script>
<template>

@ -49,7 +49,7 @@ const allCount = computed(() => {
})
const selectCount = computed(() => {
return `全部筛选(共${onList.value.length}个)`
return `已经筛选(共${onList.value.length}个)`
})
defineExpose({

@ -53,7 +53,7 @@ const loading = ref(false)
const message = useMessage()
const totalCount = ref(0)
const sortBy: PictureSortParam = {
orderbyname: "asc",
orderbyname: "desc",
orderbyvalue: "pictureResult",
};
const imageRef = ref<ComponentElRef | null>()
@ -155,6 +155,7 @@ watch(() => searchValue.value,
async (newVal, oldVal) => {
if(newVal) {
isInitSeaerch.value = true;
pagination.pageNo = 0;
const more = await featchList()
listData.value = more;
isInitSeaerch.value = false;
@ -176,7 +177,7 @@ async function featchList() {
pagination.pageNo += 1
const searchValue = configStore.getSearchValue // rao
const asideParams = unref(configStore.getAsideValue)
const params = filterId ? { userSearchId: filterId } : asideParams
const params = filterId ? { userSearchId: filterId } : cloneDeep(asideParams)
let result = {
pageCount: 0,
data: [],

@ -67,10 +67,10 @@ defineExpose({
</n-card>
</n-modal> -->
<div class="header-box">
<div class="robot-box"><svg-icon size="80" name="robot2" /></div>
<div class="robot-box"><svg-icon size="80" name="robot-two" /></div>
<div class="text-box">
<div class="msg-title">生成成功提示</div>
<div class="msg-text">AI已根据您的配置要求生成任务包</div>
<div class="msg-text">AI助手已根据您的配置要求生成任务包</div>
</div>
<div class="close-box" @click="closeIconModal">
<svg-icon size="30" name="close-none-border" />
@ -78,15 +78,15 @@ defineExpose({
</div>
<div class="wrapper-footer">
<div @click="closeModal('/worksheet')">
<svg-icon size="80" name="copy-select" />
<svg-icon size="65" name="ai-approve" />
<div class="footer-text">
进入AI工单
图审审批
</div>
</div>
<div @click="closeModal('/task')">
<svg-icon size="80" name="task-approval-select" />
<svg-icon size="65" name="ai-order" />
<div class="footer-text">
进入任务审批
任务审批
</div>
</div>
</div>
@ -96,7 +96,7 @@ defineExpose({
<style lang="less" scoped>
.finish-package-modal {
position: fixed;
width: 400px;
width: 424px;
height: 250px;
top: 50%;
left: 50%;

@ -82,7 +82,7 @@ function afterLeave() {
</div>
<n-form ref="formRef" :model="model" require-mark-placement="left" style="margin-top: 8px;" :rules="rules">
<n-form-item class="wrapper-task-package-name" path="packagename" label="任务包名称">
<n-input v-model:value="model.packagename" max="12" @keydown.enter.prevent />
<n-input v-model:value="model.packagename" maxlength="12" @keydown.enter.prevent />
</n-form-item>
<n-form-item path="mark" :style="formItemStyle">
<n-checkbox v-model:checked="model.mark">

Loading…
Cancel
Save