From 987b0190e064c8a94e763bafa0ca85ac73077796 Mon Sep 17 00:00:00 2001
From: wangxiaohua <1214073490@qq.com>
Date: Wed, 8 Dec 2021 19:01:17 +0800
Subject: [PATCH] init

---
 public/img/qh1.png             | Bin 0 -> 725 bytes
 public/img/qh2.png             | Bin 0 -> 421 bytes
 src/App.vue                    |   3 ++
 src/page/index/tags.vue        |   2 +
 src/page/index/top/index.vue   |  74 ++++++++++++---------------------
 src/page/login/userlogin.vue   |   4 +-
 src/page/wel.vue               |   8 ++--
 src/views/admin/user/index.vue |   1 +
 8 files changed, 40 insertions(+), 52 deletions(-)
 create mode 100644 public/img/qh1.png
 create mode 100644 public/img/qh2.png

diff --git a/public/img/qh1.png b/public/img/qh1.png
new file mode 100644
index 0000000000000000000000000000000000000000..be463c81fc18f7f2473506e04e52337d17a4214a
GIT binary patch
literal 725
zcmV;`0xJE9P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px%k4Z#9R7gv;mP?3^VHC%If5h0$!h$T6`z5j)jLSkUHOZyMLdh*Pq0EqlL^9dA
zrsO)IY$SuGWW+*lu`+ULT(WT~8!TiJM`xUOdi(mm@BPfodsg4~KF@i6=RD^*7Xg^r
zUSKCM*#Bq9Ct#_hCuTMfxCcxH-U1JRt3bOXD|U_o_yZW4MM|xol+<8m)xc+9NP+Gf
zV7sL2g=Z$f-@pK1AMmUUcndHOI4@~!7&{)A4NL|WhPTNPr-24Zf07S{!1<EylmeRB
zIbcm1Sh&~BW&lTknpkU*v>`WOc<r%03TzHgy`;<jyWc%bJTWsr`x>wWcn?gH^fNbL
zcsdq%2@G<uq_$jv0c{5scw8kl<q9;jk-#BfCGZ;9nm5p2>Z8<4zMm^FuCx_c7SOqc
zKo9WuGKoJ17*;M1i{zyjgbv`Qq`Cyy35@%X(zZuZbEW&u>|hw#kpL$GtBcgcVrPB?
zj(bj33QX_o2KGkG%!~adU_=G_ZrlY)or#Cj+(St_Dp2m;VrE|GcUQU}cp+&@0&D{o
zd!?7;4<}R1>>{uV_yW8uqu?!U0?;L?N@g|(xEl(sl2&BW{&|=H&q&%>O2^FHksE2C
zckJ4fLXD)yS<t=!>wv?N7MFl+l0M`Hj0fPr#+XGGWx+zHcUKz9-m`rE_!WK22cojl
z>njal74Qle6-{$_si`ZmqEEnp)&m|xmt#PaBp<GdN}quNZ2{H=;i1R1)QjyeppS~D
zfSxG}cnaJCp8L=%$!E@V9^M8{lnMBBU{_Bb7TaiM-oFk2-j34J1q_$;)y&QU>$4tL
zYW<s}>XOAfrY^4%4xa^#jv=|$V{2wJfh%r61yDD%S<?Q$xFvXPiTKMn00000NkvXX
Hu0mjfXDmW=

literal 0
HcmV?d00001

diff --git a/public/img/qh2.png b/public/img/qh2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f06d33988a1fa17c1fb8d917176d51c57e75181f
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px$Ur9tkR7gwhmOn2AK@`P*ClUz-z1o+MC?sAe{OJ^wLhv0lFFt}qf`}H0l8TN*
z;tOargzy@n(p|ao$lC1e?(8Nnik)`OoilT0&YUYVI{_9b9<RWJq`P8h7$GyWhy~Up
z?K$4e=724rFQWc5NjL>O1d0!VF<@QNZkKQe*oYu==wp&_RMLIc0%mprOr{72fELgn
zL3&%6FoNU{v?2VKBkK-(E~%MK1DiRvcm`G_y(Kr7yu)MQBe3%sU?lZQ_kopyleQ#X
zrU~DHp^_3UN;>MwJPi0oLbm8gI!~|bCv?NRJVoOL*p~EJ1k9UPo#HCB4Ph14a%+13
zXw0mRE#@Qh@G5D1_gBdHvl+%e0G1;)ua$?Mh5oh0<l$KpPyZ*LA|J~yyz(8I*&yH_
zf2d7-l5~@m7C(JyY@1jn562~4hXS~aO36mpz1hyOg?H*pk~(R^p0@g59MAg<#K!Id
P00000NkvXXu0mjfB1g5P

literal 0
HcmV?d00001

diff --git a/src/App.vue b/src/App.vue
index d983112..6fb8b9b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,4 +23,7 @@ export default {
     height: 100%;
     overflow: hidden;
   }
+  .el-tooltip__popper {
+    max-width: 300px;
+}
 </style>
diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue
index d7ffe70..49865e3 100644
--- a/src/page/index/tags.vue
+++ b/src/page/index/tags.vue
@@ -120,6 +120,7 @@
         this.active = this.tag.value
       },
       menuTag(value, action) {
+        if(value=='/wel/index'){return}
         if (action === 'remove') {
           let { tag, key } = this.findTag(value)
           this.$store.commit('DEL_TAG', tag)
@@ -130,6 +131,7 @@
         }
       },
       openTag(item) {
+        console.log(item,"99999")
         let tag
         if (item.name) {
           tag = this.findTag(item.name).tag
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 8629e27..21ae4e8 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -9,18 +9,12 @@
         <i class="icon-navicon" @click="setCollapse" />
       </div>
     </div>
-    <div class="top-bar__title">
-      <div v-if="showMenu" class="top-bar__item top-bar__item--show">
-        <top-menu />
-        <div
-          style="
-            margin-top: 15px;
-            display: flex;
-            line-height: 30px;
-            cursor: pointer;
-          "
-        >
-          <div class="daili " @click="goChange">
+    <div class="top-bar__title" style="display: flex;align-items: center;">
+      <div @click="goChange" style="line-height: 64px;cursor: pointer; display: flex;align-items: center;height:64px;">
+        <div class="daili2">
+          <img class="daili2img" src="/img/qh2.png" alt="" />
+        </div>
+        <div class="daili ">
             {{
               orgType == 0
                 ? "系统后台"
@@ -31,21 +25,18 @@
                 : "楼盘后台"
             }}
           </div>
-          <span style="font-size: 16px; margin-left: 20px">{{
-            companyName
-          }}</span>
-          <span class="change" @click="goBack">切换</span>
-          <!-- <span style="color:#fff; margin-right:10px;">楼盘选择:</span>
-          <el-select v-model="value" placeholder="请选择" @change="selectChange">
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.propertyName"
-              :value="item.id">
-            </el-option>
-          </el-select> -->
+      </div>
+      <div v-if="companyName" @click="goBack" style="line-height: 64px;cursor: pointer; display: flex;align-items: center;height:64px;margin-left: 20px;">
+        <div class="daili2">
+          <img class="daili2img" src="/img/qh1.png" alt="" />
         </div>
+        <div class="daili ">
+            {{
+             companyName
+            }}
+          </div>
       </div>
+
     </div>
     <div class="top-bar__right">
       <el-tooltip
@@ -196,20 +187,6 @@ export default {
     handleScreen() {
       fullscreenToggel();
     },
-    selectChange(e) {
-      console.log(e);
-      this.$emit("selectChange"); //关闭所有
-      localStorage.setItem("houseId", e);
-    },
-    // getHouseList(){
-    //   this.$api.api.queryHouseByUsername()
-    //   .then(res=>{
-    //     // console.log(res);
-    //     this.options=res.data
-    //     this.value=res.data[0].id
-    //     localStorage.setItem('houseId',this.value)
-    //   })
-    // },
     goBack() {
       // 判断后退是否退回去选择页面
       let idx = localStorage.getItem("orgType");
@@ -422,16 +399,19 @@ export default {
 
 <style lang="scss" scoped>
 .daili {
-  // width: 100px;
-  height: 30px;
-  // background: #2671e2;
-  border-radius: 4px;
-  line-height: 30px;
-  text-align: center;
   color: #ffffff;
-  font-size: 14px;
-  padding: 0 10px;
+  font-size: 15px;
+  margin-left: 4px;
 }
+.daili2{
+ height: 100%;
+ line-height: 58px;
+  .daili2img{
+    width: 15px;
+    height: 14px;
+  }
+}
+
 .change {
   font-size: 16px;
   // color: #2671e2;
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index d5bbbc1..d7e52f0 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -11,7 +11,7 @@
       <el-input
         v-model="loginForm.username"
         size="small"
-        auto-complete="off"
+        auto-complete="new-password"
         placeholder="请输入用户名"
         maxlength="11"
         @keyup.enter.native="handleLogin"
@@ -24,7 +24,7 @@
         :type="passwordType"
         v-model="loginForm.password"
         size="small"
-        auto-complete="off"
+      auto-complete="new-password"
         placeholder="请输入密码"
         @keyup.enter.native="handleLogin"
       >
diff --git a/src/page/wel.vue b/src/page/wel.vue
index c106a6d..8e78482 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -173,9 +173,12 @@
                <div v-else   class="tabbox" style="display:flex;flex-wrap: wrap;height: 290px;overflow-y: auto;width: 90%;margin:0 auto;">
                   <div v-for="(item,index) in indexZxllist" :key="index" style="width:33.3%;margin-top: 10px;cursor: pointer;">
                     <div style="width:130px;height:100px;margin:0 auto;"><el-progress :stroke-width="12" :width='130'  type="dashboard" :percentage="item.zxl" ></el-progress></div>
-                    <div style="width:100%;text-align: center;">
-                        {{item.name.substring(0,3)}}
+                    <div style="width:100%;text-align: center;margin-top:20px;">
+                       <el-tooltip :content="item.name" placement="top">
+                          <div style="width:80%;text-align: center;margin:0 auto;">{{item.name.substring(0,6)}}</div>
+                        </el-tooltip>
                       </div>
+
                   </div>
                </div>
            </div>
@@ -1214,7 +1217,6 @@ export default {
 
 <style scoped="scoped" lang="scss">
 .box-center{
-
   width: 100%;
   padding: 15px;
   min-width:1000px;
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index 2fadbff..cda2d27 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -2564,5 +2564,6 @@ export default {
 /deep/ .el-tooltip{
   width: 140px;
 }
+
 </style>