From 7d2dba2945bf807413e7fc809fc06acebe3721a8 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 21 一月 2025 13:46:41 +0800
Subject: [PATCH] 1

---
 src/views/doctor/checkAll/index.vue |  529 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 339 insertions(+), 190 deletions(-)

diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index b8d5832..ca22f3b 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -144,12 +144,19 @@
           width="130px"
         />
 
-        <el-table-column
+        <!-- <el-table-column
           label="浣撴鏃堕棿"
           align="center"
           prop="tjTime"
           :show-overflow-tooltip="true"
           width="110px"
+        /> -->
+        <el-table-column
+          label="瀹℃牳鏃堕棿"
+          align="center"
+          prop="shsj"
+          :show-overflow-tooltip="true"
+          width="180px"
         />
         <el-table-column
           label="瀹屾垚鏃堕棿"
@@ -163,10 +170,10 @@
           align="center"
           prop="tjStatus"
           :show-overflow-tooltip="true"
-          width="50px"
+          width="120px"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.tjStatus == "1" ? "宸叉" : "鏈" }}</span>
+            <span>{{ scope.row.tjStatus == "1" ? "宸插鏍�" : "鏈鏍�" }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -183,7 +190,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="鎿嶄綔" align="center" width="90px" fixed="right">
+        <el-table-column label="鎿嶄綔" align="center" width="120px" fixed="right">
           <template slot-scope="scope">
             <el-button
               fixed="right"
@@ -311,32 +318,34 @@
 
       <div style="margin-right: 10px; display: flex" class="btnbox">
         <div class="btn1" v-if="msgtuwen == 'y' || msgtuwen == 'Y'">
-          <el-button @click="Graphicreport()" type="primary"
-            >鍥炬枃鎶ュ憡</el-button
-          >
+          <el-button @click="Graphicreport()" type="primary">
+            <span class="vertical-text">鍥炬枃鎶ュ憡</span>
+          </el-button>
         </div>
         <div class="btn1">
           <el-button @click="historicalreport()" type="primary"
-            >鍘嗗彶鎶ュ憡</el-button
+            ><span class="vertical-text">鍘嗗彶鎶ュ憡</span></el-button
           >
         </div>
         <div v-if="tableAll.tjCategory == '02'" class="btn1">
           <el-button @click="medicalhistory()" type="primary"
-            >鑱屼笟鐥呭彶</el-button
+            ><span class="vertical-text">鑱屼笟鐥呭彶</span></el-button
           >
         </div>
         <div class="btn1" v-if="msgjianqian == 'y' || msgjianqian == 'Y'">
-          <el-button @click="jianqian()" type="primary">妫�鍓嶉棶璇�</el-button>
+          <el-button @click="jianqian()" type="primary"
+            ><span class="vertical-text">妫�鍓嶉棶璇�</span></el-button
+          >
         </div>
 
         <div class="btn1">
           <el-button @click="xiangmuqingkuang()" type="primary"
-            >椤圭洰鎯呭喌</el-button
+            ><span class="vertical-text">椤圭洰鎯呭喌</span></el-button
           >
         </div>
         <div class="btn1">
           <el-button @click="yichangjieguo()" type="primary"
-            >寮傚父缁撴灉</el-button
+            ><span class="vertical-text">寮傚父缁撴灉</span></el-button
           >
         </div>
       </div>
@@ -345,9 +354,9 @@
           class="left"
           style="
             font-size: 14px;
-            height: calc(100% - 11%);
             width: 1100px;
             margin-left: 10px;
+            padding: 0 0 50px;
           "
         >
           <div v-for="(item, index) in changedate" :key="index">
@@ -388,6 +397,12 @@
                     <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">
@@ -570,8 +585,9 @@
             <el-button type="primary" @click="proposalChange"
               >鐢熸垚寤鸿</el-button
             >
+          
           </div>
-
+  
           <el-form
             ref="numberValidateForm"
             label-width="80px"
@@ -611,7 +627,7 @@
 
         <div class="rightbox">
           <div class="right">
-            <template v-if="status == 0">
+            <template v-if="status1 == 0">
               <div v-for="(item, index) in yichangList" :key="index">
                 <div
                   style="
@@ -622,66 +638,123 @@
                 >
                   {{ item.proName || "" }}
                 </div>
-                <el-table
-                  :stripe="true"
-                  :row-style="red"
-                  :data="item.sone"
-                  border
-                  style="width: 100%"
-                  :header-cell-style="{ background: '#67C23A' }"
-                  :expand-row-keys="expends"
-                  :row-key="getRowKeys"
-                >
-                  <el-table-column type="expand">
-                    <template slot-scope="props">
-                      <div
-                        v-if="props.row.advices && props.row.advices.length > 0"
-                      >
+                <template v-if="item.jyjc == '0'">
+                  <el-table
+                    :stripe="true"
+                    :row-style="red"
+                    :data="item.sone"
+                    border
+                    style="width: 100%"
+                    :header-cell-style="{ background: '#67C23A' }"
+                    :expand-row-keys="expends"
+                    :row-key="getRowKeys"
+                  >
+                    <el-table-column type="expand">
+                      <template slot-scope="props">
                         <div
-                          v-for="(jianyi, index1) in props.row.advices"
-                          :key="index1"
-                          style="padding: 0 10px; margin-bottom: 10px"
+                          v-if="
+                            props.row.advices && props.row.advices.length > 0
+                          "
                         >
-                          <div>鏍囬锛歿{ jianyi.bt || "" }}</div>
-                          <div>鍐呭锛歿{ jianyi.nr || "" }}</div>
+                          <div
+                            v-for="(jianyi, index1) in props.row.advices"
+                            :key="index1"
+                            style="padding: 0 10px; margin-bottom: 10px"
+                          >
+                            <div>鏍囬锛歿{ jianyi.bt || "" }}</div>
+                            <div>鍐呭锛歿{ jianyi.nr || "" }}</div>
+                          </div>
                         </div>
