农林植保布局修改文笔

bigdata2/src/assets/css/global.css

@@ -19,12 +19,17 @@ p{margin:0}
     padding:15px 10px;
     margin-left:-20px;
     margin-right:-20px;
+    position: fixed;
+    z-index: 99;
+    left: 220px;
+    right: 0;
+    top: 189px;
 }
 .el-dialog__header{
     background:#F2F2F2;
     border-bottom:1px solid #CACACA;
 }
-.el-main{padding:0 20px!important;background-color: #f6f6f6;}
+.el-main{padding:66px 20px 0!important;background-color: #f6f6f6;}
 
 /* 修改分页的默认样式 */
 .el-pagination{

bigdata2/src/components/Index.vue

@@ -1,160 +1,37 @@
 <template>
 	<el-container style="height: 100%">
 		<el-header>
-			<div class="sys-name">
-				<img src="../assets/images/logo.png" @click="collapseFun" />
-				智慧农业大数据平台
-			</div>
+			
 			<div class="navbarBtn">
-				<!-- 轮播消息 -->
-				<div class="messageFrame">
-					<el-carousel
-						height="50px"
-						:interval="5000"
-						direction="vertical"
-						:autoplay="true"
-					>
-						<el-carousel-item v-for="item in 3" :key="item">
-							<div class="medium">
-								<i
-									style="font-size: 23px; float: left"
-									class="iconfont icon-xinxi1"
-								></i
-								>：太阳能气象站监测终端指标预警太阳能气象站监测终端指标预警太阳能气象站监测终端指标预警
-							</div>
-						</el-carousel-item>
-					</el-carousel>
+				<!-- 用户 -->
+				<div class="userinfo">
+					<img src="@/assets/images/12.jpg" class="userheadImg" alt="">
+					<el-dropdown trigger="click"  @command="dropdownHandle" placement="top">
+						<span class="el-dropdown-link" style="cursor: pointer;color:#fff;">
+							{{ username }}
+							<i class="el-icon-arrow-down el-icon--right"></i>
+						</span>
+						<el-dropdown-menu slot="dropdown">
+							<el-dropdown-item command="personMsg">个人中心</el-dropdown-item>
+							<el-dropdown-item command="editPwd">修改密码</el-dropdown-item>
+							<el-dropdown-item command="outSys">退出</el-dropdown-item>
+						</el-dropdown-menu>
+					</el-dropdown>
 				</div>
-				<div class="userInfoBtns">
-					<!-- 更换首页 -->
-					<div class="iconFont">
-						<i
-							@click="changeHomedialogVisible = true"
-							class="iconfont icon-BAI-wuzi"
-						></i>
-					</div>
-					<!-- 更换皮肤 -->
-					<div class="iconFont">
-						<el-dropdown
-							@command="handleCommand"
-							placement="bottom"
-							trigger="click"
-						>
-							<span class="el-dropdown-link">
-								<i class="iconfont icon-zhuti_tiaosepan_o"></i>
-							</span>
-							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item command="ffffff">深色</el-dropdown-item>
-								<el-dropdown-item command>浅色</el-dropdown-item>
-							</el-dropdown-menu>
-						</el-dropdown>
-					</div>
-					<!-- 铃铛 -->
-					<div class="iconFont">
-						<el-dropdown
-							@command="handleCommand"
-							placement="bottom-end"
-							trigger="click"
-						>
-							<span class="el-dropdown-link">
-								<el-badge is-dot class="item">
-									<i class="iconfont icon-icon_huabanfuben"></i>
-								</el-badge>
-							</span>
-							<el-dropdown-menu slot="dropdown" class="newsDropdown">
-								<h5>2016 新的系统通知</h5>
-								<div>
-									<ul>
-										<li class="news">
-											<div class="txtContent">
-												<a href
-													>太阳能气象站监测终端指标预警太阳能气象站监测终端指标预警太阳能气象站监测终端指标预警</a
-												>
-											</div>
-											<el-badge value="new" class="item"></el-badge>
-										</li>
-										<li class="news">
-											<div class="txtContent">
-												<a href>太阳能气象站监测终端指标预警太阳指标预警</a>
-											</div>
-											<el-badge value="new" class="item"></el-badge>
-										</li>
-										<li class="news">
-											<div class="txtContent">
-												<a href>终端指标预警</a>
-											</div>
-											<el-badge value="new" class="item"></el-badge>
-										</li>
-										<li class="news">
-											<div class="txtContent">
-												<a href>太阳能气象站监测</a>
-											</div>
-											<el-badge value="new" class="item"></el-badge>
-										</li>
-										<li class="news">
-											<div class="txtContent">
-												<a href>太阳能气象站监测终端指标预警太阳能</a>
-											</div>
-											<el-badge value="new" class="item"></el-badge>
-										</li>
-										<li class="news">
-											<div class="txtContent">
-												<a href style="color: #2489c5">查看全部系统通知</a>
-											</div>
-										</li>
-									</ul>
-								</div>
-							</el-dropdown-menu>
-						</el-dropdown>
-					</div>
-					<!-- 用户 -->
-					<div>
-						<el-dropdown trigger="click"  @command="dropdownHandle">
-							<span class="el-dropdown-link" style="cursor: pointer">
-								{{ username }}
-								<i class="el-icon-arrow-down el-icon--right"></i>
-							</span>
-							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item command="personMsg">个人中心</el-dropdown-item>
-								<el-dropdown-item command="editPwd">修改密码</el-dropdown-item>
-								<el-dropdown-item command="outSys">退出</el-dropdown-item>
-							</el-dropdown-menu>
-						</el-dropdown>
-					</div>
+				<!-- 标题 -->
+				<div class="caption">
+					<div class="tit">农业植保监测系统  智慧农业信息化</div>
+					<div>Agricultural plant protection monitoring system intelligent agricultural informatization</div>
 				</div>
 			</div>
 		</el-header>
-		<!-- 更换首页HTML -->
-		<el-dialog
-			title="更换首页"
-			:visible.sync="changeHomedialogVisible"
-			width="50%"
-			@close="changeHomeDialogClosed"
-		>
-			<el-row :gutter="20">
-				<el-col :span="6" v-for="(item, index) in homeList" :key="index">
-					<div class="grid-content changeHomeItem" @click="changeHome(index)">
-						<div>
-							<img :src="item.img" />
-						</div>
-						<div class="tit">{{ item.name }}</div>
-					</div>
-				</el-col>
-			</el-row>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="changeHomedialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="changeHomedialogVisible = false"
-					>确 定</el-button
-				>
-			</span>
-		</el-dialog>
+
 		<!-- 修改密码对话框 -->
 		<el-dialog
 			title="重置密码"
 			:visible.sync="resetPassDialogVisible"
 			width="500px"
-			@close="resetPassDialogClosed"
-		>
+			@close="resetPassDialogClosed">
 			<el-form
 				ref="resetPassFormRef"
 				:model="resetPassForm"
@@ -181,25 +58,6 @@
 		</el-dialog>
 		<el-container style="overflow: auto">
 			<!-- 菜单 -->
-			<el-aside :width="isCollapse ? '0px' : '200px'" class="sysAside">
-				<el-menu
-					default-active="2"
-					class="el-menu-vertical-demo"
-					:router="isRouter"
-					:collapse-transition="true"
-					active-text-color="rgb(57, 249, 190)"
-				>
-					<el-submenu index="11">
-						<template slot="title">
-							<i class="iconfont icon-shujuzhanshi"></i>
-							<span>数据展示</span>
-						</template>
-						<el-menu-item index="" @click="goBD('/bHome')"
-							>投屏入口</el-menu-item
-						>
-					</el-submenu>
-				</el-menu>
-			</el-aside>
 			<el-aside width="200px">
 				<el-menu
 					:default-openeds="menuOpeneds"
@@ -316,6 +174,7 @@ export default {
 			// 被激活导航地址
 			// activePath:'',
 			username: '',
+			userHeadImg: '',
 			resetPassDialogVisible: false,
 			resetPassForm: {
 				oldPass: '',
@@ -581,53 +440,39 @@ export default {
 	}
 }
 .el-header {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	.navbarBtn {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		.messageFrame {
-			width: 300px;
-			.medium {
-				font-size: 14px;
-				margin: 1.2em 0;
-				white-space: nowrap;
-				overflow: hidden;
-				text-overflow: ellipsis;
+	height: 189px !important;
+	background: url(../../static/images/headBj.png) no-repeat center;
+	background-size: 100% 100%;
+	.navbarBtn{
+		color: #fff;
+		.userinfo{
+			text-align: right;
+			margin-top: 10px;
+			.userheadImg{
+				width: 35px;
+				height: 35px;
+				border-radius: 50%;
+				vertical-align: middle;
+				margin-right: 6px;
 			}
 		}
-		.userInfoBtns {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			min-width: 200px;
-			.iconFont {
-				i {
-					font-size: 26px;
-					cursor: pointer;
-				}
-			}
-			.item,
-			.item:hover {
-				animation: ringing 3s linear 5;
+		.caption{
+			margin-top: 7px;
+			text-align: center;
+			font-size: 16px;
+			letter-spacing: .5px;
+			.tit{
+				font-size: 20px;
+				line-height: 46px;
+				font-weight: 700;
+				letter-spacing: 7px;
 			}
 		}
+		
 	}
-
-	.sys-name {
-		display: flex;
-		font-size: 20px;
-		font-weight: 600;
-		align-items: center;
-		line-height: 60px;
-		img {
-			height: 26px;
-			margin-right: 10px;
-			cursor: pointer;
-		}
-	}
+}
+/deep/.el-dropdown-menu__item{
+	padding: 0 10px;
 }
 .el-popper.newsDropdown {
 	padding: 0;

bigdata2/src/main.js

@@ -54,8 +54,8 @@ import 'viewerjs/dist/viewer.css'
 // 样式
 import './assets/icon/iconfont.css'
 import './plugin/elementUi';
-import './assets/css/theme/ffffff/index.css' //皮肤一
-// import '../theme/index.css'  //皮肤一
+// import './assets/css/theme/ffffff/index.css' //皮肤一
+import '../theme/index.css'  //皮肤一
 
 //导入全局样式
 import './assets/css/global.css'

bigdata2/src/pages/cure/scd/scd.vue

@@ -500,7 +500,7 @@ export default {
 					}).then((res) => {
 						if (res.data.message == '') {
 							let data = eval('(' + res.data.data.data + ')')
-							let cardInfo = data.data.card_list[0]
+							let cardInfo = data.data
 							this.sim = cardInfo
 						}
 						this.simCodeVisible = true

bigdata2/src/pages/forecasting/bzy/Bzy.vue

@@ -550,7 +550,7 @@ export default {
 				if (res.data.data) {
 					this.$message.success('设备控制修改成功')
 				} else {
-					this.$message.err('设备控制修改失败')
+					this.$message.error('设备控制修改失败')
 				}
 				this.setDialogVisible = false
 			})
@@ -620,6 +620,8 @@ export default {
 						}
 						this.simCodeVisible = true
 					})
+				}else{
+					this.$message.error(res.data.message)
 				}
 			})
 		},

bigdata2/src/pages/forecasting/cbd/PestsStats.vue

@@ -1164,7 +1164,7 @@ export default {
 .chartsSelect {
 	text-align: right;
 	position: absolute;
-	z-index: 999;
+	z-index: 31;
 	left: 0;
 	right: 21px;
 }