Merge branch 'develop' of http://39.106.8.246:3003/web/persagy_topo_editer into develop

src/components/homeView/createGraphDialog.vue

@@ -1,5 +1,6 @@
 <template>
-  <el-dialog class="create-dialog" title="新建拓扑图" width="600px" :visible.sync="outerVisible" :close-on-click-modal="false" custom-class="createDialog">
+  <el-dialog class="create-dialog" title="新建拓扑图" width="600px" :visible.sync="outerVisible" :close-on-click-modal="false" custom-class="createDialog"
+    @close="closeModal">
     <graphTypeDialog ref="graphTypeDialog" @selectNode="selectNode"></graphTypeDialog>
     <div class="dialog-bodys">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" label-position="top">
@@ -103,6 +104,8 @@ export default {
       });
     },
     resetForm(formName) {
+      this.dynamicTags = [];
+      this.buttonStr= '';
       this.$refs[formName].resetFields();
       this.outerVisible = false
     },
@@ -132,8 +135,11 @@ export default {
           this.$message(res.message)
         }
       })
+    },
+    closeModal() {
+      this.resetForm('ruleForm');
     }
-  }
+  },
 }
 </script>
 <style lang="less" scoped>

src/components/homeView/graphTypeDialog.vue

@@ -100,14 +100,18 @@ export default {
             & > .el-tree-node__content {
               background: #e1f2ffff;
               color: #0091ffff;
+              &:hover{
+                background: #e1f2ffff;
+                color: #0091ffff;
+              }
             }
           }
           .el-tree-node__content {
             height: 38px;
             line-height: 38px;
             &:hover {
-              background: #e1f2ffff;
-              color: #0091ffff;
+              background: #F5F6F7;
+              color: #1F2429;
             }
           }
         }

src/components/homeView/leftAsideTree.vue

@@ -56,6 +56,10 @@ export default {
         & > .el-tree-node__content {
           background: #e1f2ffff;
           color: #0091ffff;
+          &:hover{
+            background: #e1f2ffff;
+            color: #0091ffff;
+          }
         }
       }
       .el-tree-node__content {

src/views/home.vue

@@ -2,7 +2,7 @@
   <el-container class="home">
     <!-- 顶部导航栏 -->
     <el-header class="header">
-      <Select width="200" radius @change="testClick" :selectdata="dataSelect3" :placeholder="'请选择'" />
+      <Select width="200" radius @change="testClick" :selectdata="dataSelect3" :placeholder="'请选择'" :hideClear='true'/>
       <el-popover placement="top" width="320" v-model="popVisible" popper-class="createPopper" trigger="manual">
         <p>点击这里即可快速创建拓扑图。</p>
         <div style="text-align: right; margin: 0">
@@ -30,7 +30,7 @@
               <el-radio-button :label="0">未发布</el-radio-button>
             </el-radio-group>
             <div class="head-right">
-              <el-input placeholder="搜索" prefix-icon="el-icon-search" size="small" v-model="queryText" @keyup.native.enter="changeQueryText" clearable>
+              <el-input placeholder="搜索" prefix-icon="el-icon-search" size="small" v-model="queryText" @keyup.native.enter="changeQueryText" clearable @clear="changeQueryText">
               </el-input>
               <Dropdown class="Dropdown" v-model="selVal" :data="dataSelect">
                 <span class="drop-text">{{selText}}</span>