Merge remote-tracking branch 'origin/lichang' into lite

This commit is contained in:
TsMask
2025-03-08 10:44:41 +08:00
4 changed files with 56 additions and 45 deletions

View File

@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC"
VITE_APP_CODE = "OMC" VITE_APP_CODE = "OMC"
# 应用版本 # 应用版本
VITE_APP_VERSION = "2.250228" VITE_APP_VERSION = "2.250308"
# 接口基础URL地址-不带/后缀 # 接口基础URL地址-不带/后缀
VITE_API_BASE_URL = "/omc-api" VITE_API_BASE_URL = "/omc-api"

View File

@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC"
VITE_APP_CODE = "OMC" VITE_APP_CODE = "OMC"
# 应用版本 # 应用版本
VITE_APP_VERSION = "2.250228" VITE_APP_VERSION = "2.250308"
# 接口基础URL地址-不带/后缀 # 接口基础URL地址-不带/后缀
VITE_API_BASE_URL = "/omc-api" VITE_API_BASE_URL = "/omc-api"

View File

@@ -14,48 +14,48 @@
"dependencies": { "dependencies": {
"@ant-design/icons-vue": "^7.0.1", "@ant-design/icons-vue": "^7.0.1",
"@antv/g6": "4.8.24", "@antv/g6": "4.8.24",
"@codemirror/lang-javascript": "^6.2.2", "@codemirror/lang-javascript": "6.2.3",
"@codemirror/lang-yaml": "^6.1.2", "@codemirror/lang-yaml": "6.1.2",
"@codemirror/merge": "^6.8.0", "@codemirror/merge": "6.10.0",
"@codemirror/theme-one-dark": "^6.1.2", "@codemirror/theme-one-dark": "6.1.2",
"@tato30/vue-pdf": "^1.11.3", "@tato30/vue-pdf": "1.11.3",
"@vueuse/core": "^12.5.0", "@vueuse/core": "12.8.2",
"@xterm/addon-fit": "^0.10.0", "@xterm/addon-fit": "0.10.0",
"@xterm/xterm": "^5.5.0", "@xterm/xterm": "5.5.0",
"ant-design-vue": "^4.2.6", "ant-design-vue": "4.2.6",
"antdv-pro-layout": "^4.2.0", "antdv-pro-layout": "4.2.0",
"antdv-pro-modal": "^4.0.6", "antdv-pro-modal": "4.0.6",
"codemirror": "^6.0.1", "codemirror": "6.0.1",
"crypto-js": "^4.2.0", "crypto-js": "4.2.0",
"dayjs": "^1.11.11", "dayjs": "1.11.13",
"echarts": "~5.6.0", "echarts": "5.6.0",
"file-saver": "^2.0.5", "file-saver": "2.0.5",
"grid-layout-plus": "^1.0.6", "grid-layout-plus": "1.0.6",
"intl-tel-input": "~25.2.0", "intl-tel-input": "25.2.0",
"js-base64": "^3.7.7", "js-base64": "^3.7.7",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"localforage": "^1.10.0", "localforage": "^1.10.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"p-queue": "~8.0.1", "p-queue": "8.0.1",
"pinia": "^2.3.0", "pinia": "2.3.0",
"vue": "^3.5.13", "vue": "3.5.13",
"vue-i18n": "^11.1.0", "vue-i18n": "11.1.2",
"vue-router": "^4.5.0", "vue-router": "4.5.0",
"vue3-smooth-dnd": "^0.0.6", "vue3-smooth-dnd": "0.0.6",
"xlsx": "~0.18.5" "xlsx": "0.18.5"
}, },
"devDependencies": { "devDependencies": {
"@types/crypto-js": "^4.2.2", "@types/crypto-js": "4.2.2",
"@types/file-saver": "^2.0.7", "@types/file-saver": "2.0.7",
"@types/js-cookie": "^3.0.6", "@types/js-cookie": "3.0.6",
"@types/node": "^18.0.0", "@types/node": "^18.0.0",
"@types/nprogress": "^0.2.3", "@types/nprogress": "0.2.3",
"@vitejs/plugin-vue": "^5.2.1", "@vitejs/plugin-vue": "5.2.1",
"less": "^4.2.1", "less": "4.2.2",
"typescript": "~5.6.3", "typescript": "5.6.3",
"unplugin-vue-components": "^0.28.0", "unplugin-vue-components": "0.28.0",
"vite": "^6.1.0", "vite": "6.2.0",
"vite-plugin-compression": "~0.5.1", "vite-plugin-compression": "~0.5.1",
"vue-tsc": "^2.2.0" "vue-tsc": "2.2.0"
} }
} }

