소스 검색

拉代码

shaun-sheep 4 년 전
부모
커밋
cf125383c6

BIN
src/assets/images/rectangle.png


+ 2 - 2
src/components/brand/brandTool.vue

@@ -59,8 +59,8 @@
 </script>
 <style lang="scss" scoped>
   .saga-toolbar-box {
-    position: fixed;
-    top: 48px;
+    position: absolute;
+    top: 0;
     left: 0;
     width: 100%;
     height: 70px;

+ 22 - 19
src/components/product/productTool.vue

@@ -2,13 +2,13 @@
   <div class="saga-toolbar-box">
     <div class="saga-toolbar-main">
       <div class="top-menu">
-        <!--        <selectTree-->
-        <!--          :props="props"-->
-        <!--          :options="optionData"-->
-        <!--          :value="valueId"-->
-        <!--          :clearable="isClearable"-->
-        <!--          :accordion="isAccordion"-->
-        <!--          @getValue="getValue($event)"/>-->
+                <selectTree
+                  :props="props"
+                  :options="optionData"
+                  :value="valueId"
+                  :clearable="isClearable"
+                  :accordion="isAccordion"
+                  @getValue="getValue($event)"/>
         <span style="float: right;">
            <el-input
              v-model="value"
@@ -19,9 +19,12 @@
            <i slot="prefix" class="el-input__icon el-icon-search"></i>
            </el-input>
               <el-button type="primary" @click="handBrand">添加产品</el-button>
+
           </span>
       </div>
     </div>
+
+
     <addBrand ref="addBrand" title="添加品牌"></addBrand>
 
   </div>
@@ -51,16 +54,16 @@
         },
         // 选项列表(必选)
         list: [
-          {id: 1, parentId: 0, name: "一级菜单A", rank: 1},
-          {id: 2, parentId: 0, name: "一级菜单B", rank: 1},
-          {id: 3, parentId: 0, name: "一级菜单C", rank: 1},
-          {id: 4, parentId: 1, name: "二级菜单A-A", rank: 2},
-          {id: 5, parentId: 1, name: "二级菜单A-B", rank: 2},
-          {id: 6, parentId: 2, name: "二级菜单B-A", rank: 2},
-          {id: 7, parentId: 4, name: "三级菜单A-A-A", rank: 3},
-          {id: 20, parentId: 0, name: "一级菜单C", rank: 1},
-          {id: 39, parentId: 0, name: "一级菜单C", rank: 1},
-          {id: 40, parentId: 0, name: "一级菜单end", rank: 1}
+          {id: 1, parentId: 0, name: "一级菜单A", },
+          {id: 2, parentId: 0, name: "一级菜单B",},
+          {id: 3, parentId: 0, name: "一级菜单C", },
+          {id: 4, parentId: 1, name: "二级菜单A-A", },
+          {id: 5, parentId: 1, name: "二级菜单A-B", },
+          {id: 6, parentId: 2, name: "二级菜单B-A",},
+          {id: 7, parentId: 4, name: "三级菜单A-A-A", },
+          {id: 20, parentId: 0, name: "一级菜单C", },
+          {id: 39, parentId: 0, name: "一级菜单C", },
+          {id: 40, parentId: 0, name: "一级菜单end", }
         ],
         value: ''
       }
@@ -90,8 +93,8 @@
 </script>
 <style lang="scss" scoped>
   .saga-toolbar-box {
-    position: fixed;
-    top: 48px;
+    position: absolute;
+    top: 0;
     left: 0;
     width: 100%;
     height: 70px;

+ 5 - 2
src/components/product/sagaProduct.vue

@@ -29,7 +29,9 @@
           trigger="hover"
           placement="right"
           width="960">
-          <p>某某系统</p>
+          <div>
+            <img src="../../assets/images/rectangle.png" alt="">
+            <span>某某系统</span></div>
           <div class="sys">
             <span>燃气石油气瓶</span>
             <span>燃气石油气瓶</span>
@@ -48,6 +50,7 @@
       </div>
     </div>
     <div class="brand">
+
     </div>
   </div>
 </template>
@@ -136,7 +139,7 @@
 <style lang="less">
   .el-popover {
     p:first-child {
-      border-left: 4px solid #3A8DDE;
+      /*border-left: 4px solid #3A8DDE;*/
       color: #1F2329;
       text-indent: 8px;
     }

+ 22 - 22
src/components/public/selectTree.vue

@@ -1,27 +1,27 @@
 <template>
-<!--  <el-select :value="valueTitle" :clearable="clearable" @clear="clearHandle">-->
-<!--    <el-option :value="valueTitle" :label="valueTitle" class="options">-->
-<!--      <el-tree-->
-<!--        id="tree-option"-->
-<!--        ref="selectTree"-->
-<!--        :accordion="accordion"-->
-<!--        :data="options"-->
-<!--        :props="props"-->
-<!--        :node-key="props.value"-->
-<!--        :default-expanded-keys="defaultExpandedKey"-->
-<!--        @node-click="handleNodeClick">-->
-<!--      </el-tree>-->
-<!--    </el-option>-->
-<!--  </el-select>-->
+  <el-select :value="valueTitle" :clearable="clearable" @clear="clearHandle">
+    <el-option :value="valueTitle" :label="valueTitle" class="options">
+      <el-tree
+        id="tree-option"
+        ref="selectTree"
+        :accordion="accordion"
+        :data="options"
+        :props="props"
+        :node-key="props.value"
+        :default-expanded-keys="defaultExpandedKey"
+        @node-click="handleNodeClick">
+      </el-tree>
+    </el-option>
+  </el-select>
 
-  <el-dropdown>
-  <span class="el-dropdown-link">
-    {{value}}<i class="el-icon-arrow-down el-icon--right"></i>
-  </span>
-    <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item v-for="item in options"> {{item.name}}</el-dropdown-item>
-    </el-dropdown-menu>
-  </el-dropdown>
+<!--  <el-dropdown>-->
+<!--  <span class="el-dropdown-link">-->
+<!--    {{value}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+<!--  </span>-->
+<!--    <el-dropdown-menu slot="dropdown">-->
+<!--      <el-dropdown-item v-for="item in options"> {{item.name}}</el-dropdown-item>-->
+<!--    </el-dropdown-menu>-->
+<!--  </el-dropdown>-->
 </template>
 
 <script>

+ 1 - 0
src/components/test.vue

@@ -13,6 +13,7 @@
     <search text="请输入品牌名称" type="content"></search>
     <el-button type="primary" @click="handBrand">添加产品</el-button>
     <addBrand ref="addBrand" title="添加品牌"></addBrand>
+
   </div>
 </template>