-                      </div>
-                      <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
-                    </template>
-                  </el-table-column>
+                        <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
+                      </template>
+                    </el-table-column>
 
-                  <el-table-column align="center" label="妫�娴嬮」鐩�" width="335">
-                    <template slot-scope="scope">
-                      <div>{{ scope.row.proName }}</div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    align="center"
-                    prop="proResult"
-                    label="妫�娴嬬粨鏋�"
-                    width="85"
-                  >
-                  </el-table-column>
+                    <el-table-column
+                      align="center"
+                      label="妫�娴嬮」鐩�"
+                      width="353"
+                    >
+                      <template slot-scope="scope">
+                        <div>{{ scope.row.proName }}</div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      align="center"
+                      prop="proResult"
+                      label="妫�娴嬬粨鏋�"
+                      width="85"
+                    >
+                    </el-table-column>
 
-                  <el-table-column
-                    align="center"
-                    prop="stanId"
-                    label=" 鍙傝�冭寖鍥�"
-                    width="117"
-                  >
-                  </el-table-column>
+                    <el-table-column
+                      align="center"
+                      prop="stanId"
+                      label=" 鍙傝�冭寖鍥�"
+                      width="117"
+                    >
+                    </el-table-column>
 
-                  <el-table-column
-                    align="center"
-                    prop="proAdvice"
-                    label="鍗曚綅"
-                    width="78"
+                    <el-table-column
+                      align="center"
+                      prop="proAdvice"
+                      label="鍗曚綅"
+                      width="78"
+                    >
+                    </el-table-column>
+                  </el-table>
+                </template>
+                <template v-if="item.jyjc == '1'">
+                  <el-table
+                    :stripe="true"
+                    :row-style="red"
+                    :data="item.sone"
+                    border
+                    style="width: 100%"
+                    :header-cell-style="{ background: '#67C23A' }"
+                    :expand-row-keys="expends"
+                    :row-key="getRowKeys"
                   >
