Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject

src/views/Customer/label.vue

@@ -14,7 +14,7 @@
             v-model="houseId"
             placeholder="请选择"
             @change="houseChange"
-            filterable 
+            filterable
           >
             <el-option
               v-for="item in houseList"
@@ -29,102 +29,60 @@
       <div style="width: 100%; margin-top: 30px">
         <el-tree ref="tree" :default-expand-all="true" :data="treeList">
           <span class="custom-tree-node" slot-scope="{ node, data }">
-            <span
-              v-if="data.level == 1"
-              style="font-size: 18px; color: #32363d"
-            >
+
+            <span v-if="data.level == 1" style="font-size: 18px; color: #32363d" >
               <img class="levelimg1" src="/img/level1.png" alt="" />
               {{ data.name }}
             </span>
-            <span
-              v-if="data.level == 2 && data.isInterval == 1"
-              style="font-size: 16px; color: #32363d"
-            >
+
+
+            <span v-if="data.level == 2 && data.isInterval == 1" style="font-size: 16px; color: #32363d" >
               <img class="levelimg2" src="/img/level2.png" alt="" />
               {{ data.name }}
             </span>
             <span v-if="data.level == 2 && data.isInterval == 0">
-              <img class="levelimg2" src="/img/level2.png" alt="" />
+               <img class="levelimg2" src="/img/level2.png" alt="" />
               {{ data.name }}~{{ data.endName }}
             </span>
-            <span
-              v-if="data.level == 3"
-              style="font-size: 14px; color: #32363d"
-            >
+
+
+            <span v-if="data.level == 3" style="font-size: 14px; color: #32363d" >
               <img class="levelimg3" src="/img/level3.png" alt="" />
               {{ data.name }}
             </span>
 
-            <span
-              v-if="data.level == 1"
-              style="display: flex; align-items: center"
-            >
-              <span
-                class="editorcd"
-                @click="append(node, data)"
-                style="display: flex; align-items: center"
-              >
+
+
+            <span v-if="data.level == 1" style="display: flex; align-items: center">
+              <span class="editorcd" @click="append(node, data)" style="display: flex; align-items: center" >
                 <img class="levelimg3" src="/img/add1.png" alt="" />
                 <span>添加二级</span>
               </span>
             </span>
 
-            <span
-              v-if="data.level == 2"
-              style="display: flex; align-items: center"
-            >
-              <span
-                v-if="data.isInterval == 1"
-                class="editorcd2"
-                @click="append(node, data)"
-                style="display: flex; align-items: center"
-              >
+            <span v-if="data.level == 2" style="display: flex; align-items: center" >
+              <span v-if="data.isInterval == 1" class="editorcd2"  @click="append(node, data)" style="display: flex; align-items: center">
                 <img class="levelimg3" src="/img/add2.png" alt="" />
                 <span>添加三级</span>
               </span>
               <span style="margin-left: 10px">
-                <el-button
-                  class="editorcd"
-                  type="text"
-                  size="mini"
-                  @click="ddeditor(node, data)"
-                  >编辑</el-button
-                >
+                <el-button class="editorcd" type="text" size="mini" @click="ddeditor(node, data)">编辑</el-button>
               </span>
               <span style="margin-left: 10px">
-                <el-button
-                  class="remove"
-                  type="text"
-                  size="mini"
-                  @click="remove(node, data)"
-                  >删除</el-button
-                >
+                <el-button class="remove" type="text" size="mini" @click="remove(node, data)" >删除</el-button>
               </span>
             </span>
 
-            <span
-              v-if="data.level == 3"
-              style="display: flex; align-items: center"
-            >
+            <span v-if="data.level == 3" style="display: flex; align-items: center" >
               <span style="margin-left: 10px">
-                <el-button
-                  class="editorcd"
-                  type="text"
-                  size="mini"
-                  @click="ddeditor(node, data)"
-                  >编辑</el-button
-                >
+                <el-button class="editorcd" type="text" size="mini" @click="ddeditor(node, data)" >编辑</el-button>
               </span>
               <span style="margin-left: 10px">
-                <el-button
-                  class="remove"
-                  type="text"
-                  size="mini"
-                  @click="remove(node, data)"
-                  >删除</el-button
-                >
+                <el-button class="remove" type="text" size="mini" @click="remove(node, data)" >删除</el-button>
               </span>
             </span>
+
+
           </span>
         </el-tree>
       </div>

src/views/Template/SystemarketingWordMB.vue

@@ -11,19 +11,35 @@
           </div>
         </div>
 
-        <div style="margin-top: 16px;">
+        <div style="margin-top: 16px;width: 100%; ">
                <el-tree ref="tree" :data="datalist" node-key="id" default-expand-all
                :allow-drop="allowDrop" @node-drop="Peerdrag" draggable>
               <span slot-scope="{ node, data }">
