From 5e6fd1420f45fdaaa0896f5a604da5631c71e772 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sat, 14 Sep 2024 16:44:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=85=B3=E9=97=ADbug,=20=E8=A1=A8=E6=A0=BC=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=88=97=E9=85=8D=E7=BD=AE,=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 2 +- package.json | 2 +- src/components/Tag.vue | 1 - src/directives/permission.js | 3 +- src/fvcomponents/fvForm/index.vue | 7 +- src/fvcomponents/fvFormDialog/index.vue | 62 ++ src/fvcomponents/fvRadio/index.vue | 2 +- src/fvcomponents/fvSearchForm/index.vue | 29 +- src/fvcomponents/fvTable/index.vue | 254 +++++++-- src/fvcomponents/fvTableColumn/index.vue | 2 +- src/layout/siderbar/MenuItem.vue | 20 +- src/layout/tagsview/index.vue | 4 +- src/stores/processStore.js | 7 +- src/stores/tagsview.js | 31 +- src/utils/request.js | 8 +- src/views/login/index.vue | 2 +- src/views/system/user/index.vue | 688 +++++++---------------- 17 files changed, 537 insertions(+), 587 deletions(-) create mode 100644 src/fvcomponents/fvFormDialog/index.vue diff --git a/index.html b/index.html index 691191c..a40db35 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - SmartOpsWeb + 智能语音服务系统
diff --git a/package.json b/package.json index 84b464a..4fe46a5 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dependencies": { "axios": "^1.4.0", "echarts": "^5.4.2", - "element-plus": "^2.3.5", + "element-plus": "^2.6.0", "highlight.js": "9.18.5", "js-cookie": "^3.0.5", "nprogress": "^0.2.0", diff --git a/src/components/Tag.vue b/src/components/Tag.vue index 86985ea..e50abbd 100644 --- a/src/components/Tag.vue +++ b/src/components/Tag.vue @@ -31,7 +31,6 @@ const props = defineProps({ const tagConfig = ref({}) const filterDict = (data, value) => { - console.log(value + "aaa",!data || !value) if (!data || value == null) return if (data instanceof Array) { if (value == true || value == false) { diff --git a/src/directives/permission.js b/src/directives/permission.js index 65509b9..461c9c7 100644 --- a/src/directives/permission.js +++ b/src/directives/permission.js @@ -10,11 +10,10 @@ export const hasPerm = (el, binding, vnode) => { const hasPermission = permisstions.some(permission => { return allPermission === permission || permissiosFlag.includes(permission) }) - console.log(hasPermission); if (!hasPermission) { el.parentNode && el.parentNode.removeChild(el) } } else { throw new Error('操作权限标识应为string[]') } -} \ No newline at end of file +} diff --git a/src/fvcomponents/fvForm/index.vue b/src/fvcomponents/fvForm/index.vue index a04d2ae..fa39e52 100644 --- a/src/fvcomponents/fvForm/index.vue +++ b/src/fvcomponents/fvForm/index.vue @@ -11,12 +11,12 @@ v-bind="item.colProps || { span: 12}" :key="item.prop" > - - + + {{ showMore ? '收起' : '展开' }} @@ -65,21 +66,25 @@ const filterConfig = computed(()=>{ return arr.length >= 4 && showMore.value ? arr : arr.slice(0, 3) }) -console.log(filterConfig.value, 'filterConfig'); - // 搜索功能表单元素默认值 -const setDefaultFormValues = () => { - filterConfig.value.forEach(item=>{ - form.value[item.prop] = item.props.defaultValue || null - }) -} +// const setDefaultFormValues = () => { +// filterConfig.value.forEach(item => { +// form.value[item.prop] = item.props?.defaultValue || null +// }) +// } -watchEffect(()=>{ - if(filterConfig.value.length) { - setDefaultFormValues() +watchEffect(() => { + if (filterConfig.value.length) { + // setDefaultFormValues() } }) +const elChange = () => { + setTimeout(() => { + getValues() + }, 500) +} + const getValues = () => { emits('search', form.value) return form.value @@ -88,7 +93,7 @@ const getValues = () => { //重置 const handleReset = () => { form.value = {} - setDefaultFormValues() + // setDefaultFormValues() emits('search', form.value) } diff --git a/src/fvcomponents/fvTable/index.vue b/src/fvcomponents/fvTable/index.vue index 8833ea9..a0edf10 100644 --- a/src/fvcomponents/fvTable/index.vue +++ b/src/fvcomponents/fvTable/index.vue @@ -2,35 +2,74 @@
- - {{ btn.name }} - +
+ + {{ btn.name }} + +
+
+ +
+ + + + + + + + + + + +
+ +
+
+ + + + + +
+
- +
\ No newline at end of file +.col-setting-list { + max-height: 45vh; + overflow-y: auto; +} + +.table-head-btn { + display: flex; + justify-content: flex-start; + align-items: center; +} + +.fv-table-btn { + display: flex; + justify-content: space-between; + align-content: center; +} + +.fv-table { + :deep(.el-tooltip) { + width: 100% !important; + } +} + diff --git a/src/fvcomponents/fvTableColumn/index.vue b/src/fvcomponents/fvTableColumn/index.vue index 243a370..c57c4cf 100644 --- a/src/fvcomponents/fvTableColumn/index.vue +++ b/src/fvcomponents/fvTableColumn/index.vue @@ -49,7 +49,7 @@ import { isVNode } from 'vue' if(column && column?.formatter) { return column.formatter(row, column, value, $index) || '--' } - return value ? value.toString() : '--' + return value !== null && value !== undefined ? value.toString() : '--' } diff --git a/src/layout/siderbar/MenuItem.vue b/src/layout/siderbar/MenuItem.vue index cb9f4db..f6c285e 100644 --- a/src/layout/siderbar/MenuItem.vue +++ b/src/layout/siderbar/MenuItem.vue @@ -1,7 +1,7 @@