Эх сурвалжийг харах

style:设备管理数据统计样式优化,表格占比高度优化

lihao16 2 сар өмнө
parent
commit
9f3c619500

+ 8 - 6
smsb-plus-ui/src/views/smsb/device/index.vue

@@ -3,7 +3,7 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
       :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover" class="statistic-card">
+        <div class="statistic-card">
           <el-row :gutter="20" justify="space-between">
             <!-- 设备总数 -->
             <el-col :span="6">
@@ -70,7 +70,7 @@
               </el-statistic>
             </el-col>
           </el-row>
-        </el-card>
+        </div>
         <el-card shadow="hover" :style="{ marginTop: '10px', height: '80px' }">
           <div class="form-wrapper">
             <div class="form-container">
@@ -652,7 +652,7 @@ const data = reactive<PageData<DeviceForm, DeviceQuery>>({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     identifier: undefined,
     name: undefined,
     mac: undefined,
@@ -1106,11 +1106,13 @@ onMounted(() => {
   border-radius: 4px;
 }
 .statistic-card {
-  border-radius: 8px;
+  border-radius: 1px;
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.08);
   border: 1px solid #ebeef5;
-  padding: 15px 0;
-  height: 120px;
+  padding: 10px 0;
+  height: 100px;
+  background: #ffffff;
+  width: calc(100% - 3px);
 }
 
 .statistic-item {

+ 2 - 2
smsb-plus-ui/src/views/smsb/deviceAuth/index.vue

@@ -26,7 +26,7 @@
       </div>
     </transition>
 
-    <el-card shadow="never">
+    <el-card shadow="never" style="height: calc(100% - 20px)">
       <div class="table-content">
         <el-table v-loading="loading" :data="deviceAuthList" @selection-change="handleSelectionChange">
           <el-table-column label="" align="left" prop="" width="10" />
@@ -103,7 +103,7 @@ const data = reactive<PageData<DeviceAuthForm, DeviceAuthQuery>>({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     deviceIp: undefined,
     identifier: undefined,
     encryptCode: undefined,

+ 2 - 2
smsb-plus-ui/src/views/smsb/deviceLogPush/index.vue

@@ -23,7 +23,7 @@
       </div>
     </transition>
 
-    <el-card shadow="never">
+    <el-card shadow="never" style="height: calc(100% - 20px)">
       <div class="table-content">
         <el-table v-loading="loading" :data="deviceList">
           <el-table-column label="" align="left" prop="" width="10"/>
@@ -163,7 +163,7 @@ const data = reactive<PageData<DeviceLogPushForm, DeviceQuery>>({
   form: {...initFormData},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     name: undefined,
     serialNumber: undefined,
     params: {}

+ 2 - 19
smsb-plus-ui/src/views/smsb/deviceLogin/index.vue

@@ -27,24 +27,7 @@
       </div>
     </transition>
 
-    <el-card shadow="never">
-      <!--      <template #header>
-              <el-row :gutter="10" class="mb8">
-                <el-col :span="1.5">
-                  <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['device:deviceLogin:add']">新增</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['device:deviceLogin:edit']">修改</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['device:deviceLogin:remove']">删除</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['device:deviceLogin:export']">导出</el-button>
-                </el-col>
-                <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-              </el-row>
-            </template>-->
+    <el-card shadow="never" style="height: calc(100% - 20px)">
       <div class="table-content">
         <el-table v-loading="loading" :data="deviceLoginList" @selection-change="handleSelectionChange">
           <!--
@@ -131,7 +114,7 @@ const data = reactive<PageData<DeviceLoginForm, DeviceLoginQuery>>({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     reqIdentifier: undefined,
     reqIp: undefined,
     identifier: undefined,

+ 5 - 19
smsb-plus-ui/src/views/smsb/deviceTask/index.vue

@@ -8,6 +8,9 @@
             <el-form-item label="唯一标识" prop="identifier">
               <el-input v-model="queryParams.identifier" placeholder="请输入唯一标识" clearable @keyup.enter="handleQuery"/>
             </el-form-item>
+            <el-form-item label="设备名称" prop="identifier">
+              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery"/>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -17,24 +20,7 @@
       </div>
     </transition>
 
-    <el-card shadow="never">
-      <!--      <template #header>
-              <el-row :gutter="10" class="mb8">
-                <el-col :span="1.5">
-                  <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['device:deviceTask:add']">新增</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['device:deviceTask:edit']">修改</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['device:deviceTask:remove']">删除</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['device:deviceTask:export']">导出</el-button>
-                </el-col>
-                <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-              </el-row>
-            </template>-->
+    <el-card shadow="never" style="height: calc(100% - 20px)">
       <div class="table-content">
         <el-table v-loading="loading" :data="deviceTaskList" @selection-change="handleSelectionChange">
           <!--        <el-table-column type="selection" width="55" align="center" />-->
@@ -143,7 +129,7 @@ const data = reactive<PageData<DeviceTaskForm, DeviceTaskQuery>>({
   form: {...initFormData},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     identifier: undefined,
     deviceId: undefined,
     taskType: undefined,

+ 2 - 2
smsb-plus-ui/src/views/smsb/httpHeart/index.vue

@@ -23,7 +23,7 @@
       </div>
     </transition>
 
-    <el-card shadow="never">
+    <el-card shadow="never" style="height: calc(100% - 20px);">
       <div class="table-content">
         <el-table v-loading="loading" :data="deviceHeartRecordList" @selection-change="handleSelectionChange">
           <el-table-column label="" align="left"  width="10"  />
@@ -92,7 +92,7 @@ const data = reactive<PageData<DeviceHeartRecordForm, DeviceHeartRecordQuery>>({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     identifier: undefined,
     clientIp: undefined,
     heartType: 1,

+ 2 - 2
smsb-plus-ui/src/views/smsb/manufacturer/index.vue

@@ -26,7 +26,7 @@
       </div>
     </transition>
 
-    <el-card shadow="never">
+    <el-card shadow="never" style="height: calc(100% - 20px);">
       <div class="table-content">
         <el-table v-loading="loading" :data="deviceManufacturerList" @selection-change="handleSelectionChange">
 <!--          <el-table-column type="selection" width="55" align="center" />-->
@@ -150,7 +150,7 @@ const data = reactive<PageData<DeviceManufacturerForm, DeviceManufacturerQuery>>
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     manufacturerName: undefined,
     type: undefined,
     params: {}

+ 2 - 2
smsb-plus-ui/src/views/smsb/nettyHeart/index.vue

@@ -23,7 +23,7 @@
       </div>
     </transition>
 
-    <el-card shadow="never">
+    <el-card shadow="never" style="height: calc(100% - 20px)">
       <div class="table-content">
         <el-table v-loading="loading" :data="deviceHeartRecordList" @selection-change="handleSelectionChange">
           <!--        <el-table-column type="selection" width="55" align="center" />-->
@@ -91,7 +91,7 @@ const data = reactive<PageData<DeviceHeartRecordForm, DeviceHeartRecordQuery>>({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     identifier: undefined,
     clientIp: undefined,
     heartType: 2,