From 9d43e7051075f1fc1b2fee680a79f90becddd63f Mon Sep 17 00:00:00 2001 From: ZZJ <zzjdsg2300@163.com> Date: 星期三, 12 一月 2022 17:53:52 +0800 Subject: [PATCH] tab禁用 --- src/pages/library/components/personList.vue | 635 +++++++++++++++++++++----------------------------------- 1 files changed, 241 insertions(+), 394 deletions(-) diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue index 7775450..bd0c414 100644 --- a/src/pages/library/components/personList.vue +++ b/src/pages/library/components/personList.vue @@ -12,7 +12,8 @@ >{{ this.baseObject.bwType === "1" ? "榛戝悕鍗�" : "鐧藉悕鍗�" }}</span > <span class="ok-time" - >鏈夋晥鏃堕棿锛歿{ this.baseObject.startTime }}--{{ + >鏈夋晥鏃堕棿锛歿{ this.baseObject.startTime }} -- + {{ this.baseObject.endTime ? this.baseObject.endTime : "姘镐箙鏈夋晥" }}</span > @@ -26,12 +27,13 @@ v-model="baseObject.enable" active-color="#4E94FF" inactive-color="#BBBBBB" - style="margin-right: 25px" + style="margin-right: 10px" :disabled="isDisabled(baseObject)" @change="setEnable(baseObject)" > </el-switch> - + <div class="shutiao" v-if="baseObject.enable"></div> + <div class="shutiao1" v-else></div> <el-tooltip content="鍒犻櫎" placement="top" popper-class="atooltip"> <span class="iconfont iconfont-wrap iconshanchuku-09" @@ -50,7 +52,6 @@ </div> </div> </el-row> - <div class="border-tabl"> <div class="head-search"> <div class="desc"> @@ -107,13 +108,17 @@ <el-table id="multipleTable" ref="multipleTable" + class="tableBox" :data="BaseManageData.personList" tooltip-effect="dark" style="width: 100%; overflow: auto" :fit="true" + row-class-name="hover-row" cell-class-name="cell-classname" + @row-click="pickRow" :default-sort="{ prop: 'createTime', order: 'descending' }" @selection-change="handleSelectionChange" + border :header-cell-style="{ background: '#fff', color: '#222222', @@ -121,16 +126,8 @@ borderBottom: 'none', }" > - <el-table-column type="selection" width="30"></el-table-column> - <!-- <el-table-column label="搴忓彿" width="60" sortable align="center"> - <template slot-scope="scope">{{ scope.$index + 1 }}</template> - </el-table-column> --> - <el-table-column - prop="personPicUrl" - label="鐓х墖" - align="center" - width="120" - > + <el-table-column type="selection" width="40"></el-table-column> + <el-table-column prop="personPicUrl" label="鐓х墖" width="120"> <template slot-scope="scope"> <img :src="'/httpImage/' + scope.row.personPicUrl" @@ -142,7 +139,7 @@ </p> </template> </el-table-column> - <el-table-column label="鐢熸晥鐘舵��" align="center" min-width="70"> + <el-table-column label="鐢熸晥鐘舵��" min-width="70"> <template slot-scope="scope"> <el-switch v-model="scope.row.enable" @@ -161,14 +158,12 @@ min-width="70" show-overflow-tooltip sortable - align="center" ></el-table-column> <el-table-column prop="sex" label="鎬у埆" min-width="60" sortable - align="center" ></el-table-column> <el-table-column prop="idCard" @@ -176,7 +171,6 @@ min-width="150" show-overflow-tooltip sortable - align="center" ></el-table-column> <el-table-column prop="phoneNum" @@ -184,12 +178,10 @@ min-width="100" show-overflow-tooltip sortable - align="center" ></el-table-column> <el-table-column prop="monitorLevel" label="绛夌骇" - align="center" min-width="50" ></el-table-column> <el-table-column @@ -198,11 +190,8 @@ min-width="140" show-overflow-tooltip sortable - align="center" ></el-table-column> - <!-- <el-table-column prop="reserved" label="鍏朵粬" align="center"></el-table-column> --> - - <el-table-column label="鎿嶄綔" min-width="130" align="center"> + <el-table-column label="鎿嶄綔" min-width="130"> <template slot-scope="scope"> <fTemplate authority="library:set"> <el-tooltip @@ -218,7 +207,7 @@ </el-tooltip> </fTemplate> <el-popover - placement="left" + placement="top" trigger="click" popper-class="popper-caozuo" > @@ -285,7 +274,6 @@ class="iconfont icongengduocaozuo-09" style="font-size: 24px; cursor: pointer" ></span> - <!-- @click="handleClick(scope.row)" --> </el-popover> </template> </el-table-column> @@ -301,18 +289,6 @@ :total="BaseManageData.total" ></el-pagination> </div> - <!-- <div class="pt5" style="height: 40px; position: relative"> - <el-pagination - @size-change="handleSizeChange" - @current-change="refrash" - :current-page="BaseManageData.page" - :page-size="BaseManageData.size" - :page-sizes="[10, 20, 50, 100]" - style="position: absolute; right: 10px; bottom: 5px" - layout="total,sizes,prev,pager,next,jumper" - :total="BaseManageData.total" - ></el-pagination> - </div> --> <el-dialog title="鎶撴媿璇︽儏" :visible.sync="cameraDetailVisible" @@ -321,19 +297,16 @@ > <div class="member-info"> <label class> - <i class="iconfont icongerenxinxi_v" style="font-size: 30px"></i> + <img src="/images/library/涓汉淇℃伅.png" alt="" srcset="" /> </label> <ul> <li> - <!-- <span>濮撳悕:</span> --> <span>{{ memberInfo.personName }}</span> </li> <li> - <!-- <span>鎬у埆:</span> --> <span>{{ memberInfo.sex }}</span> </li> <li style="margin-right: 80px"> - <!-- <span>韬唤璇佸彿:</span> --> <span>{{ memberInfo.idCard }}</span> </li> <li> @@ -376,7 +349,19 @@ <p style="text-align: right; font-size: 14px; color: #5f5f5f"> 鍏眥{ faceDataCount }}鏉℃暟鎹� </p> - <el-table :data="cameraDetailData" border> + + <el-table + :data="cameraDetailData" + tooltip-effect="dark" + :fit="true" + style="width: 100%; overflow: auto" + :header-cell-style="{ + background: '#fff', + color: '#222222', + padding: '2px 1px', + borderBottom: 'none', + }" + > <el-table-column prop="faceImg" label="鎶撴媿瀹炴櫙" @@ -436,219 +421,7 @@ > </div> </el-dialog> - <!-- <el-dialog - title="淇敼淇℃伅" - :visible.sync="dialogFormVisible" - okText="淇濆瓨" - width="30%" - :before-close="handleClose" - cancelText="鍙栨秷" - > - <el-form - ref="formForEdit" - :model="form" - label-width="120px" - :rules="rules" - > - <div class="flex-center mb10"> - <el-upload - class="avatar-uploader" - action - :http-request="updateFace" - accept="image/*" - :show-file-list="false" - :on-success="uploadSuccess" - :on-error="uploadError" - > - <div class="mask1"> - <div - slot="trigger" - class="flex-center" - style="position: absolute; top: 120px" - > - <p - style=" - background: rgba(0, 0, 0, 0.35); - width: 150px; - line-height: 30px; - color: #fff; - font-size: 13px; - opacity: 1; - " - > - 鐐瑰嚮淇敼鐓х墖 - </p> - </div> - </div> - <img - v-if="`httpImage/` + form.personPicUrl" - :src="`/httpImage/` + form.personPicUrl" - style=" - max-height: 100px; - width: 100px; - object-fit: contain; - background: rgba(0, 0, 0, 0.35); - " - class="avatar" - /> - </el-upload> - </div> - <el-row> - <el-col :span="20"> - <el-form-item label="ID" style="width: 100%; margin-bottom: 10px"> - <el-input - size="small" - v-model="form.id" - disabled - placeholder="璇疯緭鍏�" - ></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20"> - <el-form-item - label="鐓х墖鏍囪瘑" - prop="picDesc" - style="width: 100%; margin-bottom: 10px" - > - <el-input - size="small" - v-model="form.picDesc" - placeholder="璇疯緭鍏�" - ></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20"> - <el-form-item label="濮撳悕" style="width: 100%; margin-bottom: 10px"> - <el-input - size="small" - v-model="form.personName" - placeholder="璇疯緭鍏�" - ></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20"> - <el-form-item - label="鎬у埆" - prop="sex" - style="width: 100%; margin-bottom: 8px; text-align: left" - > - <el-radio-group v-model="form.sex" class="mt10"> - <el-radio label="鐢�"></el-radio> - <el-radio label="濂�"></el-radio> - </el-radio-group> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20"> - <el-form-item - label="韬唤璇佸彿" - style="width: 100%; margin-bottom: 10px" - > - <el-input - size="small" - v-model="form.idCard" - placeholder="璇疯緭鍏�" - ></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20"> - <el-form-item - label="鎵嬫満鍙�" - style="width: 100%; margin-bottom: 10px" - > - <el-input - size="small" - v-model="form.phoneNum" - placeholder="璇疯緭鍏�" - ></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20"> - <el-form-item - label="浜哄憳绛夌骇" - prop="monitorLevel" - style="width: 100%; margin-bottom: 10px" - > - <el-select - size="small" - v-model="form.monitorLevel" - placeholder="璇烽�夋嫨" - style="width: 100%" - > - <el-option - v-for="item in VideoPhotoData.dictionary.MONITORLEVEL" - :key="item.value" - :label="item.name" - :value="item.value" - ></el-option> - </el-select> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20"> - <el-form-item - label="鍏ュ簱浣嶇疆" - style="width: 100%; margin-bottom: 10px" - > - <el-input - size="small" - v-model="form.fromServerId" - disabled - placeholder="璇疯緭鍏�" - ></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20"> - <el-form-item - label="鍏ュ簱鏃堕棿" - style="width: 100%; margin-bottom: 10px" - > - <el-input - size="small" - v-model="form.createTime" - disabled - placeholder="璇疯緭鍏�" - ></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20"> - <el-form-item label="鍏朵粬" style="width: 100%; margin-bottom: 10px"> - <el-input - size="small" - v-model="form.reserved" - placeholder="璇疯緭鍏�" - ></el-input> - </el-form-item> - </el-col> - </el-row> - </el-form> - <div slot="footer" class="dialog-footer"> - <el-button size="small" @click="handleClose" type="info" - >鍙� 娑�</el-button - > - <el-button size="small" type="primary" @click="submit()" - >纭� 瀹�</el-button - > - </div> - </el-dialog> --> <el-drawer title="淇敼淇℃伅" :modal="false" :visible.sync="showInfoDrawer"> - <!-- :before-close="handleClose" --> <el-form ref="formForEdit" :model="form" @@ -700,7 +473,7 @@ </div> <el-row> <el-col :span="20"> - <el-form-item label="ID" style="width: 100%; margin-bottom: 14px"> + <el-form-item label="ID" style="width: 100%; margin-bottom: 20px"> <el-input size="small" v-model="form.id" @@ -715,7 +488,7 @@ <el-form-item label="鐓х墖鏍囪瘑" prop="picDesc" - style="width: 100%; margin-bottom: 14px" + style="width: 100%; margin-bottom: 20px" > <el-input size="small" @@ -727,7 +500,7 @@ </el-row> <el-row> <el-col :span="20"> - <el-form-item label="濮撳悕" style="width: 100%; margin-bottom: 14px"> + <el-form-item label="濮撳悕" style="width: 100%; margin-bottom: 20px"> <el-input size="small" v-model="form.personName" @@ -741,7 +514,7 @@ <el-form-item label="鎬у埆" prop="sex" - style="width: 100%; margin-bottom: 14px; text-align: left" + style="width: 100%; margin-bottom: 20px; text-align: left" > <el-radio-group v-model="form.sex" class="mt10"> <el-radio label="鐢�"></el-radio> @@ -754,7 +527,7 @@ <el-col :span="20"> <el-form-item label="韬唤璇佸彿" - style="width: 100%; margin-bottom: 14px" + style="width: 100%; margin-bottom: 20px" > <el-input size="small" @@ -768,7 +541,7 @@ <el-col :span="20"> <el-form-item label="鎵嬫満鍙�" - style="width: 100%; margin-bottom: 14px" + style="width: 100%; margin-bottom: 20px" > <el-input size="small" @@ -783,7 +556,7 @@ <el-form-item label="浜哄憳绛夌骇" prop="monitorLevel" - style="width: 100%; margin-bottom: 14px" + style="width: 100%; margin-bottom: 20px" > <el-select size="small" @@ -805,13 +578,12 @@ <el-col :span="20"> <el-form-item label="鍏ュ簱浣嶇疆" - style="width: 100%; margin-bottom: 14px" + style="width: 100%; margin-bottom: 20px" > <el-input size="small" v-model="form.fromServerId" disabled - placeholder="璇疯緭鍏�" ></el-input> </el-form-item> </el-col> @@ -820,20 +592,19 @@ <el-col :span="20"> <el-form-item label="鍏ュ簱鏃堕棿" - style="width: 100%; margin-bottom: 14px" + style="width: 100%; margin-bottom: 20px" > <el-input size="small" v-model="form.createTime" disabled - placeholder="璇疯緭鍏�" ></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="20"> - <el-form-item label="鍏朵粬" style="width: 100%; margin-bottom: 14px"> + <el-form-item label="鍏朵粬" style="width: 100%; margin-bottom: 20px"> <el-input size="small" v-model="form.reserved" @@ -956,6 +727,11 @@ class="base" v-for="(item, index) in BaseManageData.blackList" :key="index" + :class=" + BaseManageData.selectBlacks.includes(item.value) + ? 'white-wrap' + : '' + " > <el-checkbox :label="item.value" @@ -1027,6 +803,11 @@ class="base" v-for="(item, index) in BaseManageData.blackList" :key="index" + :class=" + BaseManageData.selectBlacks.includes(item.value) + ? 'white-wrap' + : '' + " > <el-checkbox :label="item.value" @@ -1052,6 +833,11 @@ class="base" v-for="(item, index) in BaseManageData.whiteList" :key="index" + :class=" + BaseManageData.selectWhites.includes(item.value) + ? 'white-wrap' + : '' + " > <el-checkbox :label="item.value" @@ -1081,7 +867,6 @@ } from "@/api/baseLibrary"; import { getCameraFaceData } from "@/api/es"; import axios from "axios"; -// import { findByType } from '@/server/video.js' import UploadBtn from "./upload"; import fTemplate from "@/components/fTemplate"; import UploadIcon from "@/components/searching/UploadIcon.vue"; @@ -1123,7 +908,6 @@ idCard: "", reserved: "", }, - showPop: true, askDeleteShow: false, toDeleteId: "", reqCameraParams: { @@ -1134,7 +918,6 @@ }, cameraDetailData: [], cameraDetailVisible: false, - dialogFormVisible: false, copyVisiabled: false, moveVisiabled: false, @@ -1165,17 +948,14 @@ }, rules: { picDesc: [ - { required: true, message: "璇疯緭鍏ョ収鐗囨爣璇�", trigger: "submit" }, + { required: true, message: "璇疯緭鍏ョ収鐗囨爣璇�", trigger: "change" }, ], - sex: [{ required: true, message: "璇峰嬀閫夋�у埆", trigger: "submit" }], + sex: [{ required: true, message: "璇峰嬀閫夋�у埆", trigger: "change" }], monitorLevel: [ - { required: true, message: "璇烽�夋嫨浜哄憳绛夌骇", trigger: "submit" }, + { required: true, message: "璇烽�夋嫨浜哄憳绛夌骇", trigger: "change" }, ], }, tableData: [], - // tableHeight: window.innerHeight - 320, - // multipleSelection: [], - // peoperLevel: [], oldWidth: "", oldHeight: "", delType: "", @@ -1238,13 +1018,12 @@ this.cameraDetailVisible = true; }, isShow(authority) { - if (this.isAdmin) { - return true; - } else if (this.buttonAuthority.indexOf("," + authority + ",") > -1) { - return true; - } else { - return false; - } + return ( + this.isAdmin || this.buttonAuthority.indexOf("," + authority + ",") > -1 + ); + }, + pickRow(row, column, event) { + this.$refs.multipleTable.toggleRowSelection(row); }, toggleSelection(rows) { if (rows) { @@ -1261,6 +1040,7 @@ this.$notify({ type: "warning", message: "璇烽�夋嫨瑕佸垹闄ょ殑浜哄憳", + duration: 1000000, }); return; } @@ -1290,14 +1070,13 @@ type: "success", message: "璇ヤ汉鍛樺垹闄ゆ垚鍔燂紒", }); + this.askDeleteShow = false; } this.getPersonList(); }) - .catch((err) => { - }); + .catch((err) => {}); }, - sayHello() { - }, + sayHello() {}, getUploadResult(result) { this.uploadResult = result.data; this.dialogVisible = true; @@ -1393,13 +1172,11 @@ this.getPersonList(); }, handleSizeChange(val) { - //this.pageSize = val; this.BaseManageData.size = val; this.getPersonList(); }, handleClick(row) { this.form = row; - // this.dialogFormVisible = true; this.showInfoDrawer = true; }, async submit() { @@ -1413,7 +1190,7 @@ type: "success", message: "浜哄憳淇敼鎴愬姛锛�", }); - this.dialogFormVisible = false; + this.showInfoDrawer = false; } else { this.$notify({ type: "error", @@ -1511,43 +1288,28 @@ data: fd, }); if (res.data.success) { - this.form.personPicUrl = res.data.data.personPicUrl; + this.form.persoasyncnPicUrl = res.data.data.personPicUrl; this.form.faceFeature = res.data.data.faceFeature; } }, - uploadSuccess() { - }, - uploadError() { - }, - deleteBatch() { - if (this.selectedRowKeys.length === 0) { + uploadSuccess() {}, + uploadError() {}, + async deleteBatch() { + let ids = []; + this.selectedRowKeys.map((item, index) => { + ids.push(item.id); + }); + let res = await deleteBasePersons(ids); + if (res.success) { this.$notify({ - type: "warning", - message: "璇烽�夋嫨瑕佸垹闄ょ殑浜哄憳", + type: "success", + message: "鍒犻櫎鎴愬姛锛�", }); + this.getPersonList(); } else { - this.$confirm("鎻愮ず锛氱‘瀹氬垹闄よ搴曞簱閫変腑浜哄憳锛�", { - center: true, - cancelButtonClass: "comfirm-class-cancle", - confirmButtonClass: "comfirm-class-sure", - }).then(async (_) => { - let ids = []; - this.selectedRowKeys.map((item, index) => { - ids.push(item.id); - }); - let res = await deleteBasePersons(ids); - if (res.success) { - this.$notify({ - type: "success", - message: "鍒犻櫎鎴愬姛锛�", - }); - this.getPersonList(); - } else { - this.$notify({ - type: "error", - message: "鍒犻櫎澶辫触锛�", - }); - } + this.$notify({ + type: "error", + message: "鍒犻櫎澶辫触锛�", }); } }, @@ -1564,11 +1326,6 @@ } else { this.BaseManageData.tableId = this.BaseManageData.localTables[0].id; this.BaseManageData.queryPersonList(); - } - }, - handleRowStyle({ row, rowIndex }) { - if (rowIndex === 0) { - return "background:#222222;"; } }, blackAngWhite() { @@ -1597,17 +1354,6 @@ } } }, - // tosearch(item) { - // var curWwwPath = window.document.location.href; - // var pathname = window.document.location.pathname; - // var pos = curWwwPath.indexOf(pathname); - // var localhostPath = curWwwPath.substring(0, pos); //ip+port - // var href = localhostPath + "/Layout/Searching" - // let captureId = item.id == "" ? item.personId : item.id - // var url = item.personPicUrl ? item.personPicUrl : item.personPicUrl - // var compType = 0 - // window.open(href + '?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + url + '&compType=' + compType) - // }, tosearch(item) { //let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id let captureId = item.id == "" ? item.personId : item.id; @@ -1795,9 +1541,6 @@ max-width: none; font-size: 14px; color: #606266; - thead { - background: green !important; - } } .avatar-uploader:hover { .mask1 { @@ -1829,14 +1572,33 @@ .el-button--mini { padding: 10px 34px; font-size: 14px; - background:var(--colorCard) !important; - border-color:var(--colorCard) !important; + background: var(--colorCard) !important; + border-color: var(--colorCard) !important; width: 150px; border-radius: 18px; } } .el-dialog__body { padding-top: 0; + .el-table::before { + visibility: hidden; + } + .el-checkbox__input.is-indeterminate .el-checkbox__inner { + background-color: var(--colorCard); + border-color: var(--colorCard); + } + .el-checkbox__input.is-checked .el-checkbox__inner { + background-color: var(--colorCard); + border-color: var(--colorCard); + } + .el-table th.el-table__cell > .cell { + background: #f7f8fa; + height: 38px; + line-height: 38px; + } + .el-table__body tr.hover-row > td.el-table__cell { + background-color: #ffffff !important; + } } .el-dialog__header { box-shadow: 0px 2px 4px rgb(0 0 0 / 8%); @@ -1876,20 +1638,40 @@ display: flex; align-items: center; cursor: pointer; + .shutiao { + width: 1.73px; + height: 8.67px; + background: var(--colorCard); + border-radius: 1px; + position: absolute; + right: 125px; + transition: 0.5s; + } + + .shutiao1 { + width: 1.73px; + height: 8.67px; + background: #bbbbbb; + border-radius: 1px; + position: absolute; + right: 153px; + transform: rotate(90deg); + transition: 0.5s; + } .el-switch__core { height: 26px; border-radius: 18px; } .el-switch__core:after { - width: 22px; - height: 22px; + width: 20px; + height: 20px; + top: 2px; } .el-switch.is-checked .el-switch__core::after { margin-left: -22px; } .iconshanchuku-09 { color: #fe6d68; - margin-right: 10px; } .iconshanchuku-09:hover { background: #fe6d68; @@ -1900,8 +1682,8 @@ color: rgb(102, 102, 102); } .iconbianjiku-09:hover { - border: 1px solidvar(--colorCard); - background:var(--colorCard); + border: 1px solid var(--colorCard); + background: var(--colorCard); color: #fff; } } @@ -1934,6 +1716,14 @@ box-shadow: -4px 0px 8px rgb(0 0 0 / 16%); border-radius: 24px 0px 0px 24px; min-width: 380px; + .el-drawer__header > :first-child { + font-size: 16px; + } + .el-drawer__header { + padding: 15px 20px; + box-shadow: 0px 2px 4px rgb(0 0 0 / 8%); + margin-bottom: 0; + } .el-drawer__body { padding: 20px; .el-input.is-disabled .el-input__inner { @@ -1943,11 +1733,24 @@ color: #bbbbbb; font-size: 14px; } - .el-radio__input.is-checked .el-radio__inner { - border-color:var(--colorCard); - background:var(--colorCard); + .el-form-item.is-error .el-input__inner, + .el-form-item.is-error .el-input__inner:focus, + .el-form-item.is-error .el-textarea__inner, + .el-form-item.is-error .el-textarea__inner:focus, + .el-message-box__input input.invalid, + .el-message-box__input input.invalid:focus { + border-color: #f56c6c; } - + .el-radio__input.is-checked .el-radio__inner { + border-color: var(--colorCard); + background: var(--colorCard); + } + .el-form-item__label { + line-height: 32px; + } + .el-form-item__content { + line-height: 32px; + } .el-input--small { font-size: 14px; .el-input__inner { @@ -1961,7 +1764,7 @@ } .el-form-item__error { color: #fe6d68; - padding-top: 0px; + padding-top: 2px; left: 15px; } .el-form-item.is-required:not(.is-no-asterisk) @@ -1977,8 +1780,8 @@ padding: 11px 65px; font-size: 14px; border-radius: 18px; - border-color:var(--colorCard) !important; - background:var(--colorCard) !important; + border-color: var(--colorCard) !important; + background: var(--colorCard) !important; color: #fff; } .cancel-btn { @@ -1991,22 +1794,14 @@ } } } - // .move.el-drawer__header { - // padding-bottom: 16px; - // font-size: 16px; - // color: #5f5f5f; - // margin-bottom: 0px; - // box-shadow: 0px 2px 4px rgb(0 0 0 / 8%); - // border-radius: 24px 0px 0px 0px; - // } } } - .text-left { .el-upload-list { display: none; } } + .border-tabl { border: 1px solid #ebeef5; border-bottom: none; @@ -2017,8 +1812,24 @@ padding: 10px; margin-top: 8px; box-shadow: 0px 0px 6px 1px rgb(143 159 191 / 15%); + .tableBox { + border: none; + &::before, + &::after { + display: none; + } + .el-table--border .el-table__cell, + .el-table__body-wrapper + .el-table--border.is-scrolling-left + ~ .el-table__fixed { + border-right: none; + } + td { + border: none; + } + } .cell-classname { - border-bottom: 1px solid #eff1f5 !important; + background-color: #ffffff; } .head-search { font-size: 14px; @@ -2028,6 +1839,10 @@ margin: 15px 10px 20px 10px; justify-content: space-between; align-items: center; + .desc { + min-width: fit-content; + margin-right: 20px; + } .right-group { display: flex; .el-input--small { @@ -2035,8 +1850,6 @@ } .iconpiliangshanchu-09 { color: #fe6d68; - margin-right: 10px; - margin-left: 20px; } .iconpiliangshanchu-09:hover { background: #fe6d68; @@ -2045,11 +1858,18 @@ } .el-button--small { padding: 8px 45px; + position: relative; font-size: 14px; - background:var(--colorCard) !important; + background: var(--colorCard) !important; border-radius: 0px 18px 18px 0px; - border-color:var(--colorCard) !important; + border-color: var(--colorCard) !important; color: #fff; + margin-right: 10px; + } + + .el-button--small:hover { + // background: "rgba(#{var(--colorCard-rgb)},10%) !important" ; + filter: brightness(92%); } .el-input__suffix { top: 6px; @@ -2067,6 +1887,9 @@ line-height: 20px; color: #bbbbbb; } + } + .el-input--small .el-input__inner:focus { + border: 1px solid var(--colorCard); } // .compearValue .compearValue { @@ -2102,18 +1925,48 @@ font-size: 15px; } } + .el-table::before { + visibility: hidden; + } .el-checkbox__input.is-indeterminate .el-checkbox__inner { - background-color:var(--colorCard); - border-color:var(--colorCard); + background-color: var(--colorCard); + border-color: var(--colorCard); } .el-checkbox__input.is-checked .el-checkbox__inner { - background-color:var(--colorCard); - border-color:var(--colorCard); + background-color: var(--colorCard); + border-color: var(--colorCard); } .el-table th.el-table__cell > .cell { background: #f7f8fa; height: 38px; line-height: 38px; + } + .el-table__body tr.hover-row > td.el-table__cell { + background-color: #ffffff !important; + } + .hover-row { + cursor: pointer; + } + .hover-row:hover { + td { + background-color: #fff; + border-top: 1px solid var(--colorCard); + border-bottom: 1px solid var(--colorCard); + + &:first-child { + background-color: #fff; + border-radius: 20px 0 0 20px; + border-left: 1px solid var(--colorCard); + border-bottom: 1px solid var(--colorCard); + } + + &:last-child { + border-radius: 0 20px 20px 0; + background-color: #fff; + border-right: 1px solid var(--colorCard); + border-bottom: 1px solid var(--colorCard); + } + } } .el-table td.el-table__cell div { -webkit-box-sizing: border-box; @@ -2150,6 +2003,7 @@ text-align: center; font-size: 23px; transition: all 0.2s; + margin-left: 10px; } .el-dialog__header { padding: 20px 0 10px; @@ -2223,9 +2077,9 @@ padding: 8px 15px; font-size: 14px; border-radius: 3px; - background:var(--colorCard) !important; + background: var(--colorCard) !important; border-radius: 16px; - border-color:var(--colorCard) !important; + border-color: var(--colorCard) !important; width: 128px; } .el-input--mini .el-input__inner { @@ -2293,7 +2147,7 @@ width: 150px; } .el-button--primary { - background:var(--colorCard) !important; + background: var(--colorCard) !important; padding: 9px 37px; color: #fff; border: 1px solidvar(--colorCard) !important; @@ -2320,7 +2174,6 @@ } } .el-dialog.copy-dialog { - // min-height: 372px; width: 516px; border-radius: 24px; .el-dialog__header { @@ -2336,7 +2189,7 @@ color: #5f5f5f; } .el-dialog__body { - padding: 20px; + padding: 20px 15px; color: #5f5f5f; } .dialog-footer { @@ -2350,7 +2203,7 @@ width: 150px; } .el-button--primary { - background:var(--colorCard) !important; + background: var(--colorCard) !important; padding: 9px 37px; color: #fff; border: 1px solidvar(--colorCard) !important; @@ -2360,7 +2213,6 @@ } } .addToBase1 { - // height: 350px; position: relative; .topLabel { margin-top: 20px; @@ -2377,12 +2229,8 @@ .items { width: 100%; min-height: 150px; - // background: cadetblue; - // overflow-y: auto; - // margin: 20px 0px; margin-bottom: 20px; .lable { - // margin-top: 10px; font-size: 16px; font-weight: bold; text-align: left; @@ -2397,13 +2245,13 @@ box-sizing: border-box; float: left; text-align: left; - // font-size: 12px !important; background: #eff1f5; border-radius: 8px; - margin: 0 5px; + margin: 0 10px; + margin-bottom: 10px; .el-checkbox__input.is-checked .el-checkbox__inner { - background-color:var(--colorCard); - border-color:var(--colorCard); + background-color: var(--colorCard); + border-color: var(--colorCard); } .el-checkbox { width: 100%; @@ -2463,7 +2311,7 @@ width: 150px; } .el-button--primary { - background:var(--colorCard) !important; + background: var(--colorCard) !important; padding: 9px 37px; color: #fff; border: 1px solidvar(--colorCard) !important; @@ -2506,6 +2354,7 @@ } } } + .el-picker-panel.el-date-range-picker.el-popper.popper-pick { border-radius: 8px; .el-input--small .el-input__inner { @@ -2535,13 +2384,13 @@ } .el-date-table td.start-date span, .el-date-table td.end-date span { - background-color:var(--colorCard); + background-color: var(--colorCard); } .el-date-table td.in-range div { - background-color:var(--colorCard)17; + background-color: var(--colorCard) 17; } .el-button--default { - background:var(--colorCard); + background: var(--colorCard); padding: 9px 37px; color: #fff; border: 1px solidvar(--colorCard); @@ -2554,8 +2403,6 @@ border-radius: 8px; padding: 0; padding-right: 1px; - // background: olive; - & > span { width: 32px; height: 32px; @@ -2573,7 +2420,7 @@ } } & > span:hover { - background:var(--colorCard); + background: var(--colorCard); color: #fff; } & > .del-wrap:hover { -- Gitblit v1.8.0