-                  </el-table-column>
-                </el-table>
+                    <el-table-column type="expand">
+                      <template slot-scope="props">
+                        <div
+                          v-if="
+                            props.row.advices && props.row.advices.length > 0
+                          "
+                        >
+                          <div
+                            v-for="(jianyi, index1) in props.row.advices"
+                            :key="index1"
+                            style="padding: 0 10px; margin-bottom: 10px"
+                          >
+                            <div>鏍囬锛歿{ jianyi.bt || "" }}</div>
+                            <div>鍐呭锛歿{ jianyi.nr || "" }}</div>
+                          </div>
+                        </div>
+                        <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
+                      </template>
+                    </el-table-column>
+
+                    <el-table-column
+                      align="center"
+                      label="妫�娴嬮」鐩�"
+                      width="232"
+                    >
+                      <template slot-scope="scope">
+                        <div>{{ scope.row.proName }}</div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      align="center"
+                      prop="proResult"
+                      label="妫�娴嬬粨鏋�"
+                      width="403"
+                    >
+                    </el-table-column>
+                  </el-table>
+                </template>
               </div>
             </template>
-            <template v-if="status == 1">
+            <template v-if="status1 == 1">
               <div>
                 <div
                   style="
@@ -697,12 +770,12 @@
                   :data="statusList"
                   style="width: 100%"
                   :header-cell-style="{ background: '#e6a23c' }"
-                  :stripe="true"
+                
                 >
                   <el-table-column
                     align="center"
                     label="閮ㄩ棬"
-                    width="185"
+                    width="144"
                     prop="deptName"
                   >
                   </el-table-column>
@@ -719,11 +792,11 @@
                     align="center"
                     prop="type"
                     :show-overflow-tooltip="true"
-                    width="60"
+                    width="120"
                   >
                     <template slot-scope="scope">
-                      <span v-if="scope.row.type == '0'">鏈</span>
-                      <span v-if="scope.row.type == '1'">宸叉</span>
+                      <span v-if="scope.row.type == '0'">鏈鏍�</span>
+                      <span v-if="scope.row.type == '1'">宸插鏍�</span>
                       <span v-if="scope.row.type == '2'">寮冩</span>
                       <span v-if="scope.row.type == '3'">寤舵湡</span>
                     </template>
@@ -1255,6 +1328,7 @@
   data() {
     return {
       // 鏇存柊鎬绘寤鸿
+
       initialTotalCheckAdvice: "",
       initialState: "",
       preObj: {},
@@ -1274,7 +1348,6 @@
       cusobj: {},
       xiaojie: "",
       isdisabled: false,
-      dialogVisible: false,
       src: "",
       url: "",
       userId: "",
@@ -1382,7 +1455,7 @@
         tjCategory: undefined,
         payType: undefined,
       },
-      status: 0, // 0灞曠ず寮傚父1灞曠ず椤圭洰鎯呭喌
+      status1: 0, // 0灞曠ず寮傚父1灞曠ず椤圭洰鎯呭喌
       viewportHeight: 0,
       expends: [],
     };
