From 1c3609e9c1318e10488e49445219888697eeb198 Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Thu, 3 Dec 2020 14:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E4=BD=9C=E7=A9=BA=E9=97=B4=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=20=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/css/main.css                                  | 5 +++--
 src/views/main_web/watchall/components/EchartLineItem.vue   | 2 +-
 .../main_web/watchall/components/EchartMoreBarItem.vue      | 2 +-
 src/views/main_web/watchall/components/EchartOneBarItem.vue | 2 +-
 src/views/main_web/watchall/components/MatterDetail.vue     | 4 ++--
 src/views/main_web/watchall/components/NoteContentItem.vue  | 1 -
 .../main_web/watchall/components/PendingMatterEntry.vue     | 2 +-
 src/views/main_web/watchall/components/ProgressItem.vue     | 2 +-
 src/views/main_web/watchall/components/TextItem.vue         | 2 +-
 src/views/main_web/watchall/components/WaringItem.vue       | 2 +-
 src/views/main_web/watchall/watchall.vue                    | 2 ++
 src/views/main_web/watchall/watchlink.vue                   | 6 ++++--
 src/views/main_web/workspace/workspace.new.vue              | 5 ++++-
 13 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/public/static/css/main.css b/public/static/css/main.css
index f3466b4e..30df5463 100644
--- a/public/static/css/main.css
+++ b/public/static/css/main.css
@@ -4483,7 +4483,7 @@ button:focus {
 	background-color: #f0f0f0;
 }
 .bottomBloder{
-	border-bottom: 1px solid rgb(204,205,215);
+	border-bottom: 0.5px solid rgb(204,205,215);
 }
 .yiyun_Headtitle_center{
 	margin:0 24px;
@@ -7410,7 +7410,7 @@ button.yiyuntitle.nowFolderName{
 	/* box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.2); */
 	text-align: center;
 	line-height: 37px;
-	padding: 0 16px;
+	padding: 0 10px;
 	border: 0;
 	font-weight: 400;
 	font-family: PingFang SC;
@@ -7418,6 +7418,7 @@ button.yiyuntitle.nowFolderName{
 	margin-right: 11px;
 	position: relative;
 	top: 2px;
+	left: 8px;
 }
 .shadowbtn{
 	box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.2);
diff --git a/src/views/main_web/watchall/components/EchartLineItem.vue b/src/views/main_web/watchall/components/EchartLineItem.vue
index 03ae325e..7bbf1726 100644
--- a/src/views/main_web/watchall/components/EchartLineItem.vue
+++ b/src/views/main_web/watchall/components/EchartLineItem.vue
@@ -2,7 +2,7 @@
   <div class="line-chart">
     <Title :topTitle="chartTitle"></Title>
     <NoteContentItem>
-      <template v-slot="mian">
+      <template v-slot:main>
         <EchartItem :recChartData="chartData"/>
       </template>
     </NoteContentItem>
diff --git a/src/views/main_web/watchall/components/EchartMoreBarItem.vue b/src/views/main_web/watchall/components/EchartMoreBarItem.vue
index 890ec8af..ad777fbb 100644
--- a/src/views/main_web/watchall/components/EchartMoreBarItem.vue
+++ b/src/views/main_web/watchall/components/EchartMoreBarItem.vue
@@ -2,7 +2,7 @@
   <div class="more-bar-chart">
     <Title :topTitle="chartTitle"/>
     <NoteContentItem>
-      <template v-slot="main">
+      <template v-slot:main>
         <EchartItem :recChartData="chartData"></EchartItem>
       </template>
     </NoteContentItem>
diff --git a/src/views/main_web/watchall/components/EchartOneBarItem.vue b/src/views/main_web/watchall/components/EchartOneBarItem.vue
index e4b0a717..d60767a2 100644
--- a/src/views/main_web/watchall/components/EchartOneBarItem.vue
+++ b/src/views/main_web/watchall/components/EchartOneBarItem.vue
@@ -2,7 +2,7 @@
   <div class="bar-item">
     <Title :topTitle="chartTitle"/>
     <NoteContentItem>
-      <template v-slot="main">
+      <template v-slot:main>
         <EchartItem :recChartData="chartData"/>
       </template>
     </NoteContentItem>
diff --git a/src/views/main_web/watchall/components/MatterDetail.vue b/src/views/main_web/watchall/components/MatterDetail.vue
index cb0aaebf..01315914 100644
--- a/src/views/main_web/watchall/components/MatterDetail.vue
+++ b/src/views/main_web/watchall/components/MatterDetail.vue
@@ -66,9 +66,9 @@
     cursor: pointer;
     
   }
-  /* border为0.5px google显示不出来 */
+
   .operate-btn .wait {
-    border: 1px solid rgba(151, 151, 151, 1);
+    border: 0.5px solid rgba(151, 151, 151, 1);
     background-color: #fff;
     margin:0 0 15px 0;
   }
diff --git a/src/views/main_web/watchall/components/NoteContentItem.vue b/src/views/main_web/watchall/components/NoteContentItem.vue
index 03f6bef3..158aec94 100644
--- a/src/views/main_web/watchall/components/NoteContentItem.vue
+++ b/src/views/main_web/watchall/components/NoteContentItem.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="note-content">
     <slot name="main"></slot>
-    <slot></slot>
   </div>
 </template>
 
diff --git a/src/views/main_web/watchall/components/PendingMatterEntry.vue b/src/views/main_web/watchall/components/PendingMatterEntry.vue
index 41db0e3b..4f8d2ed7 100644
--- a/src/views/main_web/watchall/components/PendingMatterEntry.vue
+++ b/src/views/main_web/watchall/components/PendingMatterEntry.vue
@@ -35,7 +35,7 @@
     height: 44px;
     border-radius: 4px;
     background-color: rgba(255, 255, 255, 1);
-    border: 1px solid #979797;
+    border: 0.5px solid #979797;
     margin: 6px 0 6px 0;
     display: flex;
   }
