From d656ff9cf8c97a01c0cc990d935e4b42b314be22 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 06 八月 2020 18:21:50 +0800
Subject: [PATCH] 摄像机信息区域/时间规则,系统维护,实时监控,算力管理样式调整

---
 src/pages/search/index/Searching.vue |   99 +++++++++----------------------------------------
 1 files changed, 19 insertions(+), 80 deletions(-)

diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 4e23f14..62a02b7 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -120,20 +120,8 @@
             <b class="clear-searching" @click="clearSearch">閲嶇疆</b>
           </p>
         </div>
-        <div ref="mid" style="height:calc(100% - 72px)">
-          <!-- <div id="searchMid" class="mid" ref="scrollContain" v-if="!VideoPhotoData.uploadDiaplay">
-            <Card
-              :class="item.activeObject.id === VideoPhotoData.activeCard ? 'my-active-card' : ''"
-              v-for="(item, index) in VideoPhotoData.cards"
-              :key="index + 'a'"
-              :outHeight="'155px'"
-              :outWidth="cardWidth"
-              :data="item"
-              :showType="showType"
-              @detailsClick="getDetails($event, index)"
-              @addToBase="toAdd"
-            ></Card>
-          </div>-->
+        <div ref="mid" style="height:100%;overflow-y:auto;">
+         
           <div id="searchMid" class="mid">
             <div class="left-selection" v-if="VideoPhotoData.uploadDiaplay">
               <upload-img ref="uploadImg" @labelDisabled="disabled"></upload-img>
@@ -155,9 +143,21 @@
                 @addToBase="toAdd"
               ></Card>
             </div>
+            <div class="foot">
+              <el-pagination
+                :current-page="VideoPhotoData.page"
+                @current-change="changePages"
+                @size-change="sizeChange"
+                :page-sizes="VideoPhotoData.pageSizeOption"
+                :page-size="VideoPhotoData.size"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="VideoPhotoData.total"
+              ></el-pagination>
+            </div>
           </div>
+          
         </div>
-        <div class="foot">
+        <!-- <div class="foot">
           <el-pagination
             :current-page="VideoPhotoData.page"
             @current-change="changePages"
@@ -167,71 +167,10 @@
             layout="total, sizes, prev, pager, next, jumper"
             :total="VideoPhotoData.total"
           ></el-pagination>
-        </div>
+        </div> -->
       </div>
     </div>
-    <!-- <hsc-window-style-metal class="windown-model">
-      <hsc-window
-        v-for="(item, index) in CardList.addBaseList"
-        :closeButton="true"
-        @closebuttonclick="closeWindow(index)"
-        :key="index"
-        @update:height="resizeHeight"
-        @update:width="resizeWidth"
-        style="background:white; height:475px"
-        :left="center.x + index * 10"
-        :top="center.y + index * 10"
-        :resizable="true"
-        positionHint="center"
-        :isScrollable="true"
-        :minWidth="662"
-        :minHeight="479"
-        :maxWidth="10000"
-        :maxHeight="7000"
-        :height="defaultHeight"
-        :width="defaultWidth"
-      >
-        <div class="addToBase">
-          <div class="topLabel">鍔犲叆搴曞簱</div>
-          <div class="items">
-            <div class="lable">
-              <p>榛戝悕鍗� ></p>
-            </div>
-            <div class="baseList">
-              <el-checkbox-group v-model="VideoPhotoData.selectBlacks" @change="blackAngWhite">
-                <div class="base" v-for="(item, index) in VideoPhotoData.blackList" :key="index">
-                  <el-checkbox
-                    :label="item.value"
-                    :title="item.title"
-                    :disabled="item.disabled"
-                  >{{item.title}}</el-checkbox>
-                </div>
-              </el-checkbox-group>
-            </div>
-          </div>
-          <div class="items">
-            <div class="lable">
-              <p>鐧藉悕鍗� ></p>
-            </div>
-            <div class="baseList">
-              <el-checkbox-group v-model="VideoPhotoData.selectWhites" @change="blackAngWhite">
-                <div class="base" v-for="(item, index) in VideoPhotoData.whiteList" :key="index">
-                  <el-checkbox
-                    :label="item.value"
-                    :title="item.title"
-                    :disabled="item.disabled"
-                  >{{item.title}}</el-checkbox>
-                </div>
-              </el-checkbox-group>
-            </div>
-          </div>
-          <div class="buttons">
-            <el-button type="primary" @click="saveAddBase(item, index)">淇濆瓨</el-button>
-            <el-button type="default" @click="closeWindow(index)">鍙栨秷</el-button>
-          </div>
-        </div>
-      </hsc-window>
-    </hsc-window-style-metal>-->
+
   </div>
 </template>
 
@@ -772,8 +711,8 @@
         }
       }
       .mid {
-        width: 100%;
-        height: 100%;
+        //width: 100%;
+        //height: 100%;
         padding: 10px;
         overflow: auto;
         position: relative;

--
Gitblit v1.8.0