分支冲突

src/router/router.js

@@ -11,7 +11,6 @@ const diagnosisListNew = r => require.ensure([], () => r(require('../views/IM/di
 const downList = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/down-list.vue')), 'downList')
 const operation= r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/operation.vue')), 'downList')
 const workbench= r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/workbench.vue')), 'workbench')
-
 export default [{
     path: '/',
     component: App,

src/views/IM/diagnosis-admin/diagnosis-im.vue

@@ -271,6 +271,7 @@ export default {
 
   created() {
     _this = this;
+    console.log(_this);
     this.picakfAccId = getPicaKFAccid(); 
     this.tid = this.$route.query.tid || '';
     this.getFiveContentList();

src/views/IM/diagnosis-admin/workbench.vue

@@ -11,16 +11,14 @@
             <el-date-picker
             v-model="value1"
             type="date"
-            :clearable='false'
-            ref="picker"
-            placeholder="选择日期">
+            clear-icon="el-input-icon"
+            :clearable='false'>
             </el-date-picker>
-            <i class="el-icon-arrow-down" @click="onfn"></i>
          </div>
          </div>
         </el-row>
         <!-- tab栏 -->
-      <div class="box" v-if="isdon ==='1'">
+      <div id="radio" v-if="isdon ==='1'">
       <el-radio-group v-model="tabPosition" style="margin-bottom: 30px;" >
       <el-radio-button label="all">全部(0)</el-radio-button>
       <el-radio-button label="abnormal">异常(0)</el-radio-button>
@@ -29,6 +27,14 @@
       <el-radio-button label="Hasended">已结束(0)</el-radio-button>
       <el-radio-button label="Cancelled">已取消(0)</el-radio-button>
       </el-radio-group>
+      <el-row :gutter="25">
+        <el-col style="margin-bottom: 20px;" :span="8" v-for="item in 9 " :key="item">
+            <div class="grid-content bg-purple">
+                <div class="for"></div>
+             </div>
+         </el-col>
+      </el-row>
+     
       </div>
 
       <div class="lfet" v-else >
@@ -53,11 +59,25 @@
         </el-col>
         </el-row>
         <div ><i class="el-icon-s-custom"> 运营A成员(6单)</i></div>
-      <div ><i class="el-icon-s-custom"> 运营B成员(2单)</i></div>
+        <el-row :gutter="25">
+        <el-col style="margin-bottom: 20px;" :span="8" v-for="item in 6 " :key="item">
+            <div class="grid-content bg-purple">
+                <div class="for"></div>
+             </div>
+         </el-col>
+      </el-row>
+        <div ><i class="el-icon-s-custom">运营B成员(2单)</i></div>
+        <el-row :gutter="25">
+        <el-col style="margin-bottom: 20px;" :span="8" v-for="item in 6 " :key="item">
+            <div class="grid-content bg-purple">
+                <div class="for"></div>
+             </div>
+         </el-col>
+      </el-row>
       </div> 
-      <!-- <el-empty description="描述文字"></el-empty> -->
+      <!-- <el-empty :image-size="200" description="描述文字"></el-empty> -->
       <!-- 分页 -->
-      <el-row type="flex" justify="end">
+      <el-row type="flex" justify="end" >
         <el-pagination
         background
         @size-change="handleSizeChange"
@@ -89,6 +109,9 @@ export default {
 
      }
    },
+   created(){
+       console.log(this);
+   },
    methods:{
      handleSizeChange(){
 
@@ -96,25 +119,22 @@ export default {
      handleCurrentChange(){
 
      },
-     onfn(){
-      this.$refs.picker.focus();
-      console.log('123')
-     }
    },
 }
 </script>
 <style lang='scss' scoped>
-#picker{
-    ::v-deep{
+::v-deep {
     .el-date-editor{
-             padding-left: 0px;
         .el-input__inner{
-              background: turquoise !important;
-            }
+            background:red;
         }
     }
 }
-
+.for{
+    width: 100%;
+    height: 200px;
+    background: #ccc;
+}
 
 </style>
 <style lang="scss" scoped>
@@ -130,7 +150,7 @@ export default {
       justify-content: flex-start;
       align-items: center;
     }
-    .box{
+    .radio{
         border-bottom: 1px solid #ccc;
         .el-radio-group {
             margin-bottom: -1px !important;
@@ -138,7 +158,6 @@ export default {
     }
   }
 }
-
   .el-row {
     margin-bottom: 20px;
     &:last-child {