@@ -1427,7 +1500,7 @@
     // 椤圭洰鎯呭喌
     xiangmuqingkuang() {
       cSWebGetPro(this.tjNumber).then((res) => {
-        this.status = 1;
+        this.status1 = 1;
         this.statusList = res.data;
 
         if (this.statusList.length == 0) {
@@ -1439,24 +1512,27 @@
       this.drawer = false;
     },
     yichangjieguo() {
-      this.status = 0;
+      this.status1 = 0;
       let _this = this;
       yichang({
         tjNum: this.tjNumber,
       }).then((res) => {
         this.yichangList = res.data;
         this.getExpends();
-        if (this.yichangList.length == 0) {
-          _this.$message.msgSuccess("鏆傛棤寮傚父鎶ュ憡");
+        if (!this.yichangList) {
+          _this.$message({
+            type: "warning ",
+            message: "鏆傛棤寮傚父鎶ュ憡",
+          });
         }
       });
     },
     getdate() {
       getNewDateList().then((res) => {
-        this.startTime = [
+        /* this.startTime = [
           moment(res.data).format("YYYY-MM-DD 00:00:00"),
           moment(res.data).format("YYYY-MM-DD 23:59:00"),
-        ];
+        ]; */
         this.getList();
       });
     },
@@ -1731,6 +1807,7 @@
       if (this.tjproject == "0") {
         getupdateCheckType(this.tjNumber).then((response) => {
           this.changedate = response.data;
+          
           this.changedate.forEach((item) => {
             this.textarea1 = item.checkAdvice;
           });
@@ -1869,10 +1946,11 @@
       };
     },
     redxiangmu({ row }) {
-      if (row.type == 0) {
+      if (row.type != 1) {
         // 鍙橀鑹茬殑鏉′欢
         return {
-          color: "red", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
+          backgroundColor: '#AAD8DF !important', // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
+          // color: "#AAD8DF ",
         };
       }
     },
@@ -1907,39 +1985,160 @@
 
       getState(this.tjNumber).then((res) => {
         this.status = res.data;
+        if (this.status) {
+          if (this.status.status === "1") {
+            this.yichangjieguo();
+            getInfo().then((response) => {
+              this.userId = response.user.userId;
+              if (this.userId) {
+                let data = {
+                  userId: this.userId,
+                  tjNumber: this.tjNumber,
+                  state: 0,
+                };
+                getModifiedState(data).then((res) => {
+                  this.MsgId = res.msg;
+                  this.drawer = true;
+                  getupdateCheckType(this.tjNumber).then((response) => {
+                    this.changedate = response.data;
+                    if (this.changedate) {
+                      this.changedate.forEach((item) => {
+                        this.textarea1 = item.checkAdvice || "";
+                      });
 
-        if (this.status.status === "1") {
+                      // 杩欓噷璁剧疆鍒濆鍊�
+                      this.initialTotalCheckAdvice = this.textarea1; // 淇濆瓨鎬绘寤鸿
+
+                      // 淇濆瓨鍒濆鐘舵��
+                      this.initialState = JSON.parse(
+                        JSON.stringify(this.changedate)
+                      );
+
+                      for (let i = 0; i < this.changedate.length; i++) {
+                        this.remark = this.changedate[i].remark;
+                      }
+                      this.changedate.forEach((item) => {
+                        // this.remark = item.remark;
+                        // item.sons.forEach((item3) => {
+                        //   if (item3.standard.tjStandardGtValue === null) {
+                        //     item3.standard.tjStandardGtValue = "";
+                        //   }
+                        //   if (item3.standard.tjStandardLtValue === null) {
+                        //     item3.standard.tjStandardLtValue = "";
+                        //   }
+                        // });
+                      });
+                    } else {
+                      this.$message({
+                        type: "warning ",
+                        message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
+                      });
+                    }
+                  });
+                });
+              }
+            });
+          } else {
+            this.$confirm(
+              "" + this.status.name + "姝e湪淇敼璇ヤ俊鎭�, 鏄惁寮哄埗杩涘幓?",
+              "鎻愮ず",
+              {
+                confirmButtonText: "鏄�",
+                cancelButtonText: "鍚�",
+                type: "warning",
+              }
+            )
+              .then(() => {
+                this.yichangjieguo();
+                getInfo().then((response) => {
+                  this.userId = response.user.userId;
+
+                  if (this.userId) {
+                    let data = {
+                      userId: this.userId,
+                      tjNumber: this.tjNumber,
+                      state: 0,
+                    };
+                    getforceIn(data).then((res) => {
+                      this.MsgId = res.msg;
+                      this.drawer = true;
+                      getupdateCheckType(this.tjNumber).then((response) => {
+                        this.changedate = response.data;
+                        if (this.changedate) {
+                          for (let i = 0; i < this.changedate.length; i++) {
+                            this.remark = this.changedate[i].remark;
+                          }
+                          this.initialState = JSON.parse(
+                            JSON.stringify(this.changedate)
+                          );
+
+                          this.changedate.forEach((item) => {
+                            this.textarea1 = item.checkAdvice || "";
+
+                            // this.remark = item.remark;
+                            // item.sons.forEach((item3) => {
+                            //   if (item3.standard.tjStandardGtValue === null) {
+                            //     item3.standard.tjStandardGtValue = "";
+                            //   }
+                            //   if (item3.standard.tjStandardLtValue === null) {
+                            //     item3.standard.tjStandardLtValue = "";
+                            //   }
+                            // });
+                            // item.remark = "";
+                          });
+
+                          // 淇濆瓨鎬绘寤鸿
+                          this.totalCheckAdvice = this.changedate.map(
+                            (item) => item.totalCheckAdvice
+                          );
+                        } else {
+                          this.$message({
+                            type: "warning ",
+                            message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
+                          });
+                        }
+                      });
+                    });
+                  }
+                });
+              })
+              .catch(() => {
+                this.$message({
+                  type: "info",
+                  message: "宸插彇娑堣繘鍏�",
+                });
+              });
+
+            this.drawer = false;
+          }
+        } else {
+          this.drawer = true;
           this.yichangjieguo();
           getInfo().then((response) => {
             this.userId = response.user.userId;
+
             if (this.userId) {
               let data = {
                 userId: this.userId,
                 tjNumber: this.tjNumber,
                 state: 0,
               };
-              getModifiedState(data).then((res) => {
+              getforceIn(data).then((res) => {
                 this.MsgId = res.msg;
                 this.drawer = true;
                 getupdateCheckType(this.tjNumber).then((response) => {
                   this.changedate = response.data;
                   if (this.changedate) {
-                    this.changedate.forEach((item) => {
-                      this.textarea1 = item.checkAdvice || "";
-                    });
-
-                    // 杩欓噷璁剧疆鍒濆鍊�
-                    this.initialTotalCheckAdvice = this.textarea1; // 淇濆瓨鎬绘寤鸿
-
-                    // 淇濆瓨鍒濆鐘舵��
+                    for (let i = 0; i < this.changedate.length; i++) {
+                      this.remark = this.changedate[i].remark;
+                    }
                     this.initialState = JSON.parse(
                       JSON.stringify(this.changedate)
                     );
 
-                    for (let i = 0; i < this.changedate.length; i++) {
-                      this.remark = this.changedate[i].remark;
-                    }
                     this.changedate.forEach((item) => {
+                      this.textarea1 = item.checkAdvice || "";
+
                       // this.remark = item.remark;
                       // item.sons.forEach((item3) => {
                       //   if (item3.standard.tjStandardGtValue === null) {
@@ -1949,7 +2148,13 @@
                       //     item3.standard.tjStandardLtValue = "";
                       //   }
                       // });
+                      // item.remark = "";
                     });
+
+                    // 淇濆瓨鎬绘寤鸿
+                    this.totalCheckAdvice = this.changedate.map(
+                      (item) => item.totalCheckAdvice
+                    );
                   } else {
                     this.$message({
                       type: "warning ",
@@ -1960,78 +2165,6 @@
               });
             }
           });
-        } else {
-          this.$confirm(
-            "" + this.status.name + "姝e湪淇敼璇ヤ俊鎭�, 鏄惁寮哄埗杩涘幓?",
-            "鎻愮ず",
-            {
-              confirmButtonText: "鏄�",
-              cancelButtonText: "鍚�",
-              type: "warning",
-            }
-          )
-            .then(() => {
-              this.yichangjieguo();
-              getInfo().then((response) => {
-                this.userId = response.user.userId;
-
-                if (this.userId) {
-                  let data = {
-                    userId: this.userId,
-                    tjNumber: this.tjNumber,
-                    state: 0,
-                  };
-                  getforceIn(data).then((res) => {
-                    this.MsgId = res.msg;
-                    this.drawer = true;
-                    getupdateCheckType(this.tjNumber).then((response) => {
-                      this.changedate = response.data;
-                      if (this.changedate) {
-                        for (let i = 0; i < this.changedate.length; i++) {
-                          this.remark = this.changedate[i].remark;
-                        }
-                        this.initialState = JSON.parse(
-                          JSON.stringify(this.changedate)
-                        );
-
-                        this.changedate.forEach((item) => {
-                          this.textarea1 = item.checkAdvice || "";
-
-                          // this.remark = item.remark;
-                          // item.sons.forEach((item3) => {
-                          //   if (item3.standard.tjStandardGtValue === null) {
-                          //     item3.standard.tjStandardGtValue = "";
-                          //   }
-                          //   if (item3.standard.tjStandardLtValue === null) {
-                          //     item3.standard.tjStandardLtValue = "";
-                          //   }
-                          // });
-                          // item.remark = "";
-                        });
-
-                        // 淇濆瓨鎬绘寤鸿
-                        this.totalCheckAdvice = this.changedate.map(
-                          (item) => item.totalCheckAdvice
-                        );
-                      } else {
-                        this.$message({
-                          type: "warning ",
-                          message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
-                        });
-                      }
-                    });
-                  });
-                }
-              });
-            })
-            .catch(() => {
-              this.$message({
-                type: "info",
-                message: "宸插彇娑堣繘鍏�",
-              });
-            });
-
-          this.drawer = false;
         }
       });
 
@@ -2273,13 +2406,9 @@
 .mainbox {
   position: relative;
 }
-.tanchu {
-  background-color: red;
-}
 .btn {
   margin: 20px 0px;
 }
-/* 鎸夐挳鐨勫垵濮嬬姸鎬� */
 .btnbox {
   display: flex;
   flex-direction: column;
@@ -2293,13 +2422,12 @@
 /* 姣忎釜鎸夐挳鐨勬牱寮� */
 .btn1 {
   animation: fadeInUp 0.5s ease-out forwards; /* 鎸夐挳鍔犺浇鏃剁殑娣″叆鍔ㄧ敾 */
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
   cursor: pointer;
-  writing-mode: vertical-rl; /* 鎸夐挳鏂囨湰绔栫洿鎺掑垪 */
-  text-align: center; /* 鏂囧瓧灞呬腑 */
+  text-align: center;
+}
+.vertical-text {
+  writing-mode: vertical-rl;
+  text-orientation: upright;
 }
 
 /* 璁剧疆鍔ㄧ敾鏁堟灉 */
@@ -2346,7 +2474,7 @@
 }
 
 .main {
-  height: 700px;
+  height: 800px;
   overflow: hidden;
 }
 
@@ -2369,7 +2497,23 @@
   -moz-border-radius: 2em;
   border-radius: 2em;
 }
-
+::v-deep .el-dialog {
+  width: 1700px;
+  height: 900px;
+}
+::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;
@@ -2403,9 +2547,8 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  padding: 0px 20px;
   z-index: 1000; /* 纭繚鎸夐挳灞傜骇鍦ㄥ叾浠栧唴瀹逛笂鏂� */
-  width: 100%;
+  width: 300px;
   background-color: white; /* 鍙牴鎹渶瑕佽皟鏁磋儗鏅鑹� */
 }
 
@@ -2421,24 +2564,24 @@
 }
 .box {
   display: flex;
-  position: sticky;
-  top: 0px;
-  height: 85vh;
-  overflow: auto; // 纭繚鐖跺鍣ㄥ彲浠ユ粴鍔�
+
+  height: 100vh;
 }
 
 .rightbox {
   margin-left: 60px;
-  overflow-y: scroll;
-  position: sticky;
-  top: 0px;
+  position: fixed;
+  top: 107px;
+  right: 56px;
   width: 684px;
+
   .right {
-    position: sticky;
-    top: 0px;
     background-color: #fff;
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+    // box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
     z-index: 10;
+    max-height: calc(100vh - 100px); /* 鍋囪浣犳兂涓洪《閮ㄥ拰搴曢儴鐣欏嚭涓�浜涚┖闂� */
+    overflow-y: auto; /* 鍏佽鍨傜洿婊氬姩 */
+    padding: 0 0 50px; /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛浠ラ伩鍏嶅唴瀹圭揣璐磋竟缂� */
   }
 }
 
@@ -2464,6 +2607,12 @@
 ::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