init

src/App.vue

@@ -23,4 +23,7 @@ export default {
     height: 100%;
     overflow: hidden;
   }
+  .el-tooltip__popper {
+    max-width: 300px;
+}
 </style>

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

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;

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"
       >

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;

src/views/admin/user/index.vue

@@ -2564,5 +2564,6 @@ export default {
 /deep/ .el-tooltip{
   width: 140px;
 }
+
 </style>