View File

@@ -234,19 +234,14 @@ watchEffect(() => {
text-align: right; text-align: right;
} }
.thead-item:nth-child(2), .thead-item:nth-child(2),
.tbody-item:nth-child(2) { .tbody-item:nth-child(2),
flex-basis: 8rem;
width: 8rem;
}
.thead-item:nth-child(3), .thead-item:nth-child(3),
.tbody-item:nth-child(3) { .tbody-item:nth-child(3),
flex-basis: 8rem;
width: 8rem;
}
.thead-item:nth-child(4), .thead-item:nth-child(4),
.tbody-item:nth-child(4) { .tbody-item:nth-child(4) {
flex-basis: 8rem; flex-basis: 8rem;
width: 8rem; width: 8rem;
overflow-y: auto;
} }
.thead-item:nth-child(5), .thead-item:nth-child(5),
.tbody-item:nth-child(5) { .tbody-item:nth-child(5) {
@@ -271,16 +266,32 @@ watchEffect(() => {
} }
/* 修改滚动条的样式 */ /* 修改滚动条的样式 */
.thead-item:nth-child(2)::-webkit-scrollbar,
.tbody-item:nth-child(2)::-webkit-scrollbar,
.tbody-item:nth-child(3)::-webkit-scrollbar,
.tbody-item:nth-child(4)::-webkit-scrollbar,
.tbody-item:nth-child(7)::-webkit-scrollbar { .tbody-item:nth-child(7)::-webkit-scrollbar {
width: 4px; /* 设置滚动条宽度 */ width: 4px; /* 设置滚动条宽度 */
height: 4px; height: 4px;
} }
.thead-item:nth-child(2)::-webkit-scrollbar-track,
.tbody-item:nth-child(2)::-webkit-scrollbar-track,
.tbody-item:nth-child(3)::-webkit-scrollbar-track,
.tbody-item:nth-child(4)::-webkit-scrollbar-track,
.tbody-item:nth-child(7)::-webkit-scrollbar-track { .tbody-item:nth-child(7)::-webkit-scrollbar-track {
background-color: #f0f0f0; /* 设置滚动条轨道背景颜色 */ background-color: #f0f0f0; /* 设置滚动条轨道背景颜色 */
} }
.thead-item:nth-child(2)::-webkit-scrollbar-thumb,
.tbody-item:nth-child(2)::-webkit-scrollbar-thumb,
.tbody-item:nth-child(3)::-webkit-scrollbar-thumb,
.tbody-item:nth-child(4)::-webkit-scrollbar-thumb,
.tbody-item:nth-child(7)::-webkit-scrollbar-thumb { .tbody-item:nth-child(7)::-webkit-scrollbar-thumb {
background-color: #bfbfbf; /* 设置滚动条滑块颜色 */ background-color: #bfbfbf; /* 设置滚动条滑块颜色 */
} }
.thead-item:nth-child(2)::-webkit-scrollbar-thumb:hover,
.tbody-item:nth-child(2)::-webkit-scrollbar-thumb:hover,
.tbody-item:nth-child(3)::-webkit-scrollbar-thumb:hover,
.tbody-item:nth-child(4)::-webkit-scrollbar-thumb:hover,
.tbody-item:nth-child(7)::-webkit-scrollbar-thumb:hover { .tbody-item:nth-child(7)::-webkit-scrollbar-thumb:hover {
background-color: #1890ff; /* 设置鼠标悬停时滚动条滑块颜色 */ background-color: #1890ff; /* 设置鼠标悬停时滚动条滑块颜色 */
} }