修改前端页面展示

device-manager-ui/admin/src/assets/mixins/table.js

@@ -167,6 +167,21 @@ export default {
       }
     },
 
+    formatterStatus(row, column, val) {
+      const content = formatter(this.tableData, column, val);
+      if (content) {
+        if (val == '0') {
+          return <el-tag  size='mini'>{content}</el-tag>
+        } else if (val == '1') {
+          return <el-tag type={'danger'} size='mini'>{content}</el-tag>
+        } else if (val == '2') {
+          return <el-tag type={'success'} size='mini'>{content}</el-tag>
+        }
+      } else {
+        return val
+      }
+    },
+
     formatterDictLink(row, column, val) {
       const content = formatter(this.tableData, column, val);
 

device-manager-ui/admin/src/components/Header.vue

@@ -66,7 +66,6 @@
 </template>
 
 <script>
-import { createSocket } from "@/assets/utils/websocket";
 export default {
   name: "Header",
   methods: {
@@ -204,7 +203,7 @@ export default {
     line-height: 50px;
     font-size: 14px;
     color: #eee;
-    background: #222333;
+    background: #1848c8;
     .layout-logo{
       width: 80px;
       height: 50px;
@@ -216,6 +215,7 @@ export default {
         vertical-align: middle;
       }
     }
+    
     .menu-list{
       li{
         a{
@@ -223,14 +223,18 @@ export default {
           padding: 0 12px;
           height: 100%;
           color: #eee;
-          overflow: hidden;
           &.router-link-active,
           &[active]{
-            background: #1890ff;
+            //background: #1890ff;
             color: #fff;
+            list-style-type:none;
+        border-bottom:3px solid #fff;
+        padding-bottom: 2px;
+
           }
         }
       }
+      
     }
     .layout-profile{
       padding-right: 30px;

device-manager-ui/admin/src/components/Table.vue

@@ -14,6 +14,7 @@
               v-if="isShowButton('notAdd')"
               type="primary"
               icon="el-icon-plus"
+              plain
               size="mini"
               @click="config.methods.add"
               title="新增"
@@ -22,12 +23,13 @@
             <el-button
               v-if="isShowBtn('import')"
               size="mini"
+              plain
               @click="config.methods.importView"
               class="el-icon-upload2"
               title="导入"
-            ></el-button>
+            >导入</el-button>
 
-            <el-button
+            <!-- <el-button
               v-if="isShowButton('notDel')"
               icon="el-icon-delete"
               type="danger"
@@ -35,11 +37,11 @@
               size="mini"
               @click="config.methods.del"
               title="批量删除"
-              >批量删除</el-button
-            >
-            <!-- <Confirm v-if='isShowButton("notDel")' @confirm='config.methods.del' message='确定要删除选中的多条记录吗？'>
-            <el-button icon="el-icon-delete" type="danger" size='mini'  title="删除"></el-button>
-          </Confirm> -->
+              >删除</el-button
+            > -->
+             <Confirm v-if='isShowButton("notDel")' @confirm='config.methods.del' message='确定要删除选中的多条记录吗？'>
+            <el-button icon="el-icon-delete" type="danger" size='mini' plain  title="删除">删除</el-button>
+          </Confirm>
             <el-button
               @click="item.method"
               size="mini"

device-manager-ui/admin/src/views/device/list.vue

@@ -439,10 +439,10 @@ export default {
           {
             label: "状态 ",
             prop: "deviceStatus",
-            formatter: this.formatter,
+            formatter: this.formatterStatus,
           },
 
-          { label: "利旧设备", prop: "source", formatter: this.formatter },
+          { label: "利旧设备", prop: "source", formatter: this.formatterYES },
 
           {
             prop: "enabled",

device-manager-ui/admin/src/views/device/log/list.vue

@@ -50,9 +50,9 @@ export default {
         columns: [
           { label: "traceID", prop: "traceID",width:120 },
 
-          { label: "设备编号", prop: "deviceCode" },
+          { label: "设备编号", prop: "deviceCode",width:160 },
 
-          { label: "设备名称", prop: "deviceName" },
+          { label: "设备名称", prop: "deviceName",width:160 },
           { label: "内容", prop: "content" },
 
           { label: "业务标识", prop: "messageHead",width:80 },
@@ -63,7 +63,7 @@ export default {
             label: "创建时间",
             prop: "createTime",
             formatter: this.formatterDate,
-            width:120
+            width:160
           },
         //   {
         //     label: "操作",

device-manager-ui/admin/src/views/device/module/list.vue

@@ -41,6 +41,7 @@
                     ],
                     columns: [
                         {type: "selection", width: 60},
+                         {type: "index",label: "序号",width: 50},
 
                          {label: "模块名称", prop: "moduleName"},
 

device-manager-ui/admin/src/views/platform/list.vue

@@ -42,6 +42,8 @@
                     columns: [
                         {type: "selection", width: 60},
 
+                         {type: "index",label: "序号",width: 50},
+
                         {label: "平台名称，名称唯一", prop: "platformName"},
 
                         {label: "平台编码，编码唯一", prop: "platformSn"},

device-manager/src/main/resources/logback-spring.xml

@@ -43,7 +43,7 @@
         </rollingPolicy>
     </appender>
 
-    <root level="${logLevel}">
+    <root level="INFO">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfo"/>
         <appender-ref ref="fileError"/>
@@ -51,12 +51,13 @@
 
     <!--TRACE < DEBUG < INFO < WARN < ERROR < FATAL -->
 
-    <!--用来设置某一个包或者具体的某一个类的日志打印级别、以及指定<appender>。<logger>仅有一个name属性，一个可选的level和一个可选的additivity属性。-->
+    <!--用来设置某一个包或者具体的某一个类的日志打印级别、以及指定<appender>。
+    <logger>仅有一个name属性，一个可选的level和一个可选的additivity属性。-->
     <!-- name 用来指定受此loger约束的某一个包或者具体的某一个类-->
     <!-- level 用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。如果未设置此属性，那么当前logger将会继承上级的级别-->
     <!-- additivity 是否向上级logger传递打印信息。默认是true。false：表示只用当前logger的appender-ref。true：表示当前logger的appender-ref和rootLogger的appender-ref都有效。-->
 
-    <logger name="com.mortals" level="INFO" additivity="false">
+    <logger name="com.mortals" level="${logLevel}" additivity="false">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfo"/>
         <appender-ref ref="fileError"/>