-              <span>{{ node.label }}</span>
-                  <span v-if="node.level==1">
+                  <!-- <span>{{ node.label }}</span> -->
+
+                    <span v-if="node.level == 1" style="font-size: 18px; color: #32363d" >
+                      <img class="levelimg1" src="/img/level1.png" alt="" />
+                      {{ data.label }}
+                    </span>
+                    <span v-if="node.level == 2 " style="font-size: 16px; color: #32363d" >
+                      <img class="levelimg2" src="/img/level2.png" alt="" />
+                      {{ data.label }}
+                    </span>
+                    <span v-if="node.level == 3" style="font-size: 14px; color: #32363d" >
+                      <img class="levelimg3" src="/img/level3.png" alt="" />
+                      {{ node.label }}
+                    </span>
+
+
+
+                  <!-- <span v-if="node.level==1">
                     <el-button style="color:red; margin-left: 20px;" type="text" size="mini"
                               @click.stop="() => append(node,data)">添加二级</el-button>
                     <el-button type="text" size="mini" @click.stop="() => remove(node,data)"> 删除 </el-button>
                     <el-button type="text" size="mini" @click.stop="() => ddeditor(node,data)"> 编辑 </el-button>
-                  </span>
+                  </span> -->
 
-                  <span v-if="node.level==2">
+                  <!-- <span v-if="node.level==2">
                     <el-button type="text" size="mini" style=" margin-left: 20px;"
                               @click.stop="() => append1(node,data)"> 添加三级 </el-button>
                     <el-button type="text" size="mini" @click.stop="() => remove(node,data)"> 删除 </el-button>
@@ -32,7 +48,42 @@
                   <span v-if="node.level==3">
                     <el-button style=" margin-left: 20px;" type="text" size="mini" @click.stop="() => remove(node,data)"> 删除 </el-button>
                     <el-button type="text" size="mini" @click.stop="() => ddeditor(node,data)"> 编辑 </el-button>
+                  </span> -->
+
+
+
+                <span v-if="node.level == 1" >
+                  <span class="editorcd" @click="append(node, data)" >
+                    <img class="levelimg3" src="/img/add1.png" alt="" />
+                    <span>添加二级</span>
                   </span>
+                  <el-button type="text" size="mini" @click.stop="() => remove(node,data)"> 删除 </el-button>
+                  <el-button type="text" size="mini" @click.stop="() => ddeditor(node,data)"> 编辑 </el-button>
+                </span>
+
+                <span v-if="node.level == 2"  >
+                  <span  class="editorcd2"  @click="append1(node, data)" >
+                    <img class="levelimg3" src="/img/add2.png" alt="" />
+                    <span>添加三级</span>
+                  </span>
+                  <span style="margin-left: 10px">
+                    <el-button class="editorcd" type="text" size="mini" @click="ddeditor(node, data)">编辑</el-button>
+                  </span>
+                  <span style="margin-left: 10px">
+                    <el-button class="remove" type="text" size="mini" @click="remove(node, data)" >删除</el-button>
+                  </span>
+                </span>
+
+                <span v-if="node.level == 3">
+                  <span style="margin-left: 10px">
+                    <el-button class="editorcd" type="text" size="mini" @click="ddeditor(node, data)" >编辑</el-button>
+                  </span>
+                  <span style="margin-left: 10px">
+                    <el-button class="remove" type="text" size="mini" @click="remove(node, data)" >删除</el-button>
+                  </span>
+                </span>
+
+
               </span>
             </el-tree>
         </div>
@@ -70,20 +121,21 @@
         <el-button type="primary" @click="onSubmit">确 定</el-button>
       </div>
     </el-dialog>
-        <!--?编辑弹框?-->
-        <el-dialog title="编辑" :visible.sync="isshowage">
-            <div style="display: flex;align-items: center;height: 40px;">
-                <div style="margin-left: 160px;">类名：</div>
-                <div>
-                    <input v-model="frosasd.name" style="width: 280px;" type="text">
-                </div>
-            </div>
 
-            <div style="display: flex;justify-content: center;">
-                <button style="width: 100px;height: 40px;"  @click="submicll()">取消</button>
-                <button style="width: 100px;height: 40px;margin-left: 60px;"  @click="submiadd()">提交</button>
+    <!--?编辑弹框?-->
+    <el-dialog title="编辑" :visible.sync="isshowage">
+        <div style="display: flex;align-items: center;height: 40px;">
+            <div style="margin-left: 160px;">类名：</div>
+            <div>
+                <input v-model="frosasd.name" style="width: 280px;" type="text">
             </div>
-        </el-dialog>
+        </div>
+
+        <div style="display: flex;justify-content: center;">
+            <button style="width: 100px;height: 40px;"  @click="submicll()">取消</button>
+            <button style="width: 100px;height: 40px;margin-left: 60px;"  @click="submiadd()">提交</button>
+        </div>
+    </el-dialog>
 
   </div>
 </template>
@@ -389,5 +441,43 @@ export default {
   min-height: 80vh;
   border-radius: 4px;
 }
+.biaoti {
+  font-size: 20px;
+  font-family: PingFangSC-Semibold, PingFang SC;
+  font-weight: 600;
+  color: #32363d;
+  line-height: 20px;
+  padding-top: 25px;
+}
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 183px;
+}
+.remove {
+  color: red;
+}
+.editorcd {
+  color: #2671e2;
+}
+.editorcd2 {
+  color: #e6a12f;
+}
+.levelimg1 {
+  width: 18px;
+  height: 18px;
+}
+.levelimg2 {
+  width: 16px;
+  height: 16px;
+}
+.levelimg3 {
+  width: 14px;
+  height: 14px;
+}
+
 
 </style>