样式

src/assets/css/global.css

@@ -13,7 +13,7 @@ ul,li{
 p{margin:0}
 .el-breadcrumb{
     margin-bottom: 15px;
-    font-size: 22px;
+    font-size:26px;
     background: #fff;
     border-top: 1px solid #ddd;
     padding: 15px 10px;
@@ -23,13 +23,16 @@ p{margin:0}
     z-index: 8;
     left: 220px;
     right: 0;
-    top: 198px;
+    top: 180px;
     /* top: 242px; */
     background: -webkit-gradient(linear, right top, left top, from(rgba(255,255,255,0.05)), to(#04a7ff7e));
     background: linear-gradient(270deg, rgba(255,255,255,0.05) 0%, #04a7ff7e 100%);
     border: none;
     pointer-events: none;
 }
+.el-breadcrumb .el-breadcrumb__item{
+    line-height: 40px;
+}
 .el-breadcrumb__inner{
     color: white !important;
 }

src/components/Index.vue

@@ -1,7 +1,16 @@
 <template>
   <el-container class="container" style="height: 100%">
     <el-header class="header">
-      <img class="RTlogo" src="../assets/images/RTlogo.png" />
+      <div class="RTlogobox">
+        <img class="RTlogo" v-if="userinfo.logo" :src="userinfo.logo" />
+				<img class="RTlogo" v-else src="../assets/images/RTlogo.png" />
+        <div class="sysName">
+          <h2 v-if="userinfo.user_header">{{ userinfo.user_header }}</h2>
+          <h2 v-else>苗情监测应用系统</h2>
+          <p style="font-size: 12px;letter-spacing: 0px;">Plants Growth Status Monitoring System</p>
+        </div>
+      </div>
+      
       <!-- <div v-if="userinfo.logo">
         <img
           :src="userinfo.logo"
@@ -12,16 +21,12 @@
       <!-- 用户 -->
       <div class="userinfo">欢迎您，{{ username }}</div>
       <!-- 标题 -->
-      <div class="sysName">
-        <h2 v-if="userinfo.user_header">{{ userinfo.user_header }}</h2>
-        <h2 v-else>苗情监测应用系统</h2>
-        <p style="font-size: 12px;letter-spacing: 0px;">Plants Growth Status Monitoring System</p>
-      </div>
+      
       <div class="site" v-if="userinfo.site">
         <i class="iconfont icon-jidi" style="color: white;font-size: 26px;"></i>
         <span style="letter-spacing: 1px;font-size: 22px;">{{ userinfo.site }}</span>
       </div>
-      <span class="header_btn" @click="toggle">{{flag?'隐藏':'展开'}}</span>
+      <!-- <span class="header_btn" @click="toggle">{{flag?'隐藏':'展开'}}</span> -->
     </el-header>
     <!-- <el-header class="header2" v-show="!flag">
       <h3 v-if="userinfo.user_header">{{ userinfo.user_header }}</h3>
@@ -603,12 +608,39 @@ export default {
   // border-bottom: 2px solid #272b3a;
   // background: #397b0c no-repeat center / 100% 100%
     // url(../assets/images/monitor/h_bg.jpg);
+  .RTlogobox{
+		position: absolute;
+		width: 95%;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		height: calc(100% - 70px);
+		color: white;
     .RTlogo{
-      position: absolute;
-      width: 90px;
-      left: 190px;
-      top: 30px;
+			height: 90px;
+			width: auto;
+			margin-right: 20px;
+		}
+		.sysName {
+      // font-size: 30px;
+      color: #fff;
+      text-align: left;
+      
+      font-size: 16px;
+      letter-spacing: 0.5px;
+      
+      h2 {
+        font-size: 30px;
+        
+        font-weight: 700;
+        letter-spacing: 7px;
+        margin: 0;
+      }
+      p {
+        font-size: 14px;
+      }
     }
+	}
   .userinfo {
     color: #fff;
     font-size: 22px;
@@ -624,26 +656,7 @@ export default {
       margin-right: 6px;
     }
   }
-  .sysName {
-    // font-size: 30px;
-    color: #fff;
-    text-align: left;
-    margin-top: 7px;
-    padding-left: 280px;
-    font-size: 16px;
-    letter-spacing: 0.5px;
-    
-    h2 {
-      font-size: 30px;
-      line-height: 46px;
-      font-weight: 700;
-      letter-spacing: 7px;
-      margin: 0;
-    }
-    p {
-      font-size: 14px;
-    }
-  }
+  
   .logInfo {
     color: #fff;
     position: absolute;
@@ -702,6 +715,7 @@ export default {
   color: #333;
   background: url(../assets/images/asideBG.png) no-repeat center;
   background-size: cover;
+  background-position: left -1px;
   .el-menu{
     background: transparent;
   }

src/components/UserManger.vue

@@ -46,7 +46,7 @@
           <div class="img-box">
 						<img style="width: 60px;height: 60px;margin-right: 15px;" src="@/assets/images/systemManger/user.png" />
 						<div>
-							<div style="font-size: 20px;margin-bottom: 5px;">{{(item.user_have || '无') | ellipsis}}</div>
+							<div style="font-size: 20px;margin-bottom: 5px;">{{(item.username || '无') | ellipsis}}</div>
 							<span v-if="item.user_have_type == '1'">普通用户</span>
 							<span v-if="item.user_have_type == '0'">模块管理员</span>
 							<span v-if="item.user_have_type == '2'">项目管理员</span>

src/pages/EquipList.vue

@@ -18,65 +18,39 @@
         <i slot="suffix" class="el-input__icon el-icon-search"></i>
       </el-input>
     </div>
-    <el-row :gutter="10" v-if="dataList.length > 0">
-      <el-col
-        :xs="24"
-        :sm="24"
-        :md="12"
-        :lg="6"
-        :xl="4"
-        v-for="item in dataList"
-        :key="item.id"
-      >
-        <el-card class="box-card">
-          <!-- <div class="img-box">
-            <img src="@/assets/images/monitor/jkIconOn.png" />
-            <p :title="item.device_name">{{ (item.device_name || "苗情监测设备") | ellipsis }}</p>
-          </div> -->
-          <div class="detail">
-            <p>
-              <span style="display: inline-block;
-                width: 10px;
-                height: 10px;
-                background: #52459F;
-                border-radius: 50%;
-                margin-right: 15px;">
-              </span>
-              {{ (item.device_name || "苗情监测设备") | ellipsis }}
-            </p>
-            <p>
-				      <img src="../assets/images/cardicon/sbid.png" />
-              设备ID:
-              <span>{{ item.device_id }}</span>
-            </p>
-            <p>
-				      <img src="../assets/images/cardicon/zxzt.png" />
-              	在线状态:
-                <span :class="item.status==0?'red':'green'">{{ item.status==1?'在线':'离线'  }}</span>
-            </p>
-            <p>
-				      <img src="../assets/images/cardicon/yxgh.png" />
-              通道:
-              <span>{{ item.jktype }}</span>
-            </p>
-          </div>
-          <div class="btns" style="padding-top:10px;">
-            <el-button
-              size="mini"
-              type="info"
-              @click="modifyName(item.device_id, item.device_name)"
-              >修改名称</el-button
-            >
-          
-        </div>
-          <!-- <div class="bottom">
-            <span @click="modifyName(item.device_id, item.device_name)">
-              <i class="el-icon-edit-outline"></i> 修改名称
-            </span>
-          </div> -->
-        </el-card>
-      </el-col>
-    </el-row>
+    <div v-if="dataList.length > 0">
+			<el-table :data="dataList">
+				<el-table-column prop="device_id" label="设备ID"  :align="'center'">
+					<template slot-scope="scope">{{ scope.row.device_id }}</template>
+				</el-table-column>
+        <el-table-column prop="device_name" label="设备名称"  :align="'center'">
+					<template slot-scope="scope">{{
+						scope.row.device_name == '' ? '无' : scope.row.device_name
+					}}</template>
+				</el-table-column>
+				<el-table-column prop="status" label="在线状态"  :align="'center'">
+					<template slot-scope="scope"><span :class="scope.row.status == 0 ? 'red' : 'green'">{{
+                scope.row.status == 1 ? "在线" : "离线"
+              }}</span></template>
+				</el-table-column>
+				<el-table-column prop="jktype" label="通道"  :align="'center'">
+					<template slot-scope="scope">{{
+						scope.row.jktype == '' ? '无' : scope.row.jktype
+					}}</template>
+				</el-table-column>
+				
+				<el-table-column label="操作"  :align="'center'">
+					<template slot-scope="scope">
+						<el-button
+							size="mini"
+							type="info"
+							@click="modifyName(scope.row.device_id, scope.row.device_name)"
+							>修改名称</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+		</div>
     <!-- 暂无数据 -->
     <div class="expertDiagnosis_referral_units_not" v-else>
       <img :src="zanwu" alt class="expertDiagnosis_referral_units_notImg" />