From 1c028b8b24898c8adb5750e5adb8351987485a6f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 10 Apr 2021 16:55:19 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

---
 src/views/parcel/parcelKind.vue |    7 +++++++
 src/views/home/home.vue         |   10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index aa828a5..51430c5 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -13,6 +13,7 @@
     frameborder="0"
     name="showHere"
     scrolling="auto"
+    class="iframes"
     src="https://web.byisf.com/bigScreen/view/1349193280059879426"
   ></iframe>
 </template>
@@ -102,14 +103,19 @@
 };
 </script>
 
-<style>
+<style lang="scss">
 #show-iframe {
   display: block !important;
-  height: 95%;
+  height: 100%;
 }
 
 .avue-main .avue-view {
   height: 100%;
   padding: 5px 5px !important;
 }
+
+.views {
+    overflow-y: hidden !important;
+}
+
 </style>
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index e5a5106..c52b19f 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -8,6 +8,7 @@
                :before-open="beforeOpen"
                v-model="form"
                ref="crud"
+               :row-style="rowStyle"
                @row-update="rowUpdate"
                @row-save="rowSave"
                @row-del="rowDel"
@@ -246,6 +247,12 @@
              return this.$route.query.endTime
            }
       },
+      //给行加颜色
+      rowStyle({row, column, rowIndex}){
+        return {
+          color:"#fe1515"
+        }
+      },
       onLoad(page, params = {}) {
         const { dateTime } = this.query;
         let values = {

--
Gitblit v1.9.3