From e4717b437f7b4ef27c9801508f252f811fc65b3e Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期三, 09 四月 2025 13:43:22 +0800 Subject: [PATCH] 111 --- src/views/doctor/checkAll/index.vue | 815 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 492 insertions(+), 323 deletions(-) diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue index f22e922..82d9999 100644 --- a/src/views/doctor/checkAll/index.vue +++ b/src/views/doctor/checkAll/index.vue @@ -152,6 +152,7 @@ width="110px" /> --> <el-table-column + v-if="tjStatus === '1'" label="瀹℃牳鏃堕棿" align="center" prop="shsj" @@ -159,9 +160,17 @@ width="180px" /> <el-table-column + v-if="tjStatus === '0'" label="瀹屾垚鏃堕棿" align="center" prop="finishTime" + :show-overflow-tooltip="true" + width="160px" + /> + <el-table-column + label="濂楅鍚嶇О" + align="center" + prop="pacName" :show-overflow-tooltip="true" width="160px" /> @@ -199,20 +208,30 @@ <template slot-scope="scope"> <el-button fixed="right" - title="澶勬柟" - type="text" - size="mini" - @click.stop="rowClick(scope.row)" - icon="el-icon-edit-outline" - ></el-button> - <el-button - fixed="right" title="璇︽儏" type="text" size="mini" @click.stop="handleClick(scope.row)" icon="el-icon-document-copy" ></el-button> + <el-button + fixed="right" + title="鍚屾" + type="text" + size="mini" + @click.stop="tongbu(scope.row)" + v-if="scope.row.tjStatus != '1'" + icon="el-icon-upload2" + ></el-button> + <el-button + fixed="right" + title="澶勬柟" + type="text" + size="mini" + @click.stop="rowClick(scope.row)" + icon="el-icon-edit-outline" + ></el-button> + <!-- <el-button type="text" size="mini" @click="generate(scope.row)" v-if="scope.row.tjStatus=='1'">鐢熸垚</el-button> --> <el-button type="text" @@ -247,14 +266,13 @@ </div> </template> - <!-- 鐐瑰嚮寮瑰嚭妗� --> + <!-- 鐐瑰嚮寮瑰嚭妗� show-close="true"--> <el-drawer custom-class="tanchu" :visible.sync="drawer" :before-close="handleClose" :with-header="false" size="100%" - show-close="true" > <div class="top"> <table @@ -355,280 +373,287 @@ </div> </div> <div class="box"> - <div - class="left" - style=" - font-size: 14px; - width: 1100px; - margin-left: 10px; - padding: 0 0 50px; - " - > - <div v-for="(item, index) in changedate" :key="index"> - <div - style=" - text-align: center; - background-color: #aad8df; - margin-top: 10px; - " - > - {{ item.parent || "" }} - </div> - <div v-if="item.xmlb == '0'"> - <el-table - :data="item.sons" - border - style="width: 100%" - :row-style="changRed" - :header-cell-style="{ background: '#aad8df' }" + <div class="left-container"> + <div class="left"> + <div v-for="(item, index) in changedate" :key="index"> + <div + style=" + text-align: center; + background-color: #aad8df; + margin-top: 10px; + " > - <el-table-column align="center" label="妫�娴嬮」鐩�" width="464"> - <template slot-scope="scope"> - <div>{{ scope.row.proName }}</div> - </template> - </el-table-column> - <el-table-column - align="center" - prop="proResult" - label="妫�娴嬬粨鏋�" - width="180" + {{ item.parent || "" }} + </div> + <div v-if="item.xmlb == '0'"> + <el-table + :data="item.sons" + border + style="width: 100%" + :row-style="changRed" + :header-cell-style="{ background: '#aad8df' }" > - </el-table-column> - <el-table-column align="center" prop="" label="鍗曚綅"> - <template slot-scope="scope"> - <div v-if="scope.row.project != null"> - {{ scope.row.standard.company || "" }} - </div> - <div v-else>{{ scope.row.proAdvice }}</div> - </template> - </el-table-column> - <el-table-column - align="center" - prop="conclusion" - label="寮傚父" - width="180" - ></el-table-column> - <el-table-column align="center" prop="" label=" 鍙傝�冭寖鍥�"> - <template slot-scope="scope"> - <div v-if="scope.row.project != null"> - {{ - scope.row.standard.tjStandardGtValue || - "/" + "-" + scope.row.standard.tjStandardLtValue || - "/" - }} - </div> - <div v-else>{{ scope.row.stanId || "/" }}</div> - </template> - </el-table-column> - </el-table> - <table style="width: 100%" v-if="tjproject != '1'"> - <tr - style="border: 1px solid #dfe6ec; border-collapse: collapse" - > - <td - style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - width: 7%; - " + <el-table-column align="center" label="妫�娴嬮」鐩�" width="464"> + <template slot-scope="scope"> + <div>{{ scope.row.proName }}</div> + </template> + </el-table-column> + <el-table-column + align="center" + prop="proResult" + label="妫�娴嬬粨鏋�" + width="180" > - 灏忕粨锛� - </td> - <td style="border: 1px solid #dfe6ec; width: 45%"> - <el-input v-model="item.remark" disabled></el-input> - </td> - <td - style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - width: 15%; - " - > - 涓绘鍖诲笀锛� - </td> - <td + </el-table-column> + <el-table-column align="center" prop="" label="鍗曚綅"> + <template slot-scope="scope"> + <div v-if="scope.row.project != null"> + {{ scope.row.standard.company || "" }} + </div> + <div v-else>{{ scope.row.proAdvice }}</div> + </template> + </el-table-column> + <el-table-column + align="center" + prop="conclusion" + label="寮傚父" + width="180" + ></el-table-column> + <el-table-column align="center" prop="" label=" 鍙傝�冭寖鍥�"> + <template slot-scope="scope"> + <div v-if="scope.row.project != null"> + {{ + scope.row.standard.tjStandardGtValue || + "/" + "-" + scope.row.standard.tjStandardLtValue || + "/" + }} + </div> + <div v-else>{{ scope.row.stanId || "/" }}</div> + </template> + </el-table-column> + </el-table> + <table style="width: 100%" v-if="tjproject != '1'"> + <tr style="border: 1px solid #dfe6ec; border-collapse: collapse" - colspan="2" > - {{ item.doctorName }} - </td> - </tr> - <tr - style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - width: 200px; - " - > - <td + <td + style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + width: 7%; + " + > + 灏忕粨锛� + </td> + <td style="border: 1px solid #dfe6ec; width: 45%"> + <el-input v-model="item.remark" disabled></el-input> + </td> + <td + style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + width: 15%; + " + > + 涓绘鍖诲笀锛� + </td> + <td + style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + " + colspan="2" + > + {{ item.doctorName }} + </td> + </tr> + <tr style=" border: 1px solid #dfe6ec; border-collapse: collapse; - width: 240px; + width: 200px; " > - 澶囨敞锛� - </td> - <td + <td + style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + width: 240px; + " + > + 澶囨敞锛� + </td> + <td + style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + " + colspan="3" + > + <el-input + type="textarea" + autosize + placeholder="璇疯緭鍏ュ唴瀹�" + v-model="changedate[index].remark" + v-on:input="change" + style="width: 100%" + > + </el-input> + <!-- <textarea + placeholder="璇疯緭鍏ュ唴瀹�" + :autosize="{ minRows: 2 }" + style="width: 100%; height: 240px; resize: none" + v-model="changedate[index].remark" + v-on:input="change" + ></textarea> --> + </td> + </tr> + </table> + </div> + <div v-else> + <table style="width: 100%" v-if="tjproject != '1'"> + <tr style="border: 1px solid #dfe6ec"> + <td + style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + width: 15%; + height: auto; + " + > + 妫�鏌ユ墍瑙侊細 + </td> + <td + style="border: 1px solid #dfe6ec; height: auto" + colspan="2" + > + <el-input + type="textarea" + autosize + placeholder="璇疯緭鍏ュ唴瀹�" + v-model="item.jgbx" + style="width: 100%" + > + </el-input> + <!-- <textarea + placeholder="璇疯緭鍏ュ唴瀹�" + :autosize="{ minRows: 3}" + style="width: 100%; height: auto; resize: none" + v-model="item.jgbx" + ></textarea> --> + </td> + </tr> + <tr style="border: 1px solid #dfe6ec; border-collapse: collapse" - colspan="3" > - <el-input - type="textarea" - autosize - placeholder="璇疯緭鍏ュ唴瀹�" - v-model="changedate[index].remark" - v-on:input="change" - style="width: 100%" + <td + style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + width: 15%; + " > - </el-input> - <!-- <textarea - placeholder="璇疯緭鍏ュ唴瀹�" - :autosize="{ minRows: 2 }" - style="width: 100%; height: 240px; resize: none" - v-model="changedate[index].remark" - v-on:input="change" - ></textarea> --> - </td> - </tr> - </table> - </div> - <div v-else> - <table style="width: 100%" v-if="tjproject != '1'"> - <tr style="border: 1px solid #dfe6ec"> - <td - style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - width: 15%; - height: auto; - " - > - 妫�鏌ユ墍瑙侊細 - </td> - <td - style="border: 1px solid #dfe6ec; height: auto" - colspan="2" - > - <el-input - type="textarea" - autosize - placeholder="璇疯緭鍏ュ唴瀹�" - v-model="item.jgbx" - style="width: 100%" + 妫�鏌ユ彁绀猴細 + </td> + <td + style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + " + colspan="2" > - </el-input> - <!-- <textarea - placeholder="璇疯緭鍏ュ唴瀹�" - :autosize="{ minRows: 3}" - style="width: 100%; height: auto; resize: none" - v-model="item.jgbx" - ></textarea> --> - </td> - </tr> - <tr - style="border: 1px solid #dfe6ec; border-collapse: collapse" - > - <td - style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - width: 15%; - " - > - 妫�鏌ユ彁绀猴細 - </td> - <td - style="border: 1px solid #dfe6ec; border-collapse: collapse" - colspan="2" - > - <el-input - type="textarea" - autosize - placeholder="璇疯緭鍏ュ唴瀹�" - v-model="item.remark" - style="width: 100%" - > - </el-input> - <!-- <textarea + <el-input + type="textarea" + autosize + placeholder="璇疯緭鍏ュ唴瀹�" + v-model="item.remark" + style="width: 100%" + > + </el-input> + <!-- <textarea - placeholder="璇疯緭鍏ュ唴瀹�" - style="width: 100%; resize: none" - v-model="item.remark" - ></textarea> --> - </td> - </tr> - <tr - style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - width: 200px; - " - > - <td + placeholder="璇疯緭鍏ュ唴瀹�" + style="width: 100%; resize: none" + v-model="item.remark" + ></textarea> --> + </td> + </tr> + <tr style=" border: 1px solid #dfe6ec; border-collapse: collapse; - width: 15%; + width: 200px; " > - 涓绘鍖诲笀锛� - </td> - <td - style="border: 1px solid #dfe6ec; border-collapse: collapse" - colspan="2" - > - {{ item.doctorName }} - </td> - </tr> - </table> + <td + style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + width: 15%; + " + > + 涓绘鍖诲笀锛� + </td> + <td + style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + " + colspan="2" + > + {{ item.doctorName }} + </td> + </tr> + </table> + </div> </div> - </div> - <div style="margin: 0 0px 10px 15px" v-if="tjproject != '1'"> - <el-button type="primary" @click="propoChange">蹇嵎寤鸿</el-button> - <el-button type="primary" @click="proposalChange" - >鐢熸垚寤鸿</el-button - > - </div> - - <el-form - ref="numberValidateForm" - label-width="80px" - class="demo-ruleForm" - v-if="tjproject != '1'" - > - <el-form-item label="鎬绘寤鸿"> - <el-input - type="textarea" - placeholder="璇疯緭鍏ュ唴瀹�" - v-model="textarea1" - :rows="3" - style="width: 96%" + <div style="margin: 0 0px 10px 15px" v-if="tjproject != '1'"> + <el-button type="primary" @click="propoChange" + >蹇嵎寤鸿</el-button > - </el-input> - </el-form-item> - </el-form> - <div slot="footer" class="dialog-footers"> - <el-button type="primary" @click.stop="guanbi">鍙栨秷</el-button> - <el-button - v-if="tjproject == '0' && (msgkcf == 'y' || msgkcf == 'Y')" - type="primary" - @click.stop="rowClick" - icon="el-icon-edit-outline" - >寮�澶勬柟</el-button + <el-button type="primary" @click="proposalChange" + >鐢熸垚寤鸿</el-button + > + </div> + + <el-form + ref="numberValidateForm" + label-width="80px" + class="demo-ruleForm" + v-if="tjproject != '1'" > - <div v-if="tjproject == '0'"> + <el-form-item label="鎬绘寤鸿"> + <el-input + type="textarea" + placeholder="璇疯緭鍏ュ唴瀹�" + v-model="textarea1" + :rows="3" + style="width: 96%" + > + </el-input> + </el-form-item> + </el-form> + <div slot="footer" class="dialog-footers"> + <el-button type="primary" @click.stop="guanbi">鍙栨秷</el-button> <el-button + v-if="tjproject == '0' && (msgkcf == 'y' || msgkcf == 'Y')" type="primary" - @click="determine" - :disabled="isdisabled" - >鎻愪氦骞剁敓鎴愭姤鍛�</el-button + @click.stop="rowClick" + icon="el-icon-edit-outline" + >寮�澶勬柟</el-button > + <div v-if="tjproject == '0'"> + <el-button + type="primary" + @click="determine" + :disabled="isdisabled" + >鎻愪氦骞剁敓鎴愭姤鍛�</el-button + > + </div> </div> </div> </div> - <div class="rightbox"> <div class="right"> <template v-if="status1 == 0"> @@ -655,7 +680,8 @@ > <el-table-column type="expand"> <template slot-scope="props"> - <div> + <div style="padding: 10px"> + <!-- 鍐呭鍖哄煙 --> <div v-if=" props.row.advices && props.row.advices.length > 0 @@ -664,7 +690,7 @@ <div v-for="(jianyi, index1) in props.row.advices" :key="index1" - style="padding: 0 10px; margin-bottom: 10px" + style="margin-bottom: 10px" > <div> 鏍囬锛� @@ -707,6 +733,15 @@ autosize ></el-input> </div> + </div> + + <div style="margin-top: 10px"> + <el-button + @click="shanchu(props.row)" + type="danger" + size="small" + >鍒犻櫎</el-button + > </div> </div> </template> @@ -745,14 +780,6 @@ width="78" > </el-table-column> - <el-table-column - fixed="right" - label="鎿嶄綔" - width="100"> - <template slot-scope="scope"> - <el-button @click="handleClick(scope.row)" type="danger" size="small">鍒犻櫎</el-button> - </template> - </el-table-column> </el-table> </template> <template v-if="item.jyjc == '1'"> @@ -768,8 +795,8 @@ > <el-table-column type="expand"> <template slot-scope="props"> - <div> - <!-- 濡傛灉 advices 闈炵┖锛屾覆鏌撳叾鍐呭 --> + <div style="padding: 10px"> + <!-- 鍐呭鍖哄煙 --> <div v-if=" props.row.advices && props.row.advices.length > 0 @@ -778,7 +805,7 @@ <div v-for="(jianyi, index1) in props.row.advices" :key="index1" - style="padding: 0 10px; margin-bottom: 10px" + style="margin-bottom: 10px" > <div> 鏍囬锛� @@ -821,6 +848,15 @@ autosize ></el-input> </div> + </div> + + <div style="margin-top: 10px"> + <el-button + @click="shanchu(props.row)" + type="danger" + size="small" + >鍒犻櫎</el-button + > </div> </div> </template> @@ -1318,10 +1354,10 @@ </el-drawer> <el-dialog - class="dia" title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false" + width="50%" > <div class="main"> <iframe @@ -1348,7 +1384,12 @@ </el-dialog> <Packages ref="bbb" :baogao="baogao" /> <Prescription ref="Pre" :preObj="preObj" /> - <proposal ref="proposal" :cusobj="cusobj" @event1="eventchange($event)" /> + <proposal + ref="proposal" + :cusobj="cusobj" + :tjNumber="tjNumber" + @event1="eventchange($event)" + /> <createproposal ref="createproposal" :creatobj="creatobj" /> <el-dialog @@ -1360,7 +1401,7 @@ </el-dialog> </div> </template> - + <script> import jianqianwenzhen from "@/components/jianqianwenzhen"; @@ -1385,9 +1426,9 @@ import { getInfoById } from "@/api/hosp/history"; import { getInfo } from "@/api/login"; import { getCompany, queryCompany } from "@/api/team/tuanti"; -import { reportHistory, yichang } from "@/api/doctor/check"; +import { reportHistory, yichang, shanchu } from "@/api/doctor/check"; import { getPdf, revoke } from "@/api/hosp/order"; -import { cSWebGetPro } from "@/api/doctor/examination"; +import { cSWebGetPro, dataSynchronization } from "@/api/doctor/examination"; import ViewPdf from "@/components/ViewPdf"; import Historicalreport from "@/components/Historicalreport"; import { getDicts } from "@/api/system/dict/data"; @@ -1555,6 +1596,7 @@ status1: 0, // 0灞曠ず寮傚父1灞曠ず椤圭洰鎯呭喌 viewportHeight: 0, expends: [], + clearTimeSet: null, }; }, @@ -1572,6 +1614,64 @@ }); }, methods: { + setTime() { + //璁剧疆瀹氭椂鍣� + this.clearTimeSet = setInterval(() => { + this.$modal.closeLoading(); + }, 300000); + }, + tongbu(row) { + this.$modal.loading("姝e湪鍚屾锛岃绋嶅��..."); + this.setTime(); + let tjNumber = row.tjNumber; + dataSynchronization(tjNumber) + .then((res, error) => { + if (res.code == 200) { + this.clearTimeSet = null; + this.$modal.closeLoading(); + this.$modal.msgSuccess("鍚屾鎴愬姛锛�"); + } + }) + .catch((error) => { + this.clearTimeSet = null; + this.$modal.closeLoading(); + }); + }, + shanchu(row) { + console.log(row); + shanchu({ + id: row.orderDetailId, + }).then((res) => { + console.log(res); + // 鎵惧埌瑕佸垹闄ら」鎵�鍦ㄧ殑鐖剁骇鏁扮粍 + const parentItem = this.yichangList.find((item) => + item.sone.some((soneItem) => soneItem.proId === row.proId) + ); + + if (parentItem) { + // 浠庣埗绾х殑 sone 鏁扮粍涓垹闄よ椤� + const index = parentItem.sone.findIndex( + (item) => item.proId === row.proId + ); + if (index > -1) { + parentItem.sone.splice(index, 1); + + // 濡傛灉鍒犻櫎鍚� sone 鏁扮粍涓虹┖,鍒欏垹闄ゆ暣涓埗绾ч」 + if (parentItem.sone.length === 0) { + const parentIndex = this.yichangList.indexOf(parentItem); + if (parentIndex > -1) { + this.yichangList.splice(parentIndex, 1); + } + } + + // 鏇存柊 expends 鏁扮粍 + this.getExpends(); + + this.$message.success("鍒犻櫎鎴愬姛"); + } + } + }); + }, getConfigKey() { getconfigKey("sfkqtwbg").then((res) => { this.msgtuwen = res.msg; @@ -1743,7 +1843,10 @@ setTimeout(() => { loading.close(); }, 3000); - this.$message.msgSuccess("鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�"); + this.$message({ + message: "鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�", + type: "error", + }); } else { this.dialogVisible = true; @@ -1901,11 +2004,16 @@ }, eventchange(data) { this.dataText = data; + console.log(data, 6655); + if (this.textarea1 == null) { this.textarea1 = ""; } - data.forEach((item) => { + /* data.forEach((item) => { this.textarea1 += item.advice; + }); */ + data.forEach((item) => { + this.textarea1 += (item.advice || item.jynr || "") + "\n"; }); }, proposalChange() { @@ -1956,6 +2064,7 @@ if (res.data) { // this.Testitems = res.data this.changedate = res.data; + this.changedate.forEach((item) => { this.textarea1 = item.checkAdvice; }); @@ -2605,25 +2714,33 @@ .mainbox { position: relative; } + .btn { margin: 20px 0px; } + .btnbox { display: flex; flex-direction: column; - gap: 10px; /* 鎸夐挳涔嬮棿鐨勯棿璺� */ - position: fixed; /* 浣挎暣涓寜閽尯鍩熷浐瀹氬湪椤甸潰 */ - right: 0; /* 鍥哄畾鍦ㄩ〉闈㈠彸渚� */ - top: 20%; /* 鍒濆浣嶇疆 */ + gap: 10px; + /* 鎸夐挳涔嬮棿鐨勯棿璺� */ + position: fixed; + /* 浣挎暣涓寜閽尯鍩熷浐瀹氬湪椤甸潰 */ + right: 0; + /* 鍥哄畾鍦ㄩ〉闈㈠彸渚� */ + top: 20%; + /* 鍒濆浣嶇疆 */ z-index: 10; } /* 姣忎釜鎸夐挳鐨勬牱寮� */ .btn1 { - animation: fadeInUp 0.5s ease-out forwards; /* 鎸夐挳鍔犺浇鏃剁殑娣″叆鍔ㄧ敾 */ + animation: fadeInUp 0.5s ease-out forwards; + /* 鎸夐挳鍔犺浇鏃剁殑娣″叆鍔ㄧ敾 */ cursor: pointer; text-align: center; } + .vertical-text { writing-mode: vertical-rl; text-orientation: upright; @@ -2633,86 +2750,97 @@ @keyframes fadeInUp { 0% { opacity: 0; - transform: translateY(20px) scale(0.5); /* 鍒濆鐘舵�侊細閫忔槑涓旂缉灏� */ + transform: translateY(20px) scale(0.5); + /* 鍒濆鐘舵�侊細閫忔槑涓旂缉灏� */ } + 100% { opacity: 1; - transform: translateY(0) scale(1); /* 鏈�缁堢姸鎬侊細瀹屽叏鏄剧ず涓旀甯稿ぇ灏� */ + transform: translateY(0) scale(1); + /* 鏈�缁堢姸鎬侊細瀹屽叏鏄剧ず涓旀甯稿ぇ灏� */ } } /* 姣忎釜鎸夐挳鐨勪綅缃拰鍔ㄧ敾寤惰繜 */ .btnbox > div:nth-child(1) { - top: 20%; /* 绗竴涓寜閽殑浣嶇疆 */ - animation-delay: 0s; /* 鏃犲欢杩� */ + top: 20%; + /* 绗竴涓寜閽殑浣嶇疆 */ + animation-delay: 0s; + /* 鏃犲欢杩� */ } .btnbox > div:nth-child(2) { - top: 30%; /* 绗簩涓寜閽殑浣嶇疆 */ + top: 30%; + /* 绗簩涓寜閽殑浣嶇疆 */ animation-delay: 0.2s; } .btnbox > div:nth-child(3) { - top: 40%; /* 绗笁涓寜閽殑浣嶇疆 */ + top: 40%; + /* 绗笁涓寜閽殑浣嶇疆 */ animation-delay: 0.4s; } .btnbox > div:nth-child(4) { - top: 50%; /* 绗洓涓寜閽殑浣嶇疆 */ + top: 50%; + /* 绗洓涓寜閽殑浣嶇疆 */ animation-delay: 0.6s; } .btnbox > div:nth-child(5) { - top: 60%; /* 绗簲涓寜閽殑浣嶇疆 */ + top: 60%; + /* 绗簲涓寜閽殑浣嶇疆 */ animation-delay: 0.8s; } .btnbox > div:nth-child(6) { - top: 70%; /* 绗叚涓寜閽殑浣嶇疆 */ + top: 70%; + /* 绗叚涓寜閽殑浣嶇疆 */ animation-delay: 1s; } .main { - height: 800px; - overflow: hidden; + height: 80vh; // 鏀逛负浣跨敤瑙嗙獥楂樺害 + min-height: 600px; // 璁剧疆鏈�灏忛珮搴� + overflow: auto; // 鏀逛负auto鍏佽婊氬姩 } -#printIframe::-webkit-scrollbar { +// 浼樺寲婊氬姩鏉℃牱寮� +.main::-webkit-scrollbar { width: 6px; } -/* 淇敼 婊氬姩鏉$殑 涓嬮潰 鐨� 鏍峰紡 */ -#printIframe::-webkit-scrollbar-track { +.main::-webkit-scrollbar-track { background-color: white; - -webkit-border-radius: 2em; - -moz-border-radius: 2em; border-radius: 2em; } -/* 淇敼 婊戝潡 */ -#printIframe::-webkit-scrollbar-thumb { +.main::-webkit-scrollbar-thumb { background-color: #dcdfe6; - -webkit-border-radius: 2em; - -moz-border-radius: 2em; border-radius: 2em; } + ::v-deep .el-dialog { - width: 1700px; - height: 900px; + margin-top: 5vh !important; // 璋冩暣瀵硅瘽妗嗕綅缃� } + ::v-deep .el-dialog__header { padding: 8px; } + ::v-deep .el-dialog__body { padding: 0; } + ::v-deep .el-button--medium { padding: 10px; } + ::v-deep .el-dialog__headerbtn { // position: relative; top: 13px; } + /* .el-dialog { width: 1264px; height: 800px; @@ -2746,9 +2874,11 @@ display: flex; justify-content: center; align-items: center; - z-index: 1000; /* 纭繚鎸夐挳灞傜骇鍦ㄥ叾浠栧唴瀹逛笂鏂� */ + z-index: 1000; + /* 纭繚鎸夐挳灞傜骇鍦ㄥ叾浠栧唴瀹逛笂鏂� */ width: 300px; - background-color: white; /* 鍙牴鎹渶瑕佽皟鏁磋儗鏅鑹� */ + background-color: white; + /* 鍙牴鎹渶瑕佽皟鏁磋儗鏅鑹� */ } /* 纭繚鎸夐挳涔嬮棿鏈夊悎閫傜殑闂磋窛 */ @@ -2761,30 +2891,66 @@ border: none; outline: none; } + .box { display: flex; + height: calc(100% - 160px); + margin-top: 20px; + overflow: hidden; +} - // height: 100vh; +.left-container { + flex: 1; + margin-right: 10px; + overflow: hidden; +} + +.left { + height: 100%; + padding: 0 10px; + overflow-y: scroll; // 鏀逛负 scroll 鑰屼笉鏄� auto + + &::-webkit-scrollbar { + width: 8px; // 澧炲姞瀹藉害浣垮叾鏇村鏄撶湅瑙� + background-color: #f5f5f5; + display: block; // 纭繚鏄剧ず + } + + &::-webkit-scrollbar-thumb { + background: #909399; + border-radius: 4px; + } + + &::-webkit-scrollbar-track { + background: #f5f5f5; + border-radius: 4px; + } } .rightbox { - // margin-left: 60px; - // position: fixed; - // top: 107px; - // right: 56px; - width: 684px; - position: fixed; /* 鍥哄畾瀹氫綅 */ - right: 60px; - .right { - background-color: #fff; - // box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1); - z-index: 10; - max-height: 900px; - height: calc(100vh - 100px); - /* 鍋囪浣犳兂涓洪《閮ㄥ拰搴曢儴鐣欏嚭涓�浜涚┖闂� */ - overflow-y: auto !important; /* 鍏佽鍨傜洿婊氬姩 */ - padding: 0 0 50px; /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛浠ラ伩鍏嶅唴瀹圭揣璐磋竟缂� */ - padding-bottom: 200px; + width: 700px; + overflow: hidden; +} + +.right { + height: 100%; + padding: 0 10px; + overflow-y: scroll; // 鏀逛负 scroll 鑰屼笉鏄� auto + + &::-webkit-scrollbar { + width: 8px; // 澧炲姞瀹藉害 + background-color: #f5f5f5; + display: block; // 纭繚鏄剧ず + } + + &::-webkit-scrollbar-thumb { + background: #909399; + border-radius: 4px; + } + + &::-webkit-scrollbar-track { + background: #f5f5f5; + border-radius: 4px; } } @@ -2795,6 +2961,7 @@ background-color: #fff; box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1); display: flex; + .el-icon-close { cursor: pointer; font-size: 30px; @@ -2804,18 +2971,20 @@ color: rgb(24, 144, 255); } } + .kong { box-shadow: none; } + ::v-deep .el-table--medium .el-table__cell { padding: 5px 0; } + ::-webkit-scrollbar { display: none; } + ::v-deep .el-drawer { padding: 0 0 50px; } </style> - - -- Gitblit v1.8.0