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

src/components/homeView/topoImageCard.vue

@@ -15,12 +15,12 @@
             <p>更新人: {{data.putUser}}</p>
             <span slot="reference"><img :src="require('@/assets/images/tips.png')" style="width: 20px;height:20px" /></span>
           </el-popover>
-          <el-dropdown :hide-on-click="false" placement="bottom-start" trigger="click">
+          <el-dropdown :hide-on-click="false" placement="bottom-start" trigger="click" @command="handleCommand">
             <span class="el-dropdown-link">
               <img :src="require('@/assets/images/more.png')" style="width: 20px;height:20px" />
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item v-for="t in moreList" :key="t.name">{{t.label}}</el-dropdown-item>
+              <el-dropdown-item v-for="t in moreList" :key="t.name" :command="t.name">{{t.label}}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -55,9 +55,12 @@ export default {
   },
   methods: {
     changeCheck() {
-      this.$emit('changeCheck', this.data)
+      this.$emit('changeCheck', this.data);
+    },
+    handleCommand(command) {
+      this.$message('click on item ' + command);
     }
-  }
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/home.vue

@@ -28,13 +28,13 @@
             </div>
           </div>
           <div class="showAction" v-show="selectCard.length">
-            <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate"  @change="handleCheckAllChange">全选</el-checkbox>
+            <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange">全选</el-checkbox>
             <span style="margin-left: 10px;">|</span>
             <span class="sum">已选择<span style="color:#252b30;margin: 0 5px;">{{selectCard.length}}</span>项目</span>
-            <el-button size="mini">移动到</el-button>
-            <el-button size="mini">下载</el-button>
-            <el-button size="mini">删除</el-button>
-            <i class="el-icon-close" style="float:right;line-height: 100%"></i>
+            <el-button size="mini" @click="move">移动到</el-button>
+            <el-button size="mini" @click="download">下载</el-button>
+            <el-button size="mini" @click="deleteSelect">删除</el-button>
+            <i class="el-icon-close" style="float:right;line-height: 28px;margin-right: 5px;" @click="handleCheckAllChange(false)"></i>
           </div>
         </div>
         <div class="main-body">
@@ -97,13 +97,12 @@ export default {
         },
         { id: "test4", name: "滑动平均滑动平均", sub: "hi" },
       ],
-      selVal: "totalEnergy",
-      selText: "总量",
+      selVal: "lastUpdate",
+      selText: "按最后修改",
       dataSelect: [
-        { id: "totalEnergy", name: "总量" },
-        { id: "singleParty", name: "单平米" },
-        { id: "lowerLevel", name: "下级分项" },
-        { id: "average", name: "滑动平均", disabled: true },
+        { id: "lastUpdate", name: "按最后修改" },
+        { id: "code", name: "按字母顺序" },
+        { id: "createTime", name: "按创建时间" }
       ],
       queryText: "",
       isPub: "已发布", // 发布类型()
@@ -171,6 +170,7 @@ export default {
             { id: 3, name: '范333德萨' }
           ],
           img: 'https://www.baidu.com/img/flexible/logo/pc/result.png',
+          checked: false
         },
         {
           id: 2,
@@ -184,6 +184,7 @@ export default {
             { id: 3, name: '范333德萨' }
           ],
           img: 'https://www.baidu.com/img/flexible/logo/pc/result.png',
+          checked: false
         }
       ],
       checkAll: false,
@@ -214,25 +215,45 @@ export default {
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },
-    changeCheck(v){
+    // 选项改变
+    changeCheck(v) {
       const index = this.selectCard.indexOf(v);
-      console.log(index);
       if (index > -1) {
         this.selectCard.splice(index, 1);
       } else {
         this.selectCard.push(v);
       }
     },
+    // 全选按钮
     handleCheckAllChange(val) {
       this.cardList = this.cardList.map(t => {
         t.checked = val
         return t;
-      }) 
-      this.selectCard = val ? this.cardList.map(t => {t.checked = true}) : [];
+      })
+      this.selectCard = val ? this.cardList.map(t => { t.checked = true; return t }) : [];
       this.isIndeterminate = false;
     },
+    // 移动到
+    move() {
+      console.log('move');
+    },
+    // 下载
+    download() {
+      console.log('download');
+    },
+    // 删除
+    deleteSelect() {
+      console.log('deleteSelect');
+    }
   },
   components: { Select, Button, leftAsideTree, Dropdown, topoImageCard },
+  watch: {
+    // 排序方式修改
+    selVal(n, o) {
+      if (n === o) return;
+      this.selText = this.dataSelect.find(d => d.id === n).name
+    }
+  }
 };
 </script>
 <style lang="less" scoped>