Compare commits

..

1 Commits

@ -2,5 +2,4 @@
. "$(dirname -- "$0")/_/husky.sh"
# node_modules/.bin/lint-staged
date
npx lint-staged
date

8
.idea/.gitignore vendored

@ -1,8 +0,0 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

@ -1,48 +0,0 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoredPackages">
<value>
<list size="15">
<item index="0" class="java.lang.String" itemvalue="PyMuPDF" />
<item index="1" class="java.lang.String" itemvalue="scikit-image" />
<item index="2" class="java.lang.String" itemvalue="shapely" />
<item index="3" class="java.lang.String" itemvalue="opencv-contrib-python" />
<item index="4" class="java.lang.String" itemvalue="opencv-python" />
<item index="5" class="java.lang.String" itemvalue="cython" />
<item index="6" class="java.lang.String" itemvalue="numpy" />
<item index="7" class="java.lang.String" itemvalue="attrdict" />
<item index="8" class="java.lang.String" itemvalue="imgaug" />
<item index="9" class="java.lang.String" itemvalue="premailer" />
<item index="10" class="java.lang.String" itemvalue="lxml" />
<item index="11" class="java.lang.String" itemvalue="visualdl" />
<item index="12" class="java.lang.String" itemvalue="openpyxl" />
<item index="13" class="java.lang.String" itemvalue="lanms-neo" />
<item index="14" class="java.lang.String" itemvalue="Polygon3" />
</list>
</value>
</option>
</inspection_tool>
<inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<option name="ignoredErrors">
<list>
<option value="N802" />
<option value="N806" />
<option value="N812" />
<option value="N801" />
</list>
</option>
</inspection_tool>
<inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoredIdentifiers">
<list>
<option value="image_tools.image_similarity.calculate" />
<option value="float.*" />
</list>
</option>
</inspection_tool>
<inspection_tool class="TsLint" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
</component>

@ -1,6 +0,0 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptLibraryMappings">
<includedPredefinedLibrary name="Node.js Core" />
</component>
</project>

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EslintConfiguration">
<option name="fix-on-save" value="true" />
</component>
</project>

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="$PROJECT_DIR$/../../../webutils/ai/PaddleOCR/.conda" project-jdk-type="Python SDK" />
</project>

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

@ -38,6 +38,5 @@
"json",
"jsonc",
"yaml"
],
"vue3snippets.enable-compile-vue-file-on-did-save-code": true
]
}

7
components.d.ts vendored

