Skip to content

D
DC-TOM
Commit 14bd703d authored by Cai Wei's avatar Cai Wei
Browse files
Options

fix(*): 修复冲突

parents d329dc4e 04e26e3b
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 41 deletions
src/theme.scss
View file @ 14bd703d
......@@ -278,6 +278,11 @@
color: #f5b83d;
border-color: #f5b83d;
}
.cancel-btn-balck-theme {
background-color: #8a898933;
color: #8a8989;
border-color: #8a8989;
}
}
.green-color {
color: #36f1cd !important;
......@@ -312,4 +317,35 @@
}
.el-pagination__total {
color: var(--text-secondary) !important;
}
.el-radio__input.is-checked .el-radio__inner {
border-color: #36f1cd !important;
background-color: #36f1cd !important;
}
.el-radio__input.is-checked+.el-radio__label {
color: #36f1cd !important;
}
.el-dialog {
background-color: #181d21 !important;
.el-dialog__title {
color: #fff !important;
}
}
.el-textarea {
.el-textarea__inner {
background-color: #181d21 !important;
box-shadow: 0 0 0 1px #434343 inset !important;
color: #fff !important;
}
.el-textarea__inne:focus {
box-shadow: 0 0 0 1px #36f1cd inset !important;
outline: none !important;
}
}
.el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #36f1cd !important;
border-color: #36f1cd !important;
}
\ No newline at end of file
src/views/AboutView/AboutView.vue
View file @ 14bd703d
<template>
<div class="page-container collectorList">
<div class="page-container collectorList all-select-btn">
<div class="content-box">
<div class="search">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
......@@ -48,16 +48,16 @@
/>
</el-form-item>
<el-form-item>
<el-button type="default" class="default-btn" @click="onReset"
<el-button type="default" class="reset-btn-balck-theme" @click="onReset"
>重置</el-button
>
<el-button type="primary" class="search-btn" @click="onSubmit"
<el-button type="default" class="search-btn-balck-theme" @click="onSubmit"
>查询</el-button
>
<el-button
type="success"
type="default"
style="width: 140px"
class="add-btn"
class="export-btn-balck-theme"
@click="openRound()"
>挂起设备</el-button
>
......@@ -92,7 +92,7 @@
{{ getIndex($index) }}
</template>
<template #operate="{ row }">
<span class="health-score" @click="openDialog(row)">暂挂起</span>
<span class="health-score green-color" @click="openDialog(row)">暂挂起</span>
</template>
</common-table>
</div>
......@@ -141,9 +141,9 @@
</div>
<template #footer>
<span class="dialog-footer">
<el-button @click="equDialog = false">取消</el-button>
<el-button type="primary" @click="equPending(ruleFormRef)">
<span class="dialog-footer ">
<el-button type="default" class="cancel-btn-balck-theme" @click="equDialog = false">取消</el-button>
<el-button type="default" class="reset-btn-balck-theme" @click="equPending(ruleFormRef)">
确认
</el-button>
</span>
......@@ -602,6 +602,7 @@ onBeforeUnmount(() => {});
flex-direction: column;
justify-content: center;
align-items: center;
color: #dce0e4;
}
.bold {
font-weight: bold;
......
src/views/closeManage/components/dialog.vue
View file @ 14bd703d
......@@ -11,8 +11,8 @@
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="closeDialog">关闭</el-button>
<el-button type="primary" v-if="btnGroup.length" v-for="item in btnGroup" class="real-btn" :key="item.attrKey" @click="handleBtn(item.attrKey)">
<el-button type="default" @click="closeDialog" class="reset-btn-balck-them">关闭</el-button>
<el-button type="default" v-if="btnGroup.length" v-for="item in btnGroup" class="real-btn reset-btn-balck-them" :key="item.attrKey" @click="handleBtn(item.attrKey)">
{{item.label}}
</el-button>
</div>
......@@ -103,5 +103,10 @@ const handleSave = ()=> {
margin-right: 16px;
cursor: pointer;
}
.reset-btn-balck-them {
background-color: #4e7bfa33;
color: #4e7bfa;
border-color: #4e7bfa;
}
}
</style>
\ No newline at end of file
src/views/closeManage/myAgency.vue
View file @ 14bd703d
<template>
<div class="my-agency">
<div class="my-agency all-select-btn">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="事件名称：">
<el-input v-model="formInline.eventName">
......@@ -46,8 +46,8 @@
/>
</el-form-item>
<el-form-item>
<el-button class="default-btn" @click="onReset">重置</el-button>
<el-button type="primary" class="default-btn" @click="onSearch">查询</el-button>
<el-button class="default-btn reset-btn-balck-theme" @click="onReset">重置</el-button>
<el-button type="default" class="default-btn search-btn-balck-theme" @click="onSearch">查询</el-button>
</el-form-item>
</el-form>
<div class="table-box">
......@@ -74,15 +74,15 @@
</span>
</template>
<template #operation="{ row }">
<span class="view-btn" @click="handleDone(row)">
<span class="view-btn green-color" @click="handleDone(row)">
处理
</span>
<span class="table-btn">|</span>
<span class="view-btn" @click="handleDispatch(row)">
<span class="view-btn green-color" @click="handleDispatch(row)">
分派
</span>
<span class="table-btn">|</span>
<span class="view-btn" @click="changeBag(row)">
<span class="view-btn green-color" @click="changeBag(row)">
更换布袋
</span>
</template>
......@@ -574,7 +574,7 @@
:value="item.id"
></el-option>
</el-select>
<el-button type="primary" class="addBtn" @click="addPerson">新增</el-button>
<el-button type="default" class="addBtn search-btn-balck-theme" @click="addPerson">新增</el-button>
</div>
</el-form-item>
<el-form-item label="已分派人:">
......@@ -1246,7 +1246,7 @@ const handlePaginationChange = (pagination) => {
width: 100%;
height: calc(100% - 14px);
box-sizing: border-box;
background: #fff;
background: #181D21;
padding: 20px;
display: flex;
flex-direction: column;
......@@ -1319,12 +1319,13 @@ const handlePaginationChange = (pagination) => {
font-weight: 700;
font-size: 19px;
overflow: hidden;
color: #dce0e4;
&::before {
content: "";
width: 4px;
height: 4px;
border-radius: 50%;
background: #1890ff;
background: #36f1cd;
position: absolute;
left: 0px;
top: 50%;
......@@ -1335,7 +1336,7 @@ const handlePaginationChange = (pagination) => {
width: 100%;
height: 0px;
position: absolute;
border-bottom: dashed 1px rgb(209, 209, 209);
border-bottom: dashed 1px #8a9199;
left: 130px;
top: 50%;
transform: translateY(-50%);
......@@ -1358,12 +1359,13 @@ const handlePaginationChange = (pagination) => {
text-align: right;
width: 140px;
margin-right: 10px;
color: #8a9199;
}
.change-style {
width: auto;
}
.value {
color: #000000;
color: #fff;
flex: 1;
}
.alarm-value {
......@@ -1632,6 +1634,11 @@ const handlePaginationChange = (pagination) => {
margin-bottom: 28px;
}
}
.form-box::-webkit-scrollbar {
width: 0px;
height: 8px;
background-color: #434343; /* or add it to the track */
}
.input-style {
padding-left: 50px;
......
src/views/closeManage/myDone.vue
View file @ 14bd703d
<template>
<div class="my-agency">
<div class="my-agency all-select-btn">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="事件名称：">
<el-input v-model="formInline.eventName">
......@@ -46,8 +46,8 @@
/>
</el-form-item>
<el-form-item>
<el-button class="default-btn" @click="onReset">重置</el-button>
<el-button type="primary" class="default-btn" @click="onSearch">查询</el-button>
<el-button type="default" class="reset-btn-balck-theme" @click="onReset">重置</el-button>
<el-button type="default" class="search-btn-balck-theme" @click="onSearch">查询</el-button>
</el-form-item>
</el-form>
<div class="table-box">
......@@ -74,7 +74,7 @@
</span>
</template>
<template #operation="{ row }">
<span class="view-btn" @click="handleView(row)">
<span class="view-btn green-color" @click="handleView(row)">
查看
</span>
<!-- <span class="table-btn">|</span>
......@@ -1235,7 +1235,7 @@ const handlePaginationChange = (pagination) => {
width: 100%;
height: calc(100% - 14px);
box-sizing: border-box;
background: #fff;
background: #181D21;
padding: 20px;
display: flex;
flex-direction: column;
......@@ -1399,12 +1399,13 @@ const handlePaginationChange = (pagination) => {
font-weight: 700;
font-size: 19px;
overflow: hidden;
color: #dce0e4;
&::before {
content: "";
width: 4px;
height: 4px;
border-radius: 50%;
background: #1890ff;
background: #36f1cd;
position: absolute;
left: 0px;
top: 50%;
......@@ -1415,7 +1416,7 @@ const handlePaginationChange = (pagination) => {
width: 100%;
height: 0px;
position: absolute;
border-bottom: dashed 1px rgb(209, 209, 209);
border-bottom: dashed 1px #8a9199;
left: 130px;
top: 50%;
transform: translateY(-50%);
......@@ -1438,12 +1439,13 @@ const handlePaginationChange = (pagination) => {
text-align: right;
width: 140px;
margin-right: 10px;
color: #8a9199;
}
.change-style {
width: auto;
}
.value {
color: #000000;
color: #fff;
flex: 1;
}
.alarm-value {
......@@ -1683,6 +1685,7 @@ const handlePaginationChange = (pagination) => {
margin-bottom: 20px;
}
}
.label-title-content {
width: 90%;
padding-left: 30px;
......@@ -1692,6 +1695,18 @@ const handlePaginationChange = (pagination) => {
overflow: auto;
width: 100%;
}
.deal-line-wrap::-webkit-scrollbar {
width: 0;
height: 0;
background-color: #434343; /* or add it to the track */
}
.deal-line-wrap::-webkit-scrollbar-track {
background-color: #434343;
border-radius: 2px;
}
.deal-line-wrap::-webkit-thumb {
background-color: red;
}
.qusetion-records {
padding: 5px 20px;
.qusetion-records-item {
......@@ -1712,6 +1727,11 @@ const handlePaginationChange = (pagination) => {
margin-bottom: 28px;
}
}
.form-box::-webkit-scrollbar {
width: 0px;
height: 8px;
background-color: #434343; /* or add it to the track */
}
:deep(.el-tag) {
margin-right: 10px;
......
src/views/collectorList/collectorList.vue
View file @ 14bd703d
<template>
<div class="page-container collectorList">
<div class="page-container collectorList all-select-btn">
<div class="content-box">
<div class="search">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
......@@ -30,16 +30,16 @@
/>
</el-form-item>
<el-form-item>
<el-button type="default" class="default-btn" @click="onReset"
<el-button type="default" class="reset-btn-balck-theme" @click="onReset"
>重置</el-button
>
<el-button type="primary" class="search-btn" @click="onSubmit"
<el-button type="default" class="search-btn-balck-theme" @click="onSubmit"
>查询</el-button
>
<el-button
type="success"
type="default"
style="width: 140px"
class="add-btn"
class="export-btn-balck-theme"
@click="openDialog()"
>更换周期分析</el-button
>
......@@ -66,7 +66,7 @@
{{ getIndex($index) }}
</template>
<template #dusterName="{ row }">
<span class="health-score" @dblclick="openDialog(row.dusterName)">{{
<span class="health-score green-color" @dblclick="openDialog(row.dusterName)">{{
row.dusterName
}}</span>
</template>
......
src/views/equipmentManagement/components/paramsSetings.vue
View file @ 14bd703d
......@@ -427,7 +427,7 @@ body {
}
.label {
color: #fff;
color: #c5c8cc;
font-weight: 500;
font-size: 15px;
min-width: 130px;
......@@ -518,12 +518,13 @@ body {
display: flex;
align-items: center;
gap: 0.5rem;
color: #c5c8cc;
}
input[type="checkbox"] {
width: 18px;
height: 18px;
accent-color: #3b82f6;
accent-color: #36f1cd;
}
.chamber-list {
......@@ -593,7 +594,7 @@ input[type="checkbox"] {
}
</style>
<style>
.el-self-container .el-input__wrapper{
/* .el-self-container .el-input__wrapper{
background: #181D21;
box-shadow: 0 0 0 1px #697b78b6;
}
......@@ -608,9 +609,12 @@ input[type="checkbox"] {
.el-self-container .el-textarea__inner {
color: #fff;
background: #181D21;
box-shadow: 0 0 0 1px #697b78b6 !important;
border: 1px solid #697b78b6 !important;
box-shadow: 0 0 0 1px #434343 !important;
border: 1px solid #434343 !important;
}
.el-self-container .device-label {
color: #fff;
} */
.el-self-container .device-label {
color: #fff;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment