Browse Source

refactor: adjust some styles

Casper Dai 3 years ago
parent
commit
dd3395926b

+ 1 - 1
src/components/table/GridTable/GridTableBody.vue

@@ -18,7 +18,7 @@ export default {
   },
   render (h) {
     return h('div', {
-      staticClass: `l-flex__auto l-grid ${this.size} c-table__main u-overflow-y--auto`
+      staticClass: `l-grid ${this.size} c-table__main u-overflow-y--auto`
     }, this.itemRender && this.data?.map(this.itemRender))
   }
 }

+ 3 - 2
src/views/device/detail/components/external/Camera/index.vue

@@ -139,7 +139,8 @@ export default {
         condition: { deviceType: this.deviceType },
         list: getThirdPartyDevices,
         cols: [
-          { prop: 'name', label: '名称', align: 'center' }
+          { prop: 'name', label: '名称' },
+          { prop: 'remark', label: '备注' }
         ]
       }
     }
@@ -180,7 +181,7 @@ export default {
     },
     onCameraChoosen ({ value, done }) {
       this.$confirm(
-        `绑定摄像头 ${value.name} ?`,
+        `${this.title} ${value.name} ?`,
         { type: 'warning' }
       ).then(() => {
         bind(this.device.id, this.deviceType, value.id).then(() => {

+ 20 - 21
src/views/device/record/index.vue

@@ -32,28 +32,26 @@
           />
         </div>
       </div>
-      <div class="l-flex__auto u-overflow-y--auto">
-        <div
-          class="c-back-grid"
-          :class="gridClass"
+      <div
+        class="c-record-grid u-overflow-y--auto"
+        :class="gridClass"
+      >
+        <device-player
+          v-for="item in options.list"
+          :key="item.identifier"
+          :device="item"
+          controls
+          quality="ff"
         >
-          <device-player
-            v-for="item in options.list"
-            :key="item.identifier"
-            :device="item"
-            controls
-            quality="ff"
-          >
-            <div class="o-video__tag" />
-          </device-player>
-        </div>
-        <pagination
-          :total="options.totalCount"
-          :page.sync="options.params.pageNum"
-          :limit.sync="options.params.pageSize"
-          @pagination="getDevices"
-        />
+          <div class="o-video__tag" />
+        </device-player>
       </div>
+      <pagination
+        :total="options.totalCount"
+        :page.sync="options.params.pageNum"
+        :limit.sync="options.params.pageSize"
+        @pagination="getDevices"
+      />
       <status-wrapper
         v-if="isAbnormal"
         :error="options.error"
@@ -136,7 +134,8 @@ export default {
   }
 }
 
-.c-back-grid {
+.c-record-grid {
+  flex: 0 1 auto;
   display: grid;
   grid-template-rows: max-content;
   grid-row-gap: 4px;