合并

src/views/devicePhotoSchedule/components/setdevice.vue

@@ -6,17 +6,6 @@
     :close-on-click-modal="false"
     width="720px"
   >
-    <!-- <div class="flexnr">
-      <div class="w50">通道:</div>
-      <el-tree
-        :data="listnr"
-        show-checkbox
-        :props="defaultProps"
-        ref="tree"
-        node-key="id"
-        :default-expand-all="true"
-      ></el-tree>
-    </div> -->
     <div class="setTimeTd">
       <h3>时间表规则</h3>
       <el-descriptions title="" :column="3" border>
@@ -38,57 +27,17 @@
           </el-checkbox-group>
         </div>
       </div>
-      <div class="treeTable">
+      <div class="flexnr">
-        <el-table
+        <div class="w50">通道:</div>
-          :data="tableData"
+        <el-tree
-          style="width: 100%; margin-bottom: 20px"
+          :data="listnr"
-          row-key="id"
+          show-checkbox
-          border
+          :props="defaultProps"
-          stripe
+          ref="tree"
-          default-expand-all
+          node-key="id"
-          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+          :default-expand-all="true"
-        >
+        ></el-tree>
-          <el-table-column type="selection" width="55"> </el-table-column>
-          <el-table-column prop="date" label="电压"> </el-table-column>
-          <el-table-column prop="name" label="线路11"> </el-table-column>
-          <el-table-column prop="address" label="装置"> </el-table-column>
-        </el-table>
       </div>
-      <!-- <div class="setCheckbox">
-        <el-table
-          ref="multipleTable"
-          :data="tableData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column label="电压等级">
-            <template> 220KV</template>
-          </el-table-column>
-          <el-table-column prop="name" label="线路名称">
-            <template> 线路 </template>
-          </el-table-column>
-          <el-table-column
-            width="160"
-            prop="address"
-            label="装置信息"
-            show-overflow-tooltip
-          >
-            <template> XY-SIMULATOR-0001 </template>
-          </el-table-column>
-         
-          <el-table-column label="全选">
-            <template>
-              <el-checkbox v-model="checked">通道1</el-checkbox></template
-            >
-          </el-table-column>
-          <el-table-column label="全选">
-            <template
-              ><el-checkbox v-model="checked">通道2</el-checkbox></template
-            >
-          </el-table-column>
-        </el-table>
-      </div> -->
     </div>
     <div slot="footer" class="dialog-footer">
       <!-- <el-button @click="getCheckedNodes">获取</el-button> -->

src/views/realTimeSearch/index.vue

@@ -57,7 +57,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="pictureBox" v-loading="loading">
+      <div class="pictureBox" v-loading="loading" v-if="picList.length !== 0">
         <el-card
           class="box-card imgList"
           v-for="(item, index) in picList"
@@ -82,6 +82,9 @@
           </viewer>
         </el-card>
       </div>
+      <div class="pictureBox" v-else>
+        <el-empty description="暂无图片"></el-empty>
+      </div>
       <div class="pageNation">
         <el-pagination
           @current-change="handleCurrentChange"
@@ -228,7 +231,9 @@ export default {
     height: calc(100% - 86px);
     overflow: auto;
     border: 1px solid #eee;
-
+    .el-empty {
+      margin: auto;
+    }
     .imgList {
       width: calc((100% - 104px) / 4);
       position: relative;