diff --git a/src/views/main_web/watchall/components/ProgressItem.vue b/src/views/main_web/watchall/components/ProgressItem.vue
index 9fb6b318..27ba0625 100644
--- a/src/views/main_web/watchall/components/ProgressItem.vue
+++ b/src/views/main_web/watchall/components/ProgressItem.vue
@@ -2,7 +2,7 @@
   <div class="progress-com" v-if="Object.keys(progressItem).length > 0">
     <Title :topTitle="progressItem.title"/>
     <NoteContentItem>
-      <template v-slot="main">
+      <template v-slot:main>
         <div>
           <div v-for="(item, index) in progressItem.content" :key="index" class="progress-content">
             <div class="progress-name">{{item.pName}}</div>
diff --git a/src/views/main_web/watchall/components/TextItem.vue b/src/views/main_web/watchall/components/TextItem.vue
index 782f2b13..fa58fb33 100644
--- a/src/views/main_web/watchall/components/TextItem.vue
+++ b/src/views/main_web/watchall/components/TextItem.vue
@@ -2,7 +2,7 @@
   <div class="text-com">
     <Title :topTitle="textItem.title"/>
     <NoteContentItem>
-      <template v-slot="main">
+      <template v-slot:main>
         <div v-if="textItem.content.length > 0">
           <div v-for="(item, index) in textItem.content" :key="index + '1'" class="text-content">
             <div class="content-title">{{ item.itemName }}:</div>
diff --git a/src/views/main_web/watchall/components/WaringItem.vue b/src/views/main_web/watchall/components/WaringItem.vue
index f6aed48d..85bfd7b0 100644
--- a/src/views/main_web/watchall/components/WaringItem.vue
+++ b/src/views/main_web/watchall/components/WaringItem.vue
@@ -2,7 +2,7 @@
   <div class="waring-com">
     <Title topTitle="告警概况"/>
     <NoteContentItem>
-      <template v-slot="main">
+      <template v-slot:main>
           <div class="content-wrap">
             <MatterDetail iconKinds="warning"/>
             <div class="pending-matters">
diff --git a/src/views/main_web/watchall/watchall.vue b/src/views/main_web/watchall/watchall.vue
index 31ac9777..b5622a0b 100644
--- a/src/views/main_web/watchall/watchall.vue
+++ b/src/views/main_web/watchall/watchall.vue
@@ -105,6 +105,8 @@
       backToIndex() {
         this.$router.push({
           path: 'index'
+        }).catch(err => {
+          console.log(err);
         })
       }
     }
diff --git a/src/views/main_web/watchall/watchlink.vue b/src/views/main_web/watchall/watchlink.vue
index 7a0b5682..3c3a901b 100644
--- a/src/views/main_web/watchall/watchlink.vue
+++ b/src/views/main_web/watchall/watchlink.vue
@@ -7,7 +7,7 @@
       <div>
         <Title topTitle="建筑联动模型展示"/>
         <NoteContentItem class="arch-model">
-          <template v-slot="main">
+          <template v-slot:main>
             <div>我是显示建筑联动模型的地方</div>
           </template>
         </NoteContentItem>
@@ -23,7 +23,7 @@
         <div class="right-charts">
           <Title topTitle="现场施工视频监控"/>
           <NoteContentItem class="video">
-            <template v-slot="main">
+            <template v-slot:main>
               <div>我是显示现场施工视频监控的地方</div>
             </template>
           </NoteContentItem>
@@ -80,6 +80,8 @@
       backToIndex() {
         this.$router.push({
           path: 'index'
+        }).catch(err => {
+          console.log(err);
         })
       }
     }
diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue
index 0006b20a..710a35a3 100644
--- a/src/views/main_web/workspace/workspace.new.vue
+++ b/src/views/main_web/workspace/workspace.new.vue
@@ -531,7 +531,7 @@ export default {
       // }
     },
     listenBottomHeight() {
-      let oDivH = document.getElementById("bottomBox").offsetHeight;
+      let oDivH = document.getElementById('bottomBox') ? document.getElementById("bottomBox").offsetHeight : 0;
       let oShodow = document.getElementById("bottomoShodow");
       // console.log(oDivH)
       if (oDivH > 259) {
@@ -1198,6 +1198,9 @@ export default {
     ::v-deep .el-breadcrumb__item {
       user-select: none;
       font-size: 18px;
+      display: inline-block;
+      height: 56px;
+      line-height: 56px;
       .el-breadcrumb__separator {
         color: #a7a8b7;
       }