Merge pull request '邓洁 : 修改页面细节' (#16) from dengjie into master

Reviewed-on: http://git.feashow.cn/feashow/tunnel-cloud-front/pulls/16

src/assets/styles/index.scss

@@ -115,7 +115,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 
 
 .table {
-  margin-top: 15px;
+  //margin-top: 15px;
 
   .el-tag {
     .el-tag__content {
@@ -264,6 +264,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
   height: 84vh;
 
   .scrollbar-dict {
+    border: 1px solid #ebeef5;
     height: 68vh;
     overflow-y: auto;
     overflow-x: hidden;
@@ -279,7 +280,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 
   .layout-left {
     width: 30%;
-    border: 1px solid #ebeef5;
+    //border: 1px solid #ebeef5;
     padding: 10px;
 
 
@@ -301,7 +302,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 
   .layout-right {
     width: 70%;
-    border: 1px solid #ebeef5;
+    //border: 1px solid #ebeef5;
     margin-left: 10px;
     padding: 10px
   }
@@ -356,7 +357,17 @@ html, body, #app, .el-container, .el-aside, .el-main {
   margin-left: 5px;
   vertical-align: -0.21em;
 }
-
+.tag:hover {
+  color:#418DFF;
+  .close-icon{
+    fill: #418DFF;
+  }
+}
+.active{
+  .close-icon{
+    fill: #418DFF;
+  }
+}
 .svg-icon:hover {
   cursor: pointer;
   //border: 1px solid #E9E9E9;

src/assets/styles/sidebar.scss

@@ -8,6 +8,13 @@
   justify-content: center;
   align-items: center;
 }
+.port-link{
+  display: block;
+  width: 200px;
+  height: 50px;
+  margin-left: -40px;
+  padding-left: 40px;
+}
 .el-menu {
   border: none !important;
   .el-sub-menu {

src/components/Tag.vue

@@ -33,7 +33,7 @@ const getDicList=async ()=>{
 }
 onMounted(async ()=>{
   await getDicList()
-  await dictFormat();
+    dictFormat();
 })
 const dictFormat = () => {
   if (dictList.value === undefined) return;

src/layout/siderbar/MenuItem.vue

@@ -8,10 +8,18 @@
       </template>
       <Item :menu-item="item.children"></Item>
     </el-sub-menu>
-    <el-menu-item v-else-if="!item.hidden&&!item.meta.isFrame" :index="item.path">
+    <el-menu-item v-else-if="!item.hidden&&!item.meta.isFrame" :index="handleGo(item.path)">
       <template #title>
-        <svg-icon :name="item.icon" />
+        <div v-if="item.path==='/tool/swagger'">
-        <span>{{ item.title }}</span>
+          <a class="port-link" :href="link" target="_blank">
+            <svg-icon :name="item.icon"/>
+            {{ item.title }}
+          </a>
+        </div>
+        <div v-else>
+          <svg-icon :name="item.icon"/>
+          <span>{{ item.title }}</span>
+        </div>
       </template>
     </el-menu-item>
   </template>
@@ -20,12 +28,23 @@
 <script setup>
 import SvgIcon from '@/components/svgIcon/index.vue'
 import Item from './MenuItem.vue'
+
 const props = defineProps({
   menuItem: {
     type: Array,
     required: true
   }
 })
+console.log(props.menuItem)
+const link = ref('http://web-tunnel.feashow.com/api/doc.html#/home')
+const handleGo = (path) => {
+  if (path === "/tool/swagger") {
+    return ''
+  } else {
+    return path
+  }
+  // window.open(path)
+}
 
 </script>
 

src/layout/siderbar/index.vue

@@ -15,12 +15,12 @@
     >
       <MenuItem :menu-item="permisstionStore.menuList"></MenuItem>
     </el-menu>
-    <li class="el-menu-item">
+<!--    <li class="el-menu-item">-->
-      <el-icon></el-icon>
+<!--      <el-icon></el-icon>-->
-      <a :href="link" @click.prevent="handleGo(link)">
+<!--      <a :href="link" @click.prevent="handleGo(link)">-->
-        {{ title }}
+<!--        {{ title }}-->
-      </a>
+<!--      </a>-->
-    </li>
+<!--    </li>-->
   </el-scrollbar>
 </template>
 
@@ -43,7 +43,6 @@ const getLogoH = () => {
 }
 
 const activeMenu = computed(() => {
-  console.log(route);
   const {path} = route
   return path
 })
@@ -69,8 +68,8 @@ window.addEventListener('resize', () => {
 
 selectFarme()
 
-const handleGo = (path) => {
+// const handleGo = (path) => {
-  window.open(path)
+//   window.open(path)
-}
+// }
 
 </script>

src/layout/tagsview/index.vue

@@ -82,6 +82,10 @@ init()
     background-color: #E9F4FF;
     border: 1px solid #418DFF;
     color: #333333;
+    >span:first-child{
+      color:#418DFF;
+    }
+
   }
 
   .contextmenu {

src/views/monitor/logininfor/index.vue

@@ -47,6 +47,7 @@
           ref="singleTable"
           v-loading="loading"
           @select="handleSelect"
+          v-tabh
       >
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="infoId" label="访问编号" align="center"/>

src/views/monitor/operlog/index.vue

@@ -57,6 +57,7 @@
           ref="singleTable"
           v-loading="loading"
           @select="handleSelect"
+          v-tabh
       >
         <el-table-column type="selection" width="50"/>
         <el-table-column prop="operId" label="日志编号" align="center"/>

src/views/system/role/index.vue

@@ -58,6 +58,7 @@
           row-key="roleId"
           :lazy="true"
           v-loading="loading"
+          v-tabh
       >
         <el-table-column label="序号" type="index" align="center" width="60"/>
         <!--      <el-table-column prop="roleId" label="角色编号" align="center"/>-->

src/views/system/user/index.vue

@@ -73,6 +73,7 @@
             :lazy="true"
             v-loading="loading"
             :header-cell-style="{'background':'#f5f5f8'}"
+            v-tabh
         >
           <el-table-column label="序号" type="index" align="center" width="60"/>
           <!--          <el-table-column prop="userId" label="用户编号" align="center"/>-->

src/views/tool/dict/index.vue

@@ -55,10 +55,11 @@
               :data="list"
               row-key="dictId"
               border
-              height="60vh"
+              height="62vh"
               ref="singleTable"
               v-loading="loading"
               :header-cell-style="{'background':'#f5f7fa'}"
+
           >
             <!--            <el-table-column prop="dictType" label="字典类型" align="center"/>-->
             <el-table-column prop="dictLabel" label="字典标签" align="center"/>