Browse Source

解决冲突

YaolongHan 5 years ago
parent
commit
0de2bb694c
2 changed files with 22 additions and 10 deletions
  1. 10 4
      src/views/point/dynamicdata/index.vue
  2. 12 6
      src/views/ready/buildfloor/index.vue

+ 10 - 4
src/views/point/dynamicdata/index.vue

@@ -2,7 +2,7 @@
   <div id="dynamicdata">
     <!-- tab分页 -->
     <el-row class="top-tab">
-      <el-tabs v-model="curType">
+      <el-tabs v-model="curType" type='card'>
         <el-tab-pane v-for="(item) in typeList" :key="item.Name" :label="item.Name+'('+item.Sum+'/'+item.Rcount+')'" :name="item.Name">
         </el-tab-pane>
       </el-tabs>
@@ -241,7 +241,7 @@ export default {
               this.isPending = false;
               this.getPrompt()
               this.$refs.apply.getPromptobjs()
-              if(this.hasClash){
+              if (this.hasClash) {
                 this.$refs.applyLog.showDialog(missionID)
               }
             }, 2000)
@@ -261,7 +261,7 @@ export default {
       this.tipsType = 1;
     },
     //接收是否有冲突
-    getClash(length){
+    getClash(length) {
       this.hasClash = !!length
     }
   },
@@ -279,7 +279,7 @@ export default {
   background-color: #fff;
   padding: 10px;
   position: relative;
-  .top-tab {
+  /deep/ .top-tab {
     position: relative;
     height: 54px;
     .pos-right {
@@ -296,6 +296,12 @@ export default {
         background-color: #fff;
       }
     }
+    /deep/ .el-tabs__item.is-top {
+      border-top: 2px solid transparent;
+      &.is-active {
+        border-top: 2px solid #409eff;
+      }
+    }
   }
   #applySelect {
     /deep/ .el-radio__input.is-checked + .el-radio__label {

+ 12 - 6
src/views/ready/buildfloor/index.vue

@@ -3,8 +3,7 @@
     <el-row>
       <div class="l-list">
         <div class="action-box">
-          <div style="height:35px;"></div>
-          <div v-if="0">
+          <div>
             <el-button size="small" type="default" icon="el-icon-plus" @click="addBuild"></el-button>
             <el-button size="small" type="default" icon="el-icon-minus" @click="delBuild"></el-button>
             <el-button size="small" type="default" icon="el-icon-edit-outline" @click="editBuild"></el-button>
@@ -226,15 +225,22 @@ export default {
     },
     //add build
     addBuild() {
-      this.$refs.addBuildDialog.showDialog();
+      this.$message.warning('开发中...')
+      return
+      this.$refs.addBuildDialog.showDialog()
     },
     //delete build
     delBuild() {
-      this.delText = "建筑";
-      this.delDialogVis = true;
+      this.$message.warning('开发中...')
+      return
+      this.delText = '建筑';
+      this.delDialogVis = true
     },
     //edit build
-    editBuild() {},
+    editBuild() {
+      this.$message.warning('开发中...')
+      return
+    },
     //delete floor
     handleDelete(floor) {
       this.delText = "楼层";