@ -11,7 +11,6 @@ declare module 'vue' {
BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default']
DataHeader: typeof import('./src/components/DataHeader/index.vue')['default']
NAvatar: typeof import('naive-ui')['NAvatar']
NBackTop: typeof import('naive-ui')['NBackTop']
NButton: typeof import('naive-ui')['NButton']
NCard: typeof import('naive-ui')['NCard']
NCheckbox: typeof import('naive-ui')['NCheckbox']
@ -23,6 +22,7 @@ declare module 'vue' {
NDivider: typeof import('naive-ui')['NDivider']
NDropdown: typeof import('naive-ui')['NDropdown']
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']
@ -44,12 +44,15 @@ declare module 'vue' {
NSpace: typeof import('naive-ui')['NSpace']
NSpin: typeof import('naive-ui')['NSpin']
NSwitch: typeof import('naive-ui')['NSwitch']
NTabPane: typeof import('naive-ui')['NTabPane']
NTabs: typeof import('naive-ui')['NTabs']
NTag: typeof import('naive-ui')['NTag']
NTimeline: typeof import('naive-ui')['NTimeline']
NTimelineItem: typeof import('naive-ui')['NTimelineItem']
NTooltip: typeof import('naive-ui')['NTooltip']
NUpload: typeof import('naive-ui')['NUpload']
NUploadDragger: typeof import('naive-ui')['NUploadDragger']
Quill: typeof import('./src/components/RichEditor/Quill.vue')['default']
Robot: typeof import('./src/components/Robot/index.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
Search: typeof import('./src/components/Search/Search.vue')['default']

@ -1,3 +1,4 @@
// @ts-check
const antfu = require('@antfu/eslint-config').default
module.exports = antfu(
@ -9,26 +10,19 @@ module.exports = antfu(
'dist',
'/public',
'.husky',
'eslint.config.js',
],
},
{
rules: {
// 允许使用 debugger
'no-debugger': 'off',
'unused-imports/no-unused-vars': 'off',
'unused-imports/no-unused-imports': 'off',
'jsdoc/require-returns-description': 'off',
"jsdoc/check-param-names": "off",
'jsdoc/require-param-name': 'off',
'eqeqeq': 'off',
'vue/custom-event-name-casing': 'off',
'vue/eqeqeq': 'off',
'no-console': ['warn', { allow: ['warn', 'error'] }],
'no-restricted-syntax': [
// eslint-disable-next-line node/prefer-global/process
process.env.MODE === 'production' ? 2 : 0,
],
'array-callback-return': ['error', { allowImplicit: true }],
curly: ['off']
},
},
)

@ -119,6 +119,5 @@
<div class="selection-box" style="border: 1px dotted black;position: absolute;display: none;"></div>
<script>var globalThis = window;</script>
<script src="/src/main.ts" type="module"></script>
<script src="https://map.qq.com/api/js?v=2.exp&key=GIABZ-YUQKX-JOI4L-ZAGIS-673KS-NKBMC"></script>
</body>
</html>

@ -23,7 +23,7 @@ const adminInfo = {
value: 'task-main',
},
{
label: '图审审批',
label: '图审审批管理',
value: 'worksheet-main',
},
],

13477
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -48,7 +48,6 @@
"@commitlint/config-conventional": "^18.4.3",
"@types/imagesloaded": "^4.1.6",
"@types/lodash": "^4.14.197",
"@types/lodash-es": "^4.17.12",
"@types/masonry-layout": "^4.2.7",
"@types/node": "^18.17.1",
"@types/sortablejs": "^1.15.7",
@ -78,8 +77,8 @@
"vue-tsc": "^1.8.22"
},
"lint-staged": {
"*.{ts,tsx,vue,js}": [
"eslint --fix"
"*.{ts,tsx,vue}": [
"pnpm lint:fix"
]
}
}

@ -100,9 +100,6 @@ devDependencies:
'@types/lodash':
specifier: ^4.14.197
version: 4.14.202
'@types/lodash-es':
specifier: ^4.17.12
version: 4.17.12
'@types/masonry-layout':
specifier: ^4.2.7
version: 4.2.7
@ -1326,6 +1323,7 @@ packages:
resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
dependencies:
'@types/lodash': 4.14.202
dev: false
/@types/lodash@4.14.202:
resolution: {integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==}

@ -1,29 +0,0 @@
#-------------------------------------------------------------------------------#
# Qodana analysis is configured by qodana.yaml file #
# https://www.jetbrains.com/help/qodana/qodana-yaml.html #
#-------------------------------------------------------------------------------#
version: "1.0"
#Specify inspection profile for code analysis
profile:
name: qodana.starter
#Enable inspections
#include:
# - name: <SomeEnabledInspectionId>
#Disable inspections
#exclude:
# - name: <SomeDisabledInspectionId>
# paths:
# - <path/where/not/run/inspection>
#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
#bootstrap: sh ./prepare-qodana.sh
#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
#plugins:
# - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
linter: jetbrains/qodana-js:latest

@ -1,18 +1,17 @@
<script lang="ts" setup>
import { NModalProvider, dateZhCN, zhCN } from 'naive-ui'
import { computed, inject, nextTick, onMounted } from 'vue'
import { AppProvider } from '@/components/Application'
import { lighten } from '@/utils/index'
import { dateZhCN, zhCN } from "naive-ui";
import { computed, onMounted, nextTick,inject } from "vue";
import { AppProvider } from "@/components/Application";
import { lighten } from "@/utils/index";
import mouseTrapBind from '@/hooks/event/mouseTrapBind'
const mousetrap = inject('mousetrap') as any
onMounted(() => {
mouseTrapBind(mousetrap)
onMounted(()=>{
mouseTrapBind(mousetrap);
})
const getThemeOverrides = computed(() => {
const theme = '#1980FF'
const lightenStr = lighten(theme, 6)
const theme = "#1980FF";
const lightenStr = lighten(theme, 6);
return {
common: {
@ -22,34 +21,36 @@ const getThemeOverrides = computed(() => {
primaryColorSuppl: theme,
},
Switch: {
railColorActive: '#07C984',
railColorActive: "#07C984",
},
Input: {
borderHover: '0px',
borderFocus: '0px',
boxShadowFocus: '#ff0000',
borderHover: "0px",
borderFocus: "0px",
boxShadowFocus: "#ff0000",
},
Tag: {
colorCheckedHover: '#507afd',
colorCheckedPressed: '#507afd',
colorCheckedHover: "#507afd",
colorCheckedPressed: "#507afd",
},
Slider: {
fillColor: '#1980FF',
dotBorderActive: '#1980FF',
fillColorHover: '#1980FF',
fillColor: "#1980FF",
dotBorderActive: "#1980FF",
fillColorHover: "#1980FF",
},
Card: {
padding: '0px',
padding: "0px",
},
Dropdown: {
optionColorHover: '#e8f2ff',
optionColorHover: "#e8f2ff",
},
Upload: {
draggerBorder: '1px dashed #1980FF',
draggerBorderHover: '1px dashed #1980FF',
draggerBorder: "1px dashed #1980FF",
draggerBorderHover: "1px dashed #1980FF",
},
}
})
};
});
</script>
<template>
@ -58,11 +59,9 @@ const getThemeOverrides = computed(() => {
:date-locale="dateZhCN"
:theme-overrides="getThemeOverrides"
>
<NModalProvider>
<AppProvider>
<RouterView />
</AppProvider>
</NModalProvider>
<AppProvider>
<RouterView />
</AppProvider>
</NConfigProvider>
</template>
@ -79,28 +78,7 @@ const getThemeOverrides = computed(() => {
color: #666666 !important;
font-size: 14px !important;
}
::v-deep(.n-base-clear > .n-base-clear__clear) {
::v-deep(.n-base-clear > .n-base-clear__clear){
color: #c9c9c9 !important;
}
.n-form-item.n-form-item--top-labelled .n-form-item-label {
flex-direction: row-reverse !important;
justify-content: flex-end !important;
}
.n-form-item .n-form-item-label .n-form-item-label__asterisk {
transform: rotate(-90deg) !important;
}
.n-scrollbar-content {
padding: 0 7.97px 0 4px;
}
.n-form-item .n-form-item-label {
font-size: 14px !important;
color: #333333 !important;
}
.n-slider-dots > .n-slider-dot:nth-child(2) {
display: none !important;
}
.n-collapse-item-arrow i svg {
width: 14px !important;
height: 14px !important;
}
</style>

@ -1,5 +1,5 @@
import { http } from '@/utils/http/axios'
import type { PageParam } from '/#/api'
import type { BusinessParam, PageParam } from '/#/api'
/**
*
@ -26,7 +26,8 @@ export async function getPictureTypeList(): Promise<any> {
url: `/static/admin/web/distionary/bytypecode/izpicturetype`,
method: 'get',
})
const list = res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
@ -72,7 +73,7 @@ export async function getTFList() {
method: 'get',
})
const list = res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
@ -144,7 +145,7 @@ export async function getIztaskrromList(enabled: string) {
params: { enabled },
})
const list = res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
@ -160,7 +161,7 @@ export async function getIztaskstatusList(enabled: string) {
params: { enabled },
})
const list = res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
@ -190,7 +191,7 @@ export async function getIzfirmList(enabled: string) {
params: { enabled },
})
const list = res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
@ -206,7 +207,7 @@ export async function getIzproductnameList(enabled: string) {
params: { enabled },
})
const list = res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
@ -222,7 +223,7 @@ export async function getizcustomnameList(enabled: string) {
params: { enabled },
})
const list = res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
@ -236,7 +237,7 @@ export async function getIzCustomtypeList(): Promise<any> {
method: 'get',
})
const list = res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
@ -252,7 +253,7 @@ export async function getIzcustomlevel(enabled: string) {
params: { enabled },
})
const list = res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
@ -268,12 +269,13 @@ export async function getIzprojecttypeList(enabled: string) {
params: { enabled },
})
const list = res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
/**
*
* @param enabled
* @returns
*/
export async function getIzvisitcityList() {
@ -296,7 +298,8 @@ export async function getRejectList() {
method: 'get',
})
return res.data && res.data.length ? res.data[0].distionaryList : []
const list = res.data[0].distionaryList
return list
}
/**
@ -309,14 +312,14 @@ export async function getBackList() {
method: 'get',
})
return res.data && res.data.length ? res.data[0].distionaryList : []
return res.data[0].distionaryList
}
/**
*
* @returns
*/
export async function getBusinessList(field: string, page: PageParam = { pageNo: 1, pageSize: 10000 }) {
export async function getBusinessList(field: string, page: PageParam = { pageNo: 1, pageSize: 200 }) {
const res = await http.request({
url: `/ocr/dictionary/getDictionaryByField`,
method: 'get',
@ -362,7 +365,7 @@ export async function getRelationTypeList() {
method: 'get',
})
return res.data && res.data.length ? res.data[0].distionaryList : []
return res.data[0].distionaryList
}
/**
@ -374,7 +377,7 @@ export async function getizstatusList() {
url: `/static/admin/web/distionary/bytypecode/izstatus`,
method: 'get',
})
return res.data && res.data.length ? res.data[0].distionaryList : []
return res.data[0].distionaryList
}
/**
@ -386,5 +389,5 @@ export async function getizApprovalStatusList() {
url: `/static/admin/web/distionary/bytypecode/izApprovalStatus`,
method: 'get',
})
return res.data && res.data.length ? res.data[0].distionaryList : []
return res.data[0].distionaryList
}

@ -14,7 +14,7 @@ export async function getFinalList(params: FinalParam) {
Object.keys(notEmptyParams).forEach((key) => {
const val = notEmptyParams[key]
if (key === 'izyear') {
if (key === 'izuptime') {
const start = formatToDate2(val[0])
const end = formatToDate2(val[1])
notEmptyParams[key] = `${start}-${end}`
@ -65,7 +65,6 @@ export async function repetitionTask() {
/**
*
* @param params
* @returns
*/
export async function getRepeatList(params: FinalParam) {

@ -3,12 +3,8 @@ import type { FilterCondition, FilterParam, FilterSearchParam, FilterUpdate, Pag
/**
*
*
* @param page
* @param searchParam
* @param type
* @returns
*
* @param params
* @returns 1
*/
export async function getConditionList(page: PageParam, searchParam: FilterSearchParam, type: number): Promise<any> {
const res = await http.request({
@ -21,11 +17,11 @@ export async function getConditionList(page: PageParam, searchParam: FilterSearc
},
})
const { data: { records, pages, total } } = res
const { data: { records, pages,total } } = res
return {
pageCount: pages,
data: records,
total,
total
}
}
@ -56,7 +52,7 @@ export async function updateCondition(params: FilterUpdate) {
/**
*
* @param { ids: string } params
* @param params
* @returns
*/
export async function deleteCondition(params: { ids: string }) {
@ -94,7 +90,7 @@ export async function setFilter(params: FilterParam): Promise<void> {
/**
*
* @param searchid
* @param params
* @returns
*/
export async function favorite(searchid: string): Promise<void> {
@ -107,7 +103,7 @@ export async function favorite(searchid: string): Promise<void> {
/**
*
* @param searchid
* @param params
* @returns
*/
export async function unfavorite(searchid: string): Promise<void> {
@ -139,7 +135,7 @@ export async function sort(searchid: string, reorder: number): Promise<void> {
* @param userId
* @returns
*/
export async function getfieldList(reviewType: number, userId: number): Promise<void> {
export async function getfieldList(reviewType: number, userId: number): Promise<void> {
return http.request({
url: `/ocr/user/field/queryFields`,
method: 'get',
@ -152,11 +148,11 @@ export async function getfieldList(reviewType: number, userId: number): Promise<
* @param reviewType
* @returns
*/
export async function getAllfieldList(reviewType: number): Promise<void> {
export async function getAllfieldList(reviewType: number): Promise<void> {
return http.request({
url: `/ocr/field/list`,
method: 'get',
params: { reviewType },
params: { reviewType},
})
}
@ -166,13 +162,17 @@ export async function getAllfieldList(reviewType: number): Promise<void> {
* @param reviewType
* @param userId
* @param userField
*
*
* @returns
*/
export async function savefield(reviewType: number, userId: string, userFieldFixed: string, userFieldUnFixed: string = ''): Promise<void> {
export async function savefield(reviewType: number,userId:string,userFieldFixed:string,userFieldUnFixed:string=''): Promise<void> {
return http.request({
url: `/ocr/user/field/saveOrUpdate`,
method: 'POST',
params: { reviewType, userId, userFieldFixed, userFieldUnFixed },
params: { reviewType,userId,userFieldFixed,userFieldUnFixed},
})
}

@ -79,6 +79,7 @@ export async function getToolsCount() {
})
}
/**
*
* @param note
@ -107,7 +108,7 @@ export async function oneClickCheck(params: Partial<CheckParam> = { search_histo
* @param note
* @returns
*/
export async function oneClickCheckTaskPackage(params: Partial<CheckParam> = { search_history: '0' }) {
export async function oneClickCheckTaskPackage(params: Partial<CheckParam> = { search_history: '0' }) {
const notEmptyParams = pickBy(params, notEmpty)
Object.keys(notEmptyParams).forEach((key) => {
@ -130,7 +131,8 @@ export async function oneClickCheckTaskPackage(params: Partial<CheckParam> = { s
* @param note
* @returns
*/
export async function getLastCheckNo() {
export async function getLastCheckNo() {
return http.request({
url: `/ocr/checkDuplicate/getLastCheckNo`,
method: 'get',
@ -142,7 +144,8 @@ export async function getLastCheckNo() {
* @param note
* @returns
*/
export async function getCheckDuplicateStatus(checkDuplicateNo) {
export async function getCheckDuplicateStatus(checkDuplicateNo) {
return http.request({
url: `/ocr/checkDuplicate/getCheckDuplicateStatus`,
method: 'get',
@ -155,7 +158,8 @@ export async function getCheckDuplicateStatus(checkDuplicateNo) {
* @param note
* @returns
*/
export async function removeCheckDuplicate(checkDuplicateNo) {
export async function removeCheckDuplicate(checkDuplicateNo) {
return http.request({
url: `/ocr/checkDuplicate/removeCheckDuplicate`,
method: 'get',
@ -165,31 +169,33 @@ export async function removeCheckDuplicate(checkDuplicateNo) {
}
/**
*
* @param
* @param
* @returns
*/
export async function createPackage(params) {
export async function createPackage(params) {
return http.request({
url: `/ocr/ocrTaskPackage/createPackage`,
method: 'post',
params,
params
})
}
/**
*
* @param
* @param
* @returns
*/
export async function deletePackage(params) {
export async function deletePackage(params) {
return http.request({
url: `/ocr/ocrTaskPackage/deletePackage`,
method: 'get',
params,
params
})
}
/**
*
* @param
* @param
* @returns
*/
export async function queryPageListByCheckNo(params: any): Promise<any> {
@ -260,13 +266,14 @@ export async function getPictureList(params: any): Promise<any> {
/**
*
* @param
* @param
* @returns
*/
export async function getFilterList(params) {
return http.request({
url: `/ocr/ocrUsersearch/querySearchCondition`,
method: 'get',
params,
params
})
}
}

@ -6,7 +6,7 @@ import { ContentTypeEnum } from '@/enums/httpEnum'
*
* @returns
*/
export async function getCode(params: { phone: string, agentcode: string }) {
export async function getCode(params: {phone: string,agentcode:string}) {
const res = await http.request({
url: `/web/smslogin/sendcode`,
method: 'get',

@ -1,4 +1,7 @@
import qs from 'qs'
import { http } from '@/utils/http/axios'
import type { ApprovalParam, PageParam } from '/#/api'
import { ContentTypeEnum } from '@/enums/httpEnum'
/**
*
@ -12,7 +15,6 @@ export async function getApprovalList(page: any) {
pageSize: page.pageSize,
currPage: page.pageNo,
keyword: page.keyword,
userSearchId: page.userSearchId,
},
})

@ -22,7 +22,7 @@ export async function getPackageList(params: PageParam, packageName: string) {
}
/**
* -
* -
* @returns
*/
export async function getPackagePicture(params: PageParam, packagename: string) {
@ -62,11 +62,12 @@ export async function getPackageTaskList(packageid: string, params: PageParam) {
}
/**
* -
* -
* @param checkDuplicateId id
* @returns
*/
export async function getTaskDetailInfo(checkDuplicateId: string) {
const res = await http.request({
url: `/ocr/ocrPicture/getPackagePicture?checkDuplicateId=${checkDuplicateId}`,
method: 'get',
@ -74,18 +75,7 @@ export async function getTaskDetailInfo(checkDuplicateId: string) {
return res.data
}
/**
*
* @param pictureid id xx,xx,xx,xx
* @returns
*/
export async function dubiousfileyd(pictureid: string) {
const res = await http.request({
url: `/ocr/dubiousfile/dubiousfileyd?pictureid=${pictureid}`,
method: 'get',
})
return res.data
}
/**
* ()
* @param packageid id
@ -94,6 +84,7 @@ export async function dubiousfileyd(pictureid: string) {
* @returns
*/
export async function getPictureSimilarityList(params: PageParam & PictureSortParam & SimilarityPictureSortParam) {
const res = await http.request({
url: `/backstage/jifen/ocrtaskchildpicture/getPictureSimilarityList`,
method: 'get',
@ -103,7 +94,7 @@ export async function getPictureSimilarityList(params: PageParam & PictureSortPa
const { data: { records, pages, total } } = res
// 精简一下数据
const list = records.map((item, index) => {
const list = records.map((item,index) => {
return {
id: item.id,
checkDuplicateId: item.checkDuplicateId,
@ -117,9 +108,9 @@ export async function getPictureSimilarityList(params: PageParam & PictureSortPa
iztrueorfalse: item.iztrueorfalse,
states: item.states,
history: item.ocpictureid && item.picturecompare && hasHistory(item.ocpictureid, item.picturecompare),
historyStates: item.historyStates,
submitDateTimestamp: item.submitDateTimestamp,
photoDateTimestamp: item.photoDateTimestamp,
historyStates:item.historyStates,
submitDateTimestamp:item.submitDateTimestamp,
photoDateTimestamp:item.photoDateTimestamp,
}
})
return {

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="48px" height="37px" viewBox="0 0 48 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>形状 2</title>
<g id="index" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="index_图片加载中" transform="translate(-893.000000, -298.000000)" fill="#F0F0F0" fill-rule="nonzero">
<g id="编组-24" transform="translate(410.000000, 62.000000)">
<g id="编组-27" transform="translate(16.000000, 132.000000)">
<g id="编组-18备份-2" transform="translate(400.000000, 0.000000)">
<g id="形状-3" transform="translate(67.000000, 104.000000)">
<g id="形状-2" transform="translate(0.000000, 0.462637)">
<path d="M12.8421882,20.0575479 C12.1281936,19.0374348 10.9742024,19.0374348 10.2622078,20.0575479 L0.346282996,34.2309071 C-0.367711589,35.249016 0.0582851799,36.0747264 1.29427581,36.0747264 L46.7139313,36.0747264 C47.9519219,36.0747264 48.3659188,35.2510201 47.6479242,34.2349153 L31.9400434,12.0389379 C31.2160489,11.0168206 30.0540576,11.0208289 29.3340631,12.0389379 L18.2181474,27.7454729 L12.8401882,20.0575479 L12.8421882,20.0575479 Z M6.54623594,4.5093408 C6.54623594,7.00050109 8.50022111,9.0186816 10.9102029,9.0186816 C13.3201846,9.0186816 15.2721698,7.00050109 15.2721698,4.5093408 C15.2721698,2.01818051 13.3221846,0 10.9122029,0 C8.50222115,0 6.54823594,2.01818051 6.54823594,4.5093408 L6.54623594,4.5093408 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.7 KiB

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>小结重复数</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-2504.000000, -6389.000000)" fill="#507AFD" fill-rule="nonzero">
<g id="小结重复数" transform="translate(2504.000000, 6389.000000)">
<path d="M64,32 C64,49.6731274 49.6731274,64 32,64 C14.3268738,64 0,49.6731274 0,32 C0,14.3268738 14.3268738,0 32,0 C49.6731274,0 64,14.3268738 64,32 C64,32 64,32 64,32 Z" id="Ellipse-930" fill-opacity="0.1"></path>
<path d="M39.4637452,37.4192503 L42.4384908,40.9882633 L38.4168391,44.1717731 C38.238099,44.3210001 38.0082903,44.383178 37.7784816,44.3583068 L37.7784816,44.3583068 L35.4931621,44.1344663 C35.0463119,44.0971595 34.8292703,43.8360123 34.8803389,43.4007668 L34.8803389,43.4007668 L35.1229147,41.1872326 C35.148449,40.9633921 35.2633534,40.7519871 35.4420935,40.6151957 L35.4420935,40.6151957 L39.4637452,37.4192503 Z M36.3996296,40.9509565 C36.2847253,40.8141651 36.0804509,40.7892939 35.9400123,40.9012142 C35.7995736,41.0131344 35.7740393,41.2121038 35.8889437,41.3488952 L35.8889437,41.3488952 L37.7401802,43.574865 C37.8550845,43.7116564 38.0593589,43.7365276 38.1997975,43.6246073 C38.3402362,43.512687 38.3657705,43.3137177 38.2508661,43.1769262 L38.2508661,43.1769262 Z M34.7015988,24.1007387 C36.0676837,24.1877878 36.3613282,24.3743216 36.2847253,25.6924936 L36.2847253,38.0161584 L33.6546927,40.1302079 C33.2844454,41.0006988 33.1184724,41.8090119 33.1823082,42.5800182 L21.3982301,42.5800182 C19.840638,42.5800182 19.6363636,41.9582389 19.6363636,40.8887786 L19.6363636,26.0655611 C19.6363636,24.8344382 19.751268,24.1256099 21.2322572,24.1007387 L34.7015988,24.1007387 Z M40.8936659,36.3000477 C41.4809547,35.8523666 42.3235865,35.9394157 42.795971,36.499017 L42.795971,36.499017 L44.0599187,38.028594 C44.0726858,38.028594 44.0726858,38.0410296 44.085453,38.0534652 C44.5323032,38.6130665 44.430166,39.4338151 43.8556443,39.8690606 L43.8556443,39.8690606 L43.0002454,40.5530178 L40.0254998,36.9840049 Z M27.2300894,35.6641158 L23.5186803,35.6641158 C23.1851396,35.6441576 22.8663348,35.8038546 22.6825894,36.082934 C22.4997429,36.3503649 22.4997429,36.7025941 22.6825894,36.9700249 C22.864953,37.2412522 23.1786803,37.3896158 23.5186803,37.3896158 L23.5186803,37.3896158 L27.2300894,37.3896158 C27.5700894,37.3896158 27.8838166,37.2412522 28.066953,36.9700249 C28.2500894,36.6987977 28.2500894,36.3533886 28.066953,36.082934 C27.8838166,35.810934 27.5700894,35.6641158 27.2300894,35.6641158 L27.2300894,35.6641158 Z M36.093218,19.6363636 C39.182868,19.7109771 40.6383229,20.5814681 40.6766243,23.5287018 L40.6766243,34.6088081 L40.56172,34.5590658 L37.6252759,36.9218269 L37.6252759,24.1629166 C37.6252759,23.3670392 37.0762885,22.5711617 36.1570538,22.533855 L24.0665642,22.533855 C23.798454,22.533855 23.5175768,22.2851433 23.4920425,22.023996 L23.4920425,21.36491 C23.4920425,20.4819834 24.30914,19.6736704 25.2411418,19.6487992 L25.3049776,19.6487992 L36.093218,19.6363636 Z M32.8238621,31.2997522 L23.5186803,31.2997522 C23.1850199,31.2801224 22.8662573,31.4400929 22.6825894,31.7193431 C22.4997429,31.986774 22.4997429,32.3390032 22.6825894,32.606434 C22.864953,32.8776613 23.1786803,33.0260249 23.5186803,33.0260249 L23.5186803,33.0260249 L32.7983621,33.0260249 C33.1375894,33.0260249 33.4520894,32.8537067 33.6607257,32.606434 C33.8438621,32.3359795 33.8438621,31.9897977 33.6607257,31.7193431 C33.4775894,31.4481158 33.1638621,31.2997522 32.8238621,31.2997522 L32.8238621,31.2997522 Z M23.5186803,26.911434 C23.1786803,26.8867067 22.864953,27.0597977 22.6825894,27.3310249 C22.4997429,27.5984558 22.4997429,27.950685 22.6825894,28.2181158 C22.864953,28.4901158 23.1786803,28.636934 23.5186803,28.636934 L23.5186803,28.636934 L32.7983621,28.636934 C33.1375894,28.662434 33.4513166,28.4901158 33.634453,28.2428431 C33.7913166,27.9716158 33.7913166,27.6262067 33.634453,27.3557522 C33.4513166,27.0845249 33.1638621,26.911434 32.8238621,26.911434 L32.8238621,26.911434 Z" id="形状结合"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 4.2 KiB

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>卡片模式</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-3040.000000, -6389.000000)" fill-rule="nonzero">
<g id="卡片模式" transform="translate(3040.000000, 6389.000000)">
<rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="64" height="64"></rect>
<path d="M52.8,52.8 L52.8,38.95 L38.95,38.95 L38.95,52.8 L52.8,52.8 M25.05,52.8 L25.05,38.95 L11.2,38.95 L11.2,52.8 L25.05,52.8 M52.8,25.05 L52.8,11.2 L38.95,11.2 L38.95,25.05 L52.8,25.05 M25.05,25.05 L25.05,11.2 L11.2,11.2 L11.2,25.05 L25.05,25.05 M54.55,58 L37.2,58 C35.3,58 33.75,56.45 33.75,54.55 L33.75,37.2 C33.75,35.3 35.3,33.75 37.2,33.75 L54.55,33.75 C56.45,33.75 58,35.3 58,37.2 L58,54.55 C58,56.45 56.45,58 54.55,58 L54.55,58 Z M26.8,58 L9.45,58 C7.55,58 6,56.45 6,54.55 L6,37.2 C6,35.3 7.55,33.75 9.45,33.75 L26.8,33.75 C28.7,33.75 30.25,35.3 30.25,37.2 L30.25,54.55 C30.25,56.45 28.7,58 26.8,58 L26.8,58 Z M54.55,30.25 L37.2,30.25 C35.3,30.25 33.75,28.7 33.75,26.8 L33.75,9.45 C33.75,7.55 35.3,6 37.2,6 L54.55,6 C56.45,6 58,7.55 58,9.45 L58,26.8 C58,28.7 56.45,30.25 54.55,30.25 L54.55,30.25 Z M26.8,30.25 L9.45,30.25 C7.55,30.25 6,28.7 6,26.8 L6,9.45 C6,7.55 7.55,6 9.45,6 L26.8,6 C28.7,6 30.25,7.55 30.25,9.45 L30.25,26.8 C30.25,28.7 28.7,30.25 26.8,30.25 L26.8,30.25 Z" id="形状" fill="#333333"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>任务总数</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-930.000000, -6389.000000)" fill="#507AFD" fill-rule="nonzero">
<g id="任务总数" transform="translate(930.000000, 6389.000000)">
<path d="M64,32 C64,49.6731274 49.6731274,64 32,64 C14.3268738,64 0,49.6731274 0,32 C0,14.3268738 14.3268738,0 32,0 C49.6731274,0 64,14.3268738 64,32 C64,32 64,32 64,32 Z" id="Ellipse-930" fill-opacity="0.1"></path>
<path d="M42.8077595,20.3636364 L21.1922405,20.3636364 C20.9718752,20.364003 20.7607017,20.4519898 20.60527,20.6082013 C20.4498384,20.7644129 20.3629095,20.9760242 20.3636409,21.1963887 L20.3636409,27.0159562 L43.6363591,27.0159562 L43.6363591,21.1963887 C43.6370905,20.9760242 43.5501616,20.7644129 43.39473,20.6082013 C43.2392983,20.4519898 43.0281248,20.364003 42.8077595,20.3636364 L42.8077595,20.3636364 Z M23.6724827,24.7283119 C23.097779,24.7283119 22.6318895,24.2624221 22.6318895,23.6877179 C22.6318895,23.1130136 23.097779,22.6471238 23.6724827,22.6471238 C24.2468039,22.6471238 24.7123832,23.1127035 24.7123832,23.6870251 C24.7123832,24.2613467 24.2468039,24.7269264 23.6724827,24.7269264 L23.6724827,24.7283119 Z M20.3636456,42.8036113 C20.3636456,43.2664054 20.7349891,43.6363636 21.1922405,43.6363636 L42.8036027,43.6363636 C43.0239675,43.6363636 43.2352865,43.5487295 43.390978,43.3927781 C43.5466694,43.2368266 43.6339511,43.0253615 43.6335843,42.8049968 L43.6335843,36.9854294 L20.3636456,36.9854294 L20.3636456,42.8049968 L20.3636456,42.8036113 Z M23.6724827,39.2730736 C24.2464213,39.2730736 24.7116904,39.7383431 24.7116904,40.3122821 C24.7116904,40.8862211 24.2464213,41.3514906 23.6724827,41.3514906 C23.0985442,41.3514906 22.6332751,40.8862211 22.6332751,40.3122821 C22.6332751,39.7383431 23.0985442,39.2730736 23.6724827,39.2730736 L23.6724827,39.2730736 Z M20.3636456,35.3240815 L43.6363544,35.3240815 L43.6363544,28.6759185 L20.3636456,28.6759185 L20.3636456,35.3254671 L20.3636456,35.3240815 Z M23.6724827,30.9594059 C24.2468039,30.9594059 24.7123832,31.4249856 24.7123832,31.9993072 C24.7123832,32.5736288 24.2468039,33.0392084 23.6724827,33.0392084 C23.0985442,33.0392084 22.6332751,32.573939 22.6332751,32 C22.6332751,31.426061 23.0985442,30.9607916 23.6724827,30.9607916 L23.6724827,30.9594059 Z" id="形状"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>新建</title>
<defs>
<rect id="path-1" x="0" y="0" width="64" height="64"></rect>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-664.000000, -3118.000000)">
<g id="新建" transform="translate(664.000000, 3118.000000)">
<g transform="translate(0.000000, 0.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<use id="蒙版" fill="#FFFFFF" fill-rule="nonzero" opacity="0" xlink:href="#path-1"></use>
<g id="编组" mask="url(#mask-2)" fill="#FFFFFF">
<g transform="translate(7.000000, 7.000000)" id="形状结合">
<path d="M48,0 C49.1045695,-2.02906125e-16 50,0.8954305 50,2 L50,22 C50,22.5522847 49.5522847,23 49,23 L46,23 C45.4477153,23 45,22.5522847 45,22 L45,5 L5,5 L5,45 L22,45 C22.5522847,45 23,45.4477153 23,46 L23,49 C23,49.5522847 22.5522847,50 22,50 L2,50 C0.8954305,50 1.3527075e-16,49.1045695 0,48 L0,2 C-1.3527075e-16,0.8954305 0.8954305,2.02906125e-16 2,0 L48,0 Z M40.8724299,28.8483283 C41.4247147,28.8483283 41.8724299,29.2960436 41.8724299,29.8483283 L41.8724299,36.8483283 L48.8724299,36.8483283 C49.4247147,36.8483283 49.8724299,37.2960436 49.8724299,37.8483283 L49.8724299,40.8483283 C49.8724299,41.4006131 49.4247147,41.8483283 48.8724299,41.8483283 L41.8724299,41.8483283 L41.8724299,48.8483283 C41.8724299,49.4006131 41.4247147,49.8483283 40.8724299,49.8483283 L37.8724299,49.8483283 C37.3201452,49.8483283 36.8724299,49.4006131 36.8724299,48.8483283 L36.8724299,41.8483283 L29.8724299,41.8483283 C29.3201452,41.8483283 28.8724299,41.4006131 28.8724299,40.8483283 L28.8724299,37.8483283 C28.8724299,37.2960436 29.3201452,36.8483283 29.8724299,36.8483283 L36.8724299,36.8483283 L36.8724299,29.8483283 C36.8724299,29.2960436 37.3201452,28.8483283 37.8724299,28.8483283 L40.8724299,28.8483283 Z"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>已审批</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-1458.000000, -6389.000000)" fill="#507AFD" fill-rule="nonzero">
<g id="已审批" transform="translate(1458.000000, 6389.000000)">
<path d="M64,32 C64,49.6731274 49.6731274,64 32,64 C14.3268738,64 0,49.6731274 0,32 C0,14.3268738 14.3268738,0 32,0 C49.6731274,0 64,14.3268738 64,32 C64,32 64,32 64,32 Z" id="Ellipse-930" fill-opacity="0.1"></path>
<g id="编组" transform="translate(20.363636, 20.363636)">
<path d="M17.1722301,12.6691268 C20.5422747,12.6691268 23.2771277,15.3748997 23.272722,18.704746 C23.2638945,22.025864 20.5334526,24.7229086 17.1810522,24.7272727 C13.8110075,24.7272727 11.0761546,22.025864 11.0761546,18.6960177 C11.0761546,15.3705356 13.8065965,12.6691268 17.1722301,12.6691268 Z M10.5909387,21.9560376 C10.8291356,22.4971922 11.1290872,22.9990694 11.4907936,23.4616693 L0,23.4616693 L0,21.9560376 L10.5909387,21.9560376 Z M19.6159535,15.9160543 L16.4444063,19.258993 L14.596175,17.5133331 L13.4757675,18.5389083 L16.4929279,21.4847094 L20.8686926,17.1423804 L19.6159535,15.9160543 Z M10.0130907,0 C13.1317053,0 15.6636499,2.50502198 15.6636499,5.59047588 C15.6636499,6.55495299 15.4166309,7.46269615 14.9843477,8.25260726 L14.9799366,8.25697141 C14.8255498,8.536277 14.6402855,8.80249013 14.4417881,9.05561082 C13.5860438,10.4041331 12.8096985,11.4733498 13.2552148,12.760774 C11.2967072,14.0263774 9.99985758,16.2128165 9.99985758,18.6960177 C9.99985758,19.1629817 10.0483792,19.1760742 10.1321892,19.6168533 L0,19.6168533 L0,14.6286301 L5.58880439,14.6286301 C8.62802004,12.2588968 6.77096665,10.897282 5.56674913,9.03379007 C4.81687008,8.08240542 4.3625316,6.89099252 4.3625316,5.59047588 C4.3625316,2.50502198 6.89447614,0 10.0130907,0 Z" id="形状结合"></path>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.1 KiB

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="44px" viewBox="0 0 64 44" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>标签</title>
<defs>
<polygon id="path-1" points="0 0 25.9047619 0 25.9047619 3.03448276 0 3.03448276"></polygon>
<polygon id="path-3" points="0 0 25.9047619 0 25.9047619 9.10344828 0 9.10344828"></polygon>
<linearGradient x1="6.6483347%" y1="5.51282194%" x2="77.9785156%" y2="89.1343284%" id="linearGradient-5">
<stop stop-color="#FFA0A0" offset="0%"></stop>
<stop stop-color="#FF4E4F" offset="100%"></stop>
</linearGradient>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="无法上传iconfont" transform="translate(-1335.000000, -540.000000)">
<g id="标签" transform="translate(1335.000000, 540.000000)">
<g id="编组">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="Clip-2"></g>
<path d="M5.19743462,-3.10020716e-05 L2.80500448,-3.10020716e-05 C2.80500448,-3.10020716e-05 0.0824975911,0.592186069 0,7.32785113 L7.0949656,7.32785113 L13.942352,7.32785113 L25.9047619,5.84750222 L6.84747283,2.07245748 L5.19743462,-3.10020716e-05 Z" id="Fill-1" fill="#D44242" mask="url(#mask-2)"></path>
</g>
<g id="编组" transform="translate(38.095238, 0.000000)">
<mask id="mask-4" fill="white">
<use xlink:href="#path-3"></use>
</mask>
<g id="Clip-4"></g>
<path d="M23.0998499,-3.85141222e-05 L20.7074101,-3.85141222e-05 L19.0573653,1.06613433 L0,3.00817174 L11.9623713,3.76972377 L18.8098716,3.76972377 L25.9047792,3.76972377 C25.8222813,0.304622169 23.0998499,-3.85141222e-05 23.0998499,-3.85141222e-05" id="Fill-3" fill="#D44242" mask="url(#mask-4)"></path>
</g>
<path d="M3.04761905,0 C5.4656579,0.257580711 5.47255535,6.18211688 5.47255535,6.18211688 L5.47255535,6.18211688 L5.47255535,35.4136167 C5.47255535,40.1557989 9.20573842,44 13.810795,44 L13.810795,44 L13.8762772,44 L50.1236355,44 L50.1890304,44 C54.794087,44 58.52727,40.1557989 58.52727,35.4136167 L58.52727,35.4136167 L58.52727,6.18211688 C58.52727,6.18211688 58.5341675,0.257580711 60.952381,0 L60.952381,0 L3.04761905,0 Z" id="Fill-5" fill="url(#linearGradient-5)"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 1.2 MiB

@ -1,61 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 33</title>
<defs>
<rect id="path-1" x="0" y="0" width="32" height="32"></rect>
<linearGradient x1="103.941749%" y1="-9.86447236%" x2="15.6759798%" y2="100%" id="linearGradient-3">
<stop stop-color="#94B3FF" offset="0%"></stop>
<stop stop-color="#3955FF" offset="100%"></stop>
</linearGradient>
<path d="M4.81965071,11.9835294 C4.81965071,18.6007843 10.107091,23.964183 16.6334651,23.964183 C23.1570041,23.964183 28.4444444,18.6007843 28.4444444,11.9835294 C28.4444444,5.36339869 23.1570041,0 16.6334651,0 C10.107091,0 4.81965071,5.36339869 4.81965071,11.9835294 Z" id="path-4"></path>
<filter x="0.0%" y="0.0%" width="100.0%" height="100.0%" filterUnits="objectBoundingBox" id="filter-5">
<feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feColorMatrix values="0 0 0 0 0.328065454 0 0 0 0 0.41948512 0 0 0 0 1 0 0 0 1 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
</filter>
<rect id="path-6" x="0" y="0" width="28.3508865" height="28.7581699"></rect>
<path d="M2.26807092,15.4345098 C2.26807092,22.0517647 7.55551126,27.4151634 14.0818853,27.4151634 C20.6054243,27.4151634 25.8928647,22.0517647 25.8928647,15.4345098 C25.8928647,8.81437908 20.6054243,3.45098039 14.0818853,3.45098039 C7.55551126,3.45098039 2.26807092,8.81437908 2.26807092,15.4345098 Z" id="path-8"></path>
<linearGradient x1="50.4938081%" y1="35.9999974%" x2="0%" y2="114.811198%" id="linearGradient-9">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
</linearGradient>
<filter x="-338.5%" y="-333.7%" width="776.9%" height="767.3%" filterUnits="objectBoundingBox" id="filter-10">
<feGaussianBlur stdDeviation="5.75725631" in="SourceGraphic"></feGaussianBlur>
</filter>
</defs>
<g id="-index备份" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="index_1.0备份-21" transform="translate(-836.000000, -367.000000)">
<g id="编组-8备份-2" transform="translate(473.000000, 206.000000)">
<g id="画板-8" transform="translate(28.881832, 57.745953)">
<g id="画板-4" transform="translate(236.118168, 103.254047)">
<g id="编组-54备份" transform="translate(98.000000, 0.000000)">
<g id="编组-26" transform="translate(0.063866, 1.000000)">
<path d="M48,24 C48,37.2548455 37.2548455,48 24,48 C10.7451553,48 0,37.2548455 0,24 C0,10.7451553 10.7451553,0 24,0 C37.2548455,0 48,10.7451553 48,24 C48,24 48,24 48,24 Z" id="Ellipse-930" fill="#E9EEFF" fill-rule="nonzero"></path>
<g id="Group-1" transform="translate(7.936134, 8.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="蒙版"></g>
<g transform="translate(0.888889, 1.777778)">
<g id="路径">
<use fill="black" fill-opacity="1" filter="url(#filter-5)" xlink:href="#path-4"></use>
<use fill="url(#linearGradient-3)" fill-rule="evenodd" xlink:href="#path-4"></use>
</g>
<g id="user-person-profile-block-account-circle-svgrepo-com-1" transform="translate(0.000000, 0.575163)">
<mask id="mask-7" fill="white">
<use xlink:href="#path-6"></use>
</mask>
<g id="路径"></g>
<path id="路径" d="M14.0818853,3.20098039 C20.7447477,3.20098039 26.1428647,8.67755358 26.1428647,15.4345098 C26.1428647,22.189044 20.7443,27.6651634 14.0818853,27.6651634 C7.41708336,27.6651634 2.01807092,22.1894977 2.01807092,15.4345098 C2.01807092,8.6770998 7.41663558,3.20098039 14.0818853,3.20098039 Z M14.0818853,3.70098039 C7.69438694,3.70098039 2.51807092,8.95165837 2.51807092,15.4345098 C2.51807092,21.9149209 7.69481587,27.1651634 14.0818853,27.1651634 C20.4665486,27.1651634 25.6428647,21.9144854 25.6428647,15.4345098 C25.6428647,8.9520939 20.4669775,3.70098039 14.0818853,3.70098039 Z" fill="#FFFFFF" fill-rule="nonzero"></path>
<path d="M11.3638777,13.9269889 C11.5944007,13.9269889 11.7907721,14.0082723 11.9529919,14.1708392 C12.1152118,14.333406 12.1963217,14.5301975 12.1963217,14.7612135 C12.1963217,14.9836734 12.1152118,15.1783258 11.9529919,15.3451707 C11.7907721,15.5120157 11.5944007,15.5954381 11.3638777,15.5954381 C11.1333548,15.5954381 10.9369834,15.5120157 10.7747636,15.3451707 C10.6125437,15.1783258 10.5314338,14.9836734 10.5314338,14.7612135 C10.5314338,14.5301975 10.6125437,14.333406 10.7747636,14.1708392 C10.9369834,14.0082723 11.1333548,13.9269889 11.3638777,13.9269889 Z M17.8185202,9.13982315 C18.1941872,9.13982315 18.5271648,9.20613331 18.817453,9.33875363 C19.1077411,9.47137395 19.3532054,9.64249695 19.5538457,9.85212262 C19.7544861,10.0617483 19.908168,10.2991814 20.0148916,10.5644221 C20.1216152,10.8296627 20.174977,11.0906253 20.174977,11.3473098 L20.174977,17.9055986 C20.174977,18.10239 20.1301531,18.2949034 20.0405053,18.4831387 C19.9508575,18.671374 19.8313271,18.8424969 19.681914,18.9965076 C19.532501,19.1505183 19.3617433,19.2745825 19.1696408,19.3687002 C18.9775384,19.4628178 18.7790325,19.5098766 18.5741232,19.5098766 L18.5741232,12.3355451 C18.5741232,12.1130852 18.5314338,11.9055986 18.4460549,11.7130852 C18.360676,11.5205718 18.2454146,11.3515879 18.1002705,11.2061333 C17.9551264,11.0606788 17.7865031,10.9451707 17.5944007,10.8596092 C17.4022982,10.7740478 17.1952545,10.731267 16.9732694,10.731267 L9.77583079,10.731267 C9.77583079,10.5430317 9.81852022,10.3547964 9.90389909,10.1665611 C9.98927796,9.97832582 10.1045394,9.80720283 10.2496835,9.65319214 C10.3948276,9.49918144 10.5655853,9.37511727 10.7619567,9.28099962 C10.9583281,9.18688197 11.1675064,9.13982315 11.3894914,9.13982315 L17.8185202,9.13982315 L17.8185202,9.13982315 Z M16.704326,11.5398232 C17.0885309,11.5398232 17.3617433,11.644636 17.5239631,11.8542617 C17.686183,12.0638873 17.7672929,12.3441012 17.7672929,12.6949034 L17.7672929,20.2542617 C17.7672929,20.4681654 17.6776451,20.6692349 17.4983495,20.8574702 C17.3190538,21.0457055 17.0927998,21.1398232 16.8195875,21.1398232 L9.05864829,21.1398232 C8.82812535,21.1398232 8.62321606,21.0457055 8.44392044,20.8574702 C8.26462481,20.6692349 8.174977,20.4424969 8.174977,20.1772563 L8.174977,12.4767215 C8.174977,12.2029248 8.24968351,11.9783258 8.39909653,11.8029248 C8.54850955,11.6275237 8.74701542,11.5398232 8.99461414,11.5398232 L16.704326,11.5398232 Z M16.1792459,13.4906253 C16.1792459,13.3965076 16.1493633,13.3195023 16.0895981,13.2596092 C16.0298329,13.1997162 15.9529919,13.1697697 15.8590752,13.1697697 L10.0831947,13.1697697 C9.98927796,13.1697697 9.91243698,13.1997162 9.85267177,13.2596092 C9.79290656,13.3195023 9.76302396,13.3965076 9.76302396,13.4906253 L9.76302396,16.3526574 C9.83986494,16.446775 9.91030251,16.5515879 9.97433666,16.6670959 C10.0383708,16.7826039 10.1173463,16.8916948 10.211263,16.9943686 C10.3051798,17.0970424 10.4289791,17.1847429 10.5826611,17.2574702 C10.7363431,17.3301975 10.9497902,17.3665611 11.2230026,17.3665611 C11.6242833,17.3665611 11.9508575,17.30239 12.2027251,17.1740478 C12.4545928,17.0457055 12.6765779,16.8831387 12.8686803,16.6863472 C13.0607828,16.4895558 13.2400784,16.2777911 13.4065672,16.0510531 C13.573056,15.8243151 13.7715618,15.6104114 14.0020848,15.4093419 C14.2326077,15.2082723 14.5186269,15.0371494 14.8601424,14.8959729 C15.2016579,14.7547964 15.6413591,14.675652 16.1792459,14.6585397 L16.1792459,13.4906253 L16.1792459,13.4906253 Z" id="形状" fill="url(#linearGradient-9)" fill-rule="nonzero" mask="url(#mask-7)"></path>
</g>
<path d="M15.5929876,24.1568627 C14.1839485,24.1568627 13.0414078,25.315817 13.0414078,26.745098 C13.0414078,28.1743791 14.1839485,29.3333333 15.5929876,29.3333333 C17.0020266,29.3333333 18.1445674,28.1743791 18.1445674,26.745098 C18.1445674,25.315817 17.0020266,24.1568627 15.5929876,24.1568627 Z" id="路径" fill="#8B9CFF" filter="url(#filter-10)"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 8.9 KiB

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>图片重复数</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-2250.000000, -6389.000000)" fill="#507AFD" fill-rule="nonzero">
<g id="图片重复数" transform="translate(2250.000000, 6389.000000)">
<path d="M64,32 C64,49.6731274 49.6731274,64 32,64 C14.3268738,64 0,49.6731274 0,32 C0,14.3268738 14.3268738,0 32,0 C49.6731274,0 64,14.3268738 64,32 C64,32 64,32 64,32 Z" id="Ellipse-930" fill-opacity="0.1"></path>
<path d="M26.2074318,29.5008264 C26.6824488,29.5008264 27.0870929,29.6683196 27.4213641,30.0033058 C27.7556353,30.338292 27.9227709,30.7438017 27.9227709,31.2198347 C27.9227709,31.6782369 27.7556353,32.0793388 27.4213641,32.4231405 C27.0870929,32.7669421 26.6824488,32.938843 26.2074318,32.938843 C25.7324149,32.938843 25.3277708,32.7669421 24.9934996,32.4231405 C24.6592284,32.0793388 24.4920928,31.6782369 24.4920928,31.2198347 C24.4920928,30.7438017 24.6592284,30.338292 24.9934996,30.0033058 C25.3277708,29.6683196 25.7324149,29.5008264 26.2074318,29.5008264 Z M39.5079072,19.6363636 C40.282009,19.6363636 40.9681446,19.7730028 41.5663142,20.046281 C42.1644837,20.3195592 42.6702888,20.6721763 43.0837295,21.1041322 C43.4971702,21.5360882 43.8138482,22.0253444 44.0337635,22.5719008 C44.2536787,23.1184573 44.3636364,23.6561983 44.3636364,24.185124 L44.3636364,37.6991736 C44.3636364,38.1046832 44.271272,38.5013774 44.0865431,38.8892562 C43.9018143,39.277135 43.6555092,39.6297521 43.3476278,39.9471074 C43.0397465,40.2644628 42.687882,40.5201102 42.2920345,40.7140496 C41.8961871,40.907989 41.4871447,41.0049587 41.0649073,41.0049587 L41.0649073,26.2214876 C41.0649073,25.7630854 40.9769412,25.3355372 40.801009,24.938843 C40.6250768,24.5421488 40.3875683,24.1939394 40.0884836,23.8942149 C39.7893988,23.5944904 39.4419327,23.3564738 39.0460852,23.1801653 C38.6502377,23.0038567 38.2236021,22.9157025 37.7661783,22.9157025 L22.9350927,22.9157025 C22.9350927,22.5278237 23.0230588,22.1399449 23.198991,21.7520661 C23.3749232,21.3641873 23.6124317,21.0115702 23.9115164,20.6942149 C24.2106012,20.3768595 24.5624656,20.1212121 24.9671097,19.9272727 C25.3717538,19.7333333 25.8027877,19.6363636 26.2602115,19.6363636 L39.5079072,19.6363636 L39.5079072,19.6363636 Z M37.2119919,24.5818182 C38.0036868,24.5818182 38.5666699,24.7977961 38.9009411,25.2297521 C39.2352123,25.661708 39.4023479,26.2391185 39.4023479,26.9619835 L39.4023479,42.538843 C39.4023479,42.9796143 39.2176191,43.3939394 38.8481614,43.7818182 C38.4787038,44.169697 38.0124834,44.3636364 37.4495003,44.3636364 L21.4572621,44.3636364 C20.9822451,44.3636364 20.5600078,44.169697 20.1905501,43.7818182 C19.8210925,43.3939394 19.6363636,42.9267218 19.6363636,42.3801653 L19.6363636,26.5123967 C19.6363636,25.9482094 19.7903043,25.4853994 20.0981857,25.1239669 C20.4060671,24.7625344 20.8151095,24.5818182 21.3253129,24.5818182 L37.2119919,24.5818182 Z M36.1300087,28.6016529 C36.1300087,28.4077135 36.0684325,28.2490358 35.9452799,28.1256198 C35.8221274,28.0022039 35.6637884,27.9404959 35.4702629,27.9404959 L23.5684486,27.9404959 C23.3749232,27.9404959 23.2165842,28.0022039 23.0934316,28.1256198 C22.9702791,28.2490358 22.9087028,28.4077135 22.9087028,28.6016529 L22.9087028,34.4991736 C23.0670418,34.6931129 23.2121859,34.9090909 23.3441351,35.1471074 C23.4760842,35.385124 23.6388215,35.6099174 23.8323469,35.8214876 C24.0258724,36.0330579 24.2809741,36.2137741 24.5976521,36.3636364 C24.9143301,36.5134986 25.3541606,36.5884298 25.9171437,36.5884298 C26.7440251,36.5884298 27.4169658,36.4561983 27.9359658,36.1917355 C28.4549659,35.9272727 28.9123896,35.5922865 29.3082371,35.1867769 C29.7040846,34.7812672 30.0735423,34.3449036 30.4166101,33.877686 C30.7596779,33.4104683 31.1687203,32.969697 31.6437373,32.5553719 C32.1187542,32.1410468 32.7081272,31.7884298 33.411856,31.4975207 C34.1155849,31.2066116 35.0216358,31.0435262 36.1300087,31.0082645 L36.1300087,28.6016529 L36.1300087,28.6016529 Z" id="形状"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 4.2 KiB

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>不通过</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-1986.000000, -6389.000000)" fill="#507AFD" fill-rule="nonzero">
<g id="不通过" transform="translate(1986.000000, 6389.000000)">
<path d="M64,32 C64,49.6731274 49.6731274,64 32,64 C14.3268738,64 0,49.6731274 0,32 C0,14.3268738 14.3268738,0 32,0 C49.6731274,0 64,14.3268738 64,32 C64,32 64,32 64,32 Z" id="Ellipse-930" fill-opacity="0.1"></path>
<path d="M39.7482333,33.8946117 C42.6991808,33.8946117 45.0909091,36.2863399 45.0909091,39.2372874 C45.0909091,42.188235 42.6991808,44.5799632 39.7482333,44.5799632 C36.7972858,44.5799632 34.4055575,42.188235 34.4055575,39.2372874 C34.4055575,36.2863399 36.7979127,33.8946117 39.7482333,33.8946117 Z M37.4198247,20.3636364 C38.6352542,20.3636364 39.6249811,21.3102054 39.7053482,22.4981668 L39.7106177,22.6544293 L39.7106177,32.0301294 C38.2617883,32.0301294 36.9145212,32.4608286 35.7891864,33.200603 C35.6989537,32.68191 35.2735706,32.2783575 34.7434337,32.2233535 L34.6193398,32.2169538 L25.7790357,32.2169538 C25.1226427,32.2169538 24.5903813,32.7492152 24.5903813,33.4062352 C24.5903813,34.0221914 25.0576381,34.5284965 25.657413,34.5893786 L25.7790357,34.5955165 L34.2256293,34.5955165 C33.8327226,35.0663736 33.5019239,35.5857486 33.2413532,36.1408927 L33.1838326,36.136661 L33.1838326,36.136661 L33.1253717,36.1352504 L25.8699402,36.1352504 C25.2135472,36.1352504 24.6812858,36.6675118 24.6812858,37.3245318 C24.6812858,37.940488 25.1485426,38.4467931 25.7483175,38.5076752 L25.8699402,38.5138131 L32.6006334,38.5138131 C32.5805717,38.73073 32.5699139,38.9501547 32.5699139,39.172087 C32.5699139,40.7766294 33.098884,42.2566435 33.9946204,43.4540581 L34.1786098,43.6897262 L22.6544293,43.6897262 C21.4389998,43.6897262 20.4492729,42.7431572 20.3689058,41.5551958 L20.3636364,41.3989333 L20.3636364,27.8083999 C20.3636364,27.1795133 20.8413624,26.6619308 21.4543271,26.5996896 L21.5786218,26.5934145 L25.2536705,26.5934145 C25.9184095,26.5934145 26.4652323,26.0881379 26.5309885,25.4407351 L26.537618,25.3094671 L26.537618,21.5786218 C26.537618,20.9497352 27.015344,20.4321527 27.6283087,20.3699115 L27.7526034,20.3636364 L37.4198247,20.3636364 Z M41.5917907,36.6918329 C41.4158995,36.691476 41.2470992,36.7611422 41.1226598,36.8854509 L39.7104097,38.2970645 L38.2981597,36.8854509 C38.0376994,36.6296854 37.6201068,36.6305359 37.3606905,36.8873602 C37.2358759,37.0112923 37.1655227,37.1798074 37.1651631,37.3556986 C37.1648063,37.5315897 37.2344724,37.7003901 37.3587811,37.8248295 L38.7703947,39.2370795 L37.3587811,40.6493295 C37.1030156,40.9097899 37.1038661,41.3273824 37.3606905,41.5867988 C37.6216289,41.8477373 38.039767,41.8477373 38.2981597,41.5887081 L39.7104097,40.1770945 L41.1226598,41.5887081 C41.3831201,41.8444736 41.8007126,41.8436231 42.060129,41.5867988 C42.3210675,41.3258603 42.3210675,40.9077223 42.0620383,40.6493295 L40.6504247,39.2370795 L42.0620383,37.8248295 C42.3178038,37.5643691 42.3169533,37.1467766 42.060129,36.8873602 C41.936197,36.7625457 41.7676818,36.6921925 41.5917907,36.6918329 Z M34.5735741,28.300538 L28.9036422,28.300538 C28.2472491,28.300538 27.7149877,28.8327994 27.7149877,29.4898193 C27.7149877,30.1057756 28.1822446,30.6120807 28.7820195,30.6729628 L28.9036422,30.6791007 L34.5735741,30.6791007 C35.2305941,30.6791007 35.7622285,30.1468393 35.7622285,29.4898193 C35.7622285,28.8327994 35.2305941,28.300538 34.5735741,28.300538 Z M25.4646994,21.1427154 L25.4668259,21.2131231 L25.2818823,24.0261466 C25.2372137,24.7049914 24.7274923,25.2543489 24.066794,25.3601429 L23.9327344,25.3752944 L21.1197109,25.560238 C20.8274662,25.5793352 20.6570162,25.2544162 20.8090505,25.0277874 L20.8538936,24.9734339 L24.8800218,20.9473058 C25.0877759,20.7401304 25.4296108,20.8721636 25.4646994,21.1427154 Z" id="形状结合"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 4.1 KiB

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>通过</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-1720.000000, -6389.000000)" fill="#507AFD" fill-rule="nonzero">
<g id="通过" transform="translate(1720.000000, 6389.000000)">
<path d="M64,32 C64,49.6731274 49.6731274,64 32,64 C14.3268738,64 0,49.6731274 0,32 C0,14.3268738 14.3268738,0 32,0 C49.6731274,0 64,14.3268738 64,32 C64,32 64,32 64,32 Z" id="Ellipse-930" fill-opacity="0.1"></path>
<path d="M39.7482333,33.8946117 C42.6991808,33.8946117 45.0909091,36.2863399 45.0909091,39.2372874 C45.0909091,42.188235 42.6991808,44.5799632 39.7482333,44.5799632 C36.7972858,44.5799632 34.4055575,42.188235 34.4055575,39.2372874 C34.4055575,36.2863399 36.7979127,33.8946117 39.7482333,33.8946117 Z M37.4198247,20.3636364 C38.6352542,20.3636364 39.6249811,21.3102054 39.7053482,22.4981668 L39.7106177,22.6544293 L39.7106177,32.0301294 C38.2617883,32.0301294 36.9145212,32.4608286 35.7891864,33.200603 C35.6989537,32.68191 35.2735706,32.2783575 34.7434337,32.2233535 L34.6193398,32.2169538 L25.7790357,32.2169538 C25.1226427,32.2169538 24.5903813,32.7492152 24.5903813,33.4062352 C24.5903813,34.0221914 25.0576381,34.5284965 25.657413,34.5893786 L25.7790357,34.5955165 L34.2256293,34.5955165 C33.8327226,35.0663736 33.5019239,35.5857486 33.2413532,36.1408927 L33.1838326,36.136661 L33.1838326,36.136661 L33.1253717,36.1352504 L25.8699402,36.1352504 C25.2135472,36.1352504 24.6812858,36.6675118 24.6812858,37.3245318 C24.6812858,37.940488 25.1485426,38.4467931 25.7483175,38.5076752 L25.8699402,38.5138131 L32.6006334,38.5138131 C32.5805717,38.73073 32.5699139,38.9501547 32.5699139,39.172087 C32.5699139,40.7766294 33.098884,42.2566435 33.9946204,43.4540581 L34.1786098,43.6897262 L22.6544293,43.6897262 C21.4389998,43.6897262 20.4492729,42.7431572 20.3689058,41.5551958 L20.3636364,41.3989333 L20.3636364,27.8083999 C20.3636364,27.1795133 20.8413624,26.6619308 21.4543271,26.5996896 L21.5786218,26.5934145 L25.2536705,26.5934145 C25.9184095,26.5934145 26.4652323,26.0881379 26.5309885,25.4407351 L26.537618,25.3094671 L26.537618,21.5786218 C26.537618,20.9497352 27.015344,20.4321527 27.6283087,20.3699115 L27.7526034,20.3636364 L37.4198247,20.3636364 Z M41.4753711,37.4183387 L41.4127373,37.4748619 L39.4603946,39.3561686 L38.0870331,37.9835709 C37.8080077,37.7045508 37.3637172,37.6801971 37.0558662,37.9270477 L36.9924686,37.9835709 C36.7098525,38.266187 36.6915206,38.7107345 36.9359453,39.0147378 L36.9924686,39.0781355 L38.9127305,40.9976335 C39.1945827,41.2802496 39.6398941,41.2985815 39.9438973,41.0541567 L40.0065312,40.9976335 L42.506538,38.5686626 C42.7950286,38.2777623 42.80676,37.8124072 42.5332936,37.5073402 C42.2598271,37.2022731 41.7959628,37.1632489 41.4753711,37.4183387 Z M34.5735741,28.300538 L28.9036422,28.300538 C28.2472491,28.300538 27.7149877,28.8327994 27.7149877,29.4898193 C27.7149877,30.1057756 28.1822446,30.6120807 28.7820195,30.6729628 L28.9036422,30.6791007 L34.5735741,30.6791007 C35.2305941,30.6791007 35.7622285,30.1468393 35.7622285,29.4898193 C35.7622285,28.8327994 35.2305941,28.300538 34.5735741,28.300538 Z M25.4646994,21.1427154 L25.4668259,21.2131231 L25.2818823,24.0261466 C25.2372137,24.7049914 24.7274923,25.2543489 24.066794,25.3601429 L23.9327344,25.3752944 L21.1197109,25.560238 C20.8274662,25.5793352 20.6570162,25.2544162 20.8090505,25.0277874 L20.8538936,24.9734339 L24.8800218,20.9473058 C25.0877759,20.7401304 25.4296108,20.8721636 25.4646994,21.1427154 Z" id="形状结合"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.7 KiB

@ -1,45 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="96px" height="96px" viewBox="0 0 96 96" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>可疑文件夹</title>
<defs>
<radialGradient cx="49.9999974%" cy="50.0000039%" fx="49.9999974%" fy="50.0000039%" r="110.414469%" gradientTransform="translate(0.500000,0.500000),rotate(75.075110),scale(1.000000,1.409640),translate(-0.500000,-0.500000)" id="radialGradient-1">
<stop stop-color="#FFFCFC" stop-opacity="0.1" offset="0%"></stop>
<stop stop-color="#FFFFFF" stop-opacity="0.41" offset="100%"></stop>
</radialGradient>
<linearGradient x1="-0.00164029895%" y1="20.3389764%" x2="49.9999972%" y2="99.9999913%" id="linearGradient-2">
<stop stop-color="#3964EA" stop-opacity="0.18" offset="0%"></stop>
<stop stop-color="#A37D7D" stop-opacity="0" offset="100%"></stop>
</linearGradient>
<rect id="path-3" x="0" y="0" width="95.9411163" height="95.9411163" rx="15.9901861"></rect>
<rect id="path-4" x="0" y="0" width="95.9411163" height="95.9411163" rx="15.9901861"></rect>
<filter x="-1.6%" y="-1.6%" width="103.1%" height="103.1%" filterUnits="objectBoundingBox" id="filter-5">
<feOffset dx="3" dy="0" in="SourceAlpha" result="shadowOffsetInner1"></feOffset>
<feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
<feColorMatrix values="0 0 0 0 0.80541166 0 0 0 0 0.85265276 0 0 0 0 1 0 0 0 0.37 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
</filter>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-6">
<stop stop-color="#92C0FF" offset="0%"></stop>
<stop stop-color="#507AFD" offset="100%"></stop>
</linearGradient>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="无法上传iconfont" transform="translate(-392.000000, -80.000000)">
<g id="Frame-18" transform="translate(392.000000, 80.000000)">
<g id="路径">
<use fill="url(#radialGradient-1)" xlink:href="#path-3"></use>
<use fill="url(#linearGradient-2)" xlink:href="#path-3"></use>
</g>
<g id="路径" fill="black" fill-opacity="1">
<use filter="url(#filter-5)" xlink:href="#path-4"></use>
</g>
<g id="编组-50" transform="translate(24.930558, 27.327848)">
<g id="编组" fill="url(#linearGradient-6)">
<path d="M46.0573921,37.8007842 L46.0573921,8.94799551 C46.0573921,5.44326823 42.8673831,5.77157479 42.8673831,5.77157479 C42.8673831,5.77157479 23.8138175,5.79417887 24.8215345,5.77157479 C23.7282311,5.79417887 23.188438,5.20029046 23.188438,5.20029046 C23.188438,5.20029046 22.4280135,3.8954361 21.0648136,1.83035047 C19.6341878,-0.333523352 17.9784228,0.0217020285 17.9784228,0.0217020294 L3.93665198,0.0217020294 C0.0450149641,0.0217020294 0,3.76509234 0,3.76509234 L0,37.6073294 C0,41.7824512 3.15381664,41.2650045 3.15381664,41.2650045 L43.1554403,41.2650045 C46.5298238,41.2650045 46.0573921,37.8007842 46.0573921,37.8007842 Z" id="形状"></path>
</g>
<path d="M43.7347101,9.15040185 C43.7347101,9.30411916 43.6736461,9.4515406 43.5649516,9.56023515 C43.456257,9.6689297 43.3088356,9.72999366 43.1551183,9.72999366 L3.35648058,9.72999366 C3.20276327,9.72999366 3.05534183,9.6689297 2.94664728,9.56023515 C2.83795273,9.4515406 2.77688877,9.30411916 2.77688877,9.15040185 C2.77688877,8.83030213 3.03638086,8.57081004 3.35648058,8.57081004 L43.1551183,8.57081004 C43.3088356,8.57081004 43.456257,8.631874 43.5649516,8.74056855 C43.6736461,8.8492631 43.7347101,8.99668455 43.7347101,9.15040185 L43.7347101,9.15040185 Z" id="路径" fill="#FFFFFF" fill-rule="nonzero"></path>
<path d="M33.616325,23.2641708 C33.616325,23.46252 33.5442625,23.6350452 33.3973681,23.7818751 L27.5087797,29.6731039 C27.3620142,29.819805 27.1892958,29.8920608 26.9909466,29.8920608 C26.7925974,29.8920608 26.6200079,29.819805 26.4732424,29.6731039 C26.3264768,29.5261452 26.2542855,29.3562604 26.2542855,29.1552708 L26.2542855,26.2057925 L23.6758103,26.2057925 C22.9236289,26.2057925 22.251238,26.2316165 21.6588308,26.2753435 C21.0637832,26.3217108 20.4738875,26.4041417 19.8865678,26.5227004 C19.3018241,26.6411947 18.7917833,26.803416 18.358957,27.0094287 C17.9261307,27.2181462 17.5217688,27.4835348 17.1456782,27.8080418 C16.772099,28.1351248 16.4655594,28.5215194 16.2261235,28.9698658 C15.9890061,29.4180191 15.8036011,29.9486032 15.6670106,30.5643229 C15.5330605,31.1774666 15.4661499,31.870272 15.4661499,32.6482131 C15.4661499,33.0680951 15.4867576,33.5395609 15.5227567,34.0624815 C15.5227567,34.1088488 15.5330605,34.1989431 15.5536682,34.3329576 C15.574276,34.4669078 15.5845798,34.5674347 15.5845798,34.6369857 C15.5845798,34.7528397 15.5510923,34.8481504 15.4892692,34.9254937 C15.4248701,35.0026438 15.3347113,35.0413476 15.2188574,35.0413476 C15.0952111,35.0413476 14.9895322,34.9769485 14.8968619,34.8455744 C14.8452783,34.7760234 14.7938234,34.691081 14.7449445,34.590554 C14.6985127,34.492603 14.6496338,34.3742375 14.5903867,34.2427989 C14.5336511,34.1114892 14.495076,34.0187545 14.469252,33.9671708 C13.4929618,31.7879056 13.0086806,30.0594984 13.0086806,28.784332 C13.0086806,27.259426 13.2121817,25.9816836 13.619184,24.9538742 C14.8633744,21.8678698 18.2146386,20.322356 23.6808978,20.322356 L26.2568614,20.322356 L26.2568614,17.3754536 C26.2568614,17.1771044 26.328924,17.0045149 26.4756895,16.8577494 C26.6225838,16.7107906 26.792533,16.6387924 26.9935226,16.6387924 C27.1918718,16.6387924 27.3644614,16.710855 27.5112269,16.8577494 L33.3999441,22.7463378 C33.5416221,22.8956792 33.616325,23.0658216 33.616325,23.2641708 L33.616325,23.2641708 Z" id="路径" fill="#FFFFFF" fill-rule="nonzero" transform="translate(23.312503, 25.840070) scale(-1, 1) translate(-23.312503, -25.840070) "></path>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 6.1 KiB

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>待审批</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-1194.000000, -6389.000000)" fill="#507AFD" fill-rule="nonzero">
<g id="待审批" transform="translate(1194.000000, 6389.000000)">
<path d="M64,32 C64,49.6731274 49.6731274,64 32,64 C14.3268738,64 0,49.6731274 0,32 C0,14.3268738 14.3268738,0 32,0 C49.6731274,0 64,14.3268738 64,32 C64,32 64,32 64,32 Z" id="Ellipse-930" fill-opacity="0.1"></path>
<g id="待提交" transform="translate(18.909091, 18.909091)">
<rect id="矩形" opacity="0" x="0" y="0" width="26.1818182" height="26.1818182"></rect>
<path d="M23.4605455,15.3130909 C22.6325455,15.9136364 20.1436364,18.4876364 19.2485455,18.6234545 C17.5823972,18.6788919 15.9145922,18.5885479 14.2641818,18.3534545 C12.3332727,18.1341818 13.086,17.1916364 13.392,17.0901818 C13.698,16.9903636 17.3929091,16.7465455 18.6267273,16.5763636 C19.7378182,16.4225455 19.5774545,15.0987273 18.3289091,15.048 C17.0787273,14.9989091 11.4054545,14.5325455 9.49909091,14.6863636 C7.59272727,14.8401818 4.79945455,17.9214545 4.79945455,17.9214545 L4.90254545,18.4107273 L8.96727273,22.7667273 L9.50890909,22.7127273 C10.0701391,22.3256833 10.68478,22.0224973 11.3334545,21.8127273 C12.1630909,21.6032727 16.74,22.212 18.3223636,21.9354545 C19.9047273,21.6589091 23.9776364,17.5418182 24.8727273,16.6385455 C25.308,16.2 25.6172727,15.5683636 25.5272727,15.4047273 C25.092,14.6061818 23.9956364,14.9236364 23.4605455,15.3130909 L23.4605455,15.3130909 Z M7.91509091,22.9876364 C7.58781818,22.6227273 4.35272727,19.1667273 3.97636364,18.7592727 C3.85570076,18.5959645 3.66899983,18.4943709 3.46634331,18.4817444 C3.26368679,18.4691178 3.06581911,18.5467507 2.92581818,18.6938182 C2.67054545,18.9392727 1.60527273,19.9374545 1.30090909,20.1910909 C0.831272727,20.5838182 1.24690909,21.2350909 1.51690909,21.5427273 C1.78690909,21.8503636 4.66690909,25.0772727 5.09563636,25.5845455 C5.52436364,26.0934545 5.96127273,26.0378182 6.28036364,25.7121818 C6.60109091,25.3849091 7.344,24.6158182 7.81854545,24.2132727 C8.01876568,24.0816036 8.14705882,23.8649412 8.16624482,23.6260755 C8.18543081,23.3872099 8.09336453,23.1528479 7.91672727,22.9909091 L7.91672727,22.9876364 L7.91509091,22.9876364 Z" id="形状"></path>
<path d="M4.90909091,14.6667273 L4.90909091,2.18618182 C4.90909091,1.11763636 5.77636364,0.252 6.84490909,0.250363636 L21.4036364,0.250363636 C22.4721818,0.250363636 23.3394545,1.11763636 23.3394545,2.18618182 L23.3394545,13.8109091 C23.3067273,13.8305455 23.2756364,13.8534545 23.2445455,13.8763636 L18.1963636,13.608 C17.892,13.5949091 17.3225455,13.5572727 16.6025455,13.5098182 C14.8336364,13.3936364 12.1614545,13.2169091 10.4809091,13.2169091 C10.0881818,13.2169091 9.76581818,13.2267273 9.522,13.2463636 C7.86574971,13.5382965 6.31867571,14.2708532 5.04327273,15.3670909 C4.95470166,15.1442097 4.90909091,14.9065623 4.90909091,14.6667273 Z M10.2567273,7.12636364 C9.83468131,7.12636364 9.49254545,7.46849949 9.49254545,7.89054545 C9.49254545,8.31259142 9.83468131,8.65472727 10.2567273,8.65472727 L17.8985455,8.65472727 C18.3205914,8.65472727 18.6627273,8.31259142 18.6627273,7.89054545 C18.6627273,7.46849949 18.3205914,7.12636364 17.8985455,7.12636364 L10.2567273,7.12636364 L10.2567273,7.12636364 Z M10.2567273,3.30545455 C9.83468131,3.30545455 9.49254545,3.6475904 9.49254545,4.06963636 C9.49254545,4.49168233 9.83468131,4.83381818 10.2567273,4.83381818 L17.8985455,4.83381818 C18.3205914,4.83381818 18.6627273,4.49168233 18.6627273,4.06963636 C18.6627273,3.6475904 18.3205914,3.30545455 17.8985455,3.30545455 L10.2567273,3.30545455 L10.2567273,3.30545455 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 4.0 KiB

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>删除</title>
<defs>
<rect id="path-1" x="0" y="0" width="64" height="64"></rect>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-1984.000000, -3431.000000)">
<g id="删除" transform="translate(1984.000000, 3431.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<use id="蒙版" fill="#000000" fill-rule="nonzero" opacity="0" xlink:href="#path-1"></use>
<path d="M52.9231991,16 C53.4754839,16 53.9231991,16.4477153 53.9231991,17 L53.9231991,20 C53.9231991,20.5522847 53.4754839,21 52.9231991,21 L49.862,21 L46.8906837,54.9640327 C46.8414748,55.5264927 46.5639593,56.0141255 46.1574353,56.3436103 C45.7935798,56.7212522 45.2824394,56.9564221 44.7163722,56.9564221 L19.2763722,56.9564221 C18.8012585,56.9564221 18.3648389,56.7907533 18.0217296,56.5140319 C17.5531495,56.1861769 17.2269494,55.6610416 17.1731938,55.0466129 L14.194,21 L11,21 C10.4477153,21 10,20.5522847 10,20 L10,17 C10,16.4477153 10.4477153,16 11,16 L52.9231991,16 Z M42.134,51.956 L44.843,21 L19.213,21 L21.922,51.956 L42.134,51.956 Z M39,7 C39.5522847,7 40,7.44771525 40,8 L40,11 C40,11.5522847 39.5522847,12 39,12 L25,12 C24.4477153,12 24,11.5522847 24,11 L24,8 C24,7.44771525 24.4477153,7 25,7 L39,7 Z" id="形状结合" fill="#FFFFFF" mask="url(#mask-2)"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

@ -4,7 +4,7 @@ import { useMessage } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { audit } from '@/api/task/task'
const emit = defineEmits(['success', 'close'])
const emit = defineEmits(['success'])
const message = useMessage()
const loading = ref(false)
@ -42,11 +42,6 @@ function showModal(value) {
function closeModal() {
show.value = false
emit('close')
formData.disposeTypeId = '262403670085013522'
formData.failCauseId = '260402999231251188'
formData.comment = ''
}
defineExpose({
@ -118,9 +113,6 @@ async function handleSumbit(e: MouseEvent) {
}
}
})
formData.disposeTypeId = '262403670085013522'
formData.failCauseId = '260402999231251188'
formData.comment = ''
}
async function selectChange(id) {

@ -1,128 +1,98 @@
<script lang="ts" setup>
import { defineProps, onMounted } from 'vue'
<template>
<div class="header_wrap">
<div v-for="(item, index) in data" :key="index" class="header_item">
<img :src="item.link" />
<div class="data_wrap">
<div class="data_title">{{ item.count }}</div>
<div class="data_content">{{ item.title }}</div>
</div>
</div>
<SvgIcon size="14px" style="cursor: pointer" name="setting"></SvgIcon>
</div>
</template>
defineProps({
hasColor: {
type: Boolean,
default: () => false,
},
})
function initRem() {
const designWidth = 1440
const rempPx = 16
const scale = window.innerWidth / designWidth
document.documentElement.style.fontSize = `${scale * rempPx}px`
}
onMounted(() => {
initRem()
})
<script lang="ts" setup>
const data = [
{
link: 'count',
title: '任务总数',
link: "/src/assets/images/taskCount.png",
title: "任务包总数",
count: 6399,
},
{
link: 'wait',
title: '待审批',
link: "/src/assets/images/nocheck.png",
title: "未标记",
count: 6290,
},
{
link: 'done',
title: '已审批',
link: "/src/assets/images/check.png",
title: "已标记",
count: 109,
},
{
link: 'resolve',
title: '通过',
link: "/src/assets/images/status.png",
title: "真",
count: 3290,
color: '#03c984',
},
{
link: 'reject',
title: '不通过',
link: "/src/assets/images/status.png",
title: "假",
count: 3000,
color: '#ff8b8b',
},
{
link: 'reimg',
title: '图片重复数',
link: "/src/assets/images/pic.png",
title: "相似度100%图",
count: 230,
},
{
link: 'breakcount',
title: '小结重复数',
link: "/src/assets/images/xiaojie.png",
title: "小结重复数",
count: 365,
},
]
];
</script>
<template>
<div class="header_wrap">
<div v-for="(item, index) in data" :key="index" class="header_item">
<SvgIcon :name="item.link" />
<div class="data_wrap">
<div class="data_title" :style="hasColor ? `color:${item.color || ''}` : ''">
{{ item.count }}
</div>
<div class="data_content">
{{ item.title }}
</div>
</div>
</div>
<SvgIcon size="14px" style="cursor: pointer" name="setting" class="settingSvg" />
</div>
</template>
<style scoped lang="less">
.header_wrap {
display: flex;
flex-flow: row nowrap;
align-items: center;
justify-content: space-between;
padding: 1rem 1rem 1rem 3.125rem;
padding: 20px 30px;
background: #fff;
margin-bottom: 1rem;
.header_item {
min-width: 10%;
width: 10%;
display: flex;
flex-flow: row nowrap;
align-items: center;
justify-content: center;
svg {
width: 2.75rem !important;
height: 2.75rem !important;
img{
width: 50px;
height: 50px
}
.data_wrap {
margin-left: .8125rem;
.data_title {
font-size: 1.125rem;
font-size: 20px;
font-family: HarmonyOS Sans SC, HarmonyOS Sans SC-Bold;
font-weight: 900;
font-weight: Bold;
text-align: left;
color: #202020;
line-height: 1.4375rem;
line-height: 23px;
text-align: center;
white-space: nowrap;
}
.data_content {
opacity: 0.6;
font-size: .75rem;
font-size: 14px;
font-family: PingFang SC, PingFang SC-Regular;
font-weight: 500;
font-weight: Regular;
text-align: center;
color: #202020;
line-height: 1rem;
line-height: 16px;
text-align: center;
white-space: nowrap;
}
}
}
}
.settingSvg{
width: 1rem !important;
height: 1rem !important;
}
</style>

@ -22,6 +22,7 @@ const cardStyle = {
}
function showModal(value) {
console.log(value)
state.detail = value
show.value = true
}
@ -53,6 +54,8 @@ async function handleSumbit(e: MouseEvent) {
// selectRejectId.value === 'other'
// emit('commit', unref(comomitValue), unref(selectBackId), showOther.value)
console.log(state.detail)
console.log(comomitValue)
const param = {
formid: [state.detail.id],
taskId: ['66b06dda-e673-11ee-a934-0242bc74e4f3'],
@ -84,6 +87,7 @@ onBeforeMount(async () => {
})
async function selectChange(id) {
console.log(id, 'selectChange')
selectItem.value = reasonOptions.value.find(v => v.id == id)
}
</script>

@ -30,7 +30,9 @@ function initHandler() {
queryNote().then((res) => {
if (res.data)
note.value = res.data.notecontent
}).catch(e => console.error('Quill file -> Error in initHandler function', e))
console.log('note:', note.value)
}).catch(e => console.log(e))
}
const saveHandler = debounce(() => {

@ -1,30 +0,0 @@
<script setup>
import { defineProps } from 'vue'
import IPImg from '@/assets/images/IP.png'
defineProps({
canClick: {
type: Boolean,
default: () => false,
},
})
</script>
<template>
<div class="ip_box" :style="canClick ? 'cursor: pointer;' : ''">
<img :src="IPImg">
</div>
</template>
<style scoped lang="less">
.ip_box {
position: fixed;
bottom: 80px;
right: 20px;
z-index: 1000;
img {
width: 80px;
height: auto;
}
}
</style>

@ -72,10 +72,7 @@ async function getHistory() {
getHistory()
function goPath(item, id) {
const desiredObject = item.data.find((item) => {
return item.id === id
})
router.push({ name: item.path, query: { id, searchContent: desiredObject.name } })
router.push({ name: item.path, query: { id } })
emit('close')
}
@ -98,7 +95,10 @@ function highlightText(text, query) {
</div>
<div class="input_box">
<n-input
v-model:value="value" placeholder="搜索任务ID、任务名称、提报人、拜访终端" type="text" @input="inputHandler"
v-model:value="value"
placeholder="搜索任务ID、任务名称、提报人、拜访终端"
type="text"
@input="inputHandler"
@mousedown="handlerShowList"
>
<template #prefix>
@ -107,16 +107,17 @@ function highlightText(text, query) {
</n-input>
</div>
<div v-show="showList && (historyList.length || resultList.length)" class="list_box">
<div v-if="historyList.length" class="list_classfiy_item" style="border-bottom:1px solid #e4e4e4">
<div
v-if="historyList.length"
class="list_classfiy_item"
style="border-bottom:1px solid #e4e4e4"
>
<div class="list_title">
历史搜索
</div>
<div class="flex history-list">
<div class="tag-wrap">
<div
v-for="(item, index) of historyList" :key="index" class="tag"
@click="handlerHistory(item.historyname)"
>
<div v-for="(item, index) of historyList" :key="index" class="tag" @click="handlerHistory(item.historyname)">
{{ item.historyname }}
</div>
</div>
@ -124,7 +125,9 @@ function highlightText(text, query) {
</div>
</div>
<div
v-for="(item, index) in resultList" :key="index" class="list_classfiy_item"
v-for="(item, index) in resultList"
:key="index"
class="list_classfiy_item"
:style="(index === resultList.length - 1) ? '' : 'border-bottom:1px solid #e4e4e4'"
>
<div class="list_title">
@ -145,15 +148,13 @@ function highlightText(text, query) {
position: absolute;
top: 20%;
left: 20%;
box-shadow: none !important;
.ip_box {
box-shadow: none!important;
.ip_box{
z-index: 0;
position: relative;
left: calc(50% - 40px);
top: 30px;
img {
img{
width: 80px;
height: 80px;
}
@ -168,7 +169,6 @@ function highlightText(text, query) {
box-shadow: 0px 12px 12px 0px rgba(80, 122, 253, 0.15),
0px 0px 0px 0.5px #d4e3fc;
}
.list_box {
background: #fefefe;
border: 1px dashed #f4f4f4;
@ -176,7 +176,6 @@ function highlightText(text, query) {
box-shadow: 0px 12px 12px 0px rgba(80, 122, 253, 0.15);
margin-top: 15px;
padding: 8px 16px;
.list_classfiy_item {
.list_title {
font-size: 12px;
@ -186,7 +185,6 @@ function highlightText(text, query) {
line-height: 17px;
margin: 10px 0 10px 5px;
}
.list_item {
display: flex;
flex-flow: row nowrap;
@ -196,29 +194,28 @@ function highlightText(text, query) {
}
}
}
:deep(.n-input .n-input-wrapper) {
margin: 8px;
}
.history-list {
.history-list{
align-items: center;
padding-bottom: 9px;
}
.name {
.name{
margin-left: 5px;
cursor: pointer;
}
.tag-wrap {
.tag-wrap{
display: flex;
align-items: center;
flex: 1;
overflow-y: hidden;
overflow-x: auto;
.tag {
.tag{
padding: 0 12px;
height: 22px;
border: 1px solid #e4e7ed;
@ -233,11 +230,11 @@ function highlightText(text, query) {
}
}
.icon-delete {
.icon-delete{
cursor: pointer;
}
.highlight {
.highlight{
color: #507AFD;
}
</style>

@ -0,0 +1,52 @@
export const asideMap: Recordable<AsideEntity> = {
izupuser: {
label: '',
defaultValue: null,
isDefaultFilter: true,
key: 'izupuser',
component: ReportUserVue,
},
izproject: {
label: '',
defaultValue: null,
isDefaultFilter: true,
key: 'izproject',
component: IzProjectVue,
},
izplan: {
label: '',
defaultValue: null,
isDefaultFilter: true,
key: 'izplan',
component: PlanVue,
},
izstatus: {
label: '',
defaultValue: null,
isDefaultFilter: false,
key: 'izstatus',
component: PlanVue, // todo
},
izuptime: {
label: '',
defaultValue: null,
isDefaultFilter: false,
key: 'izuptime',
component: TimeVue,
},
iztaskrrom: {
label: '',
defaultValue: null,
isDefaultFilter: false,
key: 'iztaskrrom',
component: IztaskrromVue,
},
izshowall: {
label: '',
defaultValue: true,
isDefaultFilter: false,
key: 'izshowall',
component: PictureDownloadVue,
inFilterList: false,
},
}

@ -1,5 +1,5 @@
import { IzCustomlevel, IzCustomname, IzCustomtype, IzfirmVue, IzProductVue, IzProjecttype, IzProjectVue, IztaskrromVue, IztaskstatusVue, IzVisitcity, IzvisitproVue, PictureDownloadVue, PictureTypeVue, PictureUploadVue, PlanVue, ReportUserVue, SimilarityVue, TimeVue } from '@/views/home/aside/comp/items'
import type { Component } from 'vue'
import { IzCustomlevel, IzCustomname, IzCustomtype, IzProductVue, IzProjectVue, IzProjecttype, IzVisitcity, IzfirmVue, IztaskrromVue, IztaskstatusVue, IzvisitproVue, PictureDownloadVue, PictureTypeVue, PictureUploadVue, PlanVue, ReportUserVue, SimilarityVue, TimeVue } from '@/views/home/aside/comp/items'
export interface AsideEntity {
label: string

@ -1,6 +1,5 @@
import { defineAsyncComponent } from 'vue'
import type { AsideEntity } from './aside'
import { IzApprovalStatus, IzCustomlevel, IzCustomname, IzCustomtype, IzProductVue, IzProjectVue, IzProjecttype, IzShowAll, IzStatus, IzVisitcity, IzfirmVue, IztaskrromVue, IzvisitproVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items'
import { IzApprovalStatus, IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue, IzCustomname, IzCustomtype, IzVisitcity, IzCustomlevel, IzProjecttype, IzProductVue, IzvisitproVue, IzfirmVue } from '@/views/home/aside/comp/items'
export interface RowData {
id: string
@ -84,164 +83,145 @@ export const asideMap: Recordable<AsideEntity> = {
defaultValue: null,
isDefaultFilter: true,
key: 'izupuser',
// component: ReportUserVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/ReportUser.vue')),
component: ReportUserVue,
},
izproject: {
label: '所属项目',
defaultValue: null,
isDefaultFilter: true,
key: 'izproject',
// component: IzProjectVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzProject.vue')),
component: IzProjectVue,
},
izplan: {
label: '所属计划',
defaultValue: null,
isDefaultFilter: true,
key: 'izplan',
// component: PlanVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/Plan.vue')),
component: PlanVue,
},
izstatus: {
label: '审批状态',
defaultValue: null,
isDefaultFilter: false,
key: 'izstatus',
// component: IzStatus, // todo
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzStatus.vue')),
component: IzStatus, // todo
},
izyear: {
izuptime: {
label: '提报时间',
defaultValue: null,
isDefaultFilter: false,
key: 'izyear',
// component: TimeVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/Time.vue')),
key: 'izuptime',
component: TimeVue,
},
iztaskrrom: {
label: '任务来源',
defaultValue: null,
isDefaultFilter: false,
key: 'iztaskrrom',
// component: IztaskrromVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/Iztaskrrom.vue')),
component: IztaskrromVue,
},
izshowall: {
label: '显示全部任务数据',
defaultValue: false,
defaultValue: true,
isDefaultFilter: false,
key: 'izshowall',
// component: IzShowAll,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzShowAll.vue')),
component: PictureDownloadVue,
inFilterList: false,
},
}
// 审批添加筛选配置 (左侧)
export const asideTaskMap: Recordable<AsideEntity> = {
izApprovalStatus: {
izstatus: {
label: '审批状态',
defaultValue: null,
isDefaultFilter: true,
key: 'izApprovalStatus',
// component: IzApprovalStatus, // todo
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzApprovalStatus.vue')),
component: IzApprovalStatus, // todo
},
izuptime: {
label: '提报时间',
defaultValue: null,
isDefaultFilter: true,
key: 'izuptime',
// component: TimeVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/Time.vue')),
component: TimeVue,
},
izupuser: {
label: '提报人',
defaultValue: null,
isDefaultFilter: true,
key: 'izupuser',
// component: ReportUserVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/ReportUser.vue')),
component: ReportUserVue,
},
iztaskrrom: {
label: '任务来源',
defaultValue: null,
isDefaultFilter: true,
key: 'iztaskrrom',
// component: IztaskrromVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/Iztaskrrom.vue')),
component: IztaskrromVue,
},
izcustomname: {
label: '拜访客户',
defaultValue: null,
isDefaultFilter: true,
key: 'izcustomname',
// component: IzCustomname,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzCustomname.vue')),
component: IzCustomname,
},
izcustomtype: {
label: '客户类型',
defaultValue: null,
isDefaultFilter: true,
key: 'izcustomtype',
// component: IzCustomtype,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzCustomtype.vue')),
component: IzCustomtype,
},
izproject: {
label: '所属项目',
defaultValue: null,
isDefaultFilter: true,
key: 'izproject',
// component: IzProjectVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzProject.vue')),
component: IzProjectVue,
},
izvisitpro: {
label: '拜访省份/直辖市',
defaultValue: null,
isDefaultFilter: true,
key: 'izvisitpro',
// component: IzVisitcity,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzVisitcity.vue')),
component: IzVisitcity,
},
izcustomlevel: {
label: '客户级别',
defaultValue: null,
isDefaultFilter: true,
key: 'izcustomlevel',
// component: IzCustomlevel,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzCustomlevel.vue')),
component: IzCustomlevel
},
izprojecttype: {
label: '项目类别',
defaultValue: null,
isDefaultFilter: true,
key: 'izprojecttype',
// component: IzProjecttype,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzProjecttype.vue')),
component: IzProjecttype,
},
izproductname: {
label: '产品名称',
defaultValue: null,
isDefaultFilter: true,
key: 'izproductname',
// component: IzProductVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/IzProduct.vue')),
component: IzProductVue,
},
izvisitcity: {
label: '拜访城市',
defaultValue: null,
isDefaultFilter: true,
key: 'izvisitcity',
// component: IzvisitproVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/Izvisitpro.vue')),
component: IzvisitproVue,
},
izfirm: {
label: '厂商',
defaultValue: null,
isDefaultFilter: true,
key: 'izfirm',
// component: IzfirmVue,
component: defineAsyncComponent(() => import('@/views/home/aside/comp/items/Izfirm.vue')),
},
}
component: IzfirmVue,
}
}

@ -1,11 +1,11 @@
function commonKeyDown(keyCode: number) {
document.dispatchEvent(new KeyboardEvent('keydown', { keyCode }))
const commonKeyDown = (keyCode: number) => {
document.dispatchEvent(new KeyboardEvent('keydown', { keyCode }));
}
function c() {
commonKeyDown(27)
const c = () => {
commonKeyDown(27)
}
function initBind(mousetrap) {
mousetrap.bind('c', c)
const initBind = (mousetrap) => {
mousetrap.bind('c', c)
}
export default initBind
export default initBind;

@ -1,15 +1,16 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import { onBeforeMount, ref } from 'vue';
const emit = defineEmits<{
(e: 'commit')
}>()
const props = defineProps({
selectedTotal: {
type: Number,
default: () => 0,
},
}
})
const emit = defineEmits<{
(e: 'commit')
}>()
const show = ref(false)
const cardStyle = {
'width': '450px',

@ -1,38 +1,28 @@
<script lang="ts" setup>
import Masonry from 'masonry-layout'
import { useDialog, useMessage } from 'naive-ui'
import { computed, nextTick, onBeforeMount, onMounted, onUpdated, reactive, ref, unref, watch } from 'vue'
import { computed, onBeforeMount, onMounted, onUpdated, reactive, ref, unref, watch } from 'vue'
import { dubiousfilelist, removeFiles } from '@/api/task/task'
import { viewOptions } from '@/config/home'
import { useInfiniteScroll } from '@vueuse/core'
import imagesloaded from 'imagesloaded'
import { cloneDeep, debounce } from 'lodash-es'
import ConfrimModal from './ConfrimModal.vue'
import { audit, dubiousfilelist, removeFiles } from '@/api/task/task'
import { viewOptions } from '@/config/home'
import { debounce } from 'lodash-es'
import { audit } from '@/api/task/task'
import NotPassed from '@/components/Approval/NotPassed.vue'
import { formatToDateHMS } from '@/utils/dateUtil'
import { off, on } from '@/utils/domUtils'
import ConfrimModal from "./ConfrimModal.vue"
const cardStyle = {
'--n-padding-bottom': '40px',
'--n-padding-left': '120px',
}
let startTime = 0
let endTime = 0
let startCalTime = false
const message = useMessage()
const timeRange = ref('desc')
const similarRange = ref('desc')
const timeRange = ref('')
const batch = ref(false)
const imageRef = ref<ComponentElRef | null>()
const filterId = null
const isTop = ref(false)
let sortObj: any = {
orderByUptime: 'desc',
}
const timeOptions = [{
label: '升序',
value: 'asc',
@ -40,14 +30,6 @@ const timeOptions = [{
label: '降序',
value: 'desc',
}]
// const similarOptions = [{
// label: '',
// value: 'asc',
// }, {
// label: '',
// value: 'desc',
// }]
const timeLabel = computed(() => {
const item = timeOptions.find((option) => {
return option.value === timeRange.value
@ -66,18 +48,8 @@ const viewLabel = computed(() => {
return item?.label
})
const maxHeight = computed(() => {
let height = '800'
const screenWidth = window.screen.width
if (screenWidth <= 1920)
height = '600'
return `${height}px`
})
const masonryRef = ref<ComponentRef>(null)
const el = ref<HTMLDivElement | null>(null)
const elwc = ref<HTMLDivElement | null>(null)
const listData = ref<any[]>([])
const pagination = reactive({
pageNo: 1,
@ -86,10 +58,10 @@ const pagination = reactive({
let loading = false
let _masonry: null | Masonry = null
const show = ref(false)
const selectedApproveItems = ref<any[]>([]) //
const dialog = useDialog()
let processItems: any[] = []
const confrimModalRef = ref<any>()
const selectedApproveItems = ref<any[]>([]); //
const dialog = useDialog();
let processItems: any[] = [];
const confrimModalRef = ref<any>();
const layout = debounce(() => {
if (!show.value)
@ -110,45 +82,20 @@ const layout = debounce(() => {
const scrollHeight = el.value!.scrollHeight
const clientHeight = el.value!.clientHeight
const top = scrollHeight - clientHeight - 20
if (isTop.value)
el.value!.scrollTo({ top: 0, behavior: 'instant' })
else
el.value!.scrollTo({ top, behavior: 'instant' })
// let height = 800 - 15;
// const screenWidth = window.screen.width;
// if(screenWidth <= 1920) {
// height = 600 - 15;
// }
// el.value!.scrollTo({ top: height, behavior: 'instant' })
el.value!.scrollTo({ top, behavior: 'instant' })
loading = false
if (pagination.pageNo == 3) {
let timer
if (timer)
clearTimeout(timer)
timer = setTimeout(() => {
isTop.value = false
}, 1000)
}
})
}, 300)
watch(viewMode, () => {
isTop.value = true
layout()
})
onBeforeMount(async () => {
})
let canloadMore = true
useInfiniteScroll(
el as any,
() => {
loading = false
loadMore()
},
{ distance: 10, canLoadMore: () => canloadMore },
@ -157,18 +104,23 @@ useInfiniteScroll(
async function featchList() {
loading = true
try {
// const result = await dubiousfilelist({ ...pagination, orderbyname: timeRange.value })
const result = await dubiousfilelist({ ...pagination, ...sortObj })
const result = await dubiousfilelist({ ...pagination, orderbyname: timeRange.value })
// TODO
// result.data = Array.from({ length: 30 })
result.pageCount = 1
const { data, pageCount } = result
// canloadMore = pageCount >= pagination.pageNo && pageCount > 0;
canloadMore = data.pages >= pagination.pageNo && data.pages > 0
pagination.pageNo += 1
canloadMore = pageCount >= pagination.pageNo
return result.data.records
// const list = data.map((item) => {
// return {
// imgUrl: randomUrl(),
// }
// })
// console.log(list)
// return list
}
catch (error) {
canloadMore = false
return []
}
}
@ -177,35 +129,27 @@ async function loadMore() {
if (loading || el.value == null)
return
// loading = true
pagination.pageNo = pagination.pageNo + 1
loading = true
const more = await featchList()
listData.value.push(...more)
layout()
}
onUpdated(() => {
if (startCalTime) {
endTime = new Date().getTime()
if (endTime - startTime > 500)
createDom()
}
else {
removeDom()
}
// if(elwc.value) {
// on(elwc.value!, 'click', showjjj)
// }
console.log('onUpdated', onUpdated)
layout()
})
onBeforeMount(async () => {
console.log(888)
// const list = await featchList()
// listData.value = list
})
let start: { x: number, y: number } | null = null
let selectionBox: HTMLDivElement | null
const selectIds = ref<string[]>([])
function downHandler(event: MouseEvent) {
startTime = new Date().getTime()
startCalTime = true
if (!selectionBox)
return
@ -233,14 +177,6 @@ function imUpdateSelectIds(x: number, y: number, w: number, h: number) {
index === -1 && selectIds.value.push(item.dataset.id!)
else index !== -1 && selectIds.value.splice(index, 1)
})
selectedApproveItems.value = []
//
listData.value.forEach((item) => {
if (selectIds.value.includes(String(item.pictureId))) {
item.checked = true
selectedApproveItems.value.push(item)
}
})
}
function isSelected(pictureId: number) {
@ -248,14 +184,6 @@ function isSelected(pictureId: number) {
}
function moveHandler(e: MouseEvent) {
if (startCalTime) {
endTime = new Date().getTime()
if (endTime - startTime > 500)
createDom()
}
else {
removeDom()
}
if (!selectionBox || !start)
return
@ -272,79 +200,30 @@ function moveHandler(e: MouseEvent) {
imUpdateSelectIds(x, y, w, h)
}
function createDom() {
const dom = document.createElement('div')
dom.className = 'selection-box'
dom.style.width = '1px'
dom.style.border = '1px dotted black'
dom.style.position = 'absolute'
dom.style.display = 'block'
dom.style.zIndex = '9999'
document.body.appendChild(dom)
selectionBox = document.querySelector('.selection-box') as HTMLDivElement
}
function removeDom() {
const dom = document.getElementsByClassName('selection-box')[0]
if (dom)
document.body.removeChild(dom)
}
function upHandler(event: MouseEvent) {
endTime = new Date().getTime()
startCalTime = false
if (endTime - startTime > 500)
createDom()
else
removeDom()
if (!selectionBox)
return
selectionBox.style.display = 'none'
start = null
if (selectionBox.style.width == '0px') {
removeDom()
if (event.target?.className.indexOf('n-checkbox-box__border') != -1)
return
selectIds.value = []
selectedApproveItems.value.forEach(item => (item.checked = false))
selectedApproveItems.value.length = 0
listData.value.forEach((item) => {
item.checked = false
})
// batch.value = false;
}
}
const gridHeight = computed(() => {
// return viewMode.value !== 'masonry' ? '157px' : ''
let height = ''
if (viewMode.value === 'masonry')
height = ''
else if (viewMode.value === 'horizontalVersion')
height = '145px'
else if (viewMode.value === 'verticalVersion')
height = '300px'
else if (viewMode.value === '3:4')
height = '240px'
return height
return viewMode.value !== 'masonry' ? '157px' : ''
})
function addListeners() {
// selectionBox.style['z-index'] = '-1'
selectionBox = document.querySelector('.selection-box') as HTMLDivElement
on(el.value!, 'mousedown', downHandler)
on(el.value!, 'mousemove', moveHandler)
on(document, 'mouseup', upHandler)
// on(elwc.value!, 'mouseup', upHandler)
}
function removeListeners() {
off(el.value!, 'mousedown', downHandler)
on(el.value!, 'mousemove', moveHandler)
on(document, 'mouseup', upHandler)
// on(elwc.value!, 'mouseup', upHandler)
}
function afterEnter() {
@ -355,9 +234,8 @@ function afterLeave() {
removeListeners()
}
onMounted(async () => {
onMounted(() => {
show.value && addListeners()
removeDom()
})
async function showModal() {
@ -370,39 +248,9 @@ async function showModal() {
}
async function onChange() {
if (timeRange.value == 'desc')
timeRange.value = 'asc'
else
timeRange.value = 'desc'
sortObj = {
// orderbyname: val,
orderByUptime: timeRange.value,
}
pagination.pageNo = 1
canloadMore = true
const list = await featchList()
listData.value = list
isTop.value = true
layout()
}
async function onChangeView() {
if (similarRange.value == 'desc')
similarRange.value = 'asc'
else
similarRange.value = 'desc'
sortObj = {
// orderbyname: val,
orderBySimilarity: similarRange.value,
}
pagination.pageNo = 1
canloadMore = true
const list = await featchList()
listData.value = list
isTop.value = true
layout()
}
function closeModal(event: MouseEvent) {
@ -418,7 +266,6 @@ async function commit() {
const list = await featchList()
listData.value = list
layout()
setBatch(false)
}
}
function remove() {
@ -429,16 +276,17 @@ function remove() {
confrimModalRef?.value?.showModal()
}
function setBatch(value) {
if (value && batch.value)
batch.value = !value
else
batch.value = value
function setBatch(value) {
if (value && batch.value) {
batch.value = !value;
} else {
batch.value = value;
}
if (value === false) {
selectIds.value = []
selectedApproveItems.value.forEach(item => (item.checked = false))
selectedApproveItems.value.length = 0
selectedApproveItems.value.forEach((item) => (item.checked = false));
selectedApproveItems.value.length = 0;
}
}
@ -448,29 +296,16 @@ defineExpose({
const notPassModalRef = ref(null)
const showActions = computed(() => {
return selectedApproveItems.value.length > 0 && batch
})
return selectedApproveItems.value.length > 0 && batch;
});
function onCheckChange(checked: any, item: any) {
item.checked = checked
const index = selectedApproveItems.value.indexOf(item)
const picIndex = selectIds.value.indexOf(item.pictureId)
if (index === -1 && checked)
selectedApproveItems.value.push(item)
else
selectedApproveItems.value.splice(index, 1)
if (picIndex === -1 && checked)
selectIds.value.push(item.pictureId)
else
selectIds.value.splice(picIndex, 1)
setTimeout(() => {
nextTick(() => {
batch.value = true
})
}, 100)
const index = selectedApproveItems.value.indexOf(item);
if (index === -1 && checked) selectedApproveItems.value.push(item);
else selectedApproveItems.value.splice(index, 1);
}
function rejectHandler() {
@ -479,28 +314,26 @@ function rejectHandler() {
}
function reset() {
batch.value = false
// pagination.pageNo = 1;
pagination.pageNo = 1
pagination.pageSize = 20
selectIds.value = []
selectedApproveItems.value.length = 0
loading = false
canloadMore = true
layout()
batch.value = false;
pagination.pageNo = 1;
pagination.pageSize = 20;
selectIds.value = [];
selectedApproveItems.value.length = 0;
loading = false;
canloadMore = true;
}
function validate(items: any[]) {
if (items.length === 0)
return '至少选中一个任务'
return null
if (items.length === 0) return "至少选中一个任务";
return null;
}
function approvalHandler(items?: any) {
// if (batch.value) {
processItems = selectedApproveItems.value
// }
if (batch.value) {
processItems = selectedApproveItems.value
}
// => => /
if (items !== undefined && !(items instanceof PointerEvent))
processItems = [items]
const msg = validate(processItems)
if (msg !== null) {
@ -547,74 +380,29 @@ function doAudit(param: any) {
message.info(res.message)
// emitter.emit('refresh')
refreshHandler()
}
else { message.error(res.message) }
else message.error(res.message)
})
}
function reloadList() {
refreshHandler()
}
async function refreshHandler(filtersearchId?: any) {
// rao start
async function refreshHandler() {
reset()
pagination.pageNo = 1
const list = await featchList()
listData.value = list
layout()
// rao end
// reset();
// if (filtersearchId) {
// filterId = filtersearchId;
// }
nextTick(() => {
setTimeout(() => {
useInfiniteScroll(
el as any,
() => {
loadMore()
},
{ distance: 10, canLoadMore: () => canloadMore },
)
}, 300)
})
}
watch(() => show.value, async (newVal) => {
if (show.value) {
pagination.pageNo = 1
const list = await featchList()
listData.value = list
layout()
}
})
watch(() => pagination.pageNo, (newVal, oldVal) => {
if (newVal == oldVal)
return
if ((newVal == 1 || newVal == 2) && canloadMore) {
setTimeout(() => {
nextTick(() => {
loading = false
loadMore()
})
}, 500)
}
})
</script>
<template>
<div>
<n-modal
v-model:show="show" :mask-closable="false" style="position: relative;" transform-origin="center"
@after-enter="afterEnter" @after-leave="afterLeave"
>
<n-card
ref="elwc" :style="cardStyle" class="card card-1" style="position: fixed;top:64px" :bordered="false" size="huge"
role="dialog" aria-modal="true"
>
<n-modal v-model:show="show" :mask-closable="false" style="position: relative;" transform-origin="center"
@after-enter="afterEnter" @after-leave="afterLeave">
<n-card :style="cardStyle" class="card card-1" style="position: fixed;top:64px" :bordered="false" size="huge"
role="dialog" aria-modal="true">
<div class="wrapper">
<div class="wrapper-m32">
<SvgIcon name="recycle" size="16" />
@ -627,44 +415,24 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
<div class="wrapper-content">
<div class="wrapper-content-form wrapper-m32">
<div>
<n-popselect v-model:value="viewMode" :options="viewOptions" trigger="click">
<div class="wrapper-form-dropdown">
<span>视图模式</span>
<SvgIcon class="wrapper-content-form-gap" name="arrow-botton" size="14" />
</div>
</n-popselect>
<div
style="margin-left: 15px; cursor: pointer; color: #323233"
@click="onChange()"
>
<span>时间排序</span>
<SvgIcon style="margin-left: 8px" name="sort" size="12" />
</div>
<div
style="margin-left: 15px; cursor: pointer; color: #323233"
@click="onChangeView()"
>
<span>相似度排序</span>
<SvgIcon style="margin-left: 8px" name="sort" size="12" />
</div>
<!-- <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click" @change="onChange">
<n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click" @change="onChange">
<div class="wrapper-content-form-dropdown">
<span>时间排序</span>
<SvgIcon class="wrapper-content-form-dropdown-gap" name="arrow-botton" size="14" />
</div>
</n-popselect>
<n-popselect v-model:value="similarRange" :options="timeOptions" trigger="click" @change="onChangeView">
<div class="wrapper-content-form-dropdown">
<span>相似度排序</span>
<SvgIcon class="wrapper-content-form-dropdown-gap" name="arrow-botton" size="14" />
<n-popselect v-model:value="viewMode" :options="viewOptions" trigger="click">
<div class="wrapper-form-dropdown">
<span>视图模式</span>
<SvgIcon class="wrapper-content-form-gap" name="arrow-botton" size="14" />
</div>
</n-popselect> -->
</n-popselect>
</div>
<div>
<div class="remove" @click="remove">
移除可疑文件夹
</div>
<div v-show="!showActions" class="wrapper-content-form-button" @click="setBatch(true)">
<div class="wrapper-content-form-button" @click="setBatch(true)" v-show="!showActions">
<SvgIcon style="margin-right: 6px;" size="14" name="tf" />
批量审批
</div>
@ -686,38 +454,25 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
</div>
</div>
<div ref="el" class="scroll" :style="{ height: maxHeight }">
<div ref="el" class="scroll">
<!-- <n-scrollbar :on-scroll="scrollHandler"> -->
<div ref="masonryRef" class="grid">
<div
v-for="(item) in listData" :key="item.pictureId" :data-id="item.pictureId"
<div v-for="(item, index) in listData" :key="item.pictureId" :data-id="item.pictureId"
:class="{ 'grid-item-selected': isSelected(item.pictureId) }" :style="{ height: gridHeight }"
class="grid-item"
>
<n-image
ref="imageRef"
:src="item.imgUrl"
:preview-src="item.imgUrl"
class="img "
:class="{
'img-fit': viewMode === 'horizontalVersion',
'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }"
/>
<n-checkbox
v-if="batch && item.historyStates === 1" v-model:checked="item.checked"
style="position:absolute;left:20px;top:20px" @click.prevent.stop
@update:checked="onCheckChange($event, item)"
/>
class="grid-item">
<n-image :src="item.imgUrl" class="img "
:class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" />
<n-checkbox v-if="batch && item.historyStates === 1" v-model:checked="item.checked"
style="position:absolute;left:20px;top:20px" @click.prevent
@update:checked="onCheckChange($event, item)" />
<img v-if="item.historyStates === 2" class="tag-status" src="@/assets/images/task/tag-pass.png" alt="">
<img
v-if="item.historyStates === 3" class="tag-status" src="@/assets/images/task/tag-not-pass.png"
alt=""
>
<img v-if="item.historyStates === 3" class="tag-status" src="@/assets/images/task/tag-not-pass.png"
alt="">
<div :class="{ 'percent-red': item.similarityScore === 100 }" class="percent">
{{ item.similarityScore }}<span class="percent-unit">%</span>
</div>
<div class="time">
<div class="time" style="left: 25px;bottom: 15px;">
<!-- <div class="time-item">
<SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
<span>{{ item?.photoDateTimestamp ?
@ -728,15 +483,10 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
<span>{{ item.submitDateTimestamp ?
formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }}</span>
</div> -->
<div class="time-item" style="margin-bottom: 4px;">
<SvgIcon color="#FFF" size="16" name="camera" style="margin-right: 4px;" />
<span class="time-value">{{ item?.photoDateTimestamp
? formatToDateHMS(Number(item.photoDateTimestamp)) : '-' }} </span>
</div>
<div class="time-item">
<SvgIcon class="svg-time" color="#FFF" size="16" name="time" />
<span>{{ item.submitDateTimestamp
? formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }}</span>
<span>{{ item.submitDateTimestamp ?
formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }}</span>
</div>
</div>
</div>
@ -752,7 +502,8 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
</n-card>
</n-modal>
<NotPassed ref="notPassModalRef" @success="reloadList" />
<ConfrimModal ref="confrimModalRef" :selected-total="selectIds.length" @commit="commit" />
<ConfrimModal ref="confrimModalRef" @commit="commit" :selectedTotal="selectIds.length" />
</div>
</template>
@ -798,9 +549,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
}
.img {
border-radius: 7px;
display: block;
height: 100%;
border-radius: 8px;
}
.wrapper {
@ -911,12 +660,9 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
}
.time {
position: absolute;
width: 182px;
padding-left: 10px;
z-index: 3;
left: 16px;
bottom: 16px;
background: linear-gradient(180deg,rgba(6,0,0,0.01),rgba(0, 0, 0, 0.44) 100%);
left: 32px;
bottom: 32px;
.time-item {
display: flex;
@ -937,10 +683,10 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
}
}
.scroll {
overflow-y: auto;
// height: calc(100vh - 282px);
height: 800px;
height: calc(100vh - 282px);
margin-left: 20px;
}
}
@ -964,5 +710,4 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
height: 100%;
object-fit: cover;
}
}
</style>
}</style>

@ -14,7 +14,7 @@ defineExpose({
<template>
<div>
<n-modal v-model:show="show" :mask="false" :show-mask="false" transform-origin="center">
<n-modal v-model:show="show" :mask="false" :showMask="false" transform-origin="center">
<Search @close="show = false" />
</n-modal>
</div>

@ -9,7 +9,7 @@ const cardStyle = {
'width': '800px',
'--n-padding-bottom': '10px',
'--n-padding-left': '10px',
'padding-bottom': '100px',
'padding-bottom':'100px'
}
function showModal() {
@ -102,6 +102,10 @@ defineExpose({
</div>
<div class="wrapper-request">
<table style="margin-left: 100px;">
<tr>
<td><div class="key" data-key="c" /></td>
<td>关闭关闭当前场景弹窗</td>
</tr>
<tr>
<td><div class="key" data-key="p p" /></td>
<td>通过</td>
@ -113,8 +117,12 @@ defineExpose({
</table>
<table style="margin-left: 155px;">
<tr>
<td><div class="key" data-key="c" /></td>
<td>关闭关闭当前场景弹窗</td>
<td><div class="key" data-key="t t" /></td>
<td></td>
</tr>
<tr>
<td><div class="key" data-key="f f" /></td>
<td></td>
</tr>
<tr>
<td><div class="key" data-key="&larr;" /><span>/</span><div class="key" data-key="&rarr;" /></td>

@ -1,92 +1,92 @@
<script lang="ts" setup>
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'
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
}>()
(e: "logout"): void;
}>();
const router = useRouter()
const router = useRouter();
const userStore = useUser()
const userStore = useUser();
const useInfo = userStore.getUserInfo
const useInfo = userStore.getUserInfo;
const aiDisabled = ref(false)
const aiDisabled = ref(false);
function handleSelect(row) {
userStore.updateTenantId(row.key)
location.reload()
userStore.updateTenantId(row.key);
location.reload();
}
function logIt(e) {
return false
return false;
}
//
function goHome(e) {
router.push({ name: 'home' })
router.push({ name: "home" });
}
//
function goTask(e) {
router.push({ name: 'task-main' })
router.push({ name: "task-main" });
}
// AI
function goWorksheet(e) {
router.push({ name: 'worksheet-main' })
router.push({ name: "worksheet-main" });
}
//
function goFinal(e) {
router.push({ name: 'final-main' })
router.push({ name: "final-main" });
}
const mousetrap = inject('mousetrap') as any
const mousetrap = inject("mousetrap") as any;
onMounted(() => {
mousetrap.bind('g h', goHome)
mousetrap.bind('g t', goTask)
mousetrap.bind('g a', goWorksheet)
mousetrap.bind('g e', goFinal)
})
mousetrap.bind("g h", goHome);
mousetrap.bind("g t", goTask);
mousetrap.bind("g a", goWorksheet);
mousetrap.bind("g e", goFinal);
});
const showPopover = ref(false)
const popRef = ref(null)
const changeFlag = ref(false)
const showPopover = ref(false);
const popRef = ref(null);
const changeFlag = ref(false);
const iconName = computed(() => {
return showPopover.value ? 'expand' : 'collapse'
})
return showPopover.value ? "expand" : "collapse";
});
function handleUpdateShow(show: boolean) {
showPopover.value = show
showPopover.value = show;
}
function logOut() {
(popRef.value as any).setShow(false)
emit('logout')
(popRef.value as any).setShow(false);
emit("logout");
}
const currentCompanyName = computed(() => {
const deptlist = useInfo.deptlist
const currentId = userStore.getTenantId
const current = deptlist.find(item => item.id === currentId)
return current.name || 'name'
})
const tenantList = useInfo.tenantList;
const currentId = userStore.getTenantId;
const current = tenantList.find((item) => item.id === currentId);
return current.name || "name";
});
const options = computed(() => {
const deptlist = useInfo.deptlist
return deptlist.map((item) => {
const tenantList = useInfo.tenantList;
return tenantList.map((item) => {
return {
label: item.departname,
key: item.deptno,
}
})
})
label: item.name,
key: item.id,
};
});
});
</script>
<template>
@ -101,8 +101,8 @@ const options = computed(() => {
>
<template #trigger>
<div class="setting">
<span style="color: #333333">{{ useInfo.username }}</span>
<SvgIcon style="margin-left: 6px" :name="iconName" size="16" />
<span>{{ useInfo.username }}</span>
<SvgIcon style="margin-left: 6px" :name="iconName" size="14" />
</div>
</template>
<div class="container">
@ -119,28 +119,24 @@ const options = computed(() => {
</div>
<div class="trigger">
<span>{{ currentCompanyName }}</span>
<span style="cursor: pointer" @click="changeFlag = !changeFlag"><SvgIcon name="switchCompany" size="24" /></span>
<span @click="changeFlag = !changeFlag" style="cursor: pointer"><SvgIcon name="switchCompany" size="24" /></span>
</div>
<div class="item">
<span>AI设置开关</span>
<n-switch v-model:value="aiDisabled" />
</div>
<div class="trigger">
联系我们
</div>
<div class="trigger">联系我们</div>
<n-divider style="margin-top: 0px; margin-bottom: 10px; padding: 0 22px" />
<div class="trigger" @click="logOut">
退出登录
</div>
<div class="trigger" @click="logOut">退</div>
<div
v-show="changeFlag"
class="container sub-container"
v-show="changeFlag"
style="position: absolute; right: 17vw; width: 11.5vw; padding: 24px 0"
>
<div
class="trigger"
v-for="option in options"
:key="option.key"
class="trigger"
@click="handleSelect(option)"
>
{{ option.label }}

@ -11,11 +11,11 @@ import { msgPolling } from '@/api/message/message'
import { getImgUrl } from '@/utils/urlUtils'
import { useUser } from '@/store/modules/user'
import { useTaskStore } from '@/store/modules/task'
import defaultAvatar from '@/assets/icons/avatar.svg'
import defaultAvatar from '@/assets/icons/avatar.svg';
const taskStore = useTaskStore()
const taskStore = useTaskStore();
export default defineComponent({
name: 'PageHeader',
name: "PageHeader",
components: {
UserSettings,
QuillModal,
@ -31,140 +31,139 @@ export default defineComponent({
type: Boolean,
},
},
emits: ['update:collapsed'],
emits: ["update:collapsed"],
setup() {
const message = useMessage()
const dialog = useDialog()
const message = useMessage();
const dialog = useDialog();
const userStore = useUser()
const useInfo = userStore.getUserInfo
const userStore = useUser();
const useInfo = userStore.getUserInfo;
const name = ''
const name = "";
const state = reactive({
username: name ?? '',
fullscreenIcon: 'FullscreenOutlined',
})
username: name ?? "",
fullscreenIcon: "FullscreenOutlined",
});
const router = useRouter()
const route = useRoute()
const routename = ref(route.meta.title)
const router = useRouter();
const route = useRoute();
const routename = ref(route.meta.title);
// mm
const iconList = ref([
{
icon: 'magnifying-1',
icon: "magnifying-1",
handle: searchHandler,
},
{
icon: 'shortcut-keys',
icon: "shortcut-keys",
handle: shortcutHandler,
},
{
icon: 'suspicious-folder',
icon: "suspicious-folder",
handle: recycleHandler,
},
{
icon: 'memo',
icon: "memo",
handle: quillHandler,
},
{
icon: 'nomessage',
icon: "nomessage",
handle: goMessage,
},
])
]);
watch(
() => route.fullPath,
() => {
routename.value = route.meta.title
},
)
routename.value = route.meta.title;
}
);
const handleDragOver = (event, item) => {
taskStore.setInFile(true)
}
taskStore.setInFile(true);
};
const handleDragLeave = (event, item) => {
taskStore.setInFile(false)
}
taskStore.setInFile(false);
};
const dropdownSelect = (key) => {
router.push({ name: key })
}
router.push({ name: key });
};
// 退
const doLogout = () => {
dialog.info({
title: '提示',
content: '您确定要退出登录吗',
positiveText: '确定',
negativeText: '取消',
title: "提示",
content: "您确定要退出登录吗",
positiveText: "确定",
negativeText: "取消",
onPositiveClick: () => {
userStore.logout().then(() => {
message.success('成功退出登录')
message.success("成功退出登录");
router
.replace({
name: 'Login',
name: "Login",
query: {
// redirect: route.fullPath,
},
})
.finally(() => location.reload())
})
.finally(() => location.reload());
});
},
onNegativeClick: () => {},
})
}
});
};
const quillModalRef = ref(null)
const shortcutModal = ref(null)
const recycleModalRef = ref(null)
const SearchModalRef = ref(null)
const quillModalRef = ref(null);
const shortcutModal = ref(null);
const recycleModalRef = ref(null);
const SearchModalRef = ref(null);
function quillHandler() {
const modal = unref(quillModalRef)! as any
modal.showModal()
const modal = unref(quillModalRef)! as any;
modal.showModal();
}
function shortcutHandler() {
const modal = unref(shortcutModal)! as any
modal.showModal()
const modal = unref(shortcutModal)! as any;
modal.showModal();
}
function recycleHandler() {
const modal = unref(recycleModalRef)! as any
modal.showModal()
const modal = unref(recycleModalRef)! as any;
modal.showModal();
}
function searchHandler() {
const modal = unref(SearchModalRef)! as any
modal.showModal()
const modal = unref(SearchModalRef)! as any;
modal.showModal();
}
function goMessage() {
router.push({ name: 'message-main' })
router.push({ name: "message-main" });
}
async function getMessage() {
const res = await msgPolling()
if (res.data)
iconList.value[4].icon = 'hasmessage'
else iconList.value[4].icon = 'nomessage'
const res = await msgPolling();
if (res.data) iconList.value[4].icon = "hasmessage";
else iconList.value[4].icon = "nomessage";
}
setInterval(() => {
getMessage()
}, 5000)
getMessage();
}, 5000);
const mousetrap = inject('mousetrap') as any
const mousetrap = inject("mousetrap") as any;
onMounted(() => {
getMessage()
mousetrap.bind('n r', quillHandler)
mousetrap.bind('n t', quillHandler)
mousetrap.bind('n n', recycleHandler)
mousetrap.bind('m m', searchHandler)
})
getMessage();
mousetrap.bind("n r", quillHandler);
mousetrap.bind("n t", quillHandler);
mousetrap.bind("n n", recycleHandler);
mousetrap.bind("m m", searchHandler);
});
const defaultAvatarSrc = ref(defaultAvatar)
const defaultAvatarSrc = ref(defaultAvatar);
return {
...toRefs(state),
@ -188,7 +187,7 @@ export default defineComponent({
defaultAvatarSrc,
}
},
})
});
</script>
<template>
@ -202,6 +201,7 @@ export default defineComponent({
>
<SvgIcon name="homepage" size="16" />
</div>
<div>当前位置{{ routename }}</div>
</div>
<div class="layout-header-right">
@ -227,7 +227,7 @@ export default defineComponent({
<!-- 个人中心 -->
<div class="layout-header-trigger layout-header-trigger-min">
<!-- <n-avatar :src="getImgUrl(useInfo.usericon)" round /> -->
<n-avatar style="width:36px;height:36px;" :src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatarSrc" round />
<n-avatar :src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatarSrc" round/>
</div>
<!-- 设置 -->
<UserSettings @logout="doLogout" />
@ -245,7 +245,7 @@ export default defineComponent({
justify-content: space-between;
align-items: center;
padding: 0;
height: 62px;
height: 64px;
transition: all 0.2s ease-in-out;
width: 100%;
z-index: 11;
@ -253,7 +253,6 @@ export default defineComponent({
&-left {
display: flex;
align-items: center;
justify-content: flex-start;
color: #666666;
.logo {
@ -268,7 +267,7 @@ export default defineComponent({
img {
width: auto;
height: 34px;
height: 32px;
margin-right: 10px;
}
@ -281,7 +280,7 @@ export default defineComponent({
&-right {
display: flex;
align-items: center;
margin-right: 24px;
margin-right: 20px;
.back {
width: 28px;

@ -36,7 +36,7 @@ function getSvgName(item: MenuMixedOption) {
class="icon-button" :class="{ 'icon-button--selected': isSelect(item) }"
@click="handleClick(item)"
>
<SvgIcon color="#666666" :size="item.svgsize as number" :name="getSvgName(item)" />
<SvgIcon color="#666666" :size="item.svgsize as number" :name="getSvgName(item)" />
</button>
</template>
<span>{{ item.title }}</span>

@ -1,57 +1,57 @@
<script lang="ts">
import { computed, defineComponent, onMounted, ref, unref, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { IconGroup } from '../IconGroup'
import { useAsyncRouteStore } from '@/store/modules/asyncRoute'
import { generatorMenu } from '@/utils'
import { storage } from '@/utils/Storage'
import { CURRENT_USER } from '@/store/mutation-types'
import { computed, defineComponent, onMounted, ref, unref, watch } from "vue";
import { useRoute, useRouter } from "vue-router";
import { IconGroup } from "../IconGroup";
import { useAsyncRouteStore } from "@/store/modules/asyncRoute";
import { generatorMenu } from "@/utils";
import { storage } from "@/utils/Storage";
import { CURRENT_USER } from "@/store/mutation-types";
export default defineComponent({
name: 'AppMenu',
name: "AppMenu",
components: { IconGroup },
emits: ['clickMenuItem'],
emits: ["clickMenuItem"],
setup(props, { emit }) {
//
const currentRoute = useRoute()
const router = useRouter()
const asyncRouteStore = useAsyncRouteStore()
const menus = ref<any[]>([])
const selectedSvg = ref<string>(currentRoute.meta.svgname as string)
const currentRoute = useRoute();
const router = useRouter();
const asyncRouteStore = useAsyncRouteStore();
const menus = ref<any[]>([]);
const selectedSvg = ref<string>(currentRoute.meta.svgname as string);
const getSelectedSvg = computed(() => {
return unref(selectedSvg)
})
return unref(selectedSvg);
});
//
watch(
() => currentRoute.fullPath,
() => {
updateMenu()
},
)
updateMenu();
}
);
function updateSelectedKeys() {
const svgname: string = (currentRoute.meta?.svgname as string) || ''
selectedSvg.value = svgname
const svgname: string = (currentRoute.meta?.svgname as string) || "";
selectedSvg.value = svgname;
}
function updateMenu() {
menus.value = generatorMenu(asyncRouteStore.getMenus)
const userInfo = storage.get(CURRENT_USER)
menus.value = generatorMenu(asyncRouteStore.getMenus);
const userInfo = storage.get(CURRENT_USER);
if (userInfo && userInfo.frontmenuTList) {
menus.value = userInfo.frontmenuTList.map((item) => {
const v = {
let v = {
component: () =>
item.resUrl == '/task'
? import('@/views/task/index.vue')
: item.resUrl == '/home'
? import('@/views/home/index.vue')
: item.resUrl == '/worksheet'
? import('@/views/worksheet/index.vue')
: item.resUrl == '/final'
? import('@/views/final/index.vue')
: '',
item.resUrl == "/task"
? import("@/views/task/index.vue")
: item.resUrl == "/home"
? import("@/views/home/index.vue")
: item.resUrl == "/worksheet"
? import("@/views/worksheet/index.vue")
: item.resUrl == "/final"
? import("@/views/final/index.vue")
: "",
icon: undefined,
key: item.resKey,
label: item.description,
@ -62,36 +62,35 @@ export default defineComponent({
path: item.resUrl,
name: item.resKey,
svgname: item.icon,
svgsize: item.resUrl == '/home' ? 60 : 22,
svgsize: item.resUrl == "/home" ? 60 : 22,
title: item.description,
}
return v
})
};
return v;
});
}
updateSelectedKeys()
updateSelectedKeys();
}
//
function clickMenuItem(key: string) {
if (/http(s)?:/.test(key))
window.open(key)
else router.push({ name: key })
if (/http(s)?:/.test(key)) window.open(key);
else router.push({ name: key });
emit('clickMenuItem' as any, key)
emit("clickMenuItem" as any, key);
}
onMounted(() => {
updateMenu()
})
updateMenu();
});
return {
menus,
selectedSvg,
getSelectedSvg,
clickMenuItem,
}
};
},
})
});
</script>
<template>

@ -6,12 +6,16 @@ import { AsideMenu } from './components/Menu'
import { PageHeader } from './components/Header'
import { useProjectSetting } from '@/hooks/setting/useProjectSetting'
const { menuSetting } = useProjectSetting()
const {
menuSetting,
} = useProjectSetting()
const leftMenuWidth = computed(() => {
const { minMenuWidth } = unref(menuSetting)
return minMenuWidth
})
</script>
<template>
@ -41,13 +45,10 @@ const leftMenuWidth = computed(() => {
display: flex;
flex-direction: row;
flex: auto;
background-image: url("../assets/images/bg.png");
background-image: url('../assets/images/bg.png');
background-size: cover;
// height: 1100px;
// width: 1440px;
height: 100%;
max-height: 1100px;
overflow: hidden;
.layout-sider {
min-height: 100vh;
border-right: 1px solid #dae4f3;
@ -72,7 +73,7 @@ const leftMenuWidth = computed(() => {
display: flex;
flex: auto;
height: 100%;
// padding: 0px 16px 24px 16px;
padding: 0px 16px 24px 16px;
overflow-x: hidden;
box-sizing: border-box;
}

@ -16,7 +16,7 @@ async function bootstrap() {
setupGlobalProperties(app)
setupRouter(app)
await router.isReady()
const meta = document.createElement('meta')
const meta = document.createElement('meta')
meta.name = 'naive-ui-style'
document.head.appendChild(meta)
app.mount('#app', true)

@ -85,6 +85,7 @@ export function createRouterGuards(router: Router) {
router.afterEach((to, _, failure) => {
document.title = (to?.meta?.title as string) || document.title
if (isNavigationFailure(failure)) {
// console.log('failed navigation', failure)
}
const asyncRouteStore = useAsyncRoute()
// 在这里设置需要缓存的组件名称
@ -107,6 +108,7 @@ export function createRouterGuards(router: Router) {
})
router.onError((error) => {
console.error(error, '路由错误')
// eslint-disable-next-line no-console
console.log(error, '路由错误')
})
}

@ -31,7 +31,6 @@ const routes: Array<RouteRecordRaw> = [
name: 'final-main',
meta: {
title: '任务终审',
keepAlive: true,
},
component: () => import('@/views/final/index.vue'),
},

@ -1,44 +0,0 @@
import type { RouteRecordRaw } from 'vue-router'
import { Layout } from '@/router/constant'
/**
* @param name , ,
* @param meta
* @param redirect , 访,
* @param meta.disabled
* @param meta.title
* @param meta.icon
* @param meta.keepAlive
* @param meta.sort
*
*/
const routes: Array<RouteRecordRaw> = [
{
path: '/',
name: 'map',
redirect: '/map',
component: Layout,
meta: {
title: '地理位置',
permissions: ['task-main'],
svgname: 'task-approval',
svgsize: 22,
sort: 5,
disabled: true,
hidden: true,
},
children: [
{
path: 'map',
name: 'map-main',
meta: {
title: '地理位置',
},
component: () => import('@/views/map/index.vue'),
},
],
},
]
export default routes

@ -1,5 +1,5 @@
import type { RouteRecordRaw } from 'vue-router'
import { Layout } from '@/router/constant'
import type { RouteRecordRaw } from 'vue-router'
/**
* @param name , ,
@ -19,7 +19,7 @@ const routes: Array<RouteRecordRaw> = [
redirect: '/worksheet',
component: Layout,
meta: {
title: '图审审批',
title: '图审审批管理',
permissions: ['worksheet-main'],
svgname: 'worksheet',
svgsize: 22,
@ -30,7 +30,7 @@ const routes: Array<RouteRecordRaw> = [
path: 'worksheet',
name: 'worksheet-main',
meta: {
title: '图审审批',
title: '图审审批管理',
},
component: () => import('@/views/worksheet/index.vue'),
},

@ -21,7 +21,7 @@ export const useAsideConfigStore = defineStore({
systemConfig: null,
customConfig: null,
asideValue: null,
searchValue: '',
searchValue: "",
isAllowDownload: true,
timeNum: 0,
filterConfig: [],

@ -1,6 +1,6 @@
import { defineStore } from 'pinia'
import { store } from '@/store'
import { getBackList, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizApprovalStatusList, getizstatusList } from '@/api/dictionary'
import { getBackList, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizstatusList, getizApprovalStatusList } from '@/api/dictionary'
export interface DictionaryState {
regionList: any
@ -104,32 +104,32 @@ export const useDictionaryStore = defineStore({
},
getizApprovalStatus: (state) => {
return state.izApprovalStatusList
},
}
},
actions: {
initData() {
initData(){
// this.fetchRegionList(); //废弃
this.fetchPictureTypeList()
this.fetchPersionList()
this.fetchPlanList()
this.fetchTFList()
this.fetchPictureTypeList();
this.fetchPersionList();
this.fetchPlanList();
this.fetchTFList();
// this.fetchIzShowList(); //废弃
this.fetchIzProjectList()
this.fetchIztaskrromList()
this.fetchIztaskstatusList()
this.fetchIzvisitproList()
this.fetchIzfirmList()
this.fetchIzproductnameList()
this.fetchizcustomnameList()
this.fetchIzCustomtypeList()
this.fetchIzcustomlevelList()
this.fetchizizprojecttypeList()
this.fetchizvisitcityList()
this.fetchRejectList()
this.fetchBackList()
this.fetchRelationTypeList()
this.fetchizstatusListt()
this.fetchizApprovalStatusList()
this.fetchIzProjectList();
this.fetchIztaskrromList();
this.fetchIztaskstatusList();
this.fetchIzvisitproList();
this.fetchIzfirmList();
this.fetchIzproductnameList();
this.fetchizcustomnameList();
this.fetchIzCustomtypeList();
this.fetchIzcustomlevelList();
this.fetchizizprojecttypeList();
this.fetchizvisitcityList();
this.fetchRejectList();
this.fetchBackList();
this.fetchRelationTypeList();
this.fetchizstatusListt();
this.fetchizApprovalStatusList();
},
settfList(config) {
this.tfList = config

@ -1,95 +1,31 @@
import { defineStore } from 'pinia'
import { store } from '@/store'
import { getFilter } from '@/api/home/filter'
import { getConfig } from '@/api/system/user'
import { asideMap } from '@/config/final'
import { cloneDeep, isEqual } from 'lodash-es'
import type { AsideConfig } from '/#/api'
export interface ConfigState {
systemConfig: AsideConfig | null
customConfig: string[] | null
asideValue: any
listKey: number
searchValue: string
isAllowDownload: boolean
timeNum: number
filterConfig: string[] // 过滤筛选条件
}
export const useFinalStore = defineStore({
id: 'app-final',
state: (): ConfigState => ({
systemConfig: null,
customConfig: null,
asideValue: null,
listKey: 0,
searchValue: '',
isAllowDownload: true,
timeNum: 0,
filterConfig: [],
}),
getters: {
getSystemConfig(): AsideConfig | null {
return this.systemConfig
},
getCustomConfig(): string[] | null {
return this.customConfig
},
getAsideValue(): any {
return this.asideValue
},
getSearchValue(): any {
return this.searchValue
},
getIsAllowDownload(): any {
return this.isAllowDownload
},
getTimeNum(): any {
return this.timeNum
},
getFilterConfig(): any {
return this.filterConfig
},
},
actions: {
setSystemConfig(config: AsideConfig) {
this.systemConfig = config
},
setAsideValue(value) {
this.asideValue = value
},
setListKey() {
this.listKey = new Date().getTime()
},
setSearchValue(value) {
this.searchValue = value
},
setIsAllowDownload(value) {
this.isAllowDownload = value
},
setTimeNum(value) {
this.timeNum = value
},
// 设置个性化配置
setCustomConfig(value) {
this.customConfig = value
},
setFilterConfig(value) {
this.filterConfig = value
},
// 获取系统配置信息
async fetchConfig() {
const list: any = {}
const tempAsideMap = cloneDeep(asideMap)
Object.keys(tempAsideMap).forEach((key) => {
list[key] = 'Y'
})
this.setSystemConfig(list)
return list
},
// // 获取终审个性化配置
// 获取终审个性化配置
async fetchCustomConfig() {
const res = await getFilter(1)
const { data } = res

@ -1,7 +1,7 @@
import { getApprovalList } from '@/api/task/task'
import { store } from '@/store'
import { defineStore } from 'pinia'
import type { TaskState } from '/#/task'
import { getApprovalList } from '@/api/task/task'
import { store } from '@/store'
export const useTaskStore = defineStore({
id: 'task-store',
@ -12,7 +12,6 @@ export const useTaskStore = defineStore({
packageid: '',
immersion: false,
inFile: false, // 是否进入文件夹
inFileId: '',
}),
getters: {
getActiveId: (state: TaskState) => state.activeId,
@ -20,7 +19,6 @@ export const useTaskStore = defineStore({
getCurrentIndex: (state: TaskState) => state.currentIndex,
getApprovalList: (state: TaskState) => state.approvalList,
getInFile: (state: TaskState) => state.inFile,
getInFileId: (state: TaskState) => state.inFileId,
},
actions: {
setApprovalList(list: any[]) {
@ -29,9 +27,6 @@ export const useTaskStore = defineStore({
setInFile(flag: any) {
this.inFile = flag
},
setInFileId(id: any) {
this.inFileId = id
},
setActive(index: number, taskId?: string) {
this.currentIndex = index
const task = this.approvalList[index]

@ -15,7 +15,7 @@ const TOKEN_REFRESH_SECONDS = 20 * 60
export interface UserInfoType {
token: string
deptlist: any[]
tenantList: any[]
userInfo: any
}
@ -122,11 +122,12 @@ export const useUserStore = defineStore({
if (code === ResultEnum.SUCCESS) {
const ex = 7 * 24 * 60 * 60
// 默认设置为第一个租户
const firstTenant = data.deptlist.length > 0 ? data.deptlist[0] : null
const tenantId = firstTenant ? firstTenant.deptno : ''
data.frontmenuTList.forEach((ele) => {
if (ele.description === 'AI工单')
ele.description = '图审审批'
const firstTenant = data.tenantList.length > 0 ? data.tenantList[0] : null
const tenantId = firstTenant ? firstTenant.id : ''
data.frontmenuTList.forEach(ele=>{
if(ele.description === 'AI工单'){
ele.description = '图审审批管理'
}
})
storage.set(CURRENT_USER, data, ex)
storage.set(TENANT_ID, tenantId)
@ -150,6 +151,7 @@ export const useUserStore = defineStore({
},
// 刷新token
async refreshToken() {
// console.log('refresh token!')
const response = await refreshToken()
const { data: token, code } = response
if (code === ResultEnum.SUCCESS)
@ -174,7 +176,7 @@ export const useUserStore = defineStore({
// 登出
async logout() {
this.setPermissions([])
this.setUserInfo({ deptlist: [], userInfo: {}, token: '' })
this.setUserInfo({ tenantList: [], userInfo: {}, token: '' })
this.setTenantId('')
storage.remove(USER_ACCESS_TOKEN)
storage.remove(CURRENT_USER)

@ -28,7 +28,7 @@ export const useWorkOrderStore = defineStore({
this.currentIndex = index
const order = this.packageList[index]
this.activeId = orderId || order?.checkDuplicateId
this.dataId = dataId || order.id
this.dataId = dataId || order.id;
},
forward() {
const len = this.packageList.length

@ -201,8 +201,9 @@ const transform: AxiosTransform = {
// eslint-disable-next-line ts/no-use-before-define
const instance = http.getAxios()
const config = response.config
const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token', '/api/web/smslogin/login', '/api/web/smslogin/sendcode', '/api/ocr/sUser/selectSUser']
const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token','/api/web/smslogin/login','/api/web/smslogin/sendcode','/api/ocr/sUser/selectSUser']
const expirationTime = storage.get(TOKEN_EXPIRATION_TIME)
// console.log('剩余失效时间(分):', (expirationTime - Date.now()) / 1000 / 60, config.url)
if (expirationTime && (expirationTime - Date.now()) <= 0 && !whitelist.includes(config.url as string)) {
if (!isRefreshingToken) {
@ -230,6 +231,7 @@ const transform: AxiosTransform = {
}
else {
return new Promise((resolve) => {
// console.log('刷新token中暂存此请求', config.url)
requests.push((token) => {
(config as Recordable).headers.logintoken = token
resolve(instance(config)) // 执行请求,

@ -10,275 +10,171 @@ import {
shallowRef,
unref,
watch,
} from 'vue'
import { cloneDeep, isEqual } from 'lodash-es'
import { CustomFilterModalVue, FilterModal, NewFilterModal } from '@/views/final/comp'
import Search from '@/views/home/aside/comp/Search.vue'
import AdvanceFilter from '@/views/home/aside/comp/AdvanceFilter.vue'
import { getViewportOffset } from '@/utils/domUtils'
import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
import { useFinal } from '@/store/modules/final'
import type { Filter } from '/#/home'
import type { AsideEntity } from '@/config/aside'
import { asideMap } from '@/config/final'
import type { AsideConfig } from '/#/api'
import emitter from '@/utils/mitt'
import { getFilterList } from '@/api/home/main'
const emit = defineEmits(['inputChange'])
const finalStore = useFinal()
} from "vue";
import { CustomFilterModalVue, FilterModal, NewFilterModal } from "@/views/final/comp";
import Search from "@/views/home/aside/comp/Search.vue";
import AdvanceFilter from "@/views/home/aside/comp/AdvanceFilter.vue";
import { getViewportOffset } from "@/utils/domUtils";
import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
import { useFinal } from "@/store/modules/final";
import type { Filter } from "/#/home";
import type { AsideEntity } from "@/config/aside";
import { asideMap } from "@/config/final";
import type { AsideConfig } from "/#/api";
import emitter from "@/utils/mitt";
const emit = defineEmits(["inputChange"]);
const finalStore = useFinal();
//
const asideValue: Record<keyof typeof asideMap, any> = reactive({})
const asideValue: Record<keyof typeof asideMap, any> = reactive({});
// :
const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({});
//
const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
const initAsideValueRef = ref<any>(null) // ()
const customObjRef = ref<any>(null) //
const customTempObjRef = ref<any>(null) // ()
const configFilterRef = ref<any>([]) //
initAsideValueRef.value = cloneDeep(asideMap)
onBeforeMount(async () => {
finalStore.fetchConfig()
finalStore.fetchCustomConfig()
})
const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
Object.keys(asideMap).forEach((key) => {
const { defaultValue, inFilterList } = asideMap[key]
if (inFilterList !== false)
asideValue[key] = defaultValue
})
const { defaultValue, inFilterList } = asideMap[key];
if (inFilterList !== false) asideValue[key] = defaultValue;
});
const filterModalRef: any = ref(null)
const newFilterModalRef = ref(null)
const customModalRef = ref(null)
const AdvanceFilterRef: any = ref(null)
const filterModalRef = ref(null);
const newFilterModalRef = ref(null);
const customModalRef = ref(null);
function showModal(modalRef: any) {
const modal = unref(modalRef)! as any
modal.showModal()
}
function newFilterOk() {
filterModalRef.value.query(
filterModalRef.value.pagination.page,
filterModalRef.value.pagination.pageSize,
)
filterModalRef.value.showModal()
const modal = unref(modalRef)! as any;
modal.showModal();
}
const mousetrap = inject('mousetrap') as any
mousetrap.bind('[', collapseHandler)
const mousetrap = inject("mousetrap") as any;
mousetrap.bind("[", collapseHandler);
onMounted(() => {
nextTick(() => {
computeSlideHeight()
})
})
computeSlideHeight();
});
});
const collapse = ref(false)
const collapse = ref(false);
function collapseHandler() {
collapse.value = !collapse.value
collapse.value = !collapse.value;
}
const asideWidth = computed(() => {
return collapse.value ? 0 : 308
})
return collapse.value ? 0 : 308;
});
const asideHeight = ref(500)
const asideHeight = ref(500);
const asideStyle = computed(() => {
return {
width: `${asideWidth.value}px`,
height: `${asideHeight.value}px`,
}
})
};
});
const collapseIcon = computed(() => {
return collapse.value ? 'expand-cir' : 'collapse-cir'
})
return collapse.value ? "expand-cir" : "collapse-cir";
});
function computeSlideHeight() {
const headEl = document.querySelector('.aside-header')!
const { bottomIncludeBody } = getViewportOffset(headEl)
const height = bottomIncludeBody
asideHeight.value = height - 24
const headEl = document.querySelector(".aside-header")!;
const { bottomIncludeBody } = getViewportOffset(headEl);
const height = bottomIncludeBody;
asideHeight.value = height - 24;
}
useWindowSizeFn(computeSlideHeight, 280)
useWindowSizeFn(computeSlideHeight, 280);
onBeforeMount(async () => {
finalStore.fetchCustomConfig()
})
nextTick(() => {
finalStore.$subscribe(() => {
const config = finalStore.getSystemConfig
const customConfig = finalStore.getCustomConfig
if (
configFilterRef.value.length > 0
&& isEqual(configFilterRef.value, finalStore.getFilterConfig)
&& customObjRef.value
&& isEqual(customObjRef.value, customTempObjRef.value)
)
return
if (config == null || customConfig == null)
return
const sortKeyList: any = []
finalStore.getFilterConfig.forEach((item: any) => {
sortKeyList.push(item?.id)
})
const showKeys = [...sortKeyList]
Object.keys(config).forEach((key) => {
if (key.startsWith('iz') && asideMap[key] !== undefined) {
asideVisible[key]
= (showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === 'Y'
}
})
if (customObjRef.value) {
//
Object.keys(customObjRef.value).forEach((key) => {
// if (asideMap.hasOwnProperty(key)) {
if (Object.prototype.hasOwnProperty.call(asideMap, key)) {
const str = key.toLowerCase()
// console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
if (str == 'izsimilarity') {
if (typeof customObjRef.value[str] == 'string')
customObjRef.value[str] = customObjRef.value[str].split(',')
asideValue[key] = customObjRef.value[str] //
}
else if (str == 'izyear') {
if (typeof customObjRef.value[str] == 'string') {
const 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] //
}
else if (customObjRef.value[str]) {
if (typeof customObjRef.value[str] == 'string') {
customObjRef.value[str] = customObjRef.value[str].split(',')
asideValue[key] = customObjRef.value[str] //
}
else {
asideValue[key] = customObjRef.value[str] //
}
}
else {
asideValue[key] = null
}
}
})
customTempObjRef.value = customObjRef.value
const tempobj = cloneDeep(asideValue)
finalStore.setAsideValue(tempobj)
finalStore.fetchCustomConfig();
});
finalStore.$subscribe(() => {
const customConfig = finalStore.getCustomConfig;
if (customConfig === null) return;
const showKeys: string[] = [...customConfig];
const defaultKeys = Object.keys(asideMap).filter(
(key) => asideMap[key].isDefaultFilter
);
showKeys.unshift(...defaultKeys);
Object.keys(asideMap).forEach((key) => {
//
if (key.startsWith("iz"))
asideVisible[key] =
asideMap[key] && (showKeys.includes(key) || asideMap[key].isDefaultFilter);
});
const items = showKeys.reduce((acc, key) => {
if (asideMap[key]) {
const config = {
key,
config: asideMap[key],
};
return [...acc, config];
} else {
return acc;
}
const items = showKeys.reduce((acc, key) => {
const currentData = asideMap[key]
const render = currentData?.render
if (render !== false) {
const str = key?.toLowerCase()
const o = {
key: str,
config: asideMap[str],
}
return [...acc, o]
}
else {
return acc
}
}, [])
showItems.value = items
configFilterRef.value = finalStore.getFilterConfig
})
})
}, []);
showItems.value = items;
});
watch(asideVisible, (newVal) => {
Object.keys(asideValue).forEach((key) => {
if (newVal[key] === false)
asideValue[key] = asideMap[key].defaultValue
})
})
if (newVal[key] === false) asideValue[key] = asideMap[key].defaultValue;
});
});
const asideEnter = ref(false)
const asideEnter = ref(false);
const showCollapse = computed(() => {
return collapse.value ? true : asideEnter.value
})
return collapse.value ? true : asideEnter.value;
});
const showSearch = ref(false)
const showSearch = ref(false);
function setShowSearch(value: boolean) {
showSearch.value = value
if (!value)
showSearch.value = value;
if(!value){
inputChange('')
}
}
// key
function scrollHandler(key: string) {
const element = document.querySelector(`#${key}`)
element?.scrollIntoView(true)
const element = document.querySelector(`#${key}`);
element?.scrollIntoView(true);
}
async function filterHandler(searchId: string) {
const res = await getFilterList({ userSearchId: searchId })
// console.log("", res);
if (res.code == 'OK') {
const obj = res.data
customObjRef.value = res.data
const showKeys: any[] = []
Object.keys(obj).forEach((key) => {
// if (asideMap.hasOwnProperty(key)) {
if (Object.prototype.hasOwnProperty.call(asideMap, key))
showKeys.push(key)
})
finalStore.setCustomConfig(showKeys)
}
function filterHandler(searchId: string) {
emitter.emit("filter-final", searchId);
}
function editFilter(filter: any) {
const modal = unref(newFilterModalRef)! as any
modal.showModal()
modal.edit(filter)
const modal = unref(newFilterModalRef)! as any;
modal.showModal();
modal.edit(filter);
}
// watch(asideValue, (newVal) => {
// finalStore.setAsideValue(newVal);
// });
function inputChange(keyword) {
emit('inputChange', keyword)
}
function handleOk(item: any) {
if (item) {
AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname)
filterHandler(item.id)
}
else {
AdvanceFilterRef.value.setCurrentlySelectedAdvanced('高级筛选')
filterHandler('')
}
}
watch(asideValue, (newVal) => {
finalStore.setAsideValue(newVal);
});
function updateComponent(key, e) {
// let tempAsideValue = finalStore.getAsideValue || asideValue;
const tempobj = cloneDeep(asideValue)
tempobj[key] = e
customObjRef.value = tempobj
// asideValue = Object.assign({}, asideValue, tempobj);
finalStore.setAsideValue(tempobj)
}
const inputChange = (keyword) => {
emit("inputChange", keyword);
};
</script>
<template>
<div class="aside" :style="asideStyle" @mouseenter="asideEnter = true" @mouseleave="asideEnter = false">
<div
class="aside"
:style="asideStyle"
@mouseenter="asideEnter = true"
@mouseleave="asideEnter = false"
>
<div v-show="showCollapse" class="aside-collapse">
<div class="aside-collapse-btn" @click="collapseHandler">
<SvgIcon :name="collapseIcon" size="40" />
@ -291,13 +187,11 @@ function updateComponent(key, e) {
v-show="showSearch"
@select="scrollHandler"
@close="setShowSearch(false)"
@input-change="inputChange"
@show-search="setShowSearch(true)"
@inputChange="inputChange"
/>
<!-- 高级筛选 -->
<AdvanceFilter
v-show="!showSearch"
ref="AdvanceFilterRef"
:type="1"
@select="filterHandler"
@update:search="setShowSearch(true)"
@ -307,9 +201,12 @@ function updateComponent(key, e) {
</div>
<component
:is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="index"
v-model:value="asideValue[item.key]" :label="item.config.label"
@update:value="(e) => updateComponent(item.key, e)"
:is="item.config.component"
v-for="(item, index) in showItems"
:id="item.key"
:key="index"
v-model:value="asideValue[item.key]"
:label="item.config.label"
/>
<!-- 筛选 -->
@ -319,10 +216,9 @@ function updateComponent(key, e) {
ref="filterModalRef"
@edit-filter="editFilter"
@show-new-filter="showModal(newFilterModalRef)"
@handle-ok="handleOk"
/>
<!-- 新增过滤 -->
<NewFilterModal ref="newFilterModalRef" @on-ok="newFilterOk" />
<NewFilterModal ref="newFilterModalRef" />
</n-scrollbar>
</div>
</template>
@ -342,7 +238,6 @@ function updateComponent(key, e) {
width: 100%;
border-bottom: 1px solid #e8e8e8;
margin-bottom: 15px;
height: 58px
}
&-divider {
@ -370,11 +265,17 @@ function updateComponent(key, e) {
right: -20px;
}
::v-deep(.n-collapse .n-collapse-item.n-collapse-item--right-arrow-placement .n-collapse-item__header .n-collapse-item-arrow) {
::v-deep(.n-collapse
.n-collapse-item.n-collapse-item--right-arrow-placement
.n-collapse-item__header
.n-collapse-item-arrow) {
margin-left: 8px;
}
::v-deep(.n-collapse .n-collapse-item .n-collapse-item__header .n-collapse-item__header-main) {
::v-deep(.n-collapse
.n-collapse-item
.n-collapse-item__header
.n-collapse-item__header-main) {
font-weight: bold;
justify-content: space-between;
}
@ -387,11 +288,18 @@ function updateComponent(key, e) {
border-top: 0px;
}
::v-deep(.n-collapse .n-collapse-item .n-collapse-item__content-wrapper .n-collapse-item__content-inner) {
::v-deep(.n-collapse
.n-collapse-item
.n-collapse-item__content-wrapper
.n-collapse-item__content-inner) {
padding-top: 10px;
}
::v-deep(.n-scrollbar > .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar, .n-scrollbar + .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar) {
::v-deep(.n-scrollbar
> .n-scrollbar-rail.n-scrollbar-rail--vertical
> .n-scrollbar-rail__scrollbar, .n-scrollbar
+ .n-scrollbar-rail.n-scrollbar-rail--vertical
> .n-scrollbar-rail__scrollbar) {
width: 0px;
}
}

@ -1,61 +1,29 @@
<script lang="ts" setup>
import { cloneDeep, debounce, difference, isEqual } from 'lodash-es'
import { computed, onMounted, ref, watch } from 'vue'
import { debounce, difference } from 'lodash-es'
import { computed, ref, watch } from 'vue'
import { VueDraggable } from 'vue-draggable-plus'
import { setFilter } from '@/api/home/filter'
import { asideMap } from '@/config/final'
import { useFinal } from '@/store/modules/final'
const show = ref(false)
const finalStore = useFinal()
const checkAll = ref(false)
const selectIds = ref<string[]>([])
const tempList = ref<string[]>([])
const extraCustomConfig: any = []
//
const offList = ref<any[]>([])
//
const onList = ref<any[]>([])
const offKeyword = ref('')
const onKeyword = ref('')
Object.keys(asideMap).forEach((key) => {
const { isDefaultFilter } = asideMap[key]
if (isDefaultFilter)
extraCustomConfig.push(key)
})
const finalStore = useFinal()
function showModal() {
show.value = true
//
const config = finalStore.getSystemConfig
const customConfig = finalStore.getCustomConfig
if (config == null || customConfig == null)
return
if (tempList.value.length > 0 && isEqual(tempList.value, finalStore.getFilterConfig))
return
const { showList, hideList } = generatList(config, customConfig)
tempList.value = cloneDeep(showList)
if (tempList.value.length > 0)
finalStore.setFilterConfig(tempList.value)
onList.value = showList
offList.value = hideList
//
checkAll.value = hideList.every(item => item.checked)
//
offKeyword.value = ''
onKeyword.value = ''
}
function closeModal() {
show.value = false
}
//
const offList = ref<any[]>([])
//
const onList = ref<any[]>([])
const allCount = computed(() => {
return `全部筛选(共${offList.value.length}个)`
})
@ -68,16 +36,16 @@ defineExpose({
showModal,
})
function generateDefaultList(config) {
function generateDefaultList() {
return Object.keys(asideMap).reduce((acc, key) => {
const { label, isDefaultFilter } = asideMap[key]
//
if (isDefaultFilter && config[key] === 'Y') {
//
if (isDefaultFilter) {
const config = {
id: key,
name: label || '未配置',
fix: true,
fix: isDefaultFilter,
checked: true,
}
return [...acc, config]
@ -88,22 +56,20 @@ function generateDefaultList(config) {
}, [])
}
function generatList(config, customConfig) {
function generatList(customConfig) {
const keys = Object.keys(asideMap)
let onList: object[] = []
const offList: any = []
const showKeys: any[] = []
const tempShowKeys = [...customConfig, ...extraCustomConfig]
tempShowKeys.forEach((item) => {
if (!showKeys.includes(item))
showKeys.push(item)
})
const offList: object[] = []
const showKeys = customConfig.map((key: string) => key.toLowerCase())
for (const key of keys) {
if (!key.startsWith('iz') || asideMap[key] === undefined)
continue
Object.keys(asideMap).forEach((key) => {
const name = asideMap[key]?.label
const isDefaultFilter = asideMap[key]?.isDefaultFilter
// Y
// if (!isDefaultFilter) {
//
const isChecked = asideMap[key].isDefaultFilter || showKeys.includes(key)
offList.push({
@ -112,17 +78,15 @@ function generatList(config, customConfig) {
fix: isDefaultFilter,
checked: isChecked,
})
if (isChecked && !selectIds.value.includes(key))
isChecked && selectIds.value.push(key)
// }
})
isChecked && selectIds.value.push(key)
}
onList = showKeys.reduce((acc, key) => {
const isDefaultFilter = asideMap[key]?.isDefaultFilter
// && ()
if (config[key] === 'Y' && isDefaultFilter === false) {
// if (config[key] === 'Y') {
// ()
if (isDefaultFilter === false) {
const config = {
id: key,
name: asideMap[key].label || '未配置',
@ -134,74 +98,35 @@ function generatList(config, customConfig) {
return acc
}
}, [])
const fixedList = generateDefaultList(config)
onList.unshift(...fixedList)
// onListcustomConfig
const tempOnList = cloneDeep(onList)
const sortKeyList: any = []
finalStore.getFilterConfig.forEach((item: any) => {
sortKeyList.push(item.id)
})
const sortList: any = []
if (sortKeyList.length > 0) {
sortKeyList.forEach((key) => {
const tempItem = tempOnList.find(item => item.id == key)
if (tempItem)
sortList.push(tempItem)
})
}
else {
showKeys.forEach((key) => {
const tempItem = tempOnList.find(item => item.id == key)
if (tempItem)
sortList.push(tempItem)
})
}
// return { showList: onList, hideList: offList }
return { showList: sortList, hideList: offList }
const fixedList = generateDefaultList()
onList.unshift(...fixedList)
return { showList: onList, hideList: offList }
}
finalStore.$subscribe(() => {
const config = finalStore.getSystemConfig
const customConfig = finalStore.getCustomConfig
if (config == null || customConfig == null)
return
if (tempList.value.length > 0 && isEqual(tempList.value, finalStore.getFilterConfig))
if (customConfig === null)
return
const { showList, hideList } = generatList(config, customConfig)
tempList.value = cloneDeep(showList)
if (tempList.value.length > 0)
finalStore.setFilterConfig(tempList.value)
// setTimeout(() => {
// }, 500);
const { showList, hideList } = generatList(customConfig)
onList.value = showList
offList.value = hideList
})
async function handleSumbit(e: MouseEvent) {
e.preventDefault()
const param = onList.value.map((item) => {
return item.id
}).join(',')
await setFilter({ searchcount: param, type: 1 })
const obj = await finalStore.fetchCustomConfig()
const tempOnList = cloneDeep(onList.value)
const sortList: any = []
obj.forEach((key) => {
const tempItem = tempOnList.find(item => item.id == key)
if (tempItem)
sortList.push(tempItem)
})
// setTimeout(() => {
if (sortList.length > 0)
finalStore.setFilterConfig(sortList)
const param = onList.value
.filter(item => !asideMap[item.id].isDefaultFilter)
.map((item) => {
return item.id
})
.join(',')
// }, 500);
await setFilter({ searchcount: param, type: 1 })
finalStore.fetchCustomConfig()
closeModal()
}
@ -222,18 +147,16 @@ function onCheckChange(checked: any, item: any) {
const index = selectIds.value.indexOf(item.id)
item.checked = checked
const currentIndex = offList.value.findIndex(v => v.id == item.id)
offList.value[currentIndex].checked = item.checked
if (index === -1 && checked)
selectIds.value.push(item.id)
else
index !== -1 && selectIds.value.splice(index, 1)
checkAll.value = offList.value.every(item => item.checked)
else selectIds.value.splice(index, 1)
}
const showIds = computed(() => {
return onList.value.map((item) => {
return item?.id
return item.id
})
})
@ -244,7 +167,10 @@ watch(
return
const action = newVal > oldVal ? 'add' : 'remove'
const diff = action === 'add' ? difference(selectIds.value, showIds.value) : difference(showIds.value, selectIds.value)
const diff
= action === 'add'
? difference(selectIds.value, showIds.value)
: difference(showIds.value, selectIds.value)
if (diff.length === 0)
return
@ -252,13 +178,11 @@ watch(
if (action === 'add') {
for (const item of offList.value) {
if (!item.fix && diff.includes(item.id)) {
if (item.checked) {
onList.value.push({
id: item.id,
name: item.name || '未配置',
fix: item.fix || false,
})
}
onList.value.push({
id: item.id,
name: item.name || '未配置',
fix: item.fix || false,
})
}
}
}
@ -311,6 +235,9 @@ function removeHandler(id: string) {
onList.value.splice(index, 1)
}
const offKeyword = ref('')
const onKeyword = ref('')
const leftInputHandler = debounce((keyword) => {
offKeyword.value = keyword
}, 300)
@ -318,46 +245,62 @@ const leftInputHandler = debounce((keyword) => {
const rightInputHandler = debounce((keyword) => {
onKeyword.value = keyword
}, 300)
onMounted(() => {
// getfield()
})
</script>
<template>
<n-modal v-model:show="show" transform-origin="center" :mask-closable="false">
<n-card class="cardstyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
<n-card
class="cardstyle"
:bordered="false"
size="huge"
role="dialog"
aria-modal="true"
>
<div class="wrapper">
<span class="wrapper-title">自定义筛选</span>
<span class="wrapper-title" style="color: #333333;">自定义筛选</span>
<div class="wrapper-bar">
<div class="wrapper-info">
<span :style="{ 'margin-left': '18px' }">筛选项信息</span>
<div class="wrapper-info" style="background-color: #F8F8F8;">
<span :style="{ 'margin-left': '18px' ,'color':'#333333'}">筛选项信息</span>
</div>
</div>
<n-grid cols="24" class="mt-4 proCard" responsive="screen" :x-gap="24">
<n-grid-item span="11">
<NCard
:title="allCount" class="dragcardStyle" :segmented="{ content: true, footer: true }" size="small"
:title="allCount"
class="dragcardStyle"
:segmented="{ content: true, footer: true }"
size="small"
:bordered="false"
>
<div class="input_wrap">
<div>
<n-input placeholder="搜索关键词" @input="leftInputHandler">
<template #suffix>
<SvgIcon size="14px" name="magnifying-1-color999" />
<SvgIcon size="14px" name="magnifying-1" color="#999999" />
</template>
</n-input>
<n-scrollbar style="max-height: 500px;border: 1px solid #cad2dd;border-radius: 2px;">
<n-scrollbar
style="max-height: 500px; border: 1px solid #cad2dd; border-radius: 2px"
>
<div class="draggable-ul">
<div class="draggable-li">
<n-checkbox v-model:checked="checkAll" label="全选" :indeterminate="!checkAll" @update:checked="onCheckAllChange" />
<div class="draggable-li" style="color:#666666">
<n-checkbox
v-model:checked="checkAll"
label="全选"
@update:checked="onCheckAllChange"
/>
</div>
<div
v-for="item in offList" v-show="item.name.includes(offKeyword)" :key="item.id" :class="{ 'disable-check': item.fix }"
v-for="item in offList"
v-show="item.name.includes(offKeyword)"
:key="item.id"
:class="{ 'disable-check': item.fix }"
class="draggable-li"
>
<n-checkbox
v-model:checked="item.checked" :label="item.name" :disabled="item.fix"
v-model:checked="item.checked"
:label="item.name"
:disabled="item.fix"
@update:checked="onCheckChange($event, item)"
/>
</div>
@ -366,31 +309,55 @@ onMounted(() => {
</div>
</NCard>
</n-grid-item>
<n-grid-item style="display: flex;align-items: center;" span="2">
<n-grid-item style="display: flex; align-items: center" span="2">
<SvgIcon size="20" name="switchsvg" />
</n-grid-item>
<n-grid-item span="11">
<NCard
:title="selectCount" class="dragcardStyle" :segmented="{ content: true, footer: true }" size="small"
:title="selectCount"
class="dragcardStyle"
:segmented="{ content: true, footer: true }"
size="small"
:bordered="false"
>
<template #header-extra>
<span class="textbtnStyle" @click="clearDragSource"></span>
</template>
<div class="input_wrap">
<div>
<!-- j -->
<n-input placeholder="搜索关键词" @input="rightInputHandler">
<template #suffix>
<SvgIcon size="14px" name="magnifying-1-color999" />
<SvgIcon size="14px" name="magnifying-1" color="#999999" />
</template>
</n-input>
<n-scrollbar style="max-height: 500px;border: 1px solid #cad2dd;border-radius: 2px;" class="scroll">
<VueDraggable v-model="onList" class="draggable-ul" :animation="150" group="shared">
<div v-for="item in onList" v-show="item.name.includes(onKeyword)" :key="item.id" :draggable="true" class="cursor-move draggable-li">
<SvgIcon name="drag" size="24" />
<n-scrollbar
style="max-height: 500px; border: 1px solid #cad2dd; border-radius: 2px"
class="scroll"
>
<VueDraggable
v-model="onList"
class="draggable-ul"
filter=".draggable-li[draggable='false']"
:animation="150"
group="shared"
>
<div
v-for="item in onList"
v-show="item.name.includes(onKeyword)"
:key="item.id"
:draggable="!item.fix"
:class="{ fix: item.fix }"
class="cursor-move draggable-li"
>
<!-- v-show="!item.fix" 判断是否为固定值 -->
<SvgIcon name="drag" size="14" />
<span class="ml-2">{{ item.name }}</span>
<SvgIcon
v-if="!item.fix" size="16px" style="display:block;margin-left: auto;cursor: pointer;"
name="clear" @click="removeHandler(item.id)"
v-if="!item.fix"
size="16px"
style="display: block; margin-left: auto; cursor: pointer"
name="clear"
@click="removeHandler(item.id)"
/>
</div>
</VueDraggable>
@ -405,7 +372,7 @@ onMounted(() => {
<n-button type="info" @click="handleSumbit">
确定
</n-button>
<n-button secondary style="margin-left:15px; border: 1px solid #CAD2DD;" @click="closeModal">
<n-button secondary style="margin-left: 15px" @click="closeModal">
取消
</n-button>
</div>
@ -422,25 +389,18 @@ onMounted(() => {
&-title {
font-weight: bold;
font-size: 16px;
color: #333333;
}
&-bar {
background-color: #f8f8f8 !important;
width: calc(100% + 12px);
background-color: #e8e8e8;
width: 100%;
margin-top: 20px;
color: #333333;
}
&-footer {
display: flex;
justify-content: flex-end;
.n-button--info-type{
background: #507AFD !important;
}
.n-button--default-type{
background: #fff !important;
color: #333333;
}
}
&-info {
@ -449,7 +409,7 @@ onMounted(() => {
font-size: 14px;
&:before {
background-color: #1980FF;
background-color: #1980ff;
content: "";
width: 5px;
border-radius: 2px;
@ -463,28 +423,26 @@ onMounted(() => {
.dragcardStyle {
--n-padding-bottom: 0px !important;
--n-padding-left: 0px !important;
::v-deep(.n-card__content) {
padding-left: 0 !important;
padding-right: 0 !important;
}
}
.cardstyle {
width: 620px;
height: 800px;
--n-padding-bottom: 20px;
--n-padding-bottom: 16px;
--n-padding-left: 24px;
// background-color: #f8f8f8 !important;
--n-padding-right: 24px;
--n-padding-top: 20px;
}
.textbtnStyle {
cursor: pointer;
color: #1980FF;
color: #1980ff;
}
.draggable-ul {
width: 100%;
overflow: hidden;
background: #f8f8f8;
.draggable-li {
width: 100%;
@ -495,10 +453,6 @@ onMounted(() => {
align-items: center;
}
.fix {
cursor: default !important;
}
.disable-check {
color: gainsboro;
}
@ -512,33 +466,23 @@ onMounted(() => {
--n-padding-top: 0px;
--n-padding-bottom: 12px;
}
::v-deep(.n-card > .n-card-header .n-card-header__main){
::v-deep(.n-card > .n-card-header .n-card-header__main) {
font-weight: lighter !important;
font-size: 14px;
color: #666;
color: #666666;
}
::v-deep(.n-scrollbar){
border-left: 1px solid #cad2dd !important;
border-right: 1px solid #cad2dd !important;
border-bottom: 1px solid #E8E8E8 !important;
border-top: 1px solid #E8E8E8 !important;
::v-deep(.n-scrollbar) {
border-top: none !important;
}
::v-deep(.n-card__content){
padding: 20px 24px 0 24px !important;
::v-deep(.n-button--info-type) {
background: #507afd !important;
}
::v-deep(.n-card__footer){
padding: 0 24px 16px 24px !important;
::v-deep(.n-card__footer) {
padding: 0 16px 16px 16px !important;
}
::v-deep(.n-input .n-input-wrapper){
height: 44px !important;
::v-deep(.n-button--default-type) {
border: 1px solid #cad2dd !important;
border-bottom: none !important;
// margin-bottom: -3px;
.n-input__input input{
height: 44px !important;
}
}
::v-deep(.n-button--info-type){
background: #507AFD !important;
color: #333333;
background: #ffffff;
}
</style>

@ -1,98 +1,97 @@
<script lang="ts" setup>
import { difference } from 'lodash-es'
import { computed, onMounted, ref, watch } from 'vue'
import { VueDraggable } from 'vue-draggable-plus'
import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
import { ColumnsMap } from '@/config/final'
import { useUser } from '@/store/modules/user'
import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
import { ColumnsMap } from "@/config/final";
import { useUser } from "@/store/modules/user";
import { difference } from "lodash-es";
import { computed, onMounted, ref, watch } from "vue";
import { VueDraggable } from "vue-draggable-plus";
const emit = defineEmits<{
(e: "commit", columns: any[]);
}>();
//
const offList = ref<any[]>([]);
//
const fixLeftList = ref<any[]>([]);
const onList = ref<any[]>([]);
const props = defineProps({
reviewType: {
type: Number,
default: () => 0,
require: true,
},
})
});
const emit = defineEmits<{
(e: 'commit', columns: any[])
}>()
//
const offList = ref<any[]>([])
//
const fixLeftList = ref<any[]>([])
const onList = ref<any[]>([])
onMounted(async () => {
const userStore = useUser()
const userInfo = userStore.getUserInfo
let res
res = await getAllfieldList(props.reviewType) //
const allList = res.data
res = await getfieldList(props.reviewType, userInfo.id) //
const useList = res.data
const userStore = useUser();
const userInfo = userStore.getUserInfo;
let res;
res = await getAllfieldList(props.reviewType); //
const allList = res.data;
res = await getfieldList(props.reviewType, userInfo.id); //
const useList = res.data;
/**
* name 标题
* id 键值
* fix 是否默认
* checked 是否选中
*/
const userFieldFixed = useList.userFieldFixed?.split(',')
const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
const mustList = []
const userFieldFixed = useList.userFieldFixed?.split(",");
const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
let mustList = [];
allList?.map((v) => {
const item = {
let item = {
name: v.fieldDesc,
id: v.name,
fix: v.isrequired == 2,
checked:
v.isrequired == 2
|| Boolean(userFieldFixed?.find(v2 => v2 == v.name))
|| Boolean(userFieldUnFixed?.find(v2 => v2 == v.name)),
}
v.isrequired == 2 ||
Boolean(userFieldFixed?.find((v2) => v2 == v.name)) ||
Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
};
if (item.fix) {
mustList.push(item)
if (!userFieldFixed?.length && !userFieldUnFixed?.length)
fixLeftList.value.push(item)
mustList.push(item);
if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
fixLeftList.value.push(item);
}
}
if (userFieldFixed?.find(v2 => v2 == v.name))
fixLeftList.value.push(item)
if (userFieldUnFixed?.find(v2 => v2 == v.name))
onList.value.push(item)
offList.value.push(item)
})
})
if (userFieldFixed?.find((v2) => v2 == v.name)) {
fixLeftList.value.push(item);
}
if (userFieldUnFixed?.find((v2) => v2 == v.name)) {
onList.value.push(item);
}
offList.value.push(item);
});
});
const allCount = computed(() => {
return `全部字段(共${offList.value.length - 1}个)`
})
return `全部字段(共${offList.value.length - 1}个)`;
});
const selectCount = computed(() => {
return `显示字段(共${onList.value.length}个)`
})
return `显示字段(共${onList.value.length}个)`;
});
function generatList() {
const keys = Object.keys(ColumnsMap)
const keys = Object.keys(ColumnsMap);
// const showStr = 'name'
// const showKeys = showStr.split(',').map((key: string) => key.toLowerCase())
for (const key of keys) {
const { title, fixed, fixLeft, width } = ColumnsMap[key]
const { title, fixed, fixLeft, width } = ColumnsMap[key];
const item = {
id: key,
title,
fix: fixed,
checked: ColumnsMap[key].fixed,
width,
}
};
if (!fixed)
offList.value.push(item)
if (!fixed) offList.value.push(item);
if (fixLeft)
fixLeftList.value.push(item)
if (fixLeft) fixLeftList.value.push(item);
}
// showList = showKeys.reduce((acc, key) => {
@ -104,18 +103,18 @@ function generatList() {
// return [...acc, config]
// }, [])
const fixedList = generateDefaultList()
const fixedList = generateDefaultList();
const filterList = fixedList.filter((item) => {
return !item.fixLeft
})
return !item.fixLeft;
});
onList.value.unshift(...filterList)
offList.value.unshift(...fixedList)
onList.value.unshift(...filterList);
offList.value.unshift(...fixedList);
}
function generateDefaultList() {
return Object.keys(ColumnsMap).reduce((acc, key) => {
const { title, fixed, fixLeft, width } = ColumnsMap[key]
const { title, fixed, fixLeft, width } = ColumnsMap[key];
if (fixed) {
const config = {
@ -125,117 +124,115 @@ function generateDefaultList() {
checked: true,
fixLeft,
width,
}
return [...acc, config]
}
else {
return acc
};
return [...acc, config];
} else {
return acc;
}
}, [])
}, []);
}
const show = ref(false)
const checkAll = ref(false)
const show = ref(false);
const checkAll = ref(false);
function showModal() {
show.value = true
show.value = true;
}
function closeModal() {
show.value = false
show.value = false;
}
async function handleSumbit(e: MouseEvent) {
e.preventDefault()
closeModal()
const userStore = useUser()
const userInfo = userStore.getUserInfo
let userFieldFixed = ''
let userFieldUnFixed = ''
e.preventDefault();
closeModal();
const userStore = useUser();
const userInfo = userStore.getUserInfo;
let userFieldFixed = "";
let userFieldUnFixed = "";
fixLeftList.value.map((v) => {
userFieldFixed += `${v.id},`
})
userFieldFixed += `${v.id},`;
});
onList.value.map((v) => {
userFieldUnFixed += `${v.id},`
})
userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1)
userFieldUnFixed = userFieldUnFixed.slice(0, userFieldUnFixed.length - 1)
savefield(props.reviewType, userInfo.id, userFieldFixed, userFieldUnFixed)
userFieldUnFixed += `${v.id},`;
});
userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1);
userFieldUnFixed = userFieldUnFixed.slice(0, userFieldUnFixed.length - 1);
savefield(props.reviewType, userInfo.id, userFieldFixed, userFieldUnFixed);
const columns: any[] = [
{
type: 'selection',
fixed: 'left',
type: "selection",
fixed: "left",
width: 50,
},
]
];
const leftList = fixLeftList.value.map((item) => {
return {
title: item.name,
key: item.id,
fixed: 'left',
fixed: "left",
width: 120,
}
})
};
});
const unfixList = onList.value.map((item) => {
return {
title: item.name,
key: item.id,
width: 120,
}
})
};
});
columns.push(...leftList, ...unfixList)
emit('commit', columns)
columns.push(...leftList, ...unfixList);
emit("commit", columns);
}
defineExpose({
showModal,
})
});
// generatList()
const selectIds = ref<string[]>([])
const selectIds = ref<string[]>([]);
function onCheckAllChange(value) {
const ids: string[] = []
const ids: string[] = [];
for (const item of offList.value) {
if (!item.fix) {
item.checked = value
ids.push(item.id)
item.checked = value;
ids.push(item.id);
}
}
if (value) {
offList.value.map((v) => {
if (!v.checked)
onList.value.push(v)
})
}
else {
onList.value = []
fixLeftList.value = []
if (!v.checked) {
onList.value.push(v);
}
});
} else {
onList.value = [];
fixLeftList.value = [];
offList.value.map((v) => {
if (v.fix)
fixLeftList.value.push(v)
})
if (v.fix) {
fixLeftList.value.push(v);
}
});
}
selectIds.value = value ? ids : []
selectIds.value = value ? ids : [];
}
function onCheckChange(checked: any, item: any) {
item.checked = checked
item.checked = checked;
if (checked) {
onList.value.push(item)
}
else {
let index = onList.value.findIndex(v => v.id == item.id)
onList.value.push(item);
} else {
let index = onList.value.findIndex((v) => v.id == item.id);
if (index > -1) {
onList.value.splice(index, 1)
}
else {
index = fixLeftList.value.findIndex(v => v.id == item.id)
fixLeftList.value.splice(index, 1)
onList.value.splice(index, 1);
} else {
index = fixLeftList.value.findIndex((v) => v.id == item.id);
fixLeftList.value.splice(index, 1);
}
}
// TODO
@ -245,26 +242,24 @@ function onCheckChange(checked: any, item: any) {
const showIds = computed(() => {
return onList.value.map((item) => {
return item.id
})
})
return item.id;
});
});
watch(
() => selectIds.value.length,
(newVal, oldVal) => {
if (newVal === oldVal)
return
if (newVal === oldVal) return;
const action = newVal > oldVal ? 'add' : 'remove'
const diff: string[]
= action === 'add'
const action = newVal > oldVal ? "add" : "remove";
const diff: string[] =
action === "add"
? difference(selectIds.value, showIds.value)
: difference(showIds.value, selectIds.value)
: difference(showIds.value, selectIds.value);
if (diff.length === 0)
return
if (diff.length === 0) return;
if (action === 'add') {
if (action === "add") {
for (const item of offList.value) {
if (!item.fix && diff.includes(item.id)) {
onList.value.push({
@ -272,81 +267,77 @@ watch(
name: item.name,
fix: item.fix || false,
width: 120,
})
});
}
}
}
else {
const list = onList.value
} else {
const list = onList.value;
for (let index = 0; index < list.length; index++) {
const item = list[index]
const item = list[index];
if (!item.fix && diff.includes(item.id)) {
list.splice(index, 1)
return
list.splice(index, 1);
return;
}
}
}
},
)
}
);
watch(
() => showIds.value.length,
(newVal, oldVal) => {
if (newVal === oldVal)
return
if (newVal === oldVal) return;
const diff = difference(selectIds.value, showIds.value)
const diff = difference(selectIds.value, showIds.value);
if (diff.length === 0)
return
if (diff.length === 0) return;
for (const item of offList.value) {
if (!item.fix && diff.includes(item.id)) {
const index = selectIds.value.indexOf(item.id)
item.checked = false
selectIds.value.splice(index, 1)
const index = selectIds.value.indexOf(item.id);
item.checked = false;
selectIds.value.splice(index, 1);
}
}
},
)
}
);
function clearDragSource() {
onList.value = onList.value.filter((item) => {
return item.fix === true
})
return item.fix === true;
});
}
function removeHandler(id: string, type: 'fix' | 'unfix') {
const list = type === 'fix' ? fixLeftList.value : onList.value
function removeHandler(id: string, type: "fix" | "unfix") {
const list = type === "fix" ? fixLeftList.value : onList.value;
let index = list.findIndex((item) => {
return item.id === id
})
return item.id === id;
});
if (index !== -1)
list.splice(index, 1)
index = offList.value.findIndex(v => v.id == id)
if (index !== -1) list.splice(index, 1);
index = offList.value.findIndex((v) => v.id == id);
if (index !== -1) {
offList.value[index].checked = false
}
else {
index == fixLeftList.value.findIndex(v => v.id == id)
fixLeftList.value[index].checked = false
offList.value[index].checked = false;
} else {
index == fixLeftList.value.findIndex((v) => v.id == id);
fixLeftList.value[index].checked = false;
}
}
const indeterminate = computed(() => {
let baseNum = 0
let baseNum = 0;
offList.value.map((v) => {
if (v.fix)
baseNum += 1
})
if (v.fix) {
baseNum += 1;
}
});
return (
onList.value.length + fixLeftList.value.length - baseNum > 0
&& offList.value.length - baseNum
> onList.value.length + fixLeftList.value.length - baseNum
)
})
onList.value.length + fixLeftList.value.length - baseNum > 0 &&
offList.value.length - baseNum >
onList.value.length + fixLeftList.value.length - baseNum
);
});
</script>
<template>
@ -385,8 +376,8 @@ const indeterminate = computed(() => {
<n-checkbox
v-model:checked="checkAll"
label="全部"
:indeterminate="indeterminate"
@update:checked="onCheckAllChange"
:indeterminate="indeterminate"
/>
</div>
<div class="content">
@ -484,9 +475,7 @@ const indeterminate = computed(() => {
<template #footer>
<div class="wrapper-footer">
<n-button type="info" @click="handleSumbit">
确定
</n-button>
<n-button type="info" @click="handleSumbit"> </n-button>
<n-button secondary style="margin-left: 15px" @click="closeModal">
取消
</n-button>
@ -554,7 +543,7 @@ const indeterminate = computed(() => {
.textbtnStyle {
cursor: pointer;
color: #507AFD;
}
.drag-wrapper {

@ -1,6 +1,5 @@
<script lang="ts" setup>
import {
computed,
defineOptions,
h,
nextTick,
@ -9,98 +8,86 @@ import {
reactive,
ref,
unref,
} from 'vue'
import { NButton, NDataTable, useModal } from 'naive-ui'
import type { DataTableColumns, DataTableRowKey } from 'naive-ui'
import type { SortableEvent } from 'sortablejs'
import Sortable from 'sortablejs'
import { debounce } from 'lodash-es'
import Action from '@/views/home/aside/comp/Action.vue'
import { deleteCondition, getConditionList, sort } from '@/api/home/filter'
import type { FilterSearchParam } from '/#/api'
import SvgIcon from '@/components/Icon/SvgIcon.vue'
defineOptions({ name: 'FilterModal' })
computed,
} from "vue";
import { NDataTable } from "naive-ui";
import type { DataTableColumns, DataTableRowKey } from "naive-ui";
import type { SortableEvent } from "sortablejs";
import Sortable from "sortablejs";
import { debounce } from "lodash-es";
import Action from "@/views/home/aside/comp/Action.vue";
import { deleteCondition, getConditionList, sort } from "@/api/home/filter";
import type { FilterSearchParam } from "/#/api";
defineOptions({ name: "FilterModal" });
const emit = defineEmits<{
(e: 'showNewFilter'): void
(e: 'editFilter', filter: any): void
}>()
(e: "showNewFilter"): void;
(e: "editFilter", filter: any): void;
}>();
const modal = useModal()
const show = ref(false)
const checkedRowKeys = ref([])
const show = ref(false);
const checkedRowKeys = ref([]);
const cardStyle = {
'width': '800px',
'height': '800px',
'--n-padding-bottom': '10px',
'--n-padding-left': '10px',
}
width: "800px",
height: "800px",
"--n-padding-bottom": "10px",
"--n-padding-left": "10px",
};
interface RowData {
id: string
searchname: string
createby: string
createtime: string
updateby: string
updatetime: string
id: string;
searchname: string;
createby: string;
createtime: string;
updateby: string;
updatetime: string;
}
const columns: DataTableColumns<RowData> = [
{
type: 'selection',
type: "selection",
},
{
title: '操作',
key: 'action',
title: "操作",
key: "action",
render(row) {
return h(Action, {
options: [
{ label: '编辑', key: 1 },
{ label: '删除', key: 2 },
{ label: "编辑", key: 1 },
{ label: "删除", key: 2 },
],
id: row.id,
select,
})
});
},
},
{
title: '名称',
key: 'searchname',
title: "名称",
key: "searchname",
},
{
title: '创建者',
key: 'createby',
title: "创建者",
key: "createby",
},
{
title: '创建时间',
key: 'createtime',
renderSorterIcon: ({ order }) => {
if (order === false)
return h(SvgIcon, { name: 'sort-2' })
if (order === 'ascend')
return h(SvgIcon, { name: 'sort-1' })
if (order === 'descend')
return h(SvgIcon, { name: 'sort-3' })
},
sorter: (row1, row2) =>
new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime(),
title: "创建时间",
key: "createtime",
sorter: (row1, row2) => new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime()
},
{
title: '更新者',
key: 'updateby',
title: "更新者",
key: "updateby",
},
{
title: '更新时间',
key: 'updatetime',
title: "更新时间",
key: "updatetime",
},
]
];
const loading = ref(true)
const total = ref(0)
const loading = ref(true);
const total = ref(0);
const pagination = reactive({
page: 1,
pageCount: 1,
@ -108,233 +95,211 @@ const pagination = reactive({
showSizePicker: true,
pageSizes: [
{
label: '10 每页',
label: "10 每页",
value: 10,
},
{
label: '15 每页',
label: "15 每页",
value: 15,
},
{
label: '30 每页',
label: "30 每页",
value: 30,
},
{
label: '50 每页',
label: "50 每页",
value: 50,
},
],
showQuickJumper: true,
prefix: () => `${total.value} 条数据`,
})
const tableData = ref<Array<RowData>>([])
const keyword = ref('')
});
const tableData = ref<Array<RowData>>([]);
const keyword = ref("");
async function query(page: number, pageSize: number) {
const searchParam: FilterSearchParam = {
search_searchname: { value: keyword.value, op: 'like', type: 'string' },
}
const result = await getConditionList({ pageNo: page, pageSize }, searchParam, 1)
const { data, pageCount, total: totalCount } = result
total.value = totalCount
tableData.value = data
pagination.page = page
pagination.pageCount = pageCount
loading.value = false
search_searchname: { value: keyword.value, op: "like", type: "string" },
};
const result = await getConditionList({ pageNo: page, pageSize }, searchParam, 1);
const { data, pageCount, total: totalCount } = result;
total.value = totalCount;
tableData.value = data;
pagination.page = page;
pagination.pageCount = pageCount;
loading.value = false;
}
function afterLeave() {
pagination.page = 1
pagination.pageCount = 1
pagination.pageSize = 10
pagination.page = 1;
pagination.pageCount = 1;
pagination.pageSize = 10;
}
const selectionIds = ref<DataTableRowKey[]>([])
const selectionIds = ref<DataTableRowKey[]>([]);
const rowKey = (row: RowData) => row.id
const rowKey = (row: RowData) => row.id;
function rowProps(row: RowData) {
return {
'data-id': row.id,
}
"data-id": row.id,
};
}
function handleCheck(rowKeys: DataTableRowKey[]) {
selectionIds.value = rowKeys
selectionIds.value = rowKeys;
}
function select(key: number, id: string) {
switch (key) {
case 1:
editSelection(id)
break
editSelection(id);
break;
case 2:
const modalInst = modal.create({
title: '确认提示',
content: '确认删除该条过滤条件吗?',
positiveText: '确定',
negativeText: '取消',
preset: 'dialog',
onPositiveClick: () => deleteSelection(id),
onNegativeClick: () => modalInst.destroy(),
})
break
deleteSelection(id);
break;
default:
break
break;
}
}
function editSelection(id = '') {
function editSelection(id = "") {
// eslint-disable-next-line dot-notation
// const $message = window["$message"];
// if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
// $message.error("");
// return;
// }
const selectedId = id
const selectedId = id;
const selectedFilter = tableData.value.find((item: any) => {
return item.id === selectedId
})
return item.id === selectedId;
});
emit('editFilter', selectedFilter)
closeModal()
emit("editFilter", selectedFilter);
closeModal();
}
function deleteSelection(id = '') {
function deleteSelection(id = "") {
// eslint-disable-next-line dot-notation
if (selectionIds.value.length === 0) {
deleteCondition({ ids: id }).then(() => {
query(pagination.page, pagination.pageSize)
})
return
query(pagination.page, pagination.pageSize);
});
return;
}
const modalInst = modal.create({
title: '确认提示',
content: '确认删除所选过滤条件吗?',
positiveText: '确定',
negativeText: '取消',
preset: 'dialog',
onPositiveClick: () =>
deleteCondition({ ids: selectionIds.value.join(',') }).then(() => {
selectionIds.value = []
query(pagination.page, pagination.pageSize)
}),
onNegativeClick: () => modalInst.destroy(),
})
deleteCondition({ ids: selectionIds.value.join(",") }).then(() => {
selectionIds.value = [];
query(pagination.page, pagination.pageSize);
});
}
async function handlePageChange(currentPage) {
if (loading.value)
return
pagination.page = currentPage
const { pageSize } = pagination
await query(currentPage, pageSize)
if (loading.value) return;
pagination.page = currentPage;
const { pageSize } = pagination;
await query(currentPage, pageSize);
}
async function handlePageSizeChange(currentPageSize) {
if (loading.value)
return
if (loading.value) return;
const { page } = pagination
pagination.pageSize = currentPageSize
const { page } = pagination;
pagination.pageSize = currentPageSize;
await query(page, currentPageSize)
await query(page, currentPageSize);
}
function handleClick() {
emit('showNewFilter')
emit("showNewFilter");
// show.value = false;
closeModal()
}
let sortTable: Sortable | null = null
const tableRef = ref<InstanceType<typeof NDataTable>>()
let sortTable: Sortable | null = null;
const tableRef = ref<InstanceType<typeof NDataTable>>();
onMounted(() => {
nextTick(() => {
})
})
console.log(tableRef.value, "tableRef");
});
});
async function showModal() {
show.value = true
show.value = true;
const { page, pageSize } = pagination
await query(page, pageSize)
const { page, pageSize } = pagination;
await query(page, pageSize);
nextTick(() => {
if (sortTable !== null)
destory()
const el: HTMLDivElement = tableRef.value?.$el
const tbody: HTMLElement | null = el.querySelector('tbody.n-data-table-tbody')!
if (tbody)
sortTable = Sortable.create(tbody, { onEnd, onMove })
})
if (sortTable !== null) destory();
const el: HTMLDivElement = tableRef.value?.$el;
const tbody: HTMLElement | null = el.querySelector("tbody.n-data-table-tbody")!;
if (tbody) sortTable = Sortable.create(tbody, { onEnd, onMove });
});
}
let relatedId = ''
let insertafter = false
let relatedId = "";
let insertafter = false;
// TODO: bug
function onEnd(event: SortableEvent) {
const data = unref(tableData)
const oldElem = data[event.oldIndex!]
data.splice(event.oldIndex!, 1)
data.splice(event.newIndex!, 0, oldElem)
const data = unref(tableData);
const oldElem = data[event.oldIndex!];
data.splice(event.oldIndex!, 1);
data.splice(event.newIndex!, 0, oldElem);
const dragId = oldElem.id
const dragId = oldElem.id;
const index = data.findIndex((item) => {
return item.id === relatedId
})
return item.id === relatedId;
});
// -1+1
const order = insertafter ? index - 1 : index + 1
sort(dragId, order)
const order = insertafter ? index - 1 : index + 1;
// console.log('dragid:', dragId, 'order:', order)
sort(dragId, order);
}
function onMove(evt: any) {
relatedId = evt.related?.dataset?.id
insertafter = evt.willInsertAfter
relatedId = evt.related?.dataset?.id;
insertafter = evt.willInsertAfter;
// console.log(`${evt.dragged.dataset.id},${evt.related}`, 'insertafter', evt.willInsertAfter)
}
function destory() {
sortTable && sortTable.destroy()
sortTable = null
sortTable && sortTable.destroy();
sortTable = null;
}
onUnmounted(() => {
destory()
})
destory();
});
function closeModal() {
show.value = false
show.value = false;
}
defineExpose({
showModal,
query,
pagination,
})
});
const inputHandler = debounce((word) => {
keyword.value = word
query(1, 5)
}, 300)
keyword.value = word;
query(1, 5);
}, 300);
const showSearch = computed(() => {
return selectionIds.value.length > 0
})
return selectionIds.value.length > 0;
});
</script>
<template>
<div>
<!-- <n-modal v-model:show="delShow" >
</n-modal> -->
<n-modal
v-model:show="show"
transform-origin="center"
display-directive="if"
:mask-closable="false"
class="modal_wrapper"
@after-leave="afterLeave"
:mask-closable="false"
>
<n-card
:style="cardStyle"
@ -347,16 +312,10 @@ const showSearch = computed(() => {
<span class="wrapper-title">全部筛选值</span>
<div class="wrapper-bar">
<div class="wrapper-info">
<span
:style="{
'margin-left': '18px',
'font-size': '16px',
'font-weight': '600',
}"
>基本信息</span>
<span :style="{ 'margin-left': '18px' }">基本信息</span>
</div>
</div>
<div v-if="!showSearch" class="wrapper-form">
<div class="wrapper-form" v-if="!showSearch">
<n-input
:style="{ width: '360px', border: '1px solid #cad2dd' }"
placeholder="请输入过滤条件名称搜索"
@ -366,29 +325,31 @@ const showSearch = computed(() => {
<SvgIcon size="14px" name="magnifying-1" />
</template>
</n-input>
<NButton type="info" @click="handleClick">
<n-button type="info" @click="handleClick">
创建
<template #icon>
<SvgIcon size="14px" name="creatFilter" />
<SvgIcon size="14px" name="magnifying-1" />
</template>
</NButton>
</n-button>
</div>
<div v-else class="wrapper-form">
<div class="wrapper-form" v-else>
<div class="del_btn">
<NButton icon-placement="left" size="medium" @click="deleteSelection">
<n-button icon-placement="left" size="medium">
<template #icon>
<SvgIcon name="delete-history" size="16" />
</template>
删除
</NButton>
删除</n-button
>
</div>
<div class="msg">
<span>已选中
<span
>已选中
<span style="color: #507afd; font-size: 16px">{{
selectionIds.length
}}</span>
</span>
</span
>
<a @click="selectionIds = []">清空</a>
</div>
</div>
@ -403,21 +364,19 @@ const showSearch = computed(() => {
:loading="loading"
:pagination="pagination"
:row-key="rowKey"
:checked-row-keys="selectionIds"
@update:page="handlePageChange"
@update-page-size="handlePageSizeChange"
@update:checked-row-keys="handleCheck"
:checked-row-keys="selectionIds"
/>
</div>
</div>
<template #footer>
<div class="wrapper-footer">
<NButton type="info" @click="closeModal">
确认
</NButton>
<NButton secondary style="margin-left: 15px" @click="closeModal">
<n-button type="info" @click="closeModal"> </n-button>
<n-button secondary style="margin-left: 15px" @click="closeModal">
取消
</NButton>
</n-button>
</div>
</template>
</n-card>
@ -450,15 +409,13 @@ const showSearch = computed(() => {
width: 300px;
border: 1px solid gray;
}
.del_btn {
}
.msg {
span {
padding-right: 16px;
}
a {
padding-left: 17px;
margin-left: 30px;
cursor: pointer;
color: #507afd;
border-left: 1px solid #d8d8d8;
}
}
}
@ -487,29 +444,4 @@ const showSearch = computed(() => {
}
}
}
.del_btn {
margin-left: 12px;
color: #333333;
font-weight: 500;
}
::v-deep(.n-button--info-type) {
background: #507afd !important;
}
::v-deep(.n-data-table
.n-data-table-th
.n-data-table-th__title-wrapper
.n-data-table-th__title) {
font-size: 14px !important;
color: #000000 !important;
}
::v-deep(.n-data-table
.n-data-table-tr:not(.n-data-table-tr--summary):hover
> .n-data-table-td) {
color: #666666 !important;
font-size: 14px !important;
}
::v-deep(.n-data-table .n-data-table-th .n-data-table-sorter) {
position: relative;
left: -80px;
}
</style>

@ -1,192 +1,188 @@
<script lang="ts" setup>
import { reactive, ref, unref } from 'vue'
import * as XLSX from 'xlsx'
import { arrayEquals } from '@/utils/index'
import { generateUuid } from '@/utils/uuid'
import { reactive, ref, unref } from "vue";
import * as XLSX from "xlsx";
import { arrayEquals } from "@/utils/index";
import { generateUuid } from "@/utils/uuid";
const props = defineProps<{
onSuccess: Function
headerConfig: string[]
}>()
onSuccess: Function;
headerConfig: string[];
}>();
interface ExcelData {
header: string[] | null
content: any[] | null
header: string[] | null;
content: any[] | null;
}
interface ParseResults {
fileName: string
results: any[]
uuid: string
fileName: string;
results: any[];
uuid: string;
}
const cardStyle = {
'width': '620px',
'--n-padding-bottom': '10px',
'--n-padding-left': '0px',
}
const inputRef = ref(null)
let loading = false
const excelData: ExcelData = { header: null, content: null }
const excelDatas: ParseResults[] = reactive([])
width: "620px",
"--n-padding-bottom": "10px",
"--n-padding-left": "0px",
};
const inputRef = ref(null);
let loading = false;
const excelData: ExcelData = { header: null, content: null };
const excelDatas: ParseResults[] = reactive([]);
function generateData(content) {
excelData.header = props.headerConfig
excelData.content = content
props.onSuccess && props.onSuccess(excelData)
excelData.header = props.headerConfig;
excelData.content = content;
props.onSuccess && props.onSuccess(excelData);
}
function handleDrop(e) {
e.stopPropagation()
e.preventDefault()
if (loading)
return
const files = e.dataTransfer.files
const rawFiles = Array.from(files)
e.stopPropagation();
e.preventDefault();
if (loading) return;
const files = e.dataTransfer.files;
const rawFiles = Array.from(files);
// eslint-disable-next-line dot-notation
const $message = window['$message']
const $message = window["$message"];
if (!isExcel(rawFiles)) {
$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
return false
$message.error("Only supports upload .xlsx, .xls, .csv suffix files");
return false;
}
uploadFiles(rawFiles)
e.stopPropagation()
e.preventDefault()
uploadFiles(rawFiles);
e.stopPropagation();
e.preventDefault();
}
async function uploadFiles(files) {
const inputEl: HTMLInputElement | null = unref(inputRef)
inputEl!.value = ''
const inputEl: HTMLInputElement | null = unref(inputRef);
inputEl!.value = "";
loading = true
loading = true;
for (const file of files) {
const fileData = await readFileData(file)
const message = validate(fileData)
const fileData = await readFileData(file);
const message = validate(fileData);
// TODO
if (message === undefined || true) {
const uuid = generateUuid()
const uuid = generateUuid();
excelDatas.push({
fileName: file.name,
results: (fileData as any).results,
uuid,
})
});
}
}
loading = false
loading = false;
}
function commitData() {
const mergeResults: any[] = []
const mergeResults: any[] = [];
if (excelDatas.length === 0)
return
if (excelDatas.length === 0) return;
excelDatas.forEach((item) => {
mergeResults.push(...item.results)
})
mergeResults.push(...item.results);
});
generateData(mergeResults)
generateData(mergeResults);
}
function validate(fileData) {
const { header } = fileData
const { header } = fileData;
//
const equal = arrayEquals(header, props.headerConfig)
const equal = arrayEquals(header, props.headerConfig);
if (!equal)
return '表头不匹配'
if (!equal) return "表头不匹配";
// TODO
}
function readFileData(file) {
return new Promise((resolve, reject) => {
const reader = new FileReader()
const reader = new FileReader();
reader.onload = (e) => {
const data = e.target!.result
const workbook = XLSX.read(data, { type: 'array' })
const firstSheetName = workbook.SheetNames[0]
const worksheet = workbook.Sheets[firstSheetName]
const header = getHeaderRow(worksheet)
const results = XLSX.utils.sheet_to_json(worksheet)
resolve({ header, results })
}
reader.readAsArrayBuffer(file)
})
const data = e.target!.result;
const workbook = XLSX.read(data, { type: "array" });
const firstSheetName = workbook.SheetNames[0];
const worksheet = workbook.Sheets[firstSheetName];
const header = getHeaderRow(worksheet);
const results = XLSX.utils.sheet_to_json(worksheet);
resolve({ header, results });
};
reader.readAsArrayBuffer(file);
});
}
function handleDragover(e) {
e.stopPropagation()
e.preventDefault()
e.dataTransfer.dropEffect = 'copy'
e.stopPropagation();
e.preventDefault();
e.dataTransfer.dropEffect = "copy";
}
function handleUpload() {
(inputRef.value as any).click()
(inputRef.value as any).click();
}
function handleClick(e) {
const files = e.target.files
const rawFiles = Array.from(files)
uploadFiles(rawFiles)
const files = e.target.files;
const rawFiles = Array.from(files);
uploadFiles(rawFiles);
}
function getHeaderRow(sheet) {
const headers: string[] = []
const range = XLSX.utils.decode_range(sheet['!ref'])
let C
const R = range.s.r
const headers: string[] = [];
const range = XLSX.utils.decode_range(sheet["!ref"]);
let C;
const R = range.s.r;
/* start in the first row */
for (C = range.s.c; C <= range.e.c; ++C) {
/* walk every column in the range */
const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })]
const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })];
/* find the cell in the first row */
let hdr = `UNKNOWN ${C}` // <-- replace with your desired default
if (cell && cell.t)
hdr = XLSX.utils.format_cell(cell)
headers.push(hdr)
let hdr = `UNKNOWN ${C}`; // <-- replace with your desired default
if (cell && cell.t) hdr = XLSX.utils.format_cell(cell);
headers.push(hdr);
}
return headers
return headers;
}
function isExcel(files) {
return files.every((file) => {
return /\.(xlsx|xls|csv)$/.test(file.name)
})
return /\.(xlsx|xls|csv)$/.test(file.name);
});
}
const show = ref(false)
const show = ref(false);
function showModal() {
show.value = true
show.value = true;
}
function closeModal() {
show.value = false
show.value = false;
}
async function handleSumbit(e: MouseEvent) {
e.preventDefault()
commitData()
closeModal()
e.preventDefault();
commitData();
closeModal();
}
defineExpose({
showModal,
})
});
function removeHandler(id: string) {
const index = excelDatas.findIndex(item => item.uuid === id)
excelDatas.splice(index, 1)
const index = excelDatas.findIndex((item) => item.uuid === id);
excelDatas.splice(index, 1);
}
function afterLeave() {
excelDatas.length = 0
excelDatas.length = 0;
}
</script>
@ -222,7 +218,7 @@ function afterLeave() {
type="file"
accept=".xlsx, .xls,.csv"
@change="handleClick"
>
/>
<SvgIcon
style="margin-top: 32px; margin-bottom: 13px"
size="45"
@ -230,7 +226,9 @@ function afterLeave() {
@click="handleUpload"
/>
<span class="wrapper-tip1">点击或拖拽审批文件到这里上传</span>
<span style="margin-top: 3px; margin-bottom: 19px" class="wrapper-tip2">支持上传格式.xls .xlsx .csv的文件</span>
<span style="margin-top: 3px; margin-bottom: 19px" class="wrapper-tip2"
>支持上传格式.xls .xlsx .csv的文件</span
>
</div>
<div
v-for="(item, index) in excelDatas"
@ -251,9 +249,7 @@ function afterLeave() {
</div>
<template #footer>
<div class="footer">
<n-button type="info" @click="handleSumbit">
确认
</n-button>
<n-button type="info" @click="handleSumbit"> </n-button>
</div>
</template>
</n-card>

@ -1,6 +1,6 @@
<script lang="ts" setup>
import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
import { computed, defineEmits, onBeforeMount, reactive, ref, unref, watch } from 'vue'
import { computed, onBeforeMount, reactive, ref, unref, watch } from 'vue'
import { asideMap } from '@/config/final'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
@ -9,7 +9,6 @@ import { addCondition, updateCondition } from '@/api/home/filter'
import { formatToDate2, formatToDate3 } from '@/utils/dateUtil'
type Status = 'edit' | 'new'
const emit = defineEmits(['onOk'])
const show = ref(false)
const configStore = useConfig()
@ -86,13 +85,11 @@ const formRef = ref<FormInst | null>(null)
const formValue = reactive<FormType>({
name: null,
logic: 'and',
conditions: [
{
type: null,
operator: 'eq',
result: null,
},
],
conditions: [{
type: null,
operator: 'eq',
result: null,
}],
})
function handleSumbit(e: MouseEvent) {
@ -121,13 +118,14 @@ function handleSumbit(e: MouseEvent) {
if (currentStatus.value === 'new')
addCondition(param)
else updateCondition({ id: currentEditId!, ...param })
else
updateCondition({ id: currentEditId!, ...param })
closeModal()
})
}
function formatValue(searchfield: string, searchvalue: any) {
if (searchfield === 'izyear') {
if (searchfield === 'izuptime') {
const start = formatToDate2(searchvalue[0])
const end = formatToDate2(searchvalue[1])
return `${start}-${end}`
@ -139,7 +137,7 @@ function formatValue(searchfield: string, searchvalue: any) {
//
function unformatValue(searchfield: string, searchvalue: any) {
// 2022/01/03-2023/02/04
if (searchfield === 'izyear') {
if (searchfield === 'izuptime') {
const dataStrs = searchvalue.split('-')
const start = formatToDate3(dataStrs[0])
const end = formatToDate3(dataStrs[1])
@ -184,22 +182,16 @@ onBeforeMount(() => {
dicStore.fetchRelationTypeList()
})
watch(
() => dicStore.relationTypeList,
(newval) => {
logicOptions.value = newval
},
)
watch(() => dicStore.relationTypeList, (newval) => {
logicOptions.value = newval
})
function showModal() {
show.value = true
}
function closeModal() {
emit('onOk')
setTimeout(() => {
show.value = false
}, 300)
show.value = false
}
function generateAllData(): Option[] {
@ -208,8 +200,7 @@ function generateAllData(): Option[] {
if (value.startsWith('iz') && asideMap[value]?.inFilterList !== false) {
const name = asideMap[value]?.label
name
&& acc.push({
name && acc.push({
value,
label: name || '未配置',
})
@ -264,92 +255,45 @@ defineExpose({
</script>
<template>
<n-modal
v-model:show="show"
transform-origin="center"
:mask-closable="false"
@after-leave="leaveHandler"
>
<n-card
:style="cardStyle"
:bordered="false"
size="huge"
role="dialog"
aria-modal="true"
>
<n-modal v-model:show="show" transform-origin="center" @after-leave="leaveHandler" :mask-closable="false">
<n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
<div class="wrapper">
<span class="wrapper-title">{{ modalTitle }}</span>
<div class="wrapper-bar">
<div class="wrapper-info">
<span
:style="{
'margin-left': '18px',
'font-size': '16px',
'font-weight': '600',
}"
>基本信息</span>
<span :style="{ 'margin-left': '18px' }">基本信息</span>
</div>
</div>
<div class="wrapper-form">
<n-form ref="formRef" :model="formValue" :rules="rules">
<n-form-item path="name" label="标题">
<n-input
v-model:value="formValue.name"
:style="{ width: '780px' }"
placeholder="请输入过滤名称"
@keydown.enter.prevent
/>
<n-input v-model:value="formValue.name" :style="{ width: '780px' }" @keydown.enter.prevent />
</n-form-item>
<n-form-item v-show="false" path="logic" label="逻辑关系">
<n-select
v-model:value="formValue.logic"
filterable
placeholder="请选择逻辑关系"
:options="logicOptions"
/>
<n-form-item path="logic" label="逻辑关系" v-show="false">
<n-select filterable v-model:value="formValue.logic" placeholder="请选择逻辑关系" :options="logicOptions" />
</n-form-item>
<n-form-item
v-for="(item, index) in formValue.conditions"
:key="index"
:style="formItemStyle"
path="conditions"
:label="formLabel(index)"
v-for="(item, index) in formValue.conditions" :key="index" :style="formItemStyle"
path="conditions" :label="formLabel(index)"
>
<n-select
v-model:value="item.type"
filterable
placeholder="请选择筛选项名称"
:options="typeOptions"
<n-select filterable
v-model:value="item.type" placeholder="请选择筛选项名称" :options="typeOptions"
@change="item.result = ''"
/>
<n-select
v-model:value="item.operator"
filterable
style="margin-left: 8px"
placeholder="请选择"
<n-select filterable
v-model:value="item.operator" style="margin-left: 8px;" placeholder="请选择"
:options="operatorOptions"
/>
<n-space v-if="item.type === 'izyear'">
<n-space v-if="item.type === 'izuptime'">
<n-date-picker
v-model:value="item.result"
style="margin-left: 8px; width: 240px"
type="daterange"
v-model:value="item.result" style="margin-left: 8px;width: 240px;" type="daterange"
clearable
/>
</n-space>
<n-select
v-else
v-model:value="item.result"
filterable
style="margin-left: 8px"
placeholder="请选择"
:options="getOptions(item.type!)"
<n-select filterable
v-else v-model:value="item.result" style="margin-left: 8px;" placeholder="请选择" :options="getOptions(item.type!)"
/>
<n-button
:style="noBorderInput"
icon-placement="right"
@click="removeCondition(index)"
>
<n-button :style="noBorderInput" icon-placement="right" @click="removeCondition(index)">
<template #icon>
<SvgIcon size="24" name="close" />
</template>
@ -358,8 +302,8 @@ defineExpose({
</n-form>
</div>
<div class="wrapper-new" @click="createCondition">
<span style="font-size:16px;">+</span>
<span style="margin-left: 8px">添加筛选条件</span>
<span>+</span>
<span style="margin-left:8px">添加筛选条件</span>
</div>
</div>
<template #footer>
@ -367,7 +311,7 @@ defineExpose({
<n-button type="info" @click="handleSumbit">
确定
</n-button>
<n-button secondary style="margin-left: 15px" @click="closeModal">
<n-button secondary style="margin-left:15px" @click="closeModal">
取消
</n-button>
</div>
@ -383,22 +327,19 @@ defineExpose({
&-title {
font-weight: bold;
font-size: 18px;
color: #333333;
font-size: 16px;
}
&-bar {
background-color: #e8e8e8;
width: 100%;
margin-top: 27px;
font-size: 16px;
color: #333333;
margin-top: 20px;
}
&-form {
display: flex;
justify-content: space-between;
margin-top: 24px;
margin-top: 20px;
}
&-new {
@ -407,9 +348,6 @@ defineExpose({
color: #507afd;
line-height: 22px;
cursor: pointer;
span{
font-size: 11px;
}
&:hover {
color: #507aac;
@ -423,7 +361,6 @@ defineExpose({
&-footer {
display: flex;
justify-content: flex-end;
margin-bottom:6px;
}
&-info {
@ -431,7 +368,7 @@ defineExpose({
position: relative;
&:before {
background-color: #1980ff;
background-color: #1980FF;
content: "";
width: 5px;
border-radius: 2px;
@ -441,9 +378,4 @@ defineExpose({
}
}
}
::v-deep(.n-form-item .n-form-item-label){
font-size:14px;
color: #666666;
font-weight: 500;
}
</style>

@ -78,11 +78,11 @@ onBeforeMount(async () => {
</div>
<div class="wrapper-content">
<span>处理方式</span>
<n-select v-model:value="selectBackId" filterable style="margin-top: 10px;" :options="backOptions" />
<n-select filterable v-model:value="selectBackId" style="margin-top: 10px;" :options="backOptions" />
</div>
<div class="wrapper-content">
<span>不通过原因</span>
<n-select v-model:value="selectRejectId" filterable style="margin-top: 10px;" :options="reasonOptions" />
<n-select filterable v-model:value="selectRejectId" style="margin-top: 10px;" :options="reasonOptions" />
<n-input v-show="showOther" v-model:value="otherValue" type="textarea" placeholder="备注内容" style="margin-top: 10px;" />
</div>
</div>

@ -54,6 +54,14 @@ async function query() {
sortname: '',
})
const { data } = result
// console.log(data)
// // const list = []
// // data.forEach((items) => {
// // items.repeatedTaskList.forEach((item) => {
// // list.push(item)
// // })
// // })
// console.log(data)
emit('reject', data)
closeModal()
}

@ -190,6 +190,8 @@ async function query(page: number, pageSize: number) {
pageNo: pagination.page,
sortname: '',
})
console.log(666666)
console.log(result)
const { data, pageCount, totalCount } = result
total.value = totalCount
@ -286,6 +288,7 @@ function batchApproval() {
message.error(msg)
return
}
console.log(items)
const list: any = []
items.forEach((item) => {
list.push({

@ -40,7 +40,6 @@ import type { ApprovalParam } from '/#/api'
import emitter from '@/utils/mitt'
import { formatToDateHMS } from '@/utils/dateUtil'
import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
import DataHeader from '@/components/DataHeader/index.vue'
const emit = defineEmits(['changeShow'])
function changeContent() {
@ -54,12 +53,10 @@ const route = useRoute()
const reviewType = 0
const sortorder = ref('asc')
const sortname = ref('states')
const searchContent = route.query.searchContent as string
const actionsColumns = {
title: '操作',
key: 'actions',
minWidth: 200,
width: 200,
fixed: 'right',
render(row) {
return h(ListAction, {
@ -199,7 +196,6 @@ async function getColumns() {
width: 120,
})
}
return v
})
}
else {
@ -211,7 +207,6 @@ async function getColumns() {
fixed: 'left',
width: 120,
})
return v
})
userFieldUnFixed.map((v) => {
const item = allList.find(v2 => v2.name == v)
@ -220,7 +215,6 @@ async function getColumns() {
key: item.name,
width: 120,
})
return v
})
}
// TODO:
@ -278,7 +272,7 @@ async function formatColumns() {
NButton,
{
'strong': true,
// 'tertiary': true,
'tertiary': true,
'text': true,
'size': 'small',
'text-color': '#507AFD',
@ -399,6 +393,15 @@ async function formatColumns() {
key: columnsRef.value[index].key,
fixed: columnsRef.value[index].fixed || undefined,
width: 200,
sorter: 'default',
renderSorterIcon: ({ order }) => {
if (order === false)
return h(SvgIcon, { name: 'sort-2' })
if (order === 'ascend')
return h(SvgIcon, { name: 'sort-1' })
if (order === 'descend')
return h(SvgIcon, { name: 'sort-3' })
},
render(row: any) {
return row.fromusername
},
@ -422,7 +425,6 @@ async function formatColumns() {
const deviceHeight = ref(600)
onMounted(() => {
// query(pagination.page, pagination.pageSize);
emitter.on('filter-final', refreshHandler)
getColumns()
@ -485,10 +487,7 @@ const finalStore = useFinal()
async function query(page: number, pageSize: number, filterId?: any, taskName?: string) {
const asideParmas = unref(finalStore.getAsideValue)
// 使使
// let params = filterId ? { userSearchId: filterId } : asideParmas
let params = asideParmas
params = params?.izshowall ? {} : params
const params = filterId ? { userSearchId: filterId } : asideParmas
const result = await getFinalList({
sortorder: sortorder.value,
pageSize,
@ -497,7 +496,7 @@ async function query(page: number, pageSize: number, filterId?: any, taskName?:
taskName,
...params,
})
const { data, totalCount } = result
const { data, pageCount, totalCount } = result
tableData.value = data
total.value = totalCount
pagination.page = page
@ -506,11 +505,14 @@ async function query(page: number, pageSize: number, filterId?: any, taskName?:
}
async function handleSorterChange(value) {
console.log(value)
let name = value.columnKey
if (name === 'fromuptime')
name = 'field11'
else if (name === 'similarityscore')
name = 'similarity_score'
else if (name === 'fromusername')
name = 'fromuserid'
@ -574,20 +576,8 @@ const maxHeight = computed(() => {
return tableData.value.length ? `${unref(deviceHeight)}px` : 'auto'
})
const scrollX = computed(() => {
const table = unref(tableRef)
if (!table)
return
const tableEl: any = table?.$el
const wrapper = tableEl.querySelector('.n-data-table-wrapper')
// const arr = columnsRef.value.filter(item => !item.fixed)
let width = 0
columnsRef.value.forEach((item) => {
width += Number(item.width) || 200
})
query(pagination.page, pagination.pageSize)
return width
})
const customTabelRef = ref(null)
const importExcelRef = ref(null)
const notPassModalRef = ref(null) //
@ -707,7 +697,7 @@ function resetHandler() {
// TODO
// const result = await resetApproval()
},
onNegativeClick: () => { },
onNegativeClick: () => {},
})
}
@ -748,6 +738,7 @@ function batchApproval() {
message.error(msg)
return
}
console.log(items)
const list: any = []
items.forEach((item) => {
list.push({
@ -772,6 +763,7 @@ function batchApproval() {
//
function repeatBatchReject(items) {
console.log(items)
rejectHandler(items)
}
@ -812,7 +804,7 @@ function doAudit(param: any) {
}
})
},
onNegativeClick: () => { },
onNegativeClick: () => {},
})
}
@ -837,13 +829,6 @@ watch(
{ deep: true },
)
watch(
() => finalStore.listKey,
(newVal, oldVal) => {
refreshHandler()
},
)
function reset() {
pagination.page = 1
pagination.pageCount = 1
@ -851,26 +836,18 @@ function reset() {
async function refreshHandler(searchId?: any) {
reset()
let searchKeyword = ''
if (searchContent) {
const id_param = searchContent.match(/-\d+-/)
if (id_param)
searchKeyword = id_param[0].slice(1, -1)
}
query(pagination.page, pagination.pageSize, searchId, searchKeyword)
query(pagination.page, pagination.pageSize, searchId)
}
function filterTableData(keyword) {
pagination.page = 1
pagination.pageSize = 10
if (keyword) {
if (keyword)
// tableData.value = tableData.value.filter(item => item.id.includes(keyword))
query(pagination.page, pagination.pageSize, '', keyword)
}
else {
else
query(pagination.page, pagination.pageSize)
}
}
defineExpose({
filterTableData,
})
@ -881,10 +858,15 @@ defineExpose({
<div class="wrapper-header">
<div class="wrapper-header-left">
<span class="wrapper-header-font">任务管理列表</span>
<SvgIcon style="cursor: pointer" size="16" name="list-mode" @click="changeContent" />
<SvgIcon size="16" name="list-mode" @click="changeContent" />
</div>
<div>
<SvgIcon style="margin-right: 6px" size="13" name="summary" @click="showModal(repeatModalRef)" />
<SvgIcon
style="margin-right: 6px"
size="13"
name="summary"
@click="showModal(repeatModalRef)"
/>
<NButton class="xjcc" text @click="showModal(repeatModalRef)">
小结查重
</NButton>
@ -904,16 +886,27 @@ defineExpose({
</NButton>
<img
class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt=""
class="btn-approval btn-left"
src="@/assets/images/task/btn-not-pass.png"
alt=""
@click.stop="batchReject"
>
<SvgIcon size="24" name="vs" />
<img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
<img
class="btn-approval"
src="@/assets/images/task/btn-pass.png"
alt=""
@click.stop="batchApproval"
>
</div>
<n-popover
ref="popover" :style="{ padding: '0px' }" style="width: 148px" :show-arrow="false"
placement="bottom-start" trigger="click"
ref="popover"
:style="{ padding: '0px' }"
style="width: 148px"
:show-arrow="false"
placement="bottom-start"
trigger="click"
>
<template #trigger>
<div class="icon-wrap">
@ -937,9 +930,6 @@ defineExpose({
</n-popover>
</div>
</div>
<div class="header_data">
<DataHeader :has-color="true" />
</div>
<!-- <div class="wrapper-statistic">
<div v-for="i in 7" :key="i" class="item">
<div class="icon" />
@ -954,22 +944,45 @@ defineExpose({
</div>
</div> -->
<div class="wrapper-settings">
<SvgIcon style="cursor: pointer" size="18" name="column" @click="showModal(customTabelRef)" />
<SvgIcon
style="cursor: pointer"
size="18"
name="column"
@click="showModal(customTabelRef)"
/>
</div>
<div class="wrapper-content">
<NDataTable
id="table" ref="tableRef" v-model:checked-row-keys="checkedRowKeys" remote :columns="columnsRef"
:scroll-x="scrollX" :max-height="maxHeight" :data="tableData" :loading="loading" :pagination="pagination"
:row-key="rowKey" @update:page="handlePageChange" @update-page-size="handlePageSizeChange"
@update:checked-row-keys="handleCheck" @update:sorter="handleSorterChange"
ref="tableRef"
v-model:checked-row-keys="checkedRowKeys"
remote
:columns="columnsRef"
:scroll-x="1250"
:max-height="maxHeight"
:data="tableData"
:loading="loading"
:pagination="pagination"
:row-key="rowKey"
@update:page="handlePageChange"
@update-page-size="handlePageSizeChange"
@update:checked-row-keys="handleCheck"
@update:sorter="handleSorterChange"
/>
</div>
<CustomTabelModal ref="customTabelRef" @commit="commitHandler" />
<ImportExcelModal ref="importExcelRef" :on-success="sucessHandler" :header-config="headRules" />
<ImportExcelModal
ref="importExcelRef"
:on-success="sucessHandler"
:header-config="headRules"
/>
<NotPassed ref="notPassModalRef" @success="reload" />
<RepeatModal ref="repeatModalRef" @reject="repeatBatchReject" @viewrepeat="showModal(repeatTaskTableModalRef)" />
<RepeatModal
ref="repeatModalRef"
@reject="repeatBatchReject"
@viewrepeat="showModal(repeatTaskTableModalRef)"
/>
<RepeatTaskTableModal ref="repeatTaskTableModalRef" />
</div>
</template>
@ -1005,7 +1018,6 @@ defineExpose({
border-radius: 8px;
cursor: pointer;
}
.wrapper {
display: flex;
flex: 1;
@ -1151,20 +1163,13 @@ defineExpose({
background: #fff;
}
}
:deep(.n-data-table .n-data-table-td.n-data-table-td--fixed-right) {
z-index: 100 !important;
}
:deep(.n-data-table-th__title) {
color: #333;
}
:deep(.n-data-table .n-data-table-td) {
color: #666;
}
:deep(.n-data-table .n-data-table-base-table-header) {
overflow: hidden;
}
</style>

@ -1,273 +1,136 @@
<script lang="ts" setup>
import { onMounted, ref } from 'vue'
import { chunk } from 'lodash-es'
import testImg from '@/assets/images/test.png'
import { onMounted, ref } from "vue";
const emit = defineEmits(['changeShow'])
function changeContent() {
emit('changeShow')
}
function initRem() {
const designWidth = 1440
const rempPx = 16
const scale = window.innerWidth / designWidth
document.documentElement.style.fontSize = `${scale * rempPx}px`
}
onMounted(() => {
initRem()
})
const item = {
img: testImg,
// img: "/src/assets/images/test.png",
img:'http://47.93.59.251/api/image/thumbnail_1752999610491604992.jpeg',
checked: false,
title: 'YP4567890545',
date: '2023-12-19 12:09:18',
}
const data = ref<any[]>([])
title: "YP4567890545",
date: "2023-12-19 12:09:18",
};
const data = ref<any[]>([]);
onMounted(() => {
for (let i = 0; i < 8; i++)
data.value.push(item as any)
data.value = chunk(data.value, 4)
})
for (let i = 0; i < 20; i++) {
data.value.push(item as any);
}
});
</script>
<template>
<div class="wrapper">
<div class="wrapper-header">
<div class="wrapper-header-left">
<span class="wrapper-header-font">任务管理列表</span>
<SvgIcon
style="cursor: pointer"
size="16"
name="card-mode"
@click="changeContent"
/>
</div>
</div>
<div class="header_data">
<DataHeader :has-color="true" />
</div>
<div v-for="(sitem, sindex) in data" :key="sindex" class="data_wrapper">
<div v-for="(item, index) in sitem" :key="index" class="item">
<div class="top">
<div
class="img"
:style="`background:url(${item.img});background-size:100%;background-repeat: no-repeat;`"
>
<!-- <div class="check_box"><n-checkbox size="medium" label=" " /></div> -->
</div>
<div class="content">
<div class="title">
任务ID{{ item.title }}
</div>
<div class="date">
{{ item.date }}
</div>
<div class="tag_box">
<div
v-for="index in 2"
:key="index"
class="tag_item"
:style="index == 2 ? 'color:#02C984' : 'color:#507AFD'"
>
{{ index == 1 ? "待确认" : "张思" }}
</div>
</div>
</div>
<div class="item" v-for="(item, index) in data" :key="index">
<div class="top">
<div
class="img"
:style="`background:url(${item.img});background-size:100%;background-repeat: no-repeat;`"
>
<div class="check_box"><n-checkbox size="medium" label=" " /></div>
</div>
<div class="bottom">
<div class="resovle_action">
通过
</div>
<div class="reject_action">
不通过
<div class="content">
<div class="title">任务ID{{ item.title }}</div>
<div class="date">{{ item.date }}</div>
<div class="tag_box">
<div
class="tag_item"
v-for="index in 2"
:key="index"
:style="index == 2 ? 'color:#02C984' : 'color:#507AFD'"
>
{{ index==1?'待确认':'张思' }}
</div>
</div>
</div>
</div>
<div class="bottom">
<div class="resovle_action">通过</div>
<div class="reject_action">不通过</div>
</div>
</div>
</div>
</template>
<style scoped lang="less">
.wrapper {
// display: flex;
// flex-flow: row wrap;
// align-items: center;
// justify-content: flex-start;
// flex: 1;
display: flex;
flex-flow: row wrap;
align-items: center;
justify-content: flex-start;
flex: 1;
box-sizing: border-box;
margin-left: 16px;
width: 100%;
background: #fff;
padding: 0px 24px 24px 24px;
&-header {
display: flex;
justify-content: space-between;
align-items: center;
box-sizing: border-box;
height: 64px;
width: 100%;
div {
.item {
width: 23%;
border: 1px solid #ededed;
border-radius: 3px;
padding: 8px 10px;
margin-right: 10px;
.top {
display: flex;
flex-flow: row nowrap;
align-items: center;
}
.xjcc {
font-weight: bold;
color: #507afd;
margin-right: 20px;
}
.title {
color: #507afd;
font-weight: bold;
font-size: 14px;
margin-left: 8px;
}
.btn {
width: 118px;
height: 36px;
background: linear-gradient(135deg, #5b85f8, #3c6cf0);
border-radius: 17px;
box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
display: flex;
align-items: center;
justify-content: center;
color: #fff;
margin-right: 6px;
cursor: pointer;
}
.more {
width: 30px;
height: 30px;
line-height: 30px;
opacity: 0.1;
background: linear-gradient(144deg, #73a7f9 0%, #3e6ef1 96%);
border-radius: 8px;
}
&-font {
font-size: 20px;
font-family: PingFang SC, PingFang SC-Medium;
font-weight: 600;
color: #0d0b22;
margin-right: 8px;
}
&-action {
padding: 8px;
li {
height: 32px;
line-height: 32px;
cursor: pointer;
&:hover {
background-color: #f3f8ff;
}
}
}
}
.header_data {
width: 100%;
}
.data_wrapper {
display: flex;
flex-flow: row wrap;
align-items: center;
// justify-content: flex-start;
justify-content: space-between;
flex: 1;
.item {
min-width: 14.125rem;
border: 1px solid #ededed;
border-radius: 3px;
padding: 8px 10px;
margin-right: 20px;
margin-bottom: 16px;
.top {
display: flex;
flex-flow: row nowrap;
align-items: center;
justify-content: flex-start;
.img {
width: 84px;
height: 55px;
// height: auto;
object-fit: cover;
border-radius: 3px;
.check_box {
margin-left: 8px;
}
}
.content {
justify-content: flex-start;
.img {
width: 50%;
height: 70px;
border-radius: 3px;
.check_box {
margin-left: 8px;
.title,
.date {
font-size: 11px;
font-weight: bolder;
text-align: left;
color: #323233;
line-height: 16px;
}
}
.tag_box {
display: flex;
flex-flow: row nowrap;
align-items: center;
justify-content: flex-start;
.tag_item {
min-width: 31px;
min-height: 14px;
font-size: 10px;
padding: 1px 3px;
font-weight: bolder;
text-align: left;
// color: #507afd;
line-height: 14px;
letter-spacing: 0.1px;
margin-right: 8px;
// opacity: 0.1;
background: #c0f7e4;
border-radius: 2px;
text-align: center;
white-space: nowrap
}
}
.content {
margin-left: 8px;
.title,
.date {
font-size: 11px;
font-weight: bolder;
text-align: left;
color: #323233;
line-height: 16px;
}
}
.bottom {
.tag_box {
display: flex;
flex-flow: row nowrap;
align-items: center;
justify-content: flex-end;
div {
cursor: pointer;
}
.resovle_action {
font-size: 12px;
font-weight: bolder;
text-align: left;
color: #507afd;
line-height: 17px;
}
.reject_action {
font-size: 12px;
justify-content: flex-start;
.tag_item {
width: 31px;
height: 14px;
font-size: 10px;
font-weight: bolder;
text-align: left;
color: #FF4E4F;
line-height: 17px;
margin-left: 15px;
// color: #507afd;
line-height: 14px;
letter-spacing: 0.1px;
margin-right: 8px;
}
}
}
.bottom {
display: flex;
flex-flow: row nowrap;
align-items: center;
justify-content: flex-end;
.resovle_action {
font-size: 12px;
font-weight: bolder;
text-align: left;
color: #507afd;
line-height: 17px;
}
.reject_action {
font-size: 12px;
font-weight: bolder;
text-align: left;
color: #ff4e4f;
line-height: 17px;
margin-left: 15px;
}
}
}
}
</style>

@ -3,30 +3,26 @@ import { ref } from 'vue'
import Aside from './aside/Aside.vue'
import Content from './content/Content.vue'
import ListContent from './content/ListContent.vue'
import Robot from '@/components/Robot/index.vue'
defineOptions({
name: 'FinalMain',
})
const showList = ref(false)
const contentRef: any = ref(null)
function inputChange(keyword) {
const showList = ref(false);
const contentRef:any = ref(null);
const inputChange = (keyword)=>{
contentRef.value.filterTableData(keyword)
}
</script>
<template>
<div class="main">
<!-- 侧边 -->
<Aside @input-change="inputChange" />
<Aside @inputChange="inputChange" />
<!-- 内容 -->
<Content v-show="!showList" ref="contentRef" @change-show="showList = true" />
<Content @changeShow="showList=true" ref="contentRef" />
<!-- 任务管理 -->
<!-- TODO:本地演示即可 上传注释注释 -->
<ListContent v-show="showList" @change-show="showList = false" />
<!-- 机器人 -->
<Robot />
<!-- <ListContent /> -->
</div>
</template>

@ -9,260 +9,275 @@ import {
ref,
shallowRef,
unref,
} from 'vue'
import { cloneDeep, isEqual } from 'lodash-es'
import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from './comp/modals'
import Search from './comp/Search.vue'
import AdvanceFilter from './comp/AdvanceFilter.vue'
import { getViewportOffset } from '@/utils/domUtils'
import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
import { useConfig } from '@/store/modules/asideConfig'
import type { AsideEntity } from '@/config/aside'
import { asideMap } from '@/config/aside'
import type { AsideConfig } from '/#/api'
import { getFilterList } from '@/api/home/main'
const configStore = useConfig()
watch,
} from "vue";
import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from "./comp/modals";
import Search from "./comp/Search.vue";
import AdvanceFilter from "./comp/AdvanceFilter.vue";
import { getViewportOffset } from "@/utils/domUtils";
import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
import { useConfig } from "@/store/modules/asideConfig";
import type { Filter } from "/#/home";
import type { AsideEntity } from "@/config/aside";
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";
import { cloneDeep, isEqual } from "lodash-es";
const configStore = useConfig();
//
const asideValue: Record<keyof typeof asideMap, any> = reactive({})
let asideValue: Record<keyof typeof asideMap, any> = reactive({});
// :
const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({});
//
const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
Object.keys(asideMap).forEach((key) => {
const entity = asideMap[key]
const { defaultValue } = entity
asideValue[key] = defaultValue
})
const filterModalRef: any = ref(null)
const newFilterModalRef = ref(null)
const customModalRef = ref(null)
const customObjRef = ref<any>(null) //
const customTempObjRef = ref<any>(null) // ()
const configFilterRef = ref<any>([]) //
const AdvanceFilterRef: any = ref(null)
const entity = asideMap[key];
const { defaultValue } = entity;
asideValue[key] = defaultValue;
});
const filterModalRef: any = ref(null);
const newFilterModalRef = ref(null);
const customModalRef = ref(null);
const customObjRef = ref<any>(null); //
const customTempObjRef = ref<any>(null); // ()
const configFilterRef = ref<any>([]); //
const AdvanceFilterRef: any = ref(null);
function showModal(modalRef: any) {
const modal = unref(modalRef)! as any
modal.showModal()
const modal = unref(modalRef)! as any;
modal.showModal();
}
onMounted(() => {
nextTick(() => {
computeSlideHeight()
computeSlideHeight();
let tempAsideValue = cloneDeep(asideValue);
// configStore.setAsideValue(tempAsideValue);
})
})
console.log("asideMap和asideValue", tempAsideValue);
});
});
const collapse = ref(false)
const mousetrap = inject('mousetrap') as any
mousetrap.bind('[', collapseHandler)
const collapse = ref(false);
const mousetrap = inject("mousetrap") as any;
mousetrap.bind("[", collapseHandler);
function collapseHandler() {
collapse.value = !collapse.value
collapse.value = !collapse.value;
}
const asideWidth = computed(() => {
return collapse.value ? 0 : 308
})
return collapse.value ? 0 : 308;
});
const asideHeight = ref(500)
const asideHeight = ref(500);
const asideStyle = computed(() => {
return {
width: `${asideWidth.value}px`,
height: `${asideHeight.value}px`,
}
})
};
});
const collapseIcon = computed(() => {
return collapse.value ? 'expand-cir' : 'collapse-cir'
})
return collapse.value ? "expand-cir" : "collapse-cir";
});
function computeSlideHeight() {
const headEl = document.querySelector('.aside-header')!
const { bottomIncludeBody } = getViewportOffset(headEl)
const height = bottomIncludeBody
asideHeight.value = height - 24
const headEl = document.querySelector(".aside-header")!;
const { bottomIncludeBody } = getViewportOffset(headEl);
const height = bottomIncludeBody;
asideHeight.value = height - 24;
}
useWindowSizeFn(computeSlideHeight, 280)
useWindowSizeFn(computeSlideHeight, 280);
onBeforeMount(async () => {
configStore.fetchConfig()
configStore.fetchCustomConfig()
})
nextTick(() => {
configStore.$subscribe(() => {
const config = configStore.getConfig
const customConfig = configStore.getCustomConfig
if (
configFilterRef.value.length > 0
&& isEqual(configFilterRef.value, configStore.getFilterConfig)
&& customObjRef.value
&& isEqual(customObjRef.value, customTempObjRef.value)
)
return
if (config == null || customConfig == null)
return
/* rao
configStore.fetchConfig();
configStore.fetchCustomConfig();
});
configStore.$subscribe(() => {
const config = configStore.getConfig;
const customConfig = configStore.getCustomConfig;
if (
configFilterRef.value.length > 0 &&
isEqual(configFilterRef.value, configStore.getFilterConfig) &&
customObjRef.value &&
isEqual(customObjRef.value, customTempObjRef.value)
) {
return;
}
if (config == null || customConfig == null) return;
// console.log("config", config, "customConfig", customConfig);
/* rao
const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)// customConfig isDefaultFilter
const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)// asideMap isDefaultFilter
showKeys.unshift(...defaultKeys)
*/
const sortKeyList: any = []
configStore.getFilterConfig.map((item: any) => {
sortKeyList.push(item?.id)
return item
})
const showKeys = [...sortKeyList]
Object.keys(config).forEach((key) => {
if (key.startsWith('iz') && asideMap[key] !== undefined) {
asideVisible[key]
= (showKeys.includes(key) || asideMap[key].isDefaultFilter)
&& config[key] === 'Y'
}
})
if (customObjRef.value) {
//
Object.keys(customObjRef.value).map((key) => {
// TODO hasOwnProperty
// if (asideMap.hasOwnProperty(key)) {
if (Object.prototype.hasOwnProperty.call(customObjRef.value, key)) {
const str = key.toLowerCase()
if (str == 'izsimilarity') {
if (typeof customObjRef.value[str] == 'string')
customObjRef.value[str] = customObjRef.value[str].split(',')
asideValue[key] = customObjRef.value[str] //
}
else if (str == 'izyear') {
if (typeof customObjRef.value[str] == 'string') {
const 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] //
}
else if (
str != 'izsimilarity'
&& str != 'izyear'
&& customObjRef.value[str]
) {
// let list = customObjRef.value[str].split(',');
asideValue[key] = customObjRef.value[str] //
let sortKeyList: any = [];
configStore.getFilterConfig.map((item: any) => {
sortKeyList.push(item.id);
});
const showKeys = [...sortKeyList];
Object.keys(config).forEach((key) => {
if (key.startsWith("iz") && asideMap[key] !== undefined)
asideVisible[key] =
(showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === "Y";
});
if (customObjRef.value) {
//
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") {
if (typeof customObjRef.value[str] == "string") {
customObjRef.value[str] = customObjRef.value[str].split(",");
}
else {
asideValue[key] = null
asideValue[key] = customObjRef.value[str]; //
console.log("相似度2222222222", asideValue[key]);
} else if (str == "izyear") {
if (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;
}
// asideMap[str].defaultValue = customObjRef.value[str];//
asideValue[key] = customObjRef.value[str]; //
console.log("时间2222222222", asideValue[key]);
} 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] = null;
}
return key
})
customTempObjRef.value = customObjRef.value
const tempobj = cloneDeep(asideValue)
configStore.setAsideValue(tempobj)
}
const items = showKeys.reduce((acc, key) => {
const currentData = asideMap[key]
const render = currentData?.render
if (render !== false) {
const str = key?.toLowerCase()
const o = {
key: str,
config: asideMap[str],
}
return [...acc, o]
// asideMap[str].defaultValue = customObjRef.value[str];//
}
else {
return acc
}
}, [])
showItems.value = items
configFilterRef.value = configStore.getFilterConfig
})
})
const asideEnter = ref(false)
});
customTempObjRef.value = customObjRef.value;
console.log("asideValue直接处理后的结果", asideValue);
console.log("customTempObjRef.value", customTempObjRef.value);
let tempobj = cloneDeep(asideValue);
console.log("tempObj", tempobj);
configStore.setAsideValue(tempobj);
}
// console.log("showKeys", showKeys);
const items = showKeys.reduce((acc, key) => {
const { render } = asideMap[key];
if (render !== false) {
const str = key.toLowerCase();
const o = {
key: str,
config: asideMap[str],
};
return [...acc, o];
} else {
return acc;
}
}, []);
console.log("showItems=================================", items);
showItems.value = items;
configFilterRef.value = configStore.getFilterConfig;
});
const asideEnter = ref(false);
const showCollapse = computed(() => {
return collapse.value ? true : asideEnter.value
})
return collapse.value ? true : asideEnter.value;
});
const showSearch = ref(false)
const showSearch = ref(false);
function setShowSearch(value: boolean) {
showSearch.value = value
showSearch.value = value;
}
function newFilterOk() {
const newFilterOk = () => {
filterModalRef.value.query(
filterModalRef.value.pagination.page,
filterModalRef.value.pagination.pageSize,
)
filterModalRef.value.showModal()
}
filterModalRef.value.pagination.pageSize
);
};
// key
function scrollHandler(key: string) {
const element = document.querySelector(`#${key}`)
element?.scrollIntoView(true)
const element = document.querySelector(`#${key}`);
element?.scrollIntoView(true);
}
// ->
async function filterHandler(searchId: string) {
// emitter.emit('filter', searchId)
const res = await getFilterList({ userSearchId: searchId })
if (res.code == 'OK') {
const obj = res.data
customObjRef.value = res.data
const showKeys: any[] = []
const res = await getFilterList({ userSearchId: searchId });
// console.log("", res);
if (res.code == "OK") {
let obj = res.data;
customObjRef.value = res.data;
let showKeys: any[] = [];
Object.keys(obj).map((key) => {
// TODO hasOwnProperty
// if (asideMap.hasOwnProperty(key)) {
if (Object.prototype.hasOwnProperty.call(asideMap, key))
showKeys.push(key)
return key
})
configStore.setCustomConfig(showKeys)
if (asideMap.hasOwnProperty(key)) {
showKeys.push(key);
}
});
// console.log(showKeys);
configStore.setCustomConfig(showKeys);
}
}
function editFilter(filter: any) {
const modal = unref(newFilterModalRef)! as any
modal.showModal()
modal.edit(filter)
const modal = unref(newFilterModalRef)! as any;
modal.showModal();
modal.edit(filter);
}
function updateComponent(key, e) {
const tempobj = cloneDeep(asideValue)
tempobj[key] = e
customObjRef.value = tempobj
console.log("跟新值", key, e);
console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue);
// let tempAsideValue = configStore.getAsideValue || asideValue;
let tempobj = cloneDeep(asideValue);
console.log(tempobj, "tempobj");
tempobj[key] = e;
console.log(tempobj, "tempobj After");
customObjRef.value = tempobj;
// asideValue = Object.assign({}, asideValue, tempobj);
configStore.setAsideValue(tempobj)
console.log("asideValue跟新值", tempobj);
configStore.setAsideValue(tempobj);
}
function handleOk(item: any) {
const handleOk = (item: any) => {
console.log("handleOk", item);
if (item) {
AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname)
filterHandler(item.id)
AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname);
filterHandler(item.id);
} else {
AdvanceFilterRef.value.setCurrentlySelectedAdvanced("高级筛选");
filterHandler("");
}
else {
AdvanceFilterRef.value.setCurrentlySelectedAdvanced('高级筛选')
filterHandler('')
}
}
};
// watch(asideValue, (newVal) => {
// console.log("asideValue", newVal);
// configStore.setAsideValue(newVal)
// }, { deep: true })
</script>
<template>
<div class="aside" :style="asideStyle" @mouseenter="asideEnter = true" @mouseleave="asideEnter = false">
<div
class="aside"
:style="asideStyle"
@mouseenter="asideEnter = true"
@mouseleave="asideEnter = false"
>
<div v-show="showCollapse" class="aside-collapse">
<div class="aside-collapse-btn" @click="collapseHandler">
<SvgIcon :name="collapseIcon" size="40" />
@ -271,28 +286,42 @@ function handleOk(item: any) {
<n-scrollbar trigger="none">
<div class="aside-header">
<!-- 搜索跳转模块 -->
<Search v-show="showSearch" @select="scrollHandler" @close="setShowSearch(false)" />
<Search
v-show="showSearch"
@select="scrollHandler"
@close="setShowSearch(false)"
/>
<!-- 高级筛选 -->
<AdvanceFilter
v-show="!showSearch" ref="AdvanceFilterRef" :type="0" @select="filterHandler"
@update:search="setShowSearch(true)" @show-custom="showModal(customModalRef)"
v-show="!showSearch"
:type="0"
@select="filterHandler"
@update:search="setShowSearch(true)"
@show-custom="showModal(customModalRef)"
@show-filter="showModal(filterModalRef)"
ref="AdvanceFilterRef"
/>
</div>
<component
:is="item.config?.component" v-for="item in showItems" :id="item.key" :key="item.key"
v-model:value="asideValue[item.key]" :label="item.config?.label"
:is="item.config.component"
v-for="(item, index) in showItems"
:id="item.key"
:key="item.key"
v-model:value="asideValue[item.key]"
:label="item.config.label"
@update:value="(e) => updateComponent(item.key, e)"
/>
<!-- 过滤列表 -->
<FilterModalVue
ref="filterModalRef" @edit-filter="editFilter" @show-new-filter="showModal(newFilterModalRef)"
@handle-ok="handleOk"
ref="filterModalRef"
@edit-filter="editFilter"
@show-new-filter="showModal(newFilterModalRef)"
@handleOk="handleOk"
/>
<!-- 新增过滤 -->
<NewFilterModalVue ref="newFilterModalRef" @on-ok="newFilterOk" />
<NewFilterModalVue ref="newFilterModalRef" @onOk="newFilterOk" />
<!-- 筛选 -->
<CustomFilterModalVue ref="customModalRef" />
</n-scrollbar>
@ -314,7 +343,6 @@ function handleOk(item: any) {
width: 100%;
border-bottom: 1px solid #e8e8e8;
margin-bottom: 15px;
height: 58px;
}
&-divider {
@ -342,11 +370,17 @@ function handleOk(item: any) {
right: -20px;
}
::v-deep(.n-collapse .n-collapse-item.n-collapse-item--right-arrow-placement .n-collapse-item__header .n-collapse-item-arrow) {
::v-deep(.n-collapse
.n-collapse-item.n-collapse-item--right-arrow-placement
.n-collapse-item__header
.n-collapse-item-arrow) {
margin-left: 8px;
}
::v-deep(.n-collapse .n-collapse-item .n-collapse-item__header .n-collapse-item__header-main) {
::v-deep(.n-collapse
.n-collapse-item
.n-collapse-item__header
.n-collapse-item__header-main) {
font-weight: bold;
justify-content: space-between;
}
@ -359,11 +393,18 @@ function handleOk(item: any) {
border-top: 0px;
}
::v-deep(.n-collapse .n-collapse-item .n-collapse-item__content-wrapper .n-collapse-item__content-inner) {
::v-deep(.n-collapse
.n-collapse-item
.n-collapse-item__content-wrapper
.n-collapse-item__content-inner) {
padding-top: 10px;
}
::v-deep(.n-scrollbar > .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar, .n-scrollbar + .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar) {
::v-deep(.n-scrollbar
> .n-scrollbar-rail.n-scrollbar-rail--vertical
> .n-scrollbar-rail__scrollbar, .n-scrollbar
+ .n-scrollbar-rail.n-scrollbar-rail--vertical
> .n-scrollbar-rail__scrollbar) {
width: 0px;
}
}

@ -1,8 +1,8 @@
<script lang="ts" setup>
import type { DropdownMixedOption } from 'naive-ui/es/dropdown/src/interface'
import type { PropType } from 'vue'
import type { DropdownMixedOption } from "naive-ui/es/dropdown/src/interface";
import type { PropType } from "vue";
defineOptions({ name: 'Action' })
defineOptions({ name: "Action" });
const props = defineProps({
options: {
@ -16,12 +16,12 @@ const props = defineProps({
},
id: {
type: String,
default: '',
default: "",
},
})
function fun(key) {
props.select(key, props.id)
}
});
const fun = (key) => {
props.select(key, props.id);
};
</script>
<template>

@ -1,14 +1,14 @@
<script lang="ts" setup>
import { useInfiniteScroll } from '@vueuse/core'
import { debounce } from 'lodash-es'
import { onMounted, reactive, ref, watch } from 'vue'
import type { FilterSearchParam } from '/#/api'
import type { Filter, FilterEntity } from '/#/home'
import { VueDraggable } from 'vue-draggable-plus'
import { asideMap } from '@/config/aside'
import { favorite, getConditionList, sort, unfavorite } from '@/api/home/filter'
import { favorite, getConditionList, unfavorite, sort } from "@/api/home/filter";
import { asideMap } from "@/config/aside";
import { useInfiniteScroll } from "@vueuse/core";
import { debounce } from "lodash-es";
import { onMounted, reactive, ref, watch } from "vue";
import type { FilterSearchParam } from "/#/api";
import type { Filter, FilterEntity } from "/#/home";
import { VueDraggable } from "vue-draggable-plus";
defineOptions({ name: 'AdvanceFilter' })
defineOptions({ name: "AdvanceFilter" });
const props = defineProps({
type: {
@ -16,42 +16,43 @@ const props = defineProps({
default: 0,
required: true,
},
})
const emit = defineEmits<{
(e: 'show-filter'): void
(e: 'show-custom'): void
(e: 'update:search'): void
(e: 'select', id: string)
}>()
});
const ruleForm = reactive({
keyword: '',
})
const ruleformRef = ref()
const data = ref<FilterEntity[]>([])
const unData = ref<FilterEntity[]>([])
const loading = ref(false)
const canloadMore = true
const el = ref<HTMLDivElement | null>(null)
const popover = ref<ComponentRef | null>(null)
keyword: "",
});
const ruleformRef = ref();
const emit = defineEmits<{
(e: "show-filter"): void;
(e: "show-custom"): void;
(e: "update:search"): void;
(e: "select", id: string);
}>();
const data = ref<FilterEntity[]>([]);
const unData = ref<FilterEntity[]>([]);
const loading = ref(false);
const canloadMore = true;
const el = ref<HTMLDivElement | null>(null);
const popover = ref<ComponentRef | null>(null);
const pagination = reactive({
pageNo: 1,
pageSize: 300,
})
const keyword = ref('')
const currentlySelectedAdvanced = ref('高级筛选')
});
const keyword = ref("");
const currentlySelectedAdvanced = ref("高级筛选");
onMounted(() => {
// data.value = generateDefaultConfig()
})
});
//
function generateDefaultConfig(): FilterEntity[] {
return Object.keys(asideMap).reduce((acc, key) => {
const { label, defaultValue, isDefaultFilter } = asideMap[key]
const { label, defaultValue, isDefaultFilter } = asideMap[key];
if (isDefaultFilter === true) {
const config = {
id: '',
id: "",
name: label,
favorite: false,
isDefaultFilter,
@ -61,75 +62,70 @@ function generateDefaultConfig(): FilterEntity[] {
value: defaultValue,
},
],
}
return [...acc, config]
}
else {
return acc
};
return [...acc, config];
} else {
return acc;
}
}, [])
}, []);
}
useInfiniteScroll(
el as any,
() => {
loadMore()
loadMore();
},
{ distance: 10, interval: 300, canLoadMore: () => false },
)
async function showClick() {
getSearchedList('')
}
{ distance: 10, interval: 300, canLoadMore: () => false }
);
const showClick = async () => {
getSearchedList("");
};
async function loadMore() {
if (loading.value || el.value == null)
return
if (loading.value || el.value == null) return;
const more = await featchList()
const more = await featchList();
if (more.length === 0)
return
if (more.length === 0) return;
data.value.push(...more)
data.value.push(...more);
}
async function featchList() {
loading.value = true
loading.value = true;
try {
const searchParam: FilterSearchParam = {
search_searchname: { value: ruleForm.keyword, op: 'like', type: 'string' },
}
const result = await getConditionList(pagination, searchParam, props.type)
const { data } = result
search_searchname: { value: ruleForm.keyword, op: "like", type: "string" },
};
const result = await getConditionList(pagination, searchParam, props.type);
const { data } = result;
// pagination.pageNo += 1
// canloadMore = pageCount >= pagination.pageNo
const entityList = generateFilterEntityList(data)
return entityList
}
catch (error) {
return []
}
finally {
loading.value = false
const entityList = generateFilterEntityList(data);
return entityList;
} catch (error) {
return [];
} finally {
loading.value = false;
}
}
//
function generateFilterEntityList(data) {
const filterEntityList = data.map((item) => {
const { searchname, iztop, ocrUsersearchchildList, id, reorder } = item
const { searchname, iztop, ocrUsersearchchildList, id, reorder } = item;
const list = ocrUsersearchchildList.map((item) => {
const { searchfield, searchvalue } = item
const { searchfield, searchvalue } = item;
return {
key: searchfield,
value: searchvalue,
}
})
};
});
const reg = new RegExp(ruleForm.keyword, 'gi')
const hilightText = searchname.replace(reg, `<span>${ruleForm.keyword}</span>`)
const reg = new RegExp(ruleForm.keyword, "gi");
const hilightText = searchname.replace(reg, `<span>${ruleForm.keyword}</span>`);
return {
id,
@ -139,129 +135,131 @@ function generateFilterEntityList(data) {
filterList: list,
reorder,
searchname,
}
})
};
});
return filterEntityList
return filterEntityList;
}
function selectHandler(item: FilterEntity) {
(popover.value as any).setShow(false)
currentlySelectedAdvanced.value = item.searchname
emit('select', item.id)
(popover.value as any).setShow(false);
currentlySelectedAdvanced.value = item.searchname;
emit("select", item.id);
}
const inputHandler = debounce((word) => {
ruleForm.keyword = word
ruleformRef.value.validate()
if (word.length < 2 && word)
return
getSearchedList(word)
}, 300)
ruleForm.keyword = word;
ruleformRef.value.validate();
if (word.length < 2 && word) {
return;
}
getSearchedList(word);
}, 300);
function getSearchedList(word, isScroll = false) {
if (word)
pagination.pageSize = 300
if (!word)
pagination.pageSize = 10
if (isScroll)
pagination.pageSize = 300
ruleForm.keyword = word
if (word) {
pagination.pageSize = 300;
}
if (!word) {
pagination.pageSize = 10;
}
if (isScroll) {
pagination.pageSize = 300;
}
ruleForm.keyword = word;
featchList().then((list) => {
const dataArr: FilterEntity[] = []
const unDataArr: FilterEntity[] = []
let dataArr: FilterEntity[] = [];
let unDataArr: FilterEntity[] = [];
list.map((item) => {
if (item.favorite && !item.isDefaultFilter)
dataArr.push(item)
if (!item.favorite && !item.isDefaultFilter)
unDataArr.push(item)
})
if (item.favorite && !item.isDefaultFilter) {
dataArr.push(item);
}
if (!item.favorite && !item.isDefaultFilter) {
unDataArr.push(item);
}
});
data.value = dataArr.sort(
(a, b) => Number(new Date(a.createtime)) - Number(new Date(b.createtime)),
)
(a, b) => Number(new Date(a.createtime)) - Number(new Date(b.createtime))
);
unData.value = unDataArr.sort(
(a, b) => Number((a as any).reorder) - Number((b as any).reorder),
)
})
(a, b) => Number((a as any).reorder) - Number((b as any).reorder)
);
});
}
function favoriteHandler(event: MouseEvent, item: any) {
event.stopImmediatePropagation()
event.stopPropagation()
event.stopImmediatePropagation();
event.stopPropagation();
const { isDefaultFilter, id } = item
const { isDefaultFilter, id } = item;
if (!isDefaultFilter) {
item.favorite = true
favorite(id)
item.favorite = true;
favorite(id);
data.value.map((v, index) => {
if (v.id == id)
sort(v.id, 0)
else
sort(v.id, index + 1)
})
if (v.id == id) {
sort(v.id, 0);
} else {
sort(v.id, index + 1);
}
});
inputHandler(ruleForm.keyword)
inputHandler(ruleForm.keyword);
}
}
const rules = {
keyword: [
{
trigger: ['blur', 'input', 'change'],
level: 'error',
trigger: ["blur", "input", "change"],
level: "error",
validator(_rule, value) {
if (value.length >= 2)
return true
else
return new Error('搜索关键字最少为两个')
if (value.length >= 2) {
return true;
} else {
return new Error("搜索关键字最少为两个");
}
},
},
],
}
};
function unFavoriteHandler(event: MouseEvent, item) {
event.stopImmediatePropagation()
event.stopPropagation()
event.stopImmediatePropagation();
event.stopPropagation();
const { isDefaultFilter, id } = item
const { isDefaultFilter, id } = item;
if (!isDefaultFilter) {
item.favorite = false
unfavorite(id)
inputHandler(ruleForm.keyword)
item.favorite = false;
unfavorite(id);
inputHandler(ruleForm.keyword);
}
}
function handleScroll(event) {
let timer
const handleScroll = (event) => {
let timer;
if (timer) {
clearTimeout(timer)
}
else {
clearTimeout(timer);
} else {
timer = setTimeout(() => {
getSearchedList('', true)
}, 2000)
getSearchedList("", true);
}, 2000);
}
}
};
function moveEnd() {
const moveEnd = () => {
unData.value.map((v, index) => {
sort(v.id, index)
})
}
sort(v.id, index);
});
};
function setCurrentlySelectedAdvanced(value: string) {
currentlySelectedAdvanced.value = value
const setCurrentlySelectedAdvanced = (value:string)=>{
currentlySelectedAdvanced.value = value;
}
defineExpose({
setCurrentlySelectedAdvanced,
setCurrentlySelectedAdvanced
})
</script>
@ -279,14 +277,9 @@ defineExpose({
>
<template #trigger>
<div class="wrapper-left-dropdown" @click="showClick">
<span
style="
color: #333333;
font-weight: Medium;
font-size: 17px;
font-weight: 600;
"
>{{ currentlySelectedAdvanced }}</span>
<span style="font-size: 20px; color: #333333; font-weight: Medium">{{
currentlySelectedAdvanced
}}</span>
<SvgIcon
:style="{ marginLeft: '5px' }"
name="down"
@ -297,25 +290,21 @@ defineExpose({
</template>
<n-spin :show="loading">
<div class="wrapper-left-popover">
<n-form ref="ruleformRef" :rules="rules" :model="ruleForm">
<n-form :rules="rules" ref="ruleformRef" :model="ruleForm">
<n-form-item path="keyword">
<n-input
:style="{
'--n-border': '0px',
'--n-display': 'block',
'--n-height': '40px',
}"
placeholder="请输入关键词"
:style="{ '--n-border': '0px', '--n-display': 'block' }"
placeholder="请输入关键字"
@input="inputHandler"
:value="ruleForm.keyword"
:minlength="2"
@input="inputHandler"
>
<template #prefix>
<SvgIcon size="14px" name="magnifying-1" />
</template>
<template #suffix>
<SvgIcon
size="16"
size="14px"
style="cursor: pointer"
name="setting"
@click="emit('show-filter')"
@ -355,31 +344,31 @@ defineExpose({
style="margin-right: 3px"
@click="favoriteHandler($event, item)"
/>
<div style="color: #333333" v-html="item.name" />
<div v-html="item.name" style="color: #333333" />
</li>
<!-- filter=".draggable-li[draggable='false']" -->
<VueDraggable
@end="moveEnd"
v-model="unData"
class="draggable-ul"
:animation="150"
group="shared"
@end="moveEnd"
>
<li
v-for="(item, index) in unData"
:key="index"
style="display: flex; align-items: center"
@click="selectHandler(item)"
class="cursor-move draggable-li fix"
:draggable="true"
@click="selectHandler(item)"
>
<SvgIcon name="drag" size="10" style="margin-right: 3px" />
<SvgIcon name="drag" size="18" style="margin-right: 3px" />
<SvgIcon
v-if="item.favorite && !item.isDefaultFilter"
name="favorite-fill"
color="#fd9b0a"
width="13"
height="12"
height="12"
fill="#666666"
style="cursor: pointer !important; margin-right: 3px"
@click="unFavoriteHandler($event, item)"
@ -388,12 +377,12 @@ defineExpose({
v-else-if="!item.favorite && !item.isDefaultFilter"
name="favorite-unfill"
width="13"
height="12"
height="12"
fill="#666666"
style="cursor: pointer !important; margin-right: 3px"
@click="favoriteHandler($event, item)"
/>
<div style="color: #333333" v-html="item.name" />
<div v-html="item.name" style="color: #333333" />
</li>
</VueDraggable>
</ul>
@ -423,14 +412,6 @@ defineExpose({
display: flex;
justify-content: space-between;
align-items: center;
position: absolute;
left: 0;
top: -10px;
width: 100%;
padding: 17px 16px;
border-bottom: 1px solid #e8e8e8;
z-index: 10;
background: #ffffff;
&-left {
display: flex;
@ -480,10 +461,6 @@ defineExpose({
align-items: center;
}
}
.wrapper-left-popover {
width: 248px;
height: 288px;
}
::v-deep(.wrapper-left-popover .n-form-item) {
display: block !important;
}

@ -1,11 +1,9 @@
<script lang="ts" setup>
import { nextTick, onMounted, ref, watch } from 'vue'
import { ref } from 'vue'
import { debounce } from 'lodash-es'
import { useRoute, useRouter } from 'vue-router'
import { asideMap } from '@/config/aside'
import type { SearchEntity } from '/#/home'
import { useConfig } from '@/store/modules/asideConfig'
import { useFinal } from '@/store/modules/final'
defineOptions({ name: 'Search' })
@ -13,22 +11,16 @@ const emit = defineEmits<{
(e: 'close'): void
(e: 'select', key: string): void
(e: 'inputChange', value: string): void
(e: 'showSearch'): void
}>()
const finalStore = useFinal()
const router = useRouter()
const route = useRoute()
const searchContent = route.query.searchContent as string
const data = ref<SearchEntity[]>([])
const popover = ref<ComponentRef | null>(null)
const configStore = useConfig()
const searchKeyword = ref('')
const inputHandler = debounce((keyword) => {
searchKeyword.value = keyword
emit('inputChange', keyword)
searchKeyword.value = keyword;
emit('inputChange',keyword)
}, 300)
configStore.$subscribe(() => {
@ -43,7 +35,7 @@ configStore.$subscribe(() => {
return
const list = keys.map((key) => {
const name = asideMap[key]?.label
const name = asideMap[key].label
return {
key,
@ -60,61 +52,29 @@ function selectHandler(item: SearchEntity) {
}
//
function searchName() {
configStore.setSearchValue(searchKeyword.value)
finalStore.setSearchValue(searchKeyword.value)
emit('inputChange', searchKeyword.value)
const searchName = () => {
configStore.setSearchValue(searchKeyword.value);
emit('inputChange',searchKeyword.value);
}
function close() {
searchKeyword.value = ''
configStore.setSearchValue(searchKeyword.value)
finalStore.setSearchValue(searchKeyword.value)
if (searchContent)
router.push(route.path)
emit('close')
const close = () => {
searchKeyword.value = "";
configStore.setSearchValue(searchKeyword.value);
emit('close');
}
function initSerach() {
if (searchContent) {
emit('showSearch')
const id_param = searchContent.match(/-\d+-/)
if (id_param) {
searchKeyword.value = id_param[0].slice(1, -1)
emit('inputChange', searchKeyword.value)
}
}
}
onMounted(() => {
initSerach()
})
</script>
<template>
<div class="wrapper">
<n-popover
ref="popover"
:style="{ padding: '0px' }"
style="width: 248px"
:show-arrow="false"
placement="bottom-start"
ref="popover" :style="{ padding: '0px' }" style="width: 248px" :show-arrow="false" placement="bottom-start"
trigger="focus"
>
<template #trigger>
<n-input
v-model:value="searchKeyword"
style="width: 260px; height: 32px"
placeholder="请输入你需要搜索的内容"
@input="inputHandler"
>
<n-input v-model:value="searchKeyword" style="width: 260px;height: 32px;" placeholder="请输入你需要搜索的内容" @input="inputHandler">
<template #suffix>
<SvgIcon
size="14px"
name="magnifying-1"
style="cursor: pointer"
@click="searchName"
/>
<SvgIcon size="14px" name="magnifying-1" @click="searchName" style="cursor: pointer;" />
</template>
</n-input>
</template>
@ -127,12 +87,7 @@ onMounted(() => {
</div> -->
</n-popover>
<SvgIcon
size="16px"
style="margin-left: 6px; cursor: pointer"
name="clear"
@click="close"
/>
<SvgIcon size="16px" style="margin-left: 6px;cursor: pointer;" name="clear" @click="close" />
</div>
</template>

@ -1,11 +1,11 @@
<script lang="ts" setup>
import { upload } from '@/api/home/main'
import { hideDownload } from '@/utils/image'
import { getImgUrl } from '@/utils/urlUtils'
import { useElementHover } from '@vueuse/core'
import type { GlobalThemeOverrides, UploadCustomRequestOptions } from 'naive-ui'
import { useThemeVars } from 'naive-ui'
import { computed, ref } from 'vue'
import { getImgUrl } from '@/utils/urlUtils'
import { hideDownload } from '@/utils/image'
import { upload } from '@/api/home/main'
const props = defineProps<{
value: string
@ -15,11 +15,13 @@ const emit = defineEmits<{
(e: 'update:value', value: string): void
}>()
const figureUrl = ref(props.value)
if (figureUrl.value && !figureUrl.value.includes('http'))
figureUrl.value = getImgUrl(figureUrl.value)
const uploadRef = ref(null)
let figureUrl = ref(props.value)
if(figureUrl.value && figureUrl.value.indexOf('http') == -1) {
figureUrl.value = getImgUrl(figureUrl.value);
}
const uploadRef = ref(null);
async function customRequest(data: UploadCustomRequestOptions) {
const result = await upload({ file: data.file.file as any })
@ -64,35 +66,34 @@ const imageGroupThemeOverrides = computed(() => {
})
//
function handleDragOver(e) {
e.preventDefault() //
e.dataTransfer.dropEffect = 'copy' //
}
const handleDragOver = (e) => {
e.preventDefault(); //
e.dataTransfer.dropEffect = 'copy'; //
};
//
function handleDragLeave(e) {
e.preventDefault() //
}
const handleDragLeave = (e) => {
e.preventDefault(); //
};
//
async function handleDrop(e) {
e.preventDefault() //
const files = e.dataTransfer.files
if (files[0]) {
const handleDrop = async (e) => {
e.preventDefault(); //
const files = e.dataTransfer.files;
if( files[0] ){
const result = await upload({ file: files[0] as any })
const imgUrl = getImgUrl(result.data)
figureUrl.value = imgUrl
emit('update:value', result.data)
}
}
};
</script>
<template>
<n-space>
<n-upload
ref="uploadRef" directory-dnd :show-file-list="false" accept=".png,.jpg,.bmp"
:custom-request="customRequest" @dragover="handleDragOver" @dragleave="handleDragLeave" @drop="handleDrop"
>
<n-upload ref="uploadRef" directory-dnd :show-file-list="false" accept=".png,.jpg,.bmp"
:custom-request="customRequest" @dragover="handleDragOver" @dragleave="handleDragLeave" @drop="handleDrop">
<n-upload-dragger class="wrapper">
<div v-show="!showFigure" class="wrapper-dragger">
<SvgIcon size="30" name="upload" />
@ -100,14 +101,12 @@ async function handleDrop(e) {
<span class="wrapper-tip2">上传格式为.png .jpg .bmp 20M以内</span>
</div>
<div v-show="showFigure" ref="figureRef" class="wrapper-figure">
<n-image
ref="imageRef" :img-props="{ onClick: hideDownload }" :theme-overrides="imageGroupThemeOverrides"
width="288" height="116" :src="figureUrl"
/>
<n-image ref="imageRef" :img-props="{ onClick: hideDownload }" :theme-overrides="imageGroupThemeOverrides"
width="288" height="116" :src="figureUrl" />
<div v-show="figureHovered" class="wrapper-figure-tools">
<SvgIcon size="28" name="view" @click="previewHandler" />
<div class="wrapper-figure-line" />
<SvgIcon size="28" name="white_delete" @click="clearHandler" />
<SvgIcon size="28" name="delete" @click="clearHandler" />
</div>
</div>
</n-upload-dragger>

@ -4,6 +4,22 @@ import type { FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izApprovalStatus'] && typeof asideValue['izApprovalStatus'] == "string") {
let list = asideValue['izApprovalStatus'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izApprovalStatus", formValue.value.plans);
}else {
formValue.value.plans = [];
}
});
const props = defineProps<{
value: string[] | null
label: string
@ -13,29 +29,12 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const isLoadValue = ref(false)
const configUseStore = useConfig()
const formValue = ref({
plans: props.value,
})
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izApprovalStatus && typeof asideValue.izApprovalStatus == 'string') {
const list = asideValue.izApprovalStatus.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = []
}
})
if (typeof formValue.value.plans == 'string') {
const list = (formValue.value.plans as string).split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
const rules: FormRules = {
plans: [
@ -57,8 +56,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchizApprovalStatusList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -66,9 +66,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择审核状态" multiple
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择审核状态" multiple
:options="options" @update:value="onChange"
/>
</n-form-item>

@ -1,9 +1,30 @@
<script lang="ts" setup>
import { onBeforeMount, ref } from 'vue'
import type { FormRules } from 'naive-ui'
import { onBeforeMount, onMounted, 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(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izcustomlevel']) {
if(typeof asideValue['izcustomlevel'] == "string") {
let list = asideValue['izcustomlevel'].split(',');
formValue.value.plans = list;
}else {
formValue.value.plans = asideValue['izcustomlevel'];
}
console.log("formValue.value.izcustomlevel", formValue.value.plans);
}else {
formValue.value.plans = [];
}
});
const props = defineProps<{
value: string[] | null
label: string
@ -16,34 +37,12 @@ const emit = defineEmits<{
const formValue = ref({
plans: props.value,
})
const isLoadValue = ref(false)
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izcustomlevel) {
if (typeof asideValue.izcustomlevel == 'string') {
const list = asideValue.izcustomlevel.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izcustomlevel
}
}
else {
formValue.value.plans = []
}
})
if (typeof formValue.value.plans == 'string') {
const list = (formValue.value.plans as string).split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
console.log("formValue.value.izcustomlevel22222", formValue.value.plans);
const rules: FormRules = {
plans: [
@ -65,8 +64,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzcustomlevelList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -74,9 +74,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择拜访客户级别" multiple
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户级别" multiple
:options="options" @update:value="onChange"
/>
</n-form-item>

@ -4,6 +4,26 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izcustomname']) {
if(typeof asideValue['izcustomname'] == "string") {
let list = asideValue['izcustomname'].split(',');
formValue.value.plans = list;
}else {
formValue.value.plans = asideValue['izcustomname'];
}
console.log("formValue.value.izcustomname", formValue.value.plans);
}else {
formValue.value.plans = [];
}
});
const props = defineProps<{
value: string[] | null
label: string
@ -13,33 +33,12 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izcustomname) {
if (typeof asideValue.izcustomname == 'string') {
const list = asideValue.izcustomname.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izcustomname
}
}
else {
formValue.value.plans = []
}
})
const formValue = ref({
plans: props.value,
})
if (typeof formValue.value.plans == 'string') {
const list = formValue.value.plans.split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
const rules: FormRules = {
plans: [
@ -64,7 +63,7 @@ onBeforeMount(async () => {
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -72,9 +71,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择拜访客户名称" multiple
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户名称" multiple
:options="options" @update:value="onChange"
/>
</n-form-item>

@ -4,6 +4,26 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izcustomtype']) {
if(typeof asideValue['izcustomtype'] == "string") {
let list = asideValue['izcustomtype'].split(',');
formValue.value.plans = list;
}else {
formValue.value.plans = asideValue['izcustomtype'];
}
console.log("formValue.value.izcustomtype", formValue.value.plans);
}else {
formValue.value.plans = [];
}
});
const props = defineProps<{
value: string[] | null
label: string
@ -13,33 +33,12 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izcustomtype) {
if (typeof asideValue.izcustomtype == 'string') {
const list = asideValue.izcustomtype.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izcustomtype
}
}
else {
formValue.value.plans = []
}
})
const formValue = ref({
plans: props.value,
})
if (typeof formValue.value.plans == 'string') {
const list = formValue.value.plans.split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
const rules: FormRules = {
plans: [
@ -63,7 +62,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -71,9 +70,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择拜访客户类型" multiple
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户类型" multiple
:options="options" @update:value="onChange"
/>
</n-form-item>

@ -4,6 +4,26 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izcustomtypes']) {
if(typeof asideValue['izcustomtypes'] == "string") {
let list = asideValue['izcustomtypes'].split(',');
formValue.value.plans = list;
}else {
formValue.value.plans = asideValue['izcustomtypes'];
}
console.log("formValue.value.izcustomtypes", formValue.value.plans);
}else {
formValue.value.plans = [];
}
});
const props = defineProps<{
value: string[] | null
label: string
@ -13,33 +33,12 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izcustomtypes) {
if (typeof asideValue.izcustomtypes == 'string') {
const list = asideValue.izcustomtypes.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izcustomtypes
}
}
else {
formValue.value.plans = []
}
})
const formValue = ref({
plans: props.value,
})
if (typeof formValue.value.plans == 'string') {
const list = formValue.value.plans.split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
const rules: FormRules = {
plans: [
@ -69,7 +68,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -77,9 +76,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择izcustomtype" multiple
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择izcustomtype" multiple
:options="options" @update:value="onChange"
/>
</n-form-item>

@ -4,6 +4,26 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izproductname']) {
if(typeof asideValue['izproductname'] == "string") {
let list = asideValue['izproductname'].split(',');
formValue.value.plans = list;
}else {
formValue.value.plans = asideValue['izproductname'];
}
console.log("formValue.value.izproductname", formValue.value.plans);
}else {
formValue.value.plans = [];
}
});
const props = defineProps<{
value: string[] | null
label: string
@ -13,33 +33,12 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izproductname) {
if (typeof asideValue.izproductname == 'string') {
const list = asideValue.izproductname.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izproductname
}
}
else {
formValue.value.plans = []
}
})
const formValue = ref({
plans: props.value,
})
if (typeof formValue.value.plans == 'string') {
const list = formValue.value.plans.split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
const rules: FormRules = {
plans: [
@ -63,7 +62,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -71,9 +70,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择产品名称" multiple
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择产品名称" multiple
:options="options" @update:value="onChange"
/>
</n-form-item>

@ -3,66 +3,42 @@ import { onBeforeMount, onMounted, ref } from 'vue'
import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
import { useFinal } from '@/store/modules/final'
const props = defineProps<{
value: string[] | null
label: string
}>()
const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izproject) {
if (typeof asideValue.izproject == 'string') {
const list = asideValue.izproject.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izproject
let asideValue = configUseStore.getAsideValue;
if(asideValue['izproject']) {
if(typeof asideValue['izproject'] == "string") {
let list = asideValue['izproject'].split(',');
formValue.value.plans = list;
}else {
formValue.value.plans = asideValue['izproject'];
}
console.log("formValue.value.izproject", formValue.value.plans);
}else {
formValue.value.plans = [];
}
else {
formValue.value.plans = []
}
})
});
const props = defineProps<{
value: string[] | null
label: string
}>()
const finalStore = useFinal()
finalStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = finalStore.getAsideValue
if (asideValue && asideValue.izproject) {
if (typeof asideValue.izproject == 'string') {
const list = asideValue.izproject.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izproject
}
}
else {
formValue.value.plans = []
}
})
const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const formValue = ref({
plans: props.value,
})
if (typeof formValue.value.plans == 'string') {
const list = formValue.value.plans.split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
const rules: FormRules = {
plans: [
@ -78,7 +54,7 @@ const options = ref([])
const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
color: '#333333',
color: '#333333'
}
onBeforeMount(async () => {
@ -87,7 +63,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -95,9 +71,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择所属项目" multiple
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择所属项目" multiple
:options="options" @update:value="onChange"
/>
</n-form-item>

@ -1,9 +1,30 @@
<script lang="ts" setup>
import { onBeforeMount, onMounted, onUpdated, 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';
import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izprojecttype']) {
if(typeof asideValue['izprojecttype'] == "string") {
let list = asideValue['izprojecttype'].split(',');
formValue.value.plans = list;
}else {
formValue.value.plans = asideValue['izprojecttype'];
}
console.log("formValue.value.izprojecttype", formValue.value.plans);
}else {
formValue.value.plans = [];
}
});
const props = defineProps<{
value: string[] | null
label: string
@ -13,33 +34,12 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izprojecttype) {
if (typeof asideValue.izprojecttype == 'string') {
const list = asideValue.izprojecttype.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izprojecttype
}
}
else {
formValue.value.plans = []
}
})
const formValue = ref({
plans: props.value,
})
if (typeof formValue.value.plans == 'string') {
const list = formValue.value.plans.split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
const rules: FormRules = {
plans: [
@ -63,7 +63,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -71,9 +71,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择拜访项目类别" multiple
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访项目类别" multiple
:options="options" @update:value="onChange"
/>
</n-form-item>

@ -4,6 +4,26 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izsearch']) {
if(typeof asideValue['izsearch'] == "string") {
let list = asideValue['izsearch'].split(',');
formValue.value.plans = list;
}else {
formValue.value.plans = asideValue['izsearch'];
}
console.log("formValue.value.izsearch", formValue.value.plans);
}else {
formValue.value.plans = [];
}
});
const props = defineProps<{
value: string[] | null
label: string
@ -13,33 +33,12 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izsearch) {
if (typeof asideValue.izsearch == 'string') {
const list = asideValue.izsearch.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izsearch
}
}
else {
formValue.value.plans = []
}
})
const formValue = ref({
plans: props.value,
})
if (typeof formValue.value.plans == 'string') {
const list = formValue.value.plans.split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
const rules: FormRules = {
plans: [
@ -69,7 +68,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -77,9 +76,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择IzSearch" multiple
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择IzSearch" multiple
:options="options" @update:value="onChange"
/>
</n-form-item>

@ -4,6 +4,26 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izsearchmanager']) {
if(typeof asideValue['izsearchmanager'] == "string") {
let list = asideValue['izsearchmanager'].split(',');
formValue.value.plans = list;
}else {
formValue.value.plans = asideValue['izsearchmanager'];
}
console.log("formValue.value.izsearchmanager", formValue.value.plans);
}else {
formValue.value.plans = [];
}
});
const props = defineProps<{
value: string[] | null
label: string
@ -13,33 +33,12 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izsearchmanager) {
if (typeof asideValue.izsearchmanager == 'string') {
const list = asideValue.izsearchmanager.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izsearchmanager
}
}
else {
formValue.value.plans = []
}
})
const formValue = ref({
plans: props.value,
})
if (typeof formValue.value.plans == 'string') {
const list = formValue.value.plans.split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
const rules: FormRules = {
plans: [
@ -69,7 +68,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -77,9 +76,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择IzSearchManager" multiple :options="options"
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择IzSearchManager" multiple :options="options"
@update:value="onChange"
/>
</n-form-item>

@ -4,6 +4,26 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izshow']) {
if(typeof asideValue['izshow'] == "string") {
let list = asideValue['izshow'].split(',');
formValue.value.plans = list;
}else {
formValue.value.plans = asideValue['izshow'];
}
console.log("formValue.value.izshow", formValue.value.plans);
}else {
formValue.value.plans = [];
}
});
const props = defineProps<{
value: string[] | null
label: string
@ -13,33 +33,12 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if (isLoadValue.value) {
isLoadValue.value = false
return
}
const asideValue = configUseStore.getAsideValue
if (asideValue.izshow) {
if (typeof asideValue.izshow == 'string') {
const list = asideValue.izshow.split(',')
formValue.value.plans = list
}
else {
formValue.value.plans = asideValue.izshow
}
}
else {
formValue.value.plans = []
}
})
const formValue = ref({
plans: props.value,
})
if (typeof formValue.value.plans == 'string') {
const list = formValue.value.plans.split(',')
formValue.value.plans = list
if(typeof formValue.value.plans == "string") {
let list = formValue.value.plans.split(',');
formValue.value.plans = list;
}
const rules: FormRules = {
plans: [
@ -63,7 +62,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true
isLoadValue.value = true;
emit('update:value', value)
}
</script>
@ -71,9 +70,8 @@ function onChange(value: Array<string>) {
<template>
<n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
<n-form-item :label="label" path="plans" :label-style="labStyle">
<n-select
v-model:value="formValue.plans"
filterable :max-tag-count="2" placeholder="请选择分类" multiple :options="options"
<n-select filterable
v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择分类" multiple :options="options"
@update:value="onChange"
/>
</n-form-item>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save