From a093b4758d54e9dabe904c5bf301b12e31b9d6af Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 10 Aug 2022 09:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/saas/AppHome/components/Grid.vue |  4 +-
 src/project/saas/AppHome/components/Home.vue | 71 ++++++++++++++++++--
 src/project/saas/AppHome/components/My.vue   |  2 +-
 src/project/saas/AppSpecialGroups/Add.vue    |  7 +-
 src/project/saas/AppSpecialPeople/add.vue    |  6 +-
 5 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/src/project/saas/AppHome/components/Grid.vue b/src/project/saas/AppHome/components/Grid.vue
index b26e8dd9..fd758b74 100644
--- a/src/project/saas/AppHome/components/Grid.vue
+++ b/src/project/saas/AppHome/components/Grid.vue
@@ -62,8 +62,8 @@ export default {
   .banner-img {
     padding: 32px 32px 16px;
     img {
-      width: 686px;
-      height: 240px;
+      width: 100%;
+      // height: 240px;
     }
   }
   .content {
diff --git a/src/project/saas/AppHome/components/Home.vue b/src/project/saas/AppHome/components/Home.vue
index 57646152..102c4f97 100644
--- a/src/project/saas/AppHome/components/Home.vue
+++ b/src/project/saas/AppHome/components/Home.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="Home">
-    <div class="tips">
+    <u-notice-bar mode="horizontal" :list="list"></u-notice-bar>
+    <!-- <div class="tips">
       <img src="../img/home/tips-icon.png" alt="">慧政务改版上线了，点此查看帮助文档！
-    </div>
+    </div> -->
     <div class="content">
       <div class="user-info">
         <div class="left">
@@ -80,7 +81,8 @@ export default {
           num: 15
         }
       ],
-      echartData: null
+      echartData: null,
+      list: ['慧政务改版上线了，点此查看帮助文档！']
     }
   },
   computed: { ...mapState(['user']) },
@@ -96,15 +98,56 @@ export default {
         },
         xAxis: {
           type: 'category',
+          boundaryGap: false,
+          axisLine: {
+            lineStyle: {
+              color: '#E1E5EF', //x轴的颜色
+              width: 1, //轴线的宽度
+            },
+          },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#666',
+            },
+          },
           data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
         },
         yAxis: {
+          axisLine:{       //y轴
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#666',
+            },
+          },
           type: 'value'
         },
         series: [
           {
             data: [150, 230, 224, 218, 135, 147, 260],
             type: 'line',
+            areaStyle: {//覆盖区域的渐变色
+            	normal: {
+            		color: {
+                  type: 'linear',x: 0,y: 0,x2: 0,y2: 1,
+                  colorStops: [
+                    {
+                      offset: 0, color: 'rgba(58,132,255, 0.8)' // 0% 处的颜色
+                    },
+                    {
+                      offset: 1, color: 'rgba(58,132,255, 0)' // 100% 处的颜色
+                    }
+                  ],
+                  global: false // 缺省为 false
+		       		  },
+            	}
+            },
             lineStyle: {
               normal: {
                 color: '#2891FF'
@@ -219,7 +262,7 @@ export default {
     .tab-content {
       .item {
         display: inline-block;
-        width: 336px;
+        width: calc(50% - 14px);
         height: 160px;
         background: #FFF;
         box-shadow: 0 0 8px 0 rgba(0,0,0,0.0200);
@@ -266,7 +309,7 @@ export default {
       }
     }
     .chart-content{
-      width: 686px;
+      width: 100%;
       height: 514px;
       background: #FFF;
       box-shadow: 0 0 8px 0 rgba(0,0,0,0.0200);
@@ -274,5 +317,23 @@ export default {
       margin-bottom: 82px;
     }
   }
+  ::v-deep .u-type-warning-light-bg {
+    padding: 20px 32px!important;
+    background-color: #3975C6!important;
+  }
+  ::v-deep .u-icon__icon--warning {
+    color: #D7E3F3;
+    width: 32px;
+    height: 32px;
+    font-size: 0px!important;
+    background-image: url('../img/home/tips-icon.png');
+    background-size: 100%;
+  }
+  ::v-deep .u-type-warning {
+    color: #fff;
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    line-height: 40px;
+  }
 }
 </style>
diff --git a/src/project/saas/AppHome/components/My.vue b/src/project/saas/AppHome/components/My.vue
index 7235024e..f0adff87 100644
--- a/src/project/saas/AppHome/components/My.vue
+++ b/src/project/saas/AppHome/components/My.vue
@@ -64,7 +64,7 @@ export default {
   .content {
     padding: 32px 32px 0;
     .user-info{
-      width: 686px;
+      width: 100%;
       height: 248px;
       border-radius: 8px;
       background-color: #fff;
diff --git a/src/project/saas/AppSpecialGroups/Add.vue b/src/project/saas/AppSpecialGroups/Add.vue
index b53b1212..cd41a0f7 100644
--- a/src/project/saas/AppSpecialGroups/Add.vue
+++ b/src/project/saas/AppSpecialGroups/Add.vue
@@ -69,7 +69,7 @@
       <div class="item">
         <span class="label"><span class="tips"></span>所属网格</span>
         <div class="value">
-          <AiPagePicker type="custom" v-model="form.girdId" @select="handleSelectGrid"
+          <AiPagePicker type="custom" @select="handleSelectGrid"
                         :ops="{url:'../AppGridManagement/SelectGird',label: 'girdName'}">
             <AiMore v-model="form.girdName"/>
           </AiPagePicker>
@@ -158,7 +158,8 @@ export default {
         address: '',
         girdName: '',
         areaId: '',
-        sex: ''
+        sex: '',
+        girdId: '',
       },
       dateShow: false,
       deteParams: {year: true, month: true, day: true, hour: false, minute: false, second: false},
@@ -434,7 +435,9 @@ export default {
     },
 
     handleSelectGrid(v) {
+      console.log(v)
       this.form.girdName = v?.girdName || ""
+      this.form.girdId = v.id
     },
 
     submit() {
diff --git a/src/project/saas/AppSpecialPeople/add.vue b/src/project/saas/AppSpecialPeople/add.vue
index 60aa771c..79b565f3 100644
--- a/src/project/saas/AppSpecialPeople/add.vue
+++ b/src/project/saas/AppSpecialPeople/add.vue
@@ -69,7 +69,7 @@
       <div class="item">
         <span class="label"><span class="tips"></span>所属网格</span>
         <div class="value">
-          <AiPagePicker type="custom" v-model="form.girdId" @select="handleSelectGrid"
+          <AiPagePicker type="custom" @select="handleSelectGrid"
                         :ops="{url:'../AppGridManagement/SelectGird',label: 'girdName'}">
             <AiMore v-model="form.girdName"/>
           </AiPagePicker>
@@ -158,7 +158,8 @@ export default {
         address: '',
         girdName: '',
         areaId: '',
-        sex: ''
+        sex: '',
+        girdId: ''
       },
       dateShow: false,
       deteParams: {year: true, month: true, day: true, hour: false, minute: false, second: false},
@@ -435,6 +436,7 @@ export default {
 
     handleSelectGrid(v) {
       this.form.girdName = v?.girdName || ""
+      this.form.girdId = v.id
     },
 
     submit() {