Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/views/iot/alarm/log/component/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="system-edit-dic-container">
-    <el-dialog title="日志详情" v-model="isShowDialog" width="769px">
-      <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+    <el-dialog title="日志详情" v-model="isShowDialog" width="700">
+      <el-form label-width="90px" label-position="left">
         <el-form-item label="规则名称">
           {{ ruleForm.ruleName }}
         </el-form-item>
@@ -45,16 +45,9 @@ import { reactive, toRefs, defineComponent, ref } from 'vue';
 import api from '/@/api/alarm';
 import 'vue3-json-viewer/dist/index.css';
 
-interface RuleFormState {
-  id?: number;
-  name: string;
-  interval: string;
-  key: string;
-  desc: string;
-}
 interface DicState {
   isShowDialog: boolean;
-  ruleForm: RuleFormState;
+  ruleForm: any;
   product_name: '';
   devcie_name: '';
   alarmLevel_name: '';
@@ -65,7 +58,6 @@ export default defineComponent({
   name: 'Edit',
 
   setup() {
-    const formRef = ref<HTMLElement | null>(null);
     const state = reactive<DicState>({
       isShowDialog: false,
       product_name: '',
@@ -76,7 +68,7 @@ export default defineComponent({
     });
 
     // 打开弹窗
-    const openDialog = (row: RuleFormState | null) => {
+    const openDialog = (row: any) => {
       //resetForm();
       api.log.detail(row.id).then((res: any) => {
         state.ruleForm = res.data;
@@ -105,10 +97,14 @@ export default defineComponent({
       openDialog,
       closeDialog,
       onCancel,
-      formRef,
       ...toRefs(state),
     };
   },
 });
 </script>
 
+<style scoped lang="scss">
+.el-form-item {
+  margin-bottom: 0;
+}
+</style>

src/views/iot/alarm/log/index.vue

@@ -1,27 +1,18 @@
 <template>
 	<div class="system-dic-container">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<div class="system-user-search mb15">
 				<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
 					<el-form-item label="创建时间" prop="dateRange">
-						<el-date-picker
-							v-model="tableData.param.dateRange"
-							size="default"
-							style="width: 240px"
-							value-format="YYYY-MM-DD"
-							type="daterange"
-							range-separator="-"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-						></el-date-picker>
+						<el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+					</el-form-item>
+					<el-form-item label="告警状态" prop="status" style="width: 200px;">
+						<el-select v-model="tableData.param.status" placeholder="告警状态" clearable size="default" style="width: 240px">
+							<el-option label="未处理" :value="0" />
+							<el-option label="已处理" :value="1" />
+							<el-option label="已忽略" :value="2" />
+						</el-select>
 					</el-form-item>
-          <el-form-item label="告警状态" prop="status" style="width: 200px;">
-            <el-select v-model="tableData.param.status" placeholder="告警状态" clearable size="default" style="width: 240px">
-              <el-option label="未处理" :value="0" />
-              <el-option label="已处理" :value="1" />
-              <el-option label="已忽略" :value="2" />
-            </el-select>
-          </el-form-item>
 					<el-form-item>
 						<el-button size="default" type="primary" class="ml10" @click="typeList">
 							<el-icon>
@@ -40,43 +31,33 @@
 			</div>
 			<el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading">
 				<el-table-column label="ID" align="center" prop="id" width="100" v-col="'ID'" />
-				<el-table-column label="告警类型" prop="type" :show-overflow-tooltip="true" v-col="'type'">
+				<el-table-column label="告警类型" prop="type" width="120" show-overflow-tooltip v-col="'type'">
 					<template #default="scope">
 						<span v-if="scope.row.type == 1">规则告警</span>
 						<span v-else>设备自主告警</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="规则名称" prop="ruleName" :show-overflow-tooltip="true" v-col="'ruleName'" />
-				<el-table-column label="规则级别" prop="alarmLevel" :show-overflow-tooltip="true" v-col="'alarmLevel'">
-					<template #default="scope">
-						{{ scope.row.alarmLevel.name }}
-					</template>
-				</el-table-column>
-				<el-table-column label="产品标识" prop="productKey" :show-overflow-tooltip="true" v-col="'productKey'" />
-				<el-table-column label="设备标识" prop="deviceKey" :show-overflow-tooltip="true" v-col="'deviceKey'" />
+				<el-table-column label="规则级别" prop="alarmLevel.name" width="100" align="center" show-overflow-tooltip v-col="'alarmLevel'"></el-table-column>
+				<el-table-column label="规则名称" prop="ruleName" show-overflow-tooltip v-col="'ruleName'" />
+				<el-table-column label="产品标识" prop="productKey" show-overflow-tooltip v-col="'productKey'" />
+				<el-table-column label="设备标识" prop="deviceKey" show-overflow-tooltip v-col="'deviceKey'" />
 
 				<el-table-column prop="status" label="告警状态" width="100" align="center" v-col="'status'">
 					<template #default="scope">
-            <el-tag type="danger" size="small" v-if="scope.row.status == 0">未处理</el-tag>
+						<el-tag type="danger" size="small" v-if="scope.row.status == 0">未处理</el-tag>
 						<el-tag type="success" size="small" v-if="scope.row.status == 1">已处理</el-tag>
 						<el-tag type="info" size="small" v-if="scope.row.status == 2">已忽略</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="createdAt" label="告警时间" align="center" width="180" v-col="'createdAt'"></el-table-column>
-				<el-table-column label="操作" width="150" align="center" fixed="right" v-col="'handle'">
+				<el-table-column prop="createdAt" label="告警时间" align="center" width="160" v-col="'createdAt'"></el-table-column>
+				<el-table-column label="操作" width="140" align="center" fixed="right" v-col="'handle'">
 					<template #default="scope">
 						<el-button size="small" text type="primary" @click="onOpenDetailDic(scope.row)" v-auth="'detail'">详情</el-button>
 						<el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-if="scope.row.status == 0" v-auth="'edit'">处理</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
-			<pagination
-				v-show="tableData.total > 0"
-				:total="tableData.total"
-				v-model:page="tableData.param.pageNum"
-				v-model:limit="tableData.param.pageSize"
-				@pagination="typeList"
-			/>
+			<pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="typeList" />
 		</el-card>
 
 		<EditDic ref="editDicRef" @dataList="typeList" />
@@ -84,7 +65,7 @@
 	</div>
 </template>
   
-  <script lang="ts">
+<script lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
 import { FormInstance } from 'element-plus';
 import api from '/@/api/alarm';
@@ -111,7 +92,7 @@ interface TableDataState {
 			pageSize: number;
 
 			dateRange: string[];
-      status: string;
+			status: string;
 		};
 	};
 }

src/views/iot/alarm/setting/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="system-dic-container">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<div class="system-user-search mb15">
 				<el-form :model="tableData.param" ref="queryRef" :inline="true">
 					<el-form-item>

src/views/iot/certificate/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="system-dic-container">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<div class="system-user-search mb15">
 				<el-form :model="state.tableData.param" ref="queryRef" :inline="true" label-width="60px">
 					<el-form-item label="关键字" prop="keyWord">
@@ -32,15 +32,15 @@
 			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
 				<!-- <el-table-column type="selection" width="55" align="center" /> -->
 				<el-table-column v-col="'id'" label="ID" align="center" prop="id" width="100" />
-				<el-table-column v-col="'name'" label="证书名称" prop="name" min-width="120" :show-overflow-tooltip="true" />
-				<el-table-column v-col="'standard'" label="证书标准" prop="standard" min-width="120" :show-overflow-tooltip="true">
+				<el-table-column v-col="'name'" label="证书名称" prop="name" min-width="120" show-overflow-tooltip />
+				<el-table-column v-col="'standard'" label="证书标准" prop="standard" min-width="120" show-overflow-tooltip>
 					<template #default="scope">
 						{{ filterStandard(scope.row.standard) }}
 						<!-- <el-button size="small" text type="primary" @click="operate('editParams', scope.row)">编辑</el-button> -->
 						<!-- <el-button size="small" text type="danger" @click="operate('delete', scope.row)">删除</el-button> -->
 					</template>
 				</el-table-column>
-				<el-table-column v-col="'description'" label="说明" prop="description" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column v-col="'description'" label="说明" prop="description" min-width="120" show-overflow-tooltip />
 				<el-table-column label="状态" width="120" align="center">
 					<template #default="scope">
 						<el-switch v-auth="'startOrStop'" v-model="scope.row.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)"></el-switch>

src/views/iot/configuration/list/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-card shadow="hover">
+  <el-card shadow="nover">
     <div class="search">
       <el-form :inline="true">
         <el-form-item>

src/views/iot/configuration/screen/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-card shadow="hover">
+  <el-card shadow="nover">
     <div class="search">
       <el-form :inline="true">
         <el-form-item>

src/views/iot/device-tree/tree/index.vue

@@ -1,13 +1,12 @@
 <template>
-  <div class="system-dic-container">
-    <el-row :gutter="10">
-      <el-col :span="5">
-        <el-card shadow="hover">
+  <el-card shadow="nover" class="page-full">
+    <el-row :gutter="10" class="h-full">
+      <el-col :span="6" class="h-full">
+        <el-card shadow="nover" class="h-full">
           <el-scrollbar v-loading="treeLoading">
-            <el-input :prefix-icon="search" v-model="searchVal" placeholder="请输入设备树名称" clearable size="default" style="width: 100%;" />
-
+            <el-input :prefix-icon="Search" v-model="searchVal" placeholder="请输入设备树名称" clearable size="default" style="width: 100%;" />
             <el-button v-if="!treeLoading && !treeData.length" type="primary" v-auth="'add'" class="mt-2" @click="operateCmd('add', {})" style="width: 100%">新建节点</el-button>
-            <el-tree ref="zlTreeSearchRef" v-if="!treeLoading" :data="treeData" :props="{
+            <el-tree ref="zlTreeSearchRef" class="mt-4" v-if="!treeLoading" :data="treeData" :props="{
               children: 'children',
               label: 'name'
             }" :filter-node-method="filterNode" :default-expand-all="true" :node-key="'id'" highlight-current @node-click="nodeClick">
@@ -51,8 +50,8 @@
           </el-scrollbar>
         </el-card>
       </el-col>
-      <el-col :span="19">
-        <el-card shadow="hover" v-if="treeDetail.name">
+      <el-col :span="18" class="h-full">
+        <el-card shadow="nover" class="h-full" v-if="treeDetail.name">
           <el-tabs v-model="tabName" @tab-click="onTabClick">
             <el-tab-pane label="设备树信息" name="1">
               <table>
@@ -138,9 +137,8 @@
         </el-card>
       </el-col>
     </el-row>
-
     <AddOrUpdate ref="addOrUpdateRef" @finish="onFinish" />
-  </div>
+  </el-card>
 </template>
 
 <script lang="ts">
@@ -148,7 +146,7 @@ import { toRefs, reactive, onMounted, ref, defineComponent, watch } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import AddOrUpdate from './component/edit.vue';
 import api from '/@/api/device';
-import { More, Plus, Edit, Delete } from '@element-plus/icons-vue'
+import { More, Plus, Edit, Delete, Search } from '@element-plus/icons-vue'
 
 // 定义接口来定义对象的类型
 interface TableDataRow {
@@ -346,6 +344,7 @@ export default defineComponent({
       nodeClick,
       ...toRefs(state),
       ruleForm,
+      Search,
       onSaveTime,
       filterNode,
       onFinish,
@@ -356,6 +355,10 @@ export default defineComponent({
 </script>
 
 <style scoped lang="scss">
+.el-card ::v-deep(.el-card__body) {
+  height: 100%;
+}
+
 .el-tree ::v-deep(.el-tree-node__label) {
   width: 100%;
   overflow: hidden;
@@ -418,6 +421,7 @@ table {
   border-collapse: collapse;
   text-indent: initial;
   border-spacing: 2px;
+  border: 1px solid #e8e8e8;
 }
 
 tbody {

src/views/iot/device/category/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="system-dept-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-dept-search mb15">
         <el-form :inline="true">
           <el-form-item label="分类名称">
-            <el-input size="default" v-model="tableData.param.name" placeholder="请输入分类名称"  @keyup.enter.native="getCateList"  class="w-50" clearable />
+            <el-input size="default" v-model="tableData.param.name" placeholder="请输入分类名称" @keyup.enter.native="getCateList" class="w-50" clearable />
           </el-form-item>
           <el-form-item>
             <el-button size="default" type="primary" class="ml10" @click="getCateList">
@@ -22,10 +22,10 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="tableData.data" style="width: 100%" row-key="id" default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-loading="tableData.loading">
+      <el-table :data="tableData.data" style="width: 100%" row-key="id" default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-loading="tableData.loading" max-height="calc(100vh - 230px)">
         <el-table-column prop="name" label="分类名称" v-col="'name'" show-overflow-tooltip> </el-table-column>
-        <el-table-column prop="sort" v-col="'sort'" label="排序" width="60" align="center"></el-table-column>
-        <el-table-column prop="desc" label="描述" align="center" min-width="180" v-col="'desc'"></el-table-column>
+        <el-table-column prop="desc" label="描述" align="center" v-col="'desc'"></el-table-column>
+        <el-table-column prop="sort" v-col="'sort'" label="排序" align="center"></el-table-column>
         <el-table-column label="操作" align="center" width="140" fixed="right">
           <template #default="scope">
             <el-button size="small" type="text" @click="onOpenAdd(scope.row)" v-auth="'add'">新增</el-button>

src/views/iot/device/channel/index.vue

@@ -8,7 +8,7 @@
 -->
 <template>
 	<div class="page">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<div class="search">
 				<el-form :model="params" :inline="true" ref="queryRef" @keyup.enter.native="getList(1)">
 					<el-form-item label="通道名称" prop="title">

src/views/iot/device/instance/component/subDevice.vue

@@ -113,7 +113,7 @@
 
 									<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'attr'">
 										<el-table-column label="属性标识" align="center" prop="key" />
-										<el-table-column label="属性名称" prop="name" :show-overflow-tooltip="true" />
+										<el-table-column label="属性名称" prop="name" show-overflow-tooltip />
 										<el-table-column prop="valueType" label="数据类型" width="100" align="center">
 											<template #default="scope">
 												<span>{{ scope.row.valueType?.type }}</span>
@@ -135,7 +135,7 @@
 												<el-tag type="success" size="small" v-else>读写</el-tag>
 											</template>
 										</el-table-column>
-										<el-table-column label="说明" prop="desc" :show-overflow-tooltip="true" />
+										<el-table-column label="说明" prop="desc" show-overflow-tooltip />
 										<el-table-column label="操作" width="300" align="center" fixed="right">
 											<template #default="scope">
 												<el-button size="small" text type="warning" @click="onEditAttr(scope.row)">修改</el-button>
@@ -154,9 +154,9 @@
 
 									<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'fun'">
 										<el-table-column label="功能标识" align="center" prop="key" />
-										<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
+										<el-table-column label="名称" prop="name" show-overflow-tooltip />
 
-										<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+										<el-table-column label="描述" prop="desc" show-overflow-tooltip />
 										<el-table-column label="操作" width="300" align="center" fixed="right">
 											<template #default="scope">
 												<el-button size="small" text type="warning" @click="onEditFun(scope.row)">修改</el-button>
@@ -175,7 +175,7 @@
 
 									<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'event'">
 										<el-table-column label="事件标识" align="center" prop="key" />
-										<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
+										<el-table-column label="名称" prop="name" show-overflow-tooltip />
 										<el-table-column prop="level" label="事件级别" width="120" align="center">
 											<template #default="scope">
 												<el-tag type="primary" size="small" v-if="scope.row.level == 0">普通</el-tag>
@@ -183,7 +183,7 @@
 												<el-tag type="danger" size="small" v-if="scope.row.level == 2">紧急</el-tag>
 											</template>
 										</el-table-column>
-										<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+										<el-table-column label="描述" prop="desc" show-overflow-tooltip />
 
 										<el-table-column label="操作" width="300" align="center" fixed="right">
 											<template #default="scope">
@@ -203,7 +203,7 @@
 
 									<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'tab'">
 										<el-table-column label="属性标识" align="center" prop="key" />
-										<el-table-column label="属性名称" prop="name" :show-overflow-tooltip="true" />
+										<el-table-column label="属性名称" prop="name" show-overflow-tooltip />
 										<el-table-column prop="valueType" label="数据类型" width="120" align="center">
 											<template #default="scope">
 												<span>{{ scope.row.valueType.type }}</span>
@@ -215,7 +215,7 @@
 												<el-tag type="success" size="small" v-else>读写</el-tag>
 											</template>
 										</el-table-column>
-										<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+										<el-table-column label="描述" prop="desc" show-overflow-tooltip />
 										<el-table-column label="操作" width="300" align="center" fixed="right">
 											<template #default="scope">
 												<el-button size="small" text type="warning" @click="onEditTag(scope.row)">修改</el-button>
@@ -275,9 +275,9 @@
 						</div>
 						<el-table style="width: 100%" :data="logtableData.data">
 							<el-table-column label="类型" align="center" prop="type" />
-							<el-table-column label="时间" prop="ts" :show-overflow-tooltip="true" />
+							<el-table-column label="时间" prop="ts" show-overflow-tooltip />
 
-							<el-table-column label="内容" prop="content" :show-overflow-tooltip="true" />
+							<el-table-column label="内容" prop="content" show-overflow-tooltip />
 							<el-table-column label="操作" width="300" align="center" fixed="right">
 								<template #default="scope">
 									<el-button size="small" text type="warning" @click="onLogDetail(scope.row)">查看</el-button>

src/views/iot/device/instance/component/subDeviceMutipleBind.vue

@@ -12,9 +12,9 @@
 			</el-form>
 			<el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
 				<el-table-column type="selection" width="55" align="center" />
-				<el-table-column label="标识" prop="key" width="130" :show-overflow-tooltip="true" v-col="'key'" />
-				<el-table-column label="设备名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
-				<el-table-column label="产品名称" prop="productName" :show-overflow-tooltip="true" v-col="'productName'" />
+				<el-table-column label="标识" prop="key" width="130" show-overflow-tooltip v-col="'key'" />
+				<el-table-column label="设备名称" prop="name" show-overflow-tooltip v-col="'name'" />
+				<el-table-column label="产品名称" prop="productName" show-overflow-tooltip v-col="'productName'" />
 
 				<el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">
 					<template #default="scope">

src/views/iot/device/instance/detail.vue

@@ -143,7 +143,7 @@
 
                 <el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'attr'">
                   <el-table-column label="属性标识" align="center" prop="key" />
-                  <el-table-column label="属性名称" prop="name" :show-overflow-tooltip="true" />
+                  <el-table-column label="属性名称" prop="name" show-overflow-tooltip />
                   <el-table-column prop="valueType" label="数据类型" width="100" align="center">
                     <template #default="scope">
                       <span>{{ scope.row.valueType.type }}</span>
@@ -165,7 +165,7 @@
                       <el-tag type="success" size="small" v-else>读写</el-tag>
                     </template>
                   </el-table-column>
-                  <el-table-column label="说明" prop="desc" :show-overflow-tooltip="true" />
+                  <el-table-column label="说明" prop="desc" show-overflow-tooltip />
                   <el-table-column label="操作" width="300" align="center" fixed="right">
                     <template #default="scope">
                       <el-button size="small" text type="warning" v-auth="'edit'"
@@ -188,9 +188,9 @@
 
                 <el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'fun'">
                   <el-table-column label="功能标识" align="center" prop="key" />
-                  <el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
+                  <el-table-column label="名称" prop="name" show-overflow-tooltip />
 
-                  <el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+                  <el-table-column label="描述" prop="desc" show-overflow-tooltip />
                   <el-table-column label="操作" width="300" align="center" fixed="right">
                     <template #default="scope">
                       <el-button size="small" text type="warning" v-auth="'edit'"
@@ -211,7 +211,7 @@
 
                 <el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'event'">
                   <el-table-column label="事件标识" align="center" prop="key" />
-                  <el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
+                  <el-table-column label="名称" prop="name" show-overflow-tooltip />
                   <el-table-column prop="level" label="事件级别" width="120" align="center">
                     <template #default="scope">
                       <el-tag type="primary" size="small" v-if="scope.row.level == 0">普通</el-tag>
@@ -219,7 +219,7 @@
                       <el-tag type="danger" size="small" v-if="scope.row.level == 2">紧急</el-tag>
                     </template>
                   </el-table-column>
-                  <el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+                  <el-table-column label="描述" prop="desc" show-overflow-tooltip />
 
                   <el-table-column label="操作" width="300" align="center" fixed="right">
                     <template #default="scope">
@@ -242,7 +242,7 @@
 
                 <el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'tab'">
                   <el-table-column label="属性标识" align="center" prop="key" />
-                  <el-table-column label="属性名称" prop="name" :show-overflow-tooltip="true" />
+                  <el-table-column label="属性名称" prop="name" show-overflow-tooltip />
                   <el-table-column prop="valueType" label="数据类型" width="120" align="center">
                     <template #default="scope">
                       <span>{{ scope.row.valueType.type }}</span>
@@ -254,7 +254,7 @@
                       <el-tag type="success" size="small" v-else>读写</el-tag>
                     </template>
                   </el-table-column>
-                  <el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+                  <el-table-column label="描述" prop="desc" show-overflow-tooltip />
                   <el-table-column label="操作" width="300" align="center" fixed="right">
                     <template #default="scope">
                       <el-button size="small" text type="warning" v-auth="'edit'"
@@ -305,9 +305,9 @@
           </div>
           <el-table style="width: 100%" :data="logtableData.data">
             <el-table-column label="类型" align="center" prop="type" />
-            <el-table-column label="时间" prop="ts" :show-overflow-tooltip="true" />
+            <el-table-column label="时间" prop="ts" show-overflow-tooltip />
 
-            <el-table-column label="内容" prop="content" :show-overflow-tooltip="true" />
+            <el-table-column label="内容" prop="content" show-overflow-tooltip />
             <el-table-column label="操作" width="300" align="center" fixed="right">
               <template #default="scope">
                 <el-button size="small" text type="warning" @click="onLogDetail(scope.row)">查看</el-button>
@@ -332,9 +332,9 @@
             <el-table :data="deviceTableData.data" style="width: 100%" @selection-change="handleSelectionChange"
               v-loading="deviceTableData.loading">
               <el-table-column type="selection" width="55" align="center" />
-              <el-table-column label="标识" prop="key" width="130" :show-overflow-tooltip="true" />
-              <el-table-column label="设备名称" prop="name" :show-overflow-tooltip="true" />
-              <el-table-column label="产品名称" prop="productName" :show-overflow-tooltip="true" />
+              <el-table-column label="标识" prop="key" width="130" show-overflow-tooltip />
+              <el-table-column label="设备名称" prop="name" show-overflow-tooltip />
+              <el-table-column label="产品名称" prop="productName" show-overflow-tooltip />
 
               <el-table-column prop="status" label="状态" width="100" align="center">
                 <template #default="scope">

src/views/iot/device/instance/index.vue

@@ -1,22 +1,22 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover" v-loading="batchLoading">
+    <el-card shadow="nover" v-loading="batchLoading">
       <div class="system-user-search mb15">
-        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
+        <el-form :model="tableData.param" ref="queryRef" :inline="true">
           <el-form-item label="设备名称" prop="name">
-            <el-input v-model="tableData.param.name" placeholder="请输入设备名称" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+            <el-input v-model="tableData.param.name" placeholder="请输入设备名称" clearable size="default" style="width: 180px" @keyup.enter.native="typeList" />
           </el-form-item>
           <el-form-item label="设备标识" prop="key">
-            <el-input v-model="tableData.param.key" placeholder="请输入设备标识" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+            <el-input v-model="tableData.param.key" placeholder="请输入设备标识" clearable size="default" style="width: 180px" @keyup.enter.native="typeList" />
           </el-form-item>
           <el-form-item label="所属产品" prop="productId">
-            <el-select v-model="tableData.param.productId" filterable placeholder="请选择产品">
+            <el-select v-model="tableData.param.productId" style="width: 150px" filterable placeholder="请选择产品">
               <el-option v-for="item in productData" :key="item.id" :label="item.name" :value="item.id.toString()" value-key="id"> </el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="状态" prop="status" style="width: 200px;">
-            <el-select v-model="tableData.param.status" placeholder="状态" clearable size="default" style="width: 240px">
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="tableData.param.status" placeholder="状态" clearable size="default" style="width: 100px">
               <el-option label="在线" :value="2" />
               <el-option label="离线" :value="1" />
               <el-option label="未启用" :value="0" />
@@ -88,7 +88,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
+      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading" max-height="calc(100vh - 320px)">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="标识" prop="key" min-width="150" show-overflow-tooltip v-col="'key'" />
         <el-table-column label="设备名称" prop="name" min-width="160" show-overflow-tooltip v-col="'name'" />

src/views/iot/device/product/detail.vue

@@ -70,7 +70,7 @@
 
 								<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'attr'">
 									<el-table-column label="属性标识" align="center" prop="key" />
-									<el-table-column label="属性名称" prop="name" :show-overflow-tooltip="true" />
+									<el-table-column label="属性名称" prop="name" show-overflow-tooltip />
 									<el-table-column prop="valueType" label="数据类型" width="100" align="center">
 										<template #default="scope">
 											<span>{{ scope.row.valueType.type }}</span>
@@ -92,7 +92,7 @@
 											<el-tag type="success" size="small" v-else>读写</el-tag>
 										</template>
 									</el-table-column>
-									<el-table-column label="说明" prop="desc" :show-overflow-tooltip="true" />
+									<el-table-column label="说明" prop="desc" show-overflow-tooltip />
 									<el-table-column label="操作" width="300" align="center" fixed="right">
 										<template #default="scope">
 											<el-button size="small" text type="warning" v-auth="'edit'" @click="onEditAttr(scope.row)">修改</el-button>
@@ -110,9 +110,9 @@
 
 								<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'fun'">
 									<el-table-column label="功能标识" align="center" prop="key" />
-									<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
+									<el-table-column label="名称" prop="name" show-overflow-tooltip />
 
-									<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+									<el-table-column label="描述" prop="desc" show-overflow-tooltip />
 									<el-table-column label="操作" width="300" align="center" fixed="right">
 										<template #default="scope">
 											<el-button size="small" text type="warning" v-auth="'edit'" @click="onEditFun(scope.row)">修改</el-button>
@@ -130,7 +130,7 @@
 
 								<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'event'">
 									<el-table-column label="事件标识" align="center" prop="key" />
-									<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
+									<el-table-column label="名称" prop="name" show-overflow-tooltip />
 									<el-table-column prop="level" label="事件级别" width="120" align="center">
 										<template #default="scope">
 											<el-tag type="primary" size="small" v-if="scope.row.level == 0">普通</el-tag>
@@ -138,7 +138,7 @@
 											<el-tag type="danger" size="small" v-if="scope.row.level == 2">紧急</el-tag>
 										</template>
 									</el-table-column>
-									<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+									<el-table-column label="描述" prop="desc" show-overflow-tooltip />
 
 									<el-table-column label="操作" width="300" align="center" fixed="right">
 										<template #default="scope">
@@ -157,7 +157,7 @@
 
 								<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'tab'">
 									<el-table-column label="属性标识" align="center" prop="key" />
-									<el-table-column label="属性名称" prop="name" :show-overflow-tooltip="true" />
+									<el-table-column label="属性名称" prop="name" show-overflow-tooltip />
 									<el-table-column prop="valueType" label="数据类型" width="120" align="center">
 										<template #default="scope">
 											<span>{{ scope.row.valueType.type }}</span>
@@ -169,7 +169,7 @@
 											<el-tag type="success" size="small" v-else>读写</el-tag>
 										</template>
 									</el-table-column>
-									<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+									<el-table-column label="描述" prop="desc" show-overflow-tooltip />
 									<el-table-column label="操作" width="300" align="center" fixed="right">
 										<template #default="scope">
 											<el-button size="small" text type="warning" v-auth="'edit'" @click="onEditTag(scope.row)">修改</el-button>

src/views/iot/device/product/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
           <el-form-item label="产品名称" prop="name">
@@ -46,14 +46,12 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
+      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading" max-height="calc(100vh - 320px)">
         <el-table-column type="selection" width="55" align="center" />
-        <!--        <el-table-column label="ID" align="center" prop="id" width="60"  v-col="'id'"/>-->
-        <el-table-column label="标识" prop="key" min-width="150" show-overflow-tooltip v-col="'key'" />
+        <el-table-column label="标识" prop="key" min-width="130" show-overflow-tooltip v-col="'key'" />
         <el-table-column label="名称" prop="name" min-width="160" show-overflow-tooltip v-col="'name'" />
-        <el-table-column label="分类" prop="categoryName" align="center" width="160" show-overflow-tooltip v-col="'categoryName'" />
-        <!-- <el-table-column label="组织" prop="deptName" show-overflow-tooltip v-col="'deptName'"/> -->
-        <el-table-column label="消息协议" prop="messageProtocol" align="center" min-width="160" show-overflow-tooltip v-col="'messageProtocol'" />
+        <el-table-column label="分类" prop="categoryName" align="center" width="140" show-overflow-tooltip v-col="'categoryName'" />
+        <el-table-column label="消息协议" prop="messageProtocol" align="center" min-width="150" show-overflow-tooltip v-col="'messageProtocol'" />
         <el-table-column label="接入方式" prop="transportProtocol" min-width="120" align="center" show-overflow-tooltip v-col="'transportProtocol'" />
         <el-table-column label="类型" prop="deviceType" min-width="90" align="center" show-overflow-tooltip v-col="'deviceType'" />
         <el-table-column prop="status" label="状态" min-width="90" align="center" v-col="'status'">
@@ -62,7 +60,6 @@
             <el-tag type="info" size="small" v-else>未发布</el-tag>
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="createdAt" label="创建时间" align="center" width="180"></el-table-column> -->
         <el-table-column label="操作" width="130" align="center" fixed="right">
           <template #default="scope">
             <router-link :to="'/iotmanager/device/product/detail/' + scope.row.id" class="link-type" style="padding-right: 12px;font-size: 12px;color: #409eff;">

src/views/iot/device/template/detail.vue

@@ -111,7 +111,7 @@
 
 								<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'attr'">
 									<el-table-column label="属性标识" align="center" prop="key" />
-									<el-table-column label="属性名称" prop="name" :show-overflow-tooltip="true" />
+									<el-table-column label="属性名称" prop="name" show-overflow-tooltip />
 									<el-table-column prop="valueType" label="数据类型" width="100" align="center">
 										<template #default="scope">
 											<span>{{ scope.row.valueType.type }}</span>
@@ -133,7 +133,7 @@
 											<el-tag type="success" size="small" v-else>读写</el-tag>
 										</template>
 									</el-table-column>
-									<el-table-column label="说明" prop="desc" :show-overflow-tooltip="true" />
+									<el-table-column label="说明" prop="desc" show-overflow-tooltip />
 									<el-table-column label="操作" width="300" align="center" fixed="right">
 										<template #default="scope">
 											<el-button size="small" text type="warning" @click="onEditAttr(scope.row)">修改</el-button>
@@ -152,9 +152,9 @@
 
 								<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'fun'">
 									<el-table-column label="功能标识" align="center" prop="key" />
-									<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
+									<el-table-column label="名称" prop="name" show-overflow-tooltip />
 
-									<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+									<el-table-column label="描述" prop="desc" show-overflow-tooltip />
 									<el-table-column label="操作" width="300" align="center" fixed="right">
 										<template #default="scope">
 											<el-button size="small" text type="warning" @click="onEditFun(scope.row)">修改</el-button>
@@ -173,7 +173,7 @@
 
 								<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'event'">
 									<el-table-column label="事件标识" align="center" prop="key" />
-									<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
+									<el-table-column label="名称" prop="name" show-overflow-tooltip />
 									<el-table-column prop="level" label="事件级别" width="120" align="center">
 										<template #default="scope">
 											<el-tag type="primary" size="small" v-if="scope.row.level == 0">普通</el-tag>
@@ -181,7 +181,7 @@
 											<el-tag type="danger" size="small" v-if="scope.row.level == 2">紧急</el-tag>
 										</template>
 									</el-table-column>
-									<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+									<el-table-column label="描述" prop="desc" show-overflow-tooltip />
 
 									<el-table-column label="操作" width="300" align="center" fixed="right">
 										<template #default="scope">
@@ -201,7 +201,7 @@
 
 								<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'tab'">
 									<el-table-column label="属性标识" align="center" prop="key" />
-									<el-table-column label="属性名称" prop="name" :show-overflow-tooltip="true" />
+									<el-table-column label="属性名称" prop="name" show-overflow-tooltip />
 									<el-table-column prop="valueType" label="数据类型" width="120" align="center">
 										<template #default="scope">
 											<span>{{ scope.row.valueType.type }}</span>
@@ -213,7 +213,7 @@
 											<el-tag type="success" size="small" v-else>读写</el-tag>
 										</template>
 									</el-table-column>
-									<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+									<el-table-column label="描述" prop="desc" show-overflow-tooltip />
 									<el-table-column label="操作" width="300" align="center" fixed="right">
 										<template #default="scope">
 											<el-button size="small" text type="warning" @click="onEditTag(scope.row)">修改</el-button>
@@ -257,9 +257,9 @@
 					</div>
 					<el-table style="width: 100%" :data="logtableData.data">
 						<el-table-column label="类型" align="center" prop="type" />
-						<el-table-column label="时间" prop="ts" :show-overflow-tooltip="true" />
+						<el-table-column label="时间" prop="ts" show-overflow-tooltip />
 
-						<el-table-column label="内容" prop="content" :show-overflow-tooltip="true" />
+						<el-table-column label="内容" prop="content" show-overflow-tooltip />
 						<el-table-column label="操作" width="300" align="center" fixed="right">
 							<template #default="scope">
 								<el-button size="small" text type="warning" @click="onLogDetail(scope.row)">查看</el-button>

src/views/iot/device/template/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="page">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<div class="search">
 				<el-form :model="params" :inline="true" ref="queryRef">
 					<el-form-item label="模板名称" prop="title">

src/views/iot/ice104/device/detail.vue

@@ -8,7 +8,7 @@
 -->
 <template>
 	<div class="page page-full">
-		<el-card shadow="hover" class="page-full-part">
+		<el-card shadow="nover" class="page-full-part">
 			<el-tabs v-model="activeName" class="demo-tabs">
 				<el-tab-pane label="设备详情" name="detail">
 					<EditDeviceForm ref="editFormRef" />

src/views/iot/ice104/device/index.vue

@@ -8,7 +8,7 @@
 -->
 <template>
 	<div class="page page-full">
-		<el-card shadow="hover" class="page-full-part">
+		<el-card shadow="nover" class="page-full-part">
 			<div class="search">
 				<el-form :model="params" :inline="true" ref="queryRef" @submit.prevent>
 					<el-form-item label="设备名称" prop="title">

src/views/iot/ice104/template/detail.vue

@@ -8,7 +8,7 @@
 -->
 <template>
 	<div class="page page-full">
-		<el-card shadow="hover" class="page-full-part">
+		<el-card shadow="nover" class="page-full-part">
 			<el-tabs v-model="activeName">
 				<el-tab-pane label="模版详情" name="detail">
 					<EditTemplateForm ref="editFormRef" />

src/views/iot/ice104/template/index.vue

@@ -8,7 +8,7 @@
 -->
 <template>
 	<div class="page page-full">
-		<el-card shadow="hover" class="page-full-part">
+		<el-card shadow="nover" class="page-full-part">
 			<div class="search">
 				<el-form :model="params" :inline="true" ref="queryRef">
 					<el-form-item label="模版名称" prop="title">

src/views/iot/iotmanager/dashboard.vue

@@ -47,20 +47,16 @@
 					</div>
 					<el-table :data="tableData.data" style="width: 100%" v-loading="loading">
 						<el-table-column label="ID" align="center" prop="id" width="100" v-col="'ID'" />
-						<el-table-column label="告警类型" prop="type" :show-overflow-tooltip="true" v-col="'type'">
+						<el-table-column label="告警类型" width="120" prop="type" align="center" show-overflow-tooltip v-col="'type'">
 							<template #default="scope">
 								<span v-if="scope.row.type == 1">规则告警</span>
 								<span v-else>设备自主告警</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="规则名称" prop="ruleName" :show-overflow-tooltip="true" v-col="'ruleName'" />
-						<el-table-column label="规则级别" prop="alarmLevel" :show-overflow-tooltip="true" v-col="'alarmLevel'">
-							<template #default="scope">
-								{{ scope.row.alarmLevel.name }}
-							</template>
-						</el-table-column>
-						<el-table-column label="产品标识" prop="productKey" :show-overflow-tooltip="true" v-col="'productKey'" />
-						<el-table-column label="设备标识" prop="deviceKey" :show-overflow-tooltip="true" v-col="'deviceKey'" />
+						<el-table-column label="规则级别" width="120" align="center" prop="alarmLevel.name" show-overflow-tooltip v-col="'alarmLevel'" />
+						<el-table-column label="规则名称" prop="ruleName" show-overflow-tooltip v-col="'ruleName'" />
+						<el-table-column label="产品标识" prop="productKey" show-overflow-tooltip v-col="'productKey'" />
+						<el-table-column label="设备标识" prop="deviceKey" show-overflow-tooltip v-col="'deviceKey'" />
 
 						<el-table-column prop="status" label="告警状态" width="100" align="center" v-col="'status'">
 							<template #default="scope">
@@ -68,8 +64,8 @@
 								<el-tag type="info" size="small" v-else>未处理</el-tag>
 							</template>
 						</el-table-column>
-						<el-table-column prop="createdAt" label="告警时间" align="center" width="180" v-col="'createdAt'"></el-table-column>
-						<el-table-column label="操作" width="150" align="center" fixed="right" v-col="'handle'">
+						<el-table-column prop="createdAt" label="告警时间" align="center" width="170" v-col="'createdAt'"></el-table-column>
+						<el-table-column label="操作" width="130" align="center" fixed="right" v-col="'handle'">
 							<template #default="scope">
 								<el-button v-auth="'detail'" size="small" text type="primary" @click="onOpenDetailDic(scope.row)">详情</el-button>
 								<el-button v-auth="'edit'" size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-if="scope.row.status == 0">处理</el-button>
@@ -702,4 +698,5 @@ $homeNavLengh: 8;
 	.box-card.xx {
 		margin-top: 20px;
 	}
-}</style>
+}
+</style>

src/views/iot/network/server/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-card shadow="hover">
+    <el-card shadow="nover">
         <el-form :inline="true" label-width="82px" @keyup.enter="searchData">
             <el-form-item label="服务器名称">
                 <el-input size="default" style="width: 200px;margin-left: 20px;" class="search-input" v-model="key" placeholder="请输入搜索关键字" clearable>

src/views/iot/network/tunnel/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-card shadow="hover">
+    <el-card shadow="nover">
         <el-form :inline="true" label-width="68px">
             <el-form-item label="通道名称" @keyup.enter.native="searchData()">
                 <el-input size="default" style="width: 200px;margin-left: 20px;" class="search-input" v-model="key" placeholder="请输入搜索关键字" clearable>

src/views/iot/noticeservices/config/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div>
         <el-row>
           <el-col :span="12"   v-for="item in notice_send_gateway"  >

src/views/iot/noticeservices/config/setting.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="system-dic-container">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<div class="system-user-search mb15">
 				<el-form :model="tableData.param" ref="queryRef" :inline="true" @keyup.enter.native="dataList">
 					<el-form-item label="配置名称" prop="keyWord">

src/views/iot/noticeservices/log/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="system-dic-container">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<div class="system-user-search mb15">
 				<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
 					<el-form-item label="创建时间" prop="dateRange">
@@ -33,8 +33,8 @@
 
 				<el-table-column label="ID" align="center" prop="id" width="100" v-col="'ID'" />
 
-				<el-table-column label="标题" prop="title" align="center" :show-overflow-tooltip="true" v-col="'title'" />
-				<el-table-column label="发送方式" prop="gateway" align="center" :show-overflow-tooltip="true" v-col="'title'" />
+				<el-table-column label="标题" prop="title" align="center" show-overflow-tooltip v-col="'title'" />
+				<el-table-column label="发送方式" prop="gateway" align="center" show-overflow-tooltip v-col="'title'" />
 				<el-table-column prop="status" label="发送状态" align="center" v-col="'status'">
 					<template #default="scope">
 						<el-tag type="success" size="small" v-if="scope.row.status">发送成功</el-tag>

src/views/iot/operate/remoteconf/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <h2>远程配置</h2>
       <div class="container">
         <div class="selectContainer">

src/views/iot/ota-update/data/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-card shadow="hover">
+	<el-card shadow="nover">
 		<el-tabs v-model="activeTab">
 				<el-tab-pane label="版本分布" name="tab1">
 					<div class="flex">

src/views/iot/ota-update/module/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="ota-module-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="ota-module-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px" @keyup.enter.native="getList(1)">
           <el-form-item label="模块名称" prop="name">
@@ -36,8 +36,8 @@
 
       <el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading">
         <el-table-column label="ID" v-col="'id'" align="center" prop="id" width="100" />
-        <el-table-column label="模块名称" v-col="'name'" prop="name" :show-overflow-tooltip="true" />
-        <el-table-column label="模块别名" v-col="'nameAs'" prop="nameAs" :show-overflow-tooltip="true" />
+        <el-table-column label="模块名称" v-col="'name'" prop="name" show-overflow-tooltip />
+        <el-table-column label="模块别名" v-col="'nameAs'" prop="nameAs" show-overflow-tooltip />
         <el-table-column label="所属产品" v-col="'ProductName'" prop="ProductName" width="260" />
         <el-table-column label="创建时间" prop="createdAt" align="center" />
         <el-table-column label="操作" width="100" v-col="'handle'" align="center" fixed="right">

src/views/iot/ota-update/update/component/batch.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="ota-module-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="ota-module-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="90px" @keyup.enter.native="getList(1)">
           <el-form-item label="批次名称：" prop="name">

src/views/iot/ota-update/update/component/device.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-	<el-card shadow="hover">
+	<el-card shadow="nover">
 		<div class="search">
 			<el-form :inline="true" ref="queryRef">
 				<el-form-item label="设备名称：" prop="name">

src/views/iot/ota-update/update/component/deviceBind.vue

@@ -11,9 +11,9 @@
       </el-form>
       <el-table ref="multipleTable" :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="标识" prop="key" width="130" :show-overflow-tooltip="true" v-col="'key'" />
-        <el-table-column label="设备名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
-        <el-table-column label="产品名称" prop="productName" :show-overflow-tooltip="true" v-col="'productName'" />
+        <el-table-column label="标识" prop="key" width="130" show-overflow-tooltip v-col="'key'" />
+        <el-table-column label="设备名称" prop="name" show-overflow-tooltip v-col="'name'" />
+        <el-table-column label="产品名称" prop="productName" show-overflow-tooltip v-col="'productName'" />
 
         <el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">
           <template #default="scope">

src/views/iot/ota-update/update/component/productBind.vue

@@ -11,12 +11,12 @@
       </el-form>
       <el-table ref="productTable" :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" @select-all="selectAll" v-loading="tableData.loading">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="标识" prop="key" :show-overflow-tooltip="true" v-col="'key'" />
-        <el-table-column label="名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
-        <el-table-column label="分类" prop="categoryName" :show-overflow-tooltip="true" v-col="'categoryName'" />
-        <el-table-column label="消息协议" prop="messageProtocol" :show-overflow-tooltip="true" v-col="'messageProtocol'" />
-        <el-table-column label="接入方式" prop="transportProtocol" :show-overflow-tooltip="true" v-col="'transportProtocol'" />
-        <el-table-column label="类型" prop="deviceType" :show-overflow-tooltip="true" v-col="'deviceType'" />
+        <el-table-column label="标识" prop="key" show-overflow-tooltip v-col="'key'" />
+        <el-table-column label="名称" prop="name" show-overflow-tooltip v-col="'name'" />
+        <el-table-column label="分类" prop="categoryName" show-overflow-tooltip v-col="'categoryName'" />
+        <el-table-column label="消息协议" prop="messageProtocol" show-overflow-tooltip v-col="'messageProtocol'" />
+        <el-table-column label="接入方式" prop="transportProtocol" show-overflow-tooltip v-col="'transportProtocol'" />
+        <el-table-column label="类型" prop="deviceType" show-overflow-tooltip v-col="'deviceType'" />
 
         <el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">
           <template #default="scope">

src/views/iot/ota-update/update/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="ota-module-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="ota-module-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="100px">
           <el-form-item label="升级包名称" prop="keyWord">
@@ -37,15 +37,15 @@
 
       <el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading">
         <el-table-column label="ID" v-col="'id'" align="center" prop="id" width="100" />
-        <el-table-column label="升级包名称" v-col="'name'" prop="name" :show-overflow-tooltip="true" />
+        <el-table-column label="升级包名称" v-col="'name'" prop="name" show-overflow-tooltip />
         <el-table-column prop="types" label="类型" show-overflow-tooltip v-col="'types'">
           <template #default="scope">
             <el-tag  size="small" v-if="scope.row.types == 1">整包</el-tag>
             <el-tag  type="info" size="small" v-if="scope.row.types == 2">差分</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="所属产品" v-col="'productName'" prop="productName" :show-overflow-tooltip="true" />
-        <el-table-column label="模块名称" v-col="'moduleName'" prop="moduleName" :show-overflow-tooltip="true" />
+        <el-table-column label="所属产品" v-col="'productName'" prop="productName" show-overflow-tooltip />
+        <el-table-column label="模块名称" v-col="'moduleName'" prop="moduleName" show-overflow-tooltip />
         <el-table-column label="状态" prop="checkres" v-col="'checkres'" width="120" align="center">
           <template #default="scope">
             <el-tag type="success" size="small" v-if="scope.row.checkres == 1">验证</el-tag>

src/views/iot/property/attribute/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-card shadow="hover">
+	<el-card shadow="nover">
 		<div class="search">
 			<el-form :inline="true" ref="queryRef" @keyup.enter="getList(1)">
 				<el-form-item label="关键字：" prop="keyWord">

src/views/iot/property/dossier/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-card shadow="hover">
+	<el-card shadow="nover">
 		<div class="search">
 			<el-form :inline="true" ref="queryRef" @keyup.enter="getList(1)">
 				<el-form-item label="名称：" prop="keyWord">

src/views/iot/rule-engine/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-card shadow="hover">
+	<el-card shadow="nover">
 		<div class="search">
 			<el-form :inline="true">
 				<el-form-item>

src/views/iot/rule-engine/send.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-card shadow="hover">
+  <el-card shadow="nover">
     <div class="search">
       <el-form :inline="true">
         <el-form-item>

src/views/iot/scene/list/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-card shadow="hover">
+	<el-card shadow="nover">
 		<div class="search">
 			<el-form :inline="true" ref="queryRef">
 				<el-form-item label="场景名称：" prop="name">

src/views/iot/scene/manage/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-card shadow="hover">
+	<el-card shadow="nover">
 		<div class="search">
 			<el-form :inline="true" ref="queryRef" @keyup.enter="getList(1)">
 				<el-form-item label="场景名称：" prop="keyWord">

src/views/limits/frontEnd/btn/index.vue

@@ -2,7 +2,7 @@
 	<div>
 		<LimitsFrontEndPage />
 		<!-- 演示1：组件方式 -->
-		<el-card shadow="hover" header="演示1：组件方式" class="mt15">
+		<el-card shadow="nover" header="演示1：组件方式" class="mt15">
 			<el-row class="mb10" style="color: #808080">单个权限验证（:value="xxx"）：</el-row>
 			<div class="flex-warp">
 				<Auth :value="'btn.add'">
@@ -161,7 +161,7 @@
 		</el-card>
 
 		<!-- 演示2：指令方式 -->
-		<el-card shadow="hover" header="演示2：指令方式（页面初始化时执行）" class="mt15">
+		<el-card shadow="nover" header="演示2：指令方式（页面初始化时执行）" class="mt15">
 			<el-row class="mb10" style="color: #808080">单个权限验证（v-auth="xxx"）：</el-row>
 			<div class="flex-warp">
 				<div class="flex-warp-item" v-auth="'btn.add'">
@@ -296,7 +296,7 @@
 		</el-card>
 
 		<!-- 演示3：函数方式 -->
-		<el-card shadow="hover" header="演示3：函数方式（点击按钮查看有无权限，用于判断）" class="mt15">
+		<el-card shadow="nover" header="演示3：函数方式（点击按钮查看有无权限，用于判断）" class="mt15">
 			<el-row class="mb10" style="color: #808080">auth('xxx')、auths(['xxx','xxx'])、authAll(['xxx','xxx'])：</el-row>
 			<div class="flex-warp">
 				<div class="flex-warp-item">

src/views/limits/frontEnd/page/index.vue

@@ -13,7 +13,7 @@
 			:closable="false"
 			class="mt15"
 		></el-alert>
-		<el-card shadow="hover" header="切换用户演示，前端控制不同用户显示不同页面、按钮权限" class="mt15">
+		<el-card shadow="nover" header="切换用户演示，前端控制不同用户显示不同页面、按钮权限" class="mt15">
 			<el-radio-group v-model="userAuth" size="default" @change="onRadioChange">
 				<el-radio-button label="admin"></el-radio-button>
 				<el-radio-button label="common"></el-radio-button>

src/views/personal/index.vue

@@ -3,7 +3,7 @@
 		<el-row>
 			<!-- 个人信息 -->
 			<el-col :xs="24" :sm="24">
-				<el-card shadow="hover" header="个人信息" v-loading="!info.userName">
+				<el-card shadow="nover" header="个人信息" v-loading="!info.userName">
 					<div class="personal-user">
 						<div class="personal-user-left">
 							<el-image v-if="isEditStatus && info.avatar" style="width: 140px; height: 140px" :src="info.avatar" />

src/views/system/api/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="page">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<div class="search">
 				<el-form :model="params" :inline="true" ref="queryRef">
 					<el-form-item label="接口名称" prop="name">

src/views/system/application/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-card shadow="hover">
+	<el-card shadow="nover">
 		<div class="search">
 			<el-form :model="params" :inline="true" ref="queryRef">
 				<el-form-item label="应用名称：" prop="keyWord" @submit.prevent>

src/views/system/assess/totalIndex/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="assess-total-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <!-- <el-input size="default" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
 				<el-button size="default" type="success" class="ml10">

src/views/system/basicConfig/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="system-dic-container">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<el-form :model="state.tableData.param" label-position="top" ref="queryRef" :inline="true" label-width="100px">
 				<div class="form-inner-wrap">
 					<div class="left-wrap">

src/views/system/city/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="100px">
           <el-form-item label="城市名称" prop="name">
@@ -33,15 +33,15 @@
       </div>
 
       <el-table :data="tableData.data" v-loading="tableData.loading" style="width: 100%" row-key="id" default-expand-all :indent="16" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
-        <el-table-column label="城市名称" v-col="'name'" prop="name" :show-overflow-tooltip="true" />
-        <el-table-column label="城市编号" v-col="'code'" prop="code" :show-overflow-tooltip="true" />
+        <el-table-column label="城市名称" v-col="'name'" prop="name" show-overflow-tooltip />
+        <el-table-column label="城市编号" v-col="'code'" prop="code" show-overflow-tooltip />
         <el-table-column label="状态" v-col="'status'" prop="status" width="80">
           <template #default="scope">
             {{ scope.row.status === 1 ? '在线' : '不在线' }}
           </template>
         </el-table-column>
         <el-table-column label="排序" v-col="'sort'" prop="sort" align="center" />
-        <el-table-column label="创建时间" prop="createdAt" v-col="'createdAt'" :show-overflow-tooltip="true" />
+        <el-table-column label="创建时间" prop="createdAt" v-col="'createdAt'" show-overflow-tooltip />
         <el-table-column label="操作" width="200" align="center" v-col="'handle'">
           <template #default="scope">
             <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>

src/views/system/config/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
           <el-form-item label="参数名称" prop="configName">
@@ -51,10 +51,10 @@
           <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="ID" v-col="'configId'" align="center" prop="configId" width="100" />
-            <el-table-column label="参数名称" v-col="'configName'" prop="configName" :show-overflow-tooltip="true" />
-            <el-table-column label="参数键名" v-col="'configKey'" prop="configKey" :show-overflow-tooltip="true" />
+            <el-table-column label="参数名称" v-col="'configName'" prop="configName" show-overflow-tooltip />
+            <el-table-column label="参数键名" v-col="'configKey'" prop="configKey" show-overflow-tooltip />
             <el-table-column label="参数键值" v-col="'configValue'" prop="configValue" />
-            <el-table-column label="备注" prop="remark" v-col="'remark'" :show-overflow-tooltip="true" />
+            <el-table-column label="备注" prop="remark" v-col="'remark'" show-overflow-tooltip />
             <!-- <el-table-column label="创建时间" prop="createdAt" width="180" align="center" /> -->
             <el-table-column label="系统内置" v-col="'configType'" align="center" prop="configType" width="100">
               <template #default="{ row }">

src/views/system/datahub/modeling/detail.vue

@@ -53,17 +53,17 @@
 
         <el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading">
           <el-table-column label="ID" align="center" prop="id" width="100" v-col="'id'" />
-          <el-table-column label="字段名称" prop="key" width="120" :show-overflow-tooltip="true" v-col="'key'" />
-          <el-table-column label="字段标题" prop="name" width="120" :show-overflow-tooltip="true" v-col="'name'" />
-          <el-table-column label="类型" prop="dataType" width="85" :show-overflow-tooltip="true" v-col="'dataType'" />
+          <el-table-column label="字段名称" prop="key" width="120" show-overflow-tooltip v-col="'key'" />
+          <el-table-column label="字段标题" prop="name" width="120" show-overflow-tooltip v-col="'name'" />
+          <el-table-column label="类型" prop="dataType" width="85" show-overflow-tooltip v-col="'dataType'" />
 
           <el-table-column label="数据源名称" align="center" v-col="'from'">
             <template #default="scope">
               <span v-if="scope.row.from == 2">{{ scope.row.source.name }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="默认值" prop="default" width="80" :show-overflow-tooltip="true" v-col="'default'" />
-          <el-table-column label="备注说明" prop="desc" width="100" :show-overflow-tooltip="true" v-col="'value'" />
+          <el-table-column label="默认值" prop="default" width="80" show-overflow-tooltip v-col="'default'" />
+          <el-table-column label="备注说明" prop="desc" width="100" show-overflow-tooltip v-col="'value'" />
           <el-table-column prop="createdAt" label="创建时间" align="center" width="160" v-col="'createdAt'"></el-table-column>
 
           <el-table-column label="操作" width="100" align="center" fixed="right">

src/views/system/datahub/modeling/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="system-dic-container">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<div class="system-user-search mb15">
 				<el-form :model="tableData.param" ref="queryRef" :inline="true">
 					<!-- <el-form-item label="模型标识" prop="key">
@@ -52,11 +52,11 @@
 			<el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
 				<el-table-column type="selection" width="55" align="center" />
 				<el-table-column label="ID" align="center" prop="id" width="100" v-col="'id'" />
-				<!-- <el-table-column label="模型标识" prop="key" :show-overflow-tooltip="true" v-col="'key'"/> -->
-				<el-table-column label="模型名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
-				<el-table-column label="类型" prop="typeName" :show-overflow-tooltip="true" v-col="'typeName'" />
+				<!-- <el-table-column label="模型标识" prop="key" show-overflow-tooltip v-col="'key'"/> -->
+				<el-table-column label="模型名称" prop="name" show-overflow-tooltip v-col="'name'" />
+				<el-table-column label="类型" prop="typeName" show-overflow-tooltip v-col="'typeName'" />
 
-				<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" v-col="'desc'" />
+				<el-table-column label="描述" prop="desc" show-overflow-tooltip v-col="'desc'" />
 				<el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">
 					<template #default="scope">
 						<el-tag type="success" size="small" v-if="scope.row.status == 1">已发布</el-tag>

src/views/system/datahub/source/detail.vue

@@ -141,10 +141,10 @@
 
 						<el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading">
 							<el-table-column label="ID" align="center" prop="nodeId" width="100" v-col="'id'" />
-							<el-table-column label="数据标识" prop="key" :show-overflow-tooltip="true" v-col="'key'" />
-							<el-table-column label="数据名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
-							<el-table-column label="数据类型" prop="dataType" :show-overflow-tooltip="true" v-col="'dataType'" />
-							<el-table-column label="数据取值项" prop="value" :show-overflow-tooltip="true" v-col="'value'" />
+							<el-table-column label="数据标识" prop="key" show-overflow-tooltip v-col="'key'" />
+							<el-table-column label="数据名称" prop="name" show-overflow-tooltip v-col="'name'" />
+							<el-table-column label="数据类型" prop="dataType" show-overflow-tooltip v-col="'dataType'" />
+							<el-table-column label="数据取值项" prop="value" show-overflow-tooltip v-col="'value'" />
 
 							<el-table-column prop="createdAt" label="创建时间" align="center" v-col="'createdAt'" width="180"></el-table-column>
 

src/views/system/datahub/source/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true">
           <el-form-item label="数据源标识" prop="key">
@@ -47,8 +47,8 @@
       <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="ID" align="center" prop="sourceId" width="100" v-col="'sourceId'" />
-        <el-table-column label="数据源标识" prop="key" :show-overflow-tooltip="true" v-col="'key'"/>
-        <el-table-column label="数据源名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
+        <el-table-column label="数据源标识" prop="key" show-overflow-tooltip v-col="'key'"/>
+        <el-table-column label="数据源名称" prop="name" show-overflow-tooltip v-col="'name'" />
         <el-table-column prop="from" label="数据源类型" width="160" align="center" v-col="'from'">
           <template #default="scope">
             <span v-if="scope.row.from == 1">api导入</span>

src/views/system/dict/dataList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
           <el-form-item label="字典类型" prop="dictType">
@@ -44,7 +44,7 @@
         <el-table-column label="字典标签" v-col="'dictLabel'" align="center" prop="dictLabel" />
         <el-table-column label="字典键值" v-col="'dictValue'" align="center" prop="dictValue" />
         <el-table-column label="字典排序" v-col="'dictSort'" width="100" align="center" prop="dictSort" />
-        <el-table-column label="备注" v-col="'remark'" align="center" prop="remark" :show-overflow-tooltip="true" />
+        <el-table-column label="备注" v-col="'remark'" align="center" prop="remark" show-overflow-tooltip />
         <!-- <el-table-column label="创建时间" align="center" prop="createdAt" width="180" /> -->
         <el-table-column prop="status" label="字典状态" v-col="'status'" width="120" align="center">
           <template #default="scope">

src/views/system/dict/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
           <el-form-item label="字典名称" prop="dictName">
@@ -52,8 +52,8 @@
           <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="字典ID" v-col="'dictId'" align="center" prop="dictId" width="80" />
-            <el-table-column label="字典名称" v-col="'dictName'" prop="dictName" :show-overflow-tooltip="true" />
-            <el-table-column label="字典类型" v-col="'dictType'" align="center" :show-overflow-tooltip="true">
+            <el-table-column label="字典名称" v-col="'dictName'" prop="dictName" show-overflow-tooltip />
+            <el-table-column label="字典类型" v-col="'dictType'" align="center" show-overflow-tooltip>
               <template #default="scope">
                 <router-link :to="'/config/dict/' + scope.row.dictType" class="link-type">
                   <span>{{ scope.row.dictType }}</span>

src/views/system/manage/blacklist/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
           <el-form-item label="IP地址" prop="keyWord">
@@ -43,11 +43,11 @@
       <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
         <el-table-column type="selection" width="55" align="center" />
         <!--        <el-table-column label="ID" align="center" prop="id" width="100"  v-col="'id'"/>-->
-        <!-- <el-table-column label="标识" prop="key" :show-overflow-tooltip="true" v-col="'key'" /> -->
+        <!-- <el-table-column label="标识" prop="key" show-overflow-tooltip v-col="'key'" /> -->
         <el-table-column label="IP" prop="ip" v-col="'ip'"/>
-        <!-- <el-table-column label="名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" /> -->
-         <el-table-column label="备注" prop="remark" :show-overflow-tooltip="true" v-col="'remark'"/>
-        <!-- <el-table-column label="分类" prop="categoryName" :show-overflow-tooltip="true" v-col="'categoryName'" /> -->
+        <!-- <el-table-column label="名称" prop="name" show-overflow-tooltip v-col="'name'" /> -->
+         <el-table-column label="备注" prop="remark" show-overflow-tooltip v-col="'remark'"/>
+        <!-- <el-table-column label="分类" prop="categoryName" show-overflow-tooltip v-col="'categoryName'" /> -->
         <el-table-column
           align="center"
           prop="status"

src/views/system/manage/dept/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dept-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-dept-search mb15">
         <el-form :model="tableData.param" :inline="true" ref="queryRef" @keyup.enter="deptList">
           <el-form-item label="组织名称" prop="deptName">

src/views/system/manage/org/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dept-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-dept-search mb15">
         <el-form :model="tableData.param" :inline="true" ref="queryRef">
           <el-form-item label="区域名称" prop="name">

src/views/system/manage/post/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-post-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" :inline="true" ref="queryRef">
           <el-form-item label="岗位名称" prop="postName">

src/views/system/manage/role/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-role-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" :inline="true" ref="queryRef">
           <el-form-item label="角色名称" prop="name">

src/views/system/manage/user/index.vue

@@ -2,7 +2,7 @@
 	<div class="system-user-container">
 		<el-row :gutter="10">
 			<el-col :span="5">
-				<el-card shadow="hover">
+				<el-card shadow="nover">
 					<el-scrollbar>
 						<el-input :prefix-icon="search" v-model="filterText" placeholder="请输入组织名称" clearable size="default" style="width: 100%;" />
 						<el-tree ref="treeRef" class="filter-tree mt-4" :data="deptData" :props="deptProps" default-expand-all :filter-node-method="deptFilterNode" @node-click="handleNodeClick">
@@ -15,7 +15,7 @@
 				</el-card>
 			</el-col>
 			<el-col :span="19">
-				<el-card shadow="hover">
+				<el-card shadow="nover">
 					<div class="system-user-search mb15">
 						<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
 							<el-form-item label="关键字" prop="keyWords">
@@ -69,7 +69,7 @@
 						<el-table-column prop="userName" label="用户名" v-col="'userName'" min-width="120" show-overflow-tooltip></el-table-column>
 						<el-table-column prop="userNickname" label="姓名" v-col="'userNickname'" width="160" show-overflow-tooltip></el-table-column>
 						<el-table-column prop="dept.deptName" label="组织" v-col="'deptName'" show-overflow-tooltip></el-table-column>
-						<el-table-column label="角色" min-width="120" prop="rolesNames" v-col="'rolesNames'" :show-overflow-tooltip="true"></el-table-column>
+						<el-table-column label="角色" min-width="120" prop="rolesNames" v-col="'rolesNames'" show-overflow-tooltip></el-table-column>
 						<el-table-column prop="mobile" label="手机号" v-col="'mobile'" width="120" align="center"></el-table-column>
 						<el-table-column prop="status" label="用户状态" width="120" v-col="'status'" align="center">
 							<template #default="scope">

src/views/system/menu/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-user-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-menu-search">
         <el-form :model="state.queryParams" :inline="true" ref="queryRef" @keyup.enter="handleQuery()">
           <el-form-item label="菜单名称" prop="title">

src/views/system/monitor/lastLinesLog/index.vue

@@ -5,7 +5,7 @@
 
         <!-- 日志列表 -->
         <el-tab-pane label="服务日志" name="1">
-          <el-card shadow="hover">
+          <el-card shadow="nover">
             <el-table ref="table" :data="tableData" style="width: 100%" row-key="id" v-loading="loading">
               <el-table-column prop="name" label="文件名" show-overflow-tooltip></el-table-column>
               <el-table-column prop="size" label="大小" show-overflow-tooltip></el-table-column>
@@ -30,7 +30,7 @@
 
         <!-- 数据库日志 -->
         <el-tab-pane label="数据库日志" name="2">
-          <el-card shadow="hover">
+          <el-card shadow="nover">
             <el-table :data="tableData" style="width: 100%" row-key="id" v-loading="loading">
               <el-table-column prop="name" label="文件名" show-overflow-tooltip></el-table-column>
               <el-table-column prop="size" label="大小" show-overflow-tooltip></el-table-column>

src/views/system/monitor/loginLog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
           <el-form-item label="登录IP" prop="ipaddr">
@@ -65,8 +65,8 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="编号" align="center" width="60" prop="infoId" />
         <el-table-column label="登录名称" align="center" prop="loginName" />
-        <el-table-column label="登录地址" align="center" prop="ipaddr" width="150" :show-overflow-tooltip="true" />
-        <el-table-column label="登录地点" v-col="'loginLocation'" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
+        <el-table-column label="登录地址" align="center" prop="ipaddr" width="150" show-overflow-tooltip />
+        <el-table-column label="登录地点" v-col="'loginLocation'" align="center" prop="loginLocation" show-overflow-tooltip />
         <el-table-column label="浏览器" align="center" prop="browser" />
         <el-table-column label="操作系统" show-overflow-tooltip align="center" prop="os" />
         <el-table-column label="登录状态" v-col="'status'" align="center" prop="status" width="90">

src/views/system/monitor/notice/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="page">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<el-table :data="tableData" style="width: 100%" v-loading="loading">
 				<el-table-column type="index" label="序号" width="60" align="center" />
 				<el-table-column prop="MessageInfo.title" label="标题" show-overflow-tooltip></el-table-column>

src/views/system/monitor/online/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="system-dic-container">
-		<el-card shadow="hover">
+		<el-card shadow="nover">
 			<div class="system-user-search mb15" v-if="false">
 				<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
 					<el-form-item label="登录时间" prop="dateRange">
@@ -27,9 +27,9 @@
 				<el-table-column type="selection" width="55" align="center" />
 				<el-table-column label="编号" align="center" width="60" prop="id" />
 				<el-table-column label="用户名" v-col="'userName'" align="center" prop="userName" />
-				<el-table-column label="token" align="center" prop="token" :show-overflow-tooltip="true" />
-				<el-table-column label="登录地址" v-col="'ip'" align="center" prop="ip" :show-overflow-tooltip="true" />
-				<el-table-column label="登录时间" align="createdAt" prop="createdAt" :show-overflow-tooltip="true" />
+				<el-table-column label="token" align="center" prop="token" show-overflow-tooltip />
+				<el-table-column label="登录地址" v-col="'ip'" align="center" prop="ip" show-overflow-tooltip />
+				<el-table-column label="登录时间" align="createdAt" prop="createdAt" show-overflow-tooltip />
 				<el-table-column label="浏览器" align="center" prop="explorer" />
 				<el-table-column label="操作系统" v-col="'os'" show-overflow-tooltip align="center" prop="os" />
 				<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-col="'handle'">

src/views/system/monitor/operLog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
           <el-form-item label="系统模块" prop="title">
@@ -74,7 +74,7 @@
             <span size="small" v-else-if="scope.row.operatorType === 2">手机端用户</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作人员" v-col="'operName'" align="center" prop="operName" :show-overflow-tooltip="true" />
+        <el-table-column label="操作人员" v-col="'operName'" align="center" prop="operName" show-overflow-tooltip />
         <el-table-column label="组织名称" align="center" prop="deptName" />
         <el-table-column label="主机" show-overflow-tooltip align="center" prop="operIp" />
         <el-table-column label="操作地点" v-col="'operLocation'" show-overflow-tooltip align="center" prop="operLocation" />

src/views/system/monitor/plugin/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="system-plugin-container page-full">
-		<el-card shadow="hover" class="page-full-part">
+		<el-card shadow="nover" class="page-full-part">
 			<div class="system-user-search mb15">
 				<el-form :model="params" ref="queryRef" :inline="true" label-width="68px">
 					<el-form-item label="关键字" prop="keyWord">

src/views/system/task/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="system-dic-container">
-    <el-card shadow="hover">
+    <el-card shadow="nover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
           <el-form-item label="任务名称" prop="jobName">
@@ -49,7 +49,7 @@
       <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="ID" align="center" v-col="'jobId'" prop="jobId" width="100" />
-        <el-table-column label="任务名称" v-col="'jobName'" prop="jobName" :show-overflow-tooltip="true" />
+        <el-table-column label="任务名称" v-col="'jobName'" prop="jobName" show-overflow-tooltip />
         <el-table-column label="任务描述" v-col="'remark'" prop="remark" show-overflow-tooltip />
         <el-table-column label="任务分组" v-col="'jobGroup'" prop="jobGroup" width="120" :formatter="jobGroupFormat" />
         <el-table-column label="任务方法名" v-col="'invokeTarget'" prop="invokeTarget" />