diff --git a/index.html b/index.html index 5320701..c13907a 100644 --- a/index.html +++ b/index.html @@ -135,30 +135,27 @@ .loader { width: 50px; aspect-ratio: 1; - display: grid; + border-radius: 50%; + border: 8px solid #0000; + border-right-color: #ffa50097; + position: relative; + animation: l24 1s infinite linear; } - .loader::before, - .loader::after { - content:""; - grid-area: 1/1; - --c:no-repeat radial-gradient(farthest-side,#25b09b 92%,#0000); - background: - var(--c) 50% 0, - var(--c) 50% 100%, - var(--c) 100% 50%, - var(--c) 0 50%; - background-size: 12px 12px; - animation: l12 1s infinite; + .loader:before, + .loader:after { + content: ""; + position: absolute; + inset: -8px; + border-radius: 50%; + border: inherit; + animation: inherit; + animation-duration: 2s; } - .loader::before { - margin: 4px; - filter: hue-rotate(45deg); - background-size: 8px 8px; - animation-timing-function: linear + .loader:after { + animation-duration: 4s; } - - @keyframes l12 { - 100%{transform: rotate(.5turn)} + @keyframes l24 { + 100% {transform: rotate(1turn)} } diff --git a/public/ck.ico b/public/ck.ico new file mode 100644 index 0000000..ca9141d Binary files /dev/null and b/public/ck.ico differ diff --git a/public/favicon.ico b/public/favicon.ico index fcb6999..e451909 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon1.ico b/public/favicon1.ico new file mode 100644 index 0000000..fcb6999 Binary files /dev/null and b/public/favicon1.ico differ diff --git a/public/favicon_logosc.zip b/public/favicon_logosc.zip new file mode 100644 index 0000000..9032025 Binary files /dev/null and b/public/favicon_logosc.zip differ diff --git a/public/favicon_logosc/android-chrome-192x192.png b/public/favicon_logosc/android-chrome-192x192.png new file mode 100644 index 0000000..1e2d72e Binary files /dev/null and b/public/favicon_logosc/android-chrome-192x192.png differ diff --git a/public/favicon_logosc/android-chrome-512x512.png b/public/favicon_logosc/android-chrome-512x512.png new file mode 100644 index 0000000..1e2d72e Binary files /dev/null and b/public/favicon_logosc/android-chrome-512x512.png differ diff --git a/public/favicon_logosc/apple-touch-icon.png b/public/favicon_logosc/apple-touch-icon.png new file mode 100644 index 0000000..1e2d72e Binary files /dev/null and b/public/favicon_logosc/apple-touch-icon.png differ diff --git a/public/favicon_logosc/favicon-16x16.png b/public/favicon_logosc/favicon-16x16.png new file mode 100644 index 0000000..6625686 Binary files /dev/null and b/public/favicon_logosc/favicon-16x16.png differ diff --git a/public/favicon_logosc/favicon-32x32.png b/public/favicon_logosc/favicon-32x32.png new file mode 100644 index 0000000..857e777 Binary files /dev/null and b/public/favicon_logosc/favicon-32x32.png differ diff --git a/public/favicon_logosc/favicon.ico b/public/favicon_logosc/favicon.ico new file mode 100644 index 0000000..e451909 Binary files /dev/null and b/public/favicon_logosc/favicon.ico differ diff --git a/public/favicon_logosc/site.webmanifest b/public/favicon_logosc/site.webmanifest new file mode 100644 index 0000000..8bb8939 --- /dev/null +++ b/public/favicon_logosc/site.webmanifest @@ -0,0 +1 @@ +{"background_color":"#ffffff","display":"standalone","icons":[{"sizes":"192x192","src":"/android-chrome-192x192.png","type":"image/png"},{"sizes":"512x512","src":"/android-chrome-512x512.png","type":"image/png"}],"name":"","short_name":"","theme_color":"#ffffff"} \ No newline at end of file diff --git a/src/api/system/field.ts b/src/api/system/field.ts index 415d815..e5c8cc3 100644 --- a/src/api/system/field.ts +++ b/src/api/system/field.ts @@ -1,10 +1,11 @@ import request from '@/utils/request' const url = '/system/field/' -export const getModelList = () => { +export const getModelList = (params: { pageNum: number; pageSize: number }) => { return request({ url: url + 'getModelList', - method: 'get' + method: 'get', + params }) } diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 9838306..c695f28 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/assets/logo/logo1.png b/src/assets/logo/logo1.png new file mode 100644 index 0000000..9838306 Binary files /dev/null and b/src/assets/logo/logo1.png differ diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 260e85c..e20fd7e 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -4,7 +4,7 @@ overflow-y: hidden; z-index: 1001; transition: width 0.28s ease; - background-image: var(--base-menu-background); + background-color: var(--base-menu-background); height: 100%; display: flex; flex-direction: column; diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index a6aa13a..3feb928 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -22,10 +22,15 @@ $panGreen: #30b08f; --base-login-width: 280px; } +$base-menu-background: #324157; +$base-menu-light-background: #ffffff; +$base-menu-color: #bfcbd9; +$base-menu-light-color: rgba(0, 0, 0, 0.7); + /***侧边栏深色配置***/ [data-theme='theme-dark'] { - // --base-menu-background: #324157; - --base-menu-background: linear-gradient(to right, #243949 0%, #517fa4 100%); + --base-menu-background: #324157; + // --base-menu-background: linear-gradient(to right, #243949 0%, #517fa4 100%); --base-logo-title-color: #ffffff; // // el-ement ui 设置 // --el-fill-color-blank: #304156; @@ -44,3 +49,10 @@ html.cafe { html.contrast { filter: contrast(2); } + +:export { + menuColor: $base-menu-color; + menuLightColor: $base-menu-light-color; + menuBackground: $base-menu-background; + menuLightBackground: $base-menu-light-background; +} diff --git a/src/views/system/rolefields/index.vue b/src/views/system/rolefields/index.vue index 60ecea8..3800295 100644 --- a/src/views/system/rolefields/index.vue +++ b/src/views/system/rolefields/index.vue @@ -17,9 +17,15 @@ - + + @@ -60,11 +66,22 @@ const goBack = () => { } const modelTable = ref>() const initBtnLoading = ref(false) +const total = ref(0) +const queryParams = ref({ + pageNum: 1, + pageSize: 10 +}) const handleInit = async () => { initBtnLoading.value = true - await initFields() + saveBtnLoading.value = true + try { + await initFields() + modal.msgSuccess('初始化完成') + } catch (err) { + console.error(err) + } initBtnLoading.value = false - modal.msgSuccess('初始化完成') + saveBtnLoading.value = false getList() } interface model { @@ -81,13 +98,18 @@ const modelList = ref([]) const fieldList = ref([]) const getList = async () => { cardLoading.value = true - const { data } = await getModelList() - modelList.value = data + try { + const { data } = await getModelList(queryParams.value) + modelList.value = data.result + total.value = data.totalNum + } catch (err) { + console.error(err) + } cardLoading.value = false } const currentRow = ref() -const handleCurrentChange = (val: any) => { +const handleCurrentChange = async (val: any) => { if (val) { currentRow.value = val handleLoadFieldList() @@ -106,7 +128,6 @@ const handleLoadFieldList = async () => { } fieldListLoading.value = false } - const fieldListLoading = ref(false) const saveBtnLoading = ref(false) const handleSave = async () => { @@ -125,4 +146,14 @@ onMounted(() => { }) - +