*

dsk-operate-ui/src/assets/styles/public.css

@@ -1171,7 +1171,7 @@ select {
 .table-item-jf .el-table td {
 	font-size: 13px;
 }
- 
+
 
 .table-item-jf1 {
 	padding: 0px 16px;
@@ -1200,4 +1200,4 @@ select {
 	line-height: 18px;
 	padding-bottom: 48px;
 	text-align: center;
-}
\ No newline at end of file
+}

dsk-operate-ui/src/layout/components/Sidebar/Logo.vue

 <template>
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
-    <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
-      </router-link>
-      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="text-cl1 sidebar-title" :style="{ width: '98px', color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
-      </router-link>
-    </transition>
+    <el-popover
+      placement="right"
+      popper-class='tooltips'
+      visible-arrow="true"
+      trigger="hover">
+      <div>
+        <img :src="logo" class="tips_logo" />
+        <div class="tips_title">{{title}}</div>
+      </div>
+      <transition name="sidebarLogoFade" slot="reference">
+        <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
+          <img v-if="logo" :src="logo" class="sidebar-logo" />
+          <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        </router-link>
+        <router-link v-else key="expand" class="sidebar-logo-link" to="/">
+          <img v-if="logo" :src="logo" class="sidebar-logo" />
+          <h1 class="text-cl1 sidebar-title" :style="{ width: '98px', color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        </router-link>
+      </transition>
+    </el-popover>
   </div>
 </template>
 
@@ -60,7 +70,7 @@ export default {
   background: #141b2f;
   border-bottom: 1px solid #1a2743;
   text-align: center;
-  overflow: hidden;
+  /*overflow: hidden;*/
 
   & .sidebar-logo-link {
     height: 100%;
@@ -91,4 +101,40 @@ export default {
     }
   }
 }
+.tooltips{
+
+}
+</style>
+<style lang="scss">
+  .tooltips.el-popover{
+    min-width: 96px!important;
+    width: 96px;
+    padding: 0;
+    .tips_logo{
+      display: block;
+      margin: 17px auto 8px;
+    }
+    .tips_title{
+      font-family: MicrosoftYaHei-Regular, MicrosoftYaHei;
+      color: #232323;
+      line-height: 28px;
+      width: 192px;
+      font-size:22px;
+      transform:scale(0.5);
+      -webkit-transform:scale(0.5);
+      padding: 0 16px;
+      float: left;
+      margin-top: -14px;
+      margin-left: -48px;
+      text-align: center;
+    }
+  }
+  .tooltips.el-popper {
+    .popper__arrow{
+    display: block !important;
+    }
+  }
+  .tooltips.el-popper[x-placement^=right]{
+    margin-left: 3px !important;
+  }
 </style>

dsk-operate-ui/src/layout/components/Sidebar/SidebarItem.vue

@@ -188,3 +188,11 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+
+  .side-popover.el-popper {
+    .popper__arrow{
+      display: block !important;
+    }
+  }
+</style>

dsk-operate-ui/src/layout/components/TagsView/index.vue

 <template>
   <div id="tags-view-container" class="tags-view-container">
+    <div class="alltags" v-if="visitedViews.length > 0">
+      <div class="" @click="closeall"><i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i></div>
+      <div class="tagslist" v-if="showall">
+        <!--<div v-for="(tag, index) in visitedViews"-->
+        <!--:key="tag.path"-->
+        <!--:class="isActive(tag)?'active':''"-->
+        <!--&gt;-->
+        <!--<i class="el-icon-check"></i>-->
+
+        <!--</div>-->
+        <router-link
+          v-for="(tag, index) in visitedViews"
+          ref="tag"
+          :key="tag.path"
+          :class="isActive(tag)?'active':''"
+          :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
+          tag="span"
+          class="tags-view-item"
+          @contextmenu.prevent.native="openMenu(tag,$event)"
+        >
+          <div @click="changetags">
+            <i class="el-icon-check"></i>
+            <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
+          </div>
+        </router-link>
+        <div class="clasall"  @click="closeAllTag(selectedTag)">关闭全部标签</div>
+      </div>
+    </div>
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
       <router-link
         v-for="(tag, index) in visitedViews"
@@ -28,34 +56,6 @@
       <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>
       <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>
     </ul>
-    <div class="alltags" v-if="visitedViews.length > 0">
-      <div class="" @click="closeall"><i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i></div>
-      <div class="tagslist" v-if="showall">
-        <!--<div v-for="(tag, index) in visitedViews"-->
-             <!--:key="tag.path"-->
-             <!--:class="isActive(tag)?'active':''"-->
-        <!--&gt;-->
-          <!--<i class="el-icon-check"></i>-->
-
-        <!--</div>-->
-        <router-link
-          v-for="(tag, index) in visitedViews"
-          ref="tag"
-          :key="tag.path"
-          :class="isActive(tag)?'active':''"
-          :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-          tag="span"
-          class="tags-view-item"
-          @contextmenu.prevent.native="openMenu(tag,$event)"
-        >
-          <div @click="changetags">
-          <i class="el-icon-check"></i>
-          <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
-          </div>
-        </router-link>
-        <div class="clasall"  @click="closeAllTag(selectedTag)">关闭全部标签</div>
-      </div>
-    </div>
   </div>
 </template>
 

dsk-operate-ui/src/views/system/user/index.vue

@@ -149,12 +149,12 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" :key=Math.random() prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="用户编号" align="center" :key='mathkey+1' prop="userId" v-if="columns[0].visible" />
           <!--<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />-->
-          <el-table-column label="用户昵称" align="center" :key=Math.random() prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" :key=Math.random() prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" :key=Math.random() prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" :key=Math.random() v-if="columns[5].visible">
+          <el-table-column label="用户昵称" align="center" :key='mathkey+2' prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" :key='mathkey+3' prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" :key='mathkey+4' prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="状态" align="center" :key='mathkey+5' v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -164,12 +164,12 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" :key=Math.random() prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column label="创建时间" align="center" :key='mathkey+6' prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column :key='mathkey+7'
             label="操作"
             align="center"
             width="160"
@@ -245,7 +245,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" :disabled="isUpdate" placeholder="请输入手机号码" maxlength="11" />
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
               <!--<el-input v-model="form.userName" placeholder="请输入手机号码" maxlength="11" />-->
             </el-form-item>
           </el-col>
@@ -400,6 +400,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      mathkey:10,
       //导入失败数据
       showupload:false,
       tableData: [],
@@ -496,13 +497,18 @@ export default {
           }
         ]
       },
-      isUpdate:false,
     };
   },
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
+    },
+    //隐藏列回复之后保证不错位
+    columns:{
+      handler(){
+        this.mathkey = Math.random()
+      },deep:true
     }
   },
   created() {
@@ -607,7 +613,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.isUpdate = false
       this.reset();
       getUser().then(response => {
         this.postOptions = response.data.posts;
@@ -619,7 +624,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.isUpdate = true
       this.reset();
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {