设备界面优化

vue/src/views/iot/device/device-log.vue

@@ -1,7 +1,7 @@
 <template>
 <div style="padding-left:20px;">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="类型" prop="logType">
+        <el-form-item label="日志类型" prop="logType">
             <el-select v-model="queryParams.logType" placeholder="请选择类型" clearable size="small">
                 <el-option v-for="dict in dict.type.iot_device_log_type" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>

vue/src/views/iot/device/device-timer.vue

@@ -13,23 +13,10 @@
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
-    </el-form>
+        <el-form-item style="float:right;">
-
-    <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['iot:job:add']">新增</el-button>
-        </el-col>
+        </el-form-item>
-        <el-col :span="1.5">
+    </el-form>
-            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['iot:job:edit']">修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['iot:job:remove']">删除</el-button>
-        </el-col>
-        <el-col :span="1.5">
-            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['iot:job:export']">导出</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" size="mini">
         <el-table-column type="selection" width="55" align="center" />
@@ -66,18 +53,12 @@
     <!-- 添加或修改定时定时对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-            <el-row>
-                <el-col :span="15">
             <el-form-item label="定时名称" prop="jobName">
-                        <el-input v-model="form.jobName" placeholder="请输入定时名称" />
+                <el-input v-model="form.jobName" placeholder="请输入定时名称" style="width:340px;" />
             </el-form-item>
-                </el-col>
-                <el-col :span="24">
             <el-form-item label="执行时间" prop="timerTimeValue">
-                        <el-time-picker v-model="timerTimeValue" value-format="HH:mm" placeholder="选择时间" style="width:354px;" @change="timeChange" :disabled="form.isAdvance==1"></el-time-picker>
+                <el-time-picker v-model="timerTimeValue" value-format="HH:mm" placeholder="选择时间" style="width:340px;" @change="timeChange" :disabled="form.isAdvance==1"></el-time-picker>
             </el-form-item>
-                </el-col>
-                <el-col :span="24">
             <el-form-item label="重复执行" prop="timerWeek">
                 <el-row>
                     <el-col :span="4">
@@ -94,9 +75,7 @@
                     </el-col>
                 </el-row>
             </el-form-item>
-                </el-col>
+            <el-form-item label="cron表达式" prop="cron">
-                <el-col :span="24">
-                    <el-form-item label="cron表达式" prop="">
                 <el-row>
                     <el-col :span="18">
                         <el-input v-model="form.cronExpression" placeholder="cron执行表达式" :disabled="form.isAdvance==0">
@@ -113,13 +92,16 @@
                     </el-col>
                 </el-row>
             </el-form-item>
-                </el-col>
+            <el-form-item label="定时状态" prop="status">
+                <el-radio-group v-model="form.status">
+                    <el-radio v-for="dict in dict.type.sys_job_status" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+                </el-radio-group>
+            </el-form-item>
 
-                <el-col :span="24">
             <div style="padding-bottom:15px;padding:0 20px;">
                 <el-divider></el-divider>
             </div>
-                    <el-form-item label="执行动作">
+            <el-form-item label="执行动作" prop="actions">
                 <el-row v-for="(actionItem,index) in actionList" :key="index+'action'" style="margin-bottom:10px;">
                     <el-col :span="4">
                         <el-select v-model="actionItem.type" placeholder="请选择类别">
@@ -164,15 +146,6 @@
                 </el-row>
                 <div>+ <a style="color:#409EFF" @click="addEnumItem()">添加执行动作</a></div>
             </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="定时状态">
-                        <el-radio-group v-model="form.status">
-                            <el-radio v-for="dict in dict.type.sys_job_status" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                </el-col>
-            </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitForm" :loading="submitButtonLoading">确 定</el-button>
@@ -375,16 +348,6 @@ export default {
                     message: "定时名称不能为空",
                     trigger: "blur"
                 }],
-                actions: [{
-                    required: true,
-                    message: "执行动作不能为空",
-                    trigger: "blur"
-                }],
-                cronExpression: [{
-                    required: true,
-                    message: "cron执行表达式不能为空",
-                    trigger: "blur"
-                }]
             }
         };
     },

vue/src/views/iot/device/device-user.vue

@@ -5,7 +5,9 @@
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="selectUser" v-hasPermi="['iot:deviceUser:add']">分享设备</el-button>
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="selectUserShareAllDevice" v-hasPermi="['iot:deviceUser:add']">分享所有设备</el-button>
         </el-col>
-        <right-toolbar @queryTable="getList"></right-toolbar>
+        <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="getList">刷新</el-button>
+        </el-col>
     </el-row>
 
     <el-table v-loading="loading" :data="deviceUserList" @selection-change="handleSelectionChange" size="mini">

vue/src/views/iot/device/running-status.vue

@@ -156,10 +156,10 @@
         </el-col>
 
         <el-col :xs="24" :sm="24" :md="24" :lg="14" :xl="14">
-            <el-row :gutter="20" style="background-color:#F5F7FA;padding:20px;padding-left:10px;">
+            <el-row :gutter="20" style="background-color:#F5F7FA;padding:20px 20px 10px 10px;border-radius:15px;margin-right:5px;">
-                <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="8" v-for="(item,index) in deviceInfo.readOnlyList" :key="index" style="margin-bottom:20px;">
+                <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="8" v-for="(item,index) in deviceInfo.readOnlyList" :key="index">
-                    <el-card shadow="hover" style="border-radius:30px;">
+                    <el-card shadow="hover" style="border-radius:30px;margin-bottom:20px;">
-                        <div ref="map" style="height:230px;width:180px;margin:0 auto;margin-top:-10px;"></div>
+                        <div ref="map" style="height:230px;width:180px;margin:0 auto;"></div>
                     </el-card>
                 </el-col>
             </el-row>