ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调颜色

Browse Source
This commit is contained in:
sjl
2025-03-17 15:55:30 +08:00
parent 630eb48d28
commit 5f68071c77
25 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/api/check/interface/index.ts
View File

@@ -144,8 +144,8 @@ export namespace CheckData {
export enum ButtonColorEnum { export enum ButtonColorEnum {
INFO = '#909399', INFO = '#909399',
LOADING = '#003078', LOADING = 'var(--el-color-primary)',
SUCCESS = '#67c23a', SUCCESS = '#91cc75',
WARNING = '#e6a23c', WARNING = '#e6a23c',
DANGER = '#f56c6c', DANGER = '#f56c6c',
} }

3
frontend/src/config/index.ts
View File

@@ -9,7 +9,6 @@ export const HOME_URL: string = "/home/index";
export const LOGIN_URL: string = "/login"; export const LOGIN_URL: string = "/login";
// 默认主题颜色 // 默认主题颜色
//export const DEFAULT_PRIMARY: string = "#003078";
export const DEFAULT_PRIMARY: string = "#526ADE"; export const DEFAULT_PRIMARY: string = "#526ADE";
// 路由白名单地址（本地存在的路由 staticRouter.ts 中） // 路由白名单地址（本地存在的路由 staticRouter.ts 中）
@@ -20,3 +19,5 @@ export const AMAP_MAP_KEY: string = "";
// 百度地图 key // 百度地图 key
export const BAIDU_MAP_KEY: string = ""; export const BAIDU_MAP_KEY: string = "";

4
frontend/src/hooks/useTheme.ts
View File

@@ -27,6 +27,7 @@ export const useTheme = () => {
// 修改主题颜色 // 修改主题颜色
const changePrimary = (val: string | null) => { const changePrimary = (val: string | null) => {
if (!val) { if (!val) {
val = DEFAULT_PRIMARY; val = DEFAULT_PRIMARY;
ElMessage({ type: "success", message: `主题颜色已重置为 ${DEFAULT_PRIMARY}` }); ElMessage({ type: "success", message: `主题颜色已重置为 ${DEFAULT_PRIMARY}` });
@@ -42,8 +43,7 @@ export const useTheme = () => {
document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, primaryColor); document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, primaryColor);
} }
globalStore.setGlobalState("primary", val); globalStore.setGlobalState("primary", val);
}; }
// 灰色和弱色切换 // 灰色和弱色切换
const changeGreyOrWeak = (type: Theme.GreyOrWeakType, value: boolean) => { const changeGreyOrWeak = (type: Theme.GreyOrWeakType, value: boolean) => {
const body = document.body as HTMLElement; const body = document.body as HTMLElement;

3
frontend/src/stores/modules/global.ts
View File

@@ -1,6 +1,6 @@
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import { GlobalState } from "@/stores/interface"; import { GlobalState } from "@/stores/interface";
import { DEFAULT_PRIMARY } from "@/config"; import { DEFAULT_PRIMARY} from "@/config";
import piniaPersistConfig from "@/stores/helper/persist"; import piniaPersistConfig from "@/stores/helper/persist";
import {GLOBAL_STORE_KEY} from "@/stores/constant"; import {GLOBAL_STORE_KEY} from "@/stores/constant";
@@ -42,6 +42,7 @@ export const useGlobalStore = defineStore({
tabsIcon: true, tabsIcon: true,
// 页脚 // 页脚
footer: false footer: false
}), }),
getters: {}, getters: {},
actions: { actions: {

2
frontend/src/utils/color.ts
View File

@@ -37,6 +37,7 @@ export function rgbToHex(r: any, g: any, b: any) {
* @returns {String} 返回处理后的颜色值 * @returns {String} 返回处理后的颜色值
*/ */
export function getDarkColor(color: string, level: number) { export function getDarkColor(color: string, level: number) {
let reg = /^\#?[0-9A-Fa-f]{6}$/; let reg = /^\#?[0-9A-Fa-f]{6}$/;
if (!reg.test(color)) return ElMessage.warning("输入错误的hex颜色值"); if (!reg.test(color)) return ElMessage.warning("输入错误的hex颜色值");
let rgb = hexToRgb(color); let rgb = hexToRgb(color);
@@ -51,6 +52,7 @@ export function getDarkColor(color: string, level: number) {
* @returns {String} 返回处理后的颜色值 * @returns {String} 返回处理后的颜色值
*/ */
export function getLightColor(color: string, level: number) { export function getLightColor(color: string, level: number) {
let reg = /^\#?[0-9A-Fa-f]{6}$/; let reg = /^\#?[0-9A-Fa-f]{6}$/;
if (!reg.test(color)) return ElMessage.warning("输入错误的hex颜色值"); if (!reg.test(color)) return ElMessage.warning("输入错误的hex颜色值");
let rgb = hexToRgb(color); let rgb = hexToRgb(color);

2
frontend/src/views/home/components/channelsTest.vue
View File

@@ -7,7 +7,7 @@
<div>{{ outputDsc }}</div> <div>{{ outputDsc }}</div>
<div> <div>
<span style=" font-size: 18px;font-weight: 600;"> <span style=" font-size: 18px;font-weight: 600;">
设备已合格 <span style="color: #67C23A">{{ qualified }}</span> 台/共 <span style="color: green">{{ total }}</span> 设备已合格 <span style="color: #91cc75">{{ qualified }}</span> 台/共 <span style="color: green">{{ total }}</span>
台 台
</span> </span>
<!-- <el-button type="primary" loading <!-- <el-button type="primary" loading

4
frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
View File

@@ -38,13 +38,13 @@
<!-- <el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">合格92项/共103项</el-button> <!-- <el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">合格92项/共103项</el-button>
<el-button type="primary" v-if="activeIndex >= activeTotalNum" disabled>合格92项/共103项</el-button> --> <el-button type="primary" v-if="activeIndex >= activeTotalNum" disabled>合格92项/共103项</el-button> -->
<span style=" font-size: 18px;font-weight: 600;"> <span style=" font-size: 18px;font-weight: 600;">
数据已合格 <span style="color: #67C23A">{{ qualified }}</span> 项/共 <span style="color: green">{{ 103 }}</span> 数据已合格 <span style="color: #91cc75">{{ qualified }}</span> 项/共 <span style="color: green">{{ 103 }}</span>
项 项
</span> </span>
</div> </div>
<div class="dialog-content"> <div class="dialog-content">
<el-table :data="tableData" :cell-class-name="tableCell" row-key="id" height="450px" <el-table :data="tableData" :cell-class-name="tableCell" row-key="id" height="450px"
:header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' }" style="width: 100%" :header-cell-style="{ background: 'var(--el-color-primary)', color: '#eee', textAlign: 'center' }" style="width: 100%"
border> border>
<el-table-column fixed prop="scriptItemName" label="检测项目" width="210px" /> <el-table-column fixed prop="scriptItemName" label="检测项目" width="210px" />
<el-table-column label="被检通道1" :min-width="minwidth" align="center"> <el-table-column label="被检通道1" :min-width="minwidth" align="center">

2
frontend/src/views/home/components/dataCheckPopup.vue
View File

@@ -43,7 +43,7 @@
v-model="scriptSwitch" v-model="scriptSwitch"
class="ml-2" class="ml-2"
inline-prompt inline-prompt
style="--el-switch-on-color: #003078; --el-switch-off-color: #5a79a9" style="--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #5a79a9"
active-text="不合格测试项" active-text="不合格测试项"
inactive-text="全部测试项" inactive-text="全部测试项"
/> --> /> -->

2
frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
View File

@@ -835,7 +835,7 @@ defineExpose({
<!--.el-popover.popover-class {--> <!--.el-popover.popover-class {-->
<!-- .el-popover__title {--> <!-- .el-popover__title {-->
<!-- color: #fff;--> <!-- color: #fff;-->
<!-- background-color: #003078 !important;--> <!-- background-color: var(--el-color-primary) !important;-->
<!-- }--> <!-- }-->
<!--}--> <!--}-->
<!--</style>--> <!--</style>-->

2
frontend/src/views/home/components/factorTest.vue
View File

@@ -6,7 +6,7 @@
<div>{{ outputDsc }}</div> <div>{{ outputDsc }}</div>
<div> <div>
<span style=" font-size: 18px;font-weight: 600;"> <span style=" font-size: 18px;font-weight: 600;">
设备已合格 <span style="color: #67C23A">{{ qualified }}</span> 台/共 <span style="color: green">{{ total }}</span> 设备已合格 <span style="color: #91cc75">{{ qualified }}</span> 台/共 <span style="color: green">{{ total }}</span>
台 台
</span> </span>
<!-- <el-button type="primary" loading <!-- <el-button type="primary" loading

2
frontend/src/views/home/components/reportPopup.vue
View File

@@ -27,7 +27,7 @@
<div class="tabs-title "> <div class="tabs-title ">
<el-button type="primary" :icon="Download" >报告下载</el-button> <el-button type="primary" :icon="Download" >报告下载</el-button>
<span style=" font-size: 18px;font-weight: 600;"> <span style=" font-size: 18px;font-weight: 600;">
已生成 <span style="color: #67C23A">2</span> 台/共 <span style="color: green">3</span> 台 已生成 <span style="color: #91cc75">2</span> 台/共 <span style="color: green">3</span> 台
</span> </span>
</div> </div>

2
frontend/src/views/home/components/temptest.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<el-table <el-table
:data="tableData" :data="tableData"
:row-class-name="tableRowClassName" row-key="id" height="300px" :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " style="width: 100%" border v-on:cell-click="handleClick" :row-class-name="tableRowClassName" row-key="id" height="300px" :header-cell-style="{ background: 'var(--el-color-primary)', color: '#eee', textAlign: 'center' } " style="width: 100%" border v-on:cell-click="handleClick"
> >
<el-table-column prop="date" label="Date" width="180" /> <el-table-column prop="date" label="Date" width="180" />
<el-table-column prop="name" label="Name" width="180" /> <el-table-column prop="name" label="Name" width="180" />

12
frontend/src/views/home/components/test.vue
View File

@@ -75,7 +75,7 @@
<div class="dialog-content"> <div class="dialog-content">
<el-table :data="checkResultView" row-key="scriptType" height="450px" <el-table :data="checkResultView" row-key="scriptType" height="450px"
:header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " style="width: 100%" :header-cell-style="{ background: 'var(--el-color-primary)', color: '#eee', textAlign: 'center' } " style="width: 100%"
border> border>
<el-table-column fixed prop="scriptName" label="检测项目" width="150px" align="center"> <el-table-column fixed prop="scriptName" label="检测项目" width="150px" align="center">
</el-table-column> </el-table-column>
@@ -169,6 +169,7 @@ import {useCheckStore} from "@/stores/modules/check";
import {ElMessage, ElMessageBox} from "element-plus"; import {ElMessage, ElMessageBox} from "element-plus";
import {getBigTestItem} from "@/api/check/test"; import {getBigTestItem} from "@/api/check/test";
const checkStore = useCheckStore() const checkStore = useCheckStore()
// 最大通道数 // 最大通道数
@@ -196,7 +197,7 @@ const emit = defineEmits(['update:testStatus', 'update:webMsgSend', 'sendPause',
// 用来保存测试项进度抽屉是否打开 // 用来保存测试项进度抽屉是否打开
const drawer = ref(false) const drawer = ref(false)
// 进度条颜色 // 进度条颜色
const customColors = [{color: "#67c23a", percentage: 100}] const customColors = [{color: "#91cc75", percentage: 100}]
// 检测脚本数据 // 检测脚本数据
let scriptData: CheckData.ScriptItem[] = [] let scriptData: CheckData.ScriptItem[] = []
// 用来保存被检设备 // 用来保存被检设备
@@ -1424,6 +1425,7 @@ const secondToTime = (second: number) => {
} }
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (timer) { if (timer) {
clearInterval(timer) clearInterval(timer)
} }
@@ -1480,7 +1482,7 @@ onBeforeUnmount(() => {
display: flex; display: flex;
align-items: center; align-items: center;
color: #67c23a;; color: #91cc75;
width: 28%; width: 28%;
margin-right: 0px; margin-right: 0px;
text-align: left; text-align: left;
@@ -1514,7 +1516,7 @@ onBeforeUnmount(() => {
.drawer-container { .drawer-container {
:deep(header.el-drawer__header) { :deep(header.el-drawer__header) {
color: #fff !important; color: #fff !important;
background-color: #003078 !important; background-color: var(--el-color-primary) !important;
.el-drawer__close-btn svg:hover { .el-drawer__close-btn svg:hover {
color: #ccc !important; color: #ccc !important;
@@ -1541,7 +1543,7 @@ onBeforeUnmount(() => {
//:deep(.el-drawer .el-drawer__title){ //:deep(.el-drawer .el-drawer__title){
// background-color: #003078 !important; // background-color: var(--el-color-primary) !important;
//} //}
</style> </style>

8
frontend/src/views/home/components/timeTest.vue
View File

@@ -5,7 +5,7 @@
<div class="right-title" > <div class="right-title" >
<span v-if="activeIndex <= 1"> </span> <span v-if="activeIndex <= 1"> </span>
<span v-if="activeIndex > 1" class="time-text"> <span v-if="activeIndex > 1" class="time-text">
标准时间: <span style="color: #003078">{{ gpsTime }}</span> 标准时间: <span style="color: var(--el-color-primary)">{{ gpsTime }}</span>
</span> </span>
<div class="error-dsc"> <div class="error-dsc">
<div class="green-div"></div> <div class="green-div"></div>
@@ -52,7 +52,7 @@
<!-- <span v-if="activeIndex <= 1"> </span> <!-- <span v-if="activeIndex <= 1"> </span>
<span v-if="activeIndex > 1" style=" font-size: 18px;font-weight: 600;"> <span v-if="activeIndex > 1" style=" font-size: 18px;font-weight: 600;">
标准时间: <span style="color: #003078">{{ gpsTime }}</span> 标准时间: <span style="color: var(--el-color-primary)">{{ gpsTime }}</span>
</span> </span>
<div class="error-dsc"> <div class="error-dsc">
<div class="green-div"></div> <div class="green-div"></div>
@@ -423,7 +423,7 @@ watch(ts, function (newValue, oldValue) {
} }
.right-title .gps-time { .right-title .gps-time {
color: #003078; color: var(--el-color-primary);
} }
.error-dsc { .error-dsc {
@@ -440,7 +440,7 @@ watch(ts, function (newValue, oldValue) {
} }
.error-dsc .green-div { .error-dsc .green-div {
background-color: #67C23A; background-color: #91cc75;
} }
.error-dsc .red-div { .error-dsc .red-div {

2
frontend/src/views/login/index.scss
View File

@@ -2,7 +2,7 @@
height: 100%; height: 100%;
min-height: 550px; min-height: 550px;
// background-color: #eeeeee; // background-color: #eeeeee;
background-color: #003078; background-color: var(--el-color-primary);
background-image: url("@/assets/images/login_bg.svg"); background-image: url("@/assets/images/login_bg.svg");
background-size: 100% 100%; background-size: 100% 100%;
background-size: cover; background-size: cover;

4
frontend/src/views/machine/controlSource/components/controlSourceDetail.vue
View File

@@ -48,7 +48,7 @@
:data="tableData" :data="tableData"
:header-cell-style="{ :header-cell-style="{
textAlign: 'center', textAlign: 'center',
backgroundColor: '#003078', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
}" }"
stripe stripe
@@ -598,7 +598,7 @@ defineExpose({
width: 45%; width: 45%;
} }
.theFirst { .theFirst {
background-color: #003078; background-color: var(--el-color-primary);
color: #fff; color: #fff;
width: 20px !important; width: 20px !important;
} }

2
frontend/src/views/machine/controlSource/index.vue
View File

@@ -31,7 +31,7 @@
<!-- <div class="formBut">--> <!-- <div class="formBut">-->
<el-button type="primary" :icon="Select" @click="start()" :disabled="connectDisabeld">通讯校验</el-button> <el-button type="primary" :icon="Select" @click="start()" :disabled="connectDisabeld">通讯校验</el-button>
<el-button v-if="!connectDisabeld" type="text" style="color: #303133" disabled>源未连接</el-button> <el-button v-if="!connectDisabeld" type="text" style="color: #303133" disabled>源未连接</el-button>
<el-button v-else type="text" style="color: #67c23a" disabled>源连接成功</el-button> <el-button v-else type="text" style="color: #91cc75" disabled>源连接成功</el-button>
<!-- </div>--> <!-- </div>-->
</el-form-item> </el-form-item>
</el-form> </el-form>

2
frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
View File

@@ -69,7 +69,7 @@ interface SpanMethodProps {
const rowClass = ({ row, column, rowIndex, columnIndex }: { row: any; column: any; rowIndex: number; columnIndex: number }): CSSProperties => { const rowClass = ({ row, column, rowIndex, columnIndex }: { row: any; column: any; rowIndex: number; columnIndex: number }): CSSProperties => {
let res: CSSProperties = { let res: CSSProperties = {
textAlign: 'center' as CSSProperties['textAlign'], textAlign: 'center' as CSSProperties['textAlign'],
backgroundColor: '#003078', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
} }
if (rowIndex === 1) { if (rowIndex === 1) {

2
frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue
View File

@@ -5,7 +5,7 @@
</div> </div>
<div class="table-container"> <div class="table-container">
<el-table :data="tableData" <el-table :data="tableData"
:header-cell-style="{ textAlign: 'center',backgroundColor: '#003078',color: '#fff' } " :header-cell-style="{ textAlign: 'center',backgroundColor: 'var(--el-color-primary)',color: '#fff' } "
:cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
style="width: 100%" style="width: 100%"
:style="{ height: '400px',maxHeight: '400px',overflow:'hidden'}" :style="{ height: '400px',maxHeight: '400px',overflow:'hidden'}"

2
frontend/src/views/machine/testScript/components/communication.vue
View File

@@ -4,7 +4,7 @@
:data="tableData" :data="tableData"
:header-cell-style="{ :header-cell-style="{
textAlign: 'center', textAlign: 'center',
backgroundColor: '#003078', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
}" }"
stripe stripe

2
frontend/src/views/machine/testScript/components/setValueTable.vue
View File

@@ -8,7 +8,7 @@
:data="tableData" :data="tableData"
:header-cell-style="{ :header-cell-style="{
textAlign: 'center', textAlign: 'center',
backgroundColor: '#003078', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
}" }"
stripe stripe

2
frontend/src/views/machine/testScript/components/testProjectPopup.vue
View File

@@ -31,7 +31,7 @@
:show-header="false" :show-header="false"
:span-method="arraySpanMethod" :span-method="arraySpanMethod"
:cell-style="tableStyle.cellStyle" :cell-style="tableStyle.cellStyle"
:header-cell-style="{ textAlign: 'center', backgroundColor: '#003078', color: '#fff' }" :header-cell-style="{ textAlign: 'center', backgroundColor: 'var(--el-color-primary)', color: '#fff' }"
@cell-click="handleRowClick" @cell-click="handleRowClick"
:key="key" :key="key"
> >

4
frontend/src/views/machine/testScript/components/testScriptDetail.vue
View File

@@ -54,7 +54,7 @@
:data="tableData" :data="tableData"
:header-cell-style="{ :header-cell-style="{
textAlign: 'center', textAlign: 'center',
backgroundColor: '#003078', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
}" }"
stripe stripe
@@ -528,7 +528,7 @@ onMounted(() => {
width: 45%; width: 45%;
} }
.theFirst { .theFirst {
background-color: #003078; background-color: var(--el-color-primary);
color: #fff; color: #fff;
width: 20px !important; width: 20px !important;
} }

10
frontend/src/views/machine/testScript/components/viewRow.vue
View File

@@ -90,7 +90,7 @@
size="small" size="small"
:header-cell-style="{ :header-cell-style="{
textAlign: 'center', textAlign: 'center',
backgroundColor: '#003078', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
}" }"
stripe stripe
@@ -111,7 +111,7 @@
size="small" size="small"
:header-cell-style="{ :header-cell-style="{
textAlign: 'center', textAlign: 'center',
backgroundColor: '#003078', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
}" }"
stripe stripe
@@ -134,7 +134,7 @@
size="small" size="small"
:header-cell-style="{ :header-cell-style="{
textAlign: 'center', textAlign: 'center',
backgroundColor: '#003078', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
}" }"
stripe stripe
@@ -155,7 +155,7 @@
size="small" size="small"
:header-cell-style="{ :header-cell-style="{
textAlign: 'center', textAlign: 'center',
backgroundColor: '#003078', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
}" }"
stripe stripe
@@ -178,7 +178,7 @@
:data="setValue_TableData" :data="setValue_TableData"
:header-cell-style="{ :header-cell-style="{
textAlign: 'center', textAlign: 'center',
backgroundColor: '#003078', backgroundColor: 'var(--el-color-primary)',
color: '#fff' color: '#fff'
}" }"
stripe stripe

2
frontend/src/views/plan/autoTest/components/tree.vue
View File

@@ -24,7 +24,7 @@
class="custom-tree-node" class="custom-tree-node"
style="display: flex; align-items: center" style="display: flex; align-items: center"
> >
<CircleCheck v-if="data.isChildNode && data.scriptIdx < currentIndex" style="width:18px;height: 18px;margin-right:8px;color:#67C23A;"/> <CircleCheck v-if="data.isChildNode && data.scriptIdx < currentIndex" style="width:18px;height: 18px;margin-right:8px;color:#91cc75;"/>
<svg-icon v-if="data.isChildNode && data.scriptIdx === currentIndex" name="loading" spin ></svg-icon> <svg-icon v-if="data.isChildNode && data.scriptIdx === currentIndex" name="loading" spin ></svg-icon>
<span>{{ node.label }}</span> <span>{{ node.label }}</span>