deepsea 1 éve
szülő
commit
7821990316

BIN
src/.DS_Store


+ 4 - 4
src/components/SearchBar/index.vue

@@ -48,10 +48,10 @@ export default {
       this.value = event.target.value;
       this.$emit("input", this.value);
     },
-    onBlur() {
-      this.show = false;
-      console.log('=======-------======')
-      this.$emit("blur");
+    onBlur(e) {
+      // this.show = false;
+      // console.log('=======-------======', e.currentTarget.classList)
+      // this.$emit("blur");
     },
     goBack() {
       if (window.location.href.indexOf("squarePage") !== -1) {

BIN
src/images/more.png


BIN
src/images/screen.png


+ 35 - 3
src/views/ordinaryPage/components/TableComponent/index.vue

@@ -56,11 +56,17 @@
       <el-table-column label="Carline" prop="Carline" :filters="filters"></el-table-column>
       <el-table-column label="Market" prop="Market" :filters="filters"></el-table-column>
       <el-table-column label="SW" prop="MU_SW"></el-table-column>
-      <el-table-column label="Status" prop="status" :filters="filters"></el-table-column>
+      <el-table-column label="Status" :filters="filters">
+        <template slot-scope="scope">
+          <div v-if="scope.row.status == 'ready'" style="background: #95d475;" class="bench-status">{{ scope.row.status }}</div>
+          <div v-if="scope.row.status == 'running'" style="background: #eebe77;" class="bench-status">{{ scope.row.status }}</div>
+          <div v-if="scope.row.status == 'error'" style="background: #f89898;" class="bench-status">{{ scope.row.status }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="Action">
         <template slot-scope="scope">
-          <el-button type="primary" circle></el-button>
-          <el-button type="success" circle></el-button>
+          <span class="bench-action-1"></span>
+          <span class="bench-action-2"></span>
         </template>
       </el-table-column>
     </el-table>
@@ -203,4 +209,30 @@ th .cell {
   height: 68px !important;
   border-bottom: 1px solid #fff;
 }
+.bench-status {
+  width: 74px; 
+  height: 32px; 
+  border-radius: 60px;
+  margin: 0 auto;
+  line-height: 32px;
+}
+.bench-action-1 {
+  background-image: url('../../../../images/screen.png');
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  background-position: center;
+  width: 32px;
+  height: 32px;
+  display: inline-block;
+}
+.bench-action-2 {
+  background-image: url('../../../../images/more.png');
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  background-position: center;
+  width: 32px;
+  height: 32px;
+  display: inline-block;
+  margin-left: 15px;
+}
 </style>

+ 7 - 4
src/views/ordinaryPage/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ordinary-container">
+  <div class="ordinary-container" @click="onBlur">
     <div class="ordinary-left">
       <SearchBar
         class="search-container"
@@ -45,7 +45,7 @@
       <div
         v-show="!isConnected && !isOpenSquare"
         class="ordinary-map-container"
-        z-index="0"
+        z-index="9999"
       >
         <div class="ordinary-map" id="ordinary-map">
           <!-- <img src="../../images/map.png" /> -->
@@ -1132,8 +1132,11 @@ export default {
     onFocus() {
       this.isOpen = true;
     },
-    onBlur() {
-      this.isOpen = false;
+    onBlur(e) {
+      console.log('=====----====', e.target.classList)
+      if (Array.prototype.indexOf.call(e.target.classList,'ordinary-left') > -1) {
+        this.isOpen = false;
+      }
     },
     onInput(value) {
       this.inputValue = value;

+ 1 - 0
src/views/originPage/list.vue

@@ -571,6 +571,7 @@ export default {
       this.inputValue = value;
     },
     onBulr() {
+      console.log('=======--------=========', e.target.classList)
       this.isOpen = false;
     },
     closeDetail() {