代码合并

src/views/home/index.vue

@@ -360,10 +360,11 @@
       ></HKmonitorbox>
     </div>
 
-    <!-- 在线人员 -->
-    <div class="online-user-container" v-if="false">
-      <Onlineuserbox></Onlineuserbox>
-    </div>
+      <!-- 在线人员 -->
+      <div class="online-user-container" v-drag v-if="onlineUserBoxShow">
+        <Onlineuserbox></Onlineuserbox>
+      </div>
+      
   </div>
 </template>
 
@@ -473,6 +474,7 @@ export default {
       currentInfo: {},
       LCmonitorboxShow: false,
       HKmonitorboxShow: false,
+      onlineUserBoxShow:true,
       deviceId: null,
       channelId: null,
       checkList: [],
@@ -1619,4 +1621,14 @@ export default {
   transform: translate(-50%, -50%);
   z-index: 999;
 }
+
+.online-user-container{
+  width:800px;
+  height:400px;
+  position:absolute;
+  top:50%;
+  left:50%;
+  transform: translate(-50%,-50%);
+  z-index:999999999;
+}
 </style>

src/views/home/widget/onlineuserbox.vue

@@ -1,7 +1,29 @@
 <template>
   <div class="onebuttoncall-container">
       <div class="title">在线人员</div>
-        
+      <div class="filter-container">
+          <el-checkbox-group v-model="checkList" @change="checkChange" style="float:left;line-height:30px;color:#fff;">
+              <el-checkbox label="护林员" value="1" style="margin-right:10px;"></el-checkbox>
+              <el-checkbox label="消防员" value="2"></el-checkbox>
+            </el-checkbox-group>
+
+            <el-input clearable size="mini" prefix-icon="el-icon-search" style="width: 200px;margin-bottom: 0;margin:0px 12px;" class="filter-item" :placeholder="'人员姓名'"
+            >
+            </el-input>
+    
+            <el-button type="default" size="mini" >重置</el-button>
+            <el-button type="primary" size="mini" >搜索</el-button>
+
+      </div>
+        <div class="call-text-container" v-if="callTextShow">
+            <div class="call-title">呼叫内容</div>
+            <div style="padding:15px;">
+                 <el-input placeholder="请输入呼叫内容" v-model="callText"></el-input>
+                 <p>&nbsp;</p>
+                <el-button type="default" size="small" @click="callTextShow = false;">取消</el-button>
+                <el-button type="primary" size="small"  @click="callPhone">呼叫</el-button>
+            </div>
+        </div>
       <div class="box-container">
           <div class="table-body">
               <div class="table-li" v-for="(item,index) in list" :key="index">
@@ -19,6 +41,16 @@
                  </div>
               </div>
           </div>
+          <div class="flex  callbox">
+              <el-pagination
+                background
+                :page-size="listQuery.pageSize"
+                :pager-count="12"
+                layout="prev, pager, next"
+                :total="total">
+                </el-pagination>
+                <el-button type="primary" size="small" style="float:right;position:absolute;right:30px;" @click="callPhoneAll">一键呼叫</el-button>
+          </div>
       </div>
   </div>
 </template>