ui更新

src/App.vue

@@ -28,9 +28,10 @@ export default {
 @import '~@/components/d2-icon/font-awesome-4.7.0/css/font-awesome.min.css';
 
               .d2-container-full {
-                background-image: url("./assets/images/bj.png");
-                background-repeat: no-repeat;
-                background-size: 100% 100%;
+                background-color: #f6f6f6;
+                // background-image: url("./assets/images/bj.png");
+                // background-repeat: no-repeat;
+                // background-size: 100% 100%;
                
               }
 </style>

src/api/modules/shouye.api.js

@@ -58,7 +58,7 @@ export default ({
     //报警统计
     homeAlarm( orgCode,time ) {
       return request({
-        url: `/homePage/getByTimeList/${orgCode}?optionTime=${time}`,
+        url: `/homePage/getByTimeList/${orgCode}/${time}`,
         method: 'get',
       })
     },

src/assets/style/public-class.scss

@@ -90,6 +90,7 @@ $sizes: (0, 5, 10, 15, 20);
 // }
 // //头部导航一级菜单的样式
 .theme-d2 .d2-theme-header .el-menu .el-menu-item{
+  height: 50px;
   // border-right:linear-gradient(#193a6d, #487B98 20%,#193a6d 80%) !important;
   border-right:linear-gradient(red yellow) !important;
 }
@@ -198,10 +199,13 @@ $sizes: (0, 5, 10, 15, 20);
 }
 //树形节点鼠标移上去的颜色
 .el-tree-node__content:hover {
-  background-color: #91a8bc !important;
+  background-color: rgba(0, 135, 117, 0.3) !important;
+}
+.left .el-tree-node__content{
+  height: 46px !important;
 }
 .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{
-  // background-color: #0064b9 !important;
+  background-color: rgba(0, 135, 117, 0.1) !important;
   // border-radius: 20px;
 }
 //table border
@@ -294,6 +298,7 @@ $sizes: (0, 5, 10, 15, 20);
 
 .el-button--text {
   // color: #fff !important;
+  color: #008775 !important;
 }
 // 编辑按钮
 .main #formLabel .editBtn {
@@ -390,6 +395,11 @@ button.el-button.el-button--delebtn.el-button--mini{
     }
   // display: none !important;
 }
-
+.el-pager li.active{
+  color: #008775 !important;
+}
+.el-pager li:hover {
+  color: #008775 !important;
+}
 
 

src/assets/style/theme/theme-base.scss

@@ -27,7 +27,7 @@
   .d2-layout-header-aside-content {
     @extend %full;
     .d2-theme-header {
-      height: 60px;
+      height: 90px;
       .d2-theme-header-menu {
         overflow: hidden;
         margin-left:20px;
@@ -42,6 +42,7 @@
         }
         .d2-theme-header-menu__content {
           overflow: hidden;
+          height: 50px;
           .d2-theme-header-menu__scroll {
             white-space: nowrap;
             position: relative;
@@ -63,11 +64,13 @@
         }
         .d2-theme-header-menu__prev {
           left: 0;
+          top: 15px;
           border-top-left-radius: 2px;
           border-bottom-left-radius: 2px;
         }
         .d2-theme-header-menu__next {
           right: 0;
+          top: 15px;
           border-top-right-radius: 2px;
           border-bottom-right-radius: 2px;
         }
@@ -169,7 +172,7 @@
       // 顶栏右侧的按钮
       .d2-header-right {
         float: right;
-        height: 60px;
+        height: 90px;
         display: flex;
         align-items: center;
         .btn-text {

src/layout/header-aside/layout.vue

@@ -174,7 +174,14 @@ export default {
 @import "~@/assets/style/theme/register.scss";
 //头部导航背景色
 .d2-theme-header {
-  background-image: url(../../assets/images/nav-bg.png);
+  background-image: url(../../assets/images/nav-bg.jpg);
+}
+.theme-d2 .d2-theme-header .el-menu .el-submenu .el-submenu__title{
+  height: 50px;
+  line-height: 50px;
+}
+.d2-layout-header-aside-group .d2-layout-header-aside-content .d2-theme-header .el-menu .el-menu-item{
+  line-height: 50px;
 }
 //头部每个菜单宽度
 .theme-d2 .d2-theme-header .el-menu .el-menu-item{
@@ -188,6 +195,14 @@ export default {
   // background-image: url(../../assets/images/selected.png);
   // background-position: 50% 86%;
 }
+.theme-d2 .d2-theme-header .el-menu .el-menu-item.is-active:first-child{
+  border-top-left-radius: 6px;
+  border-bottom-left-radius: 6px;
+}
+.theme-d2 .d2-theme-header .el-menu .el-menu-item.is-active:last-child{
+  border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
+}
 //头部导航二级菜单选中后的样式
 .theme-d2 .d2-theme-header .el-menu .el-submenu.is-active .el-submenu__title {
   color: #fff !important;
@@ -203,20 +218,64 @@ export default {
   display: flex;
   align-items: center;
   padding-left: 10px;
+  // margin-right: 170px;
 }
 
 // 设置导航右边框
 .theme-d2 .d2-theme-header .el-menu .el-submenu {
-  border-right: 1px solid #6fa4bc;
+  // border-right: 1px solid rgba(255, 255, 255, 0.5);
   //  border-image: linear-gradient(red,yellow) 30 30;
+  width: 170px;
+  text-align: center;
+}
+.theme-d2 .d2-theme-header .el-menu .el-submenu:last-child {
+  border: none ;
+  //  border-image: linear-gradient(red,yellow) 30 30;
+  .el-submenu__title{
+      border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
+  }
 }
 .theme-d2 .d2-theme-header .el-menu .el-menu-item {
-  border-right: 1px solid #6fa4bc;
+  // border-right: 1px solid rgba(255, 255, 255, 0.5);
+  width: 170px;
+  text-align: center;
   //  border-image: linear-gradient(red,yellow) 30 30;
 }
 .theme-d2 .d2-theme-header .el-menu {
   background-color: none;
 }
+
+.theme-d2 .d2-theme-header .el-menu .el-menu-item::after{
+  content: "";
+  display: inline-block;
+  position: absolute;
+  right: 0;
+  top: 8px;
+  width: 1px;
+  height: 34px;
+  background: rgba(255, 255, 255, 0.61);
+  border-radius: 50%;
+}
+.theme-d2 .d2-theme-header .el-menu .el-submenu .el-submenu__title::after{
+  content: "";
+  display: inline-block;
+  position: absolute;
+  right: 0;
+  top: 8px;
+  width: 1px;
+  height: 34px;
+  background: rgba(255, 255, 255, 0.61);
+  border-radius: 50%;
+}
+.theme-d2 .d2-theme-header .el-menu li:last-child .el-submenu__title::after{
+  content: "";
+  display: none;
+}
+.theme-d2 .d2-theme-header .el-menu li:last-child::after{
+  content: "";
+  display: none;
+}
 .el-menu--horizontal .el-menu .el-submenu__title:hover {
   // color: #008775 !important;
 }
@@ -227,8 +286,17 @@ export default {
 .el-menu--horizontal .el-menu .el-menu-item.is-active{
   color: #008775 !important;
 }
+.el-menu--horizontal .el-menu .el-menu-item{
+  font-weight: bold;
+  width: 170px;
+}
 .el-menu--horizontal .el-menu .el-menu-item:hover{
   color: #008775 !important;
-  background: #F4F9F9 !important;
+  background: rgba(244, 249, 249, 1) !important;
+}
+.d2-theme-header-menu__scroll{
+  background-image: url('./menuBack.png');
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
 }
 </style>

src/views/demo/alarmRecord/index.vue

@@ -213,7 +213,7 @@
                   align="center"
                 >
                     <template slot-scope="scope">
-                      {{scope.row.handleState==0?'未处理':scope.row.handleState==1?'已处理':scope.row.handleState}}
+                      {{scope.row.handleState==0?'待处理':scope.row.handleState==1?'已处理':scope.row.handleState}}
                     </template>
                 </el-table-column>
                 <el-table-column align="center" label="操作" width="100">
@@ -221,11 +221,12 @@
                     <el-button
                     v-if="scope.row.handleState=='1'"
                       @click="handleCheck(scope.row)"
-                      type="text"
+                      type="warning"
+                      plain
                       size="mini"
                       >查看</el-button
                     >
-                    <el-button v-if="scope.row.handleState=='0'" type="text" size="mini" @click="chuli(scope.row)"
+                    <el-button v-if="scope.row.handleState=='0'" type="primary" plain size="mini" @click="chuli(scope.row)"
                       >处理</el-button
                     >
                   </template>
@@ -535,6 +536,7 @@
 </template>
 <script>
 import api from "@/api";
+import { connected } from "process";
 // 1  异常点   2  断开
 export default {
   name: "alarmRecord",
@@ -1161,11 +1163,15 @@ export default {
     //获取列表数据
     getList() {
       var condition = this.formInline;
+      condition.orgCode=localStorage.getItem("orgCode")
       condition = JSON.stringify(condition);
       var data = {
         pageIndex: this.pagination.curPage,
         pageSize: this.pagination.pageSize,
         condition: condition,
+        // orgCode:localStorage.getItem("orgCode"),
+        // orgName:localStorage.getItem("orgName")
+
       };
       api
         .alarmRecordList(data)

src/views/demo/equipmentManage/compontents/addDialog.vue

@@ -199,6 +199,8 @@ export default {
         if (valid) {
           if(this.dialogTitle=='新建设备'){
             this.addForm.id=""
+            this.addForm.orgCode=localStorage.getItem("orgCode")
+            this.addForm.orgName=localStorage.getItem("orgName")
             api.equipmentSu(this.addForm).then(res=>{
               if (res.code == 200) {
                 this.$message.success("新建成功");
@@ -209,11 +211,12 @@ export default {
               }
             })
           }else{
+            
             api.equipmentSu(this.addForm).then(res=>{
               if (res.code == 200) {
                 this.$message.success("编辑成功");
                 this.dialogFormVisible=false;
-                this.$parent.$parent.$parent.getList()
+                this.$parent.$parent.$parent.getBasic()
               }else{
                 this.$message.error(res.msg);
               }

src/views/demo/equipmentManage/compontents/addDialogC.vue

@@ -66,6 +66,8 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if(this.dialogTitle=='新建设备标签'){
+            this.addForm.orgCode=localStorage.getItem("orgCode")
+            this.addForm.orgName=localStorage.getItem("orgName")
             api.equipmentTagSu(this.addForm).then(res=>{
               if (res.code == 200) {
                 this.$message.success("新建成功");

src/views/demo/equipmentManage/equipment/index.vue

@@ -173,7 +173,7 @@
                 >
                 </el-table-column>
 
-                <el-table-column label="操作" width="240" align="center">
+                <el-table-column label="操作" width="160" align="center">
                   <template slot-scope="scope">
                     <el-button
                       type="primary"
@@ -182,9 +182,9 @@
                       @click="goDetail(scope.row)"
                       >查看</el-button
                     >
-                    <el-button type="warning" plain size="mini" @click="edit(scope.row)"
+                    <!-- <el-button type="warning" plain size="mini" @click="edit(scope.row)"
                       >编辑</el-button
-                    >
+                    > -->
                     <el-button type="danger" plain size="mini" @click="del(scope.row)"
                       >删除</el-button
                     >

src/views/demo/equipmentManage/equipmentInfo/index.vue

@@ -9,7 +9,7 @@
             <div class="nameTitle">
               <i @click="goBack" class="el-icon-back"></i>
               <span class="name">
-                产品名称：{{ info.proName }}</span
+                设备名称：{{ info.eqName }}</span
               >
               <!-- <span style="font-size:14px;margin-left:40px">设备数：<span style="color:#008775">30</span>
               </span> -->
@@ -54,7 +54,7 @@
                 </div>
                 <div class="infoTitle">
                   <h5>定时任务</h5>
-                  <el-button type="primary" size="mini">修改定时任务</el-button>
+                  <el-button type="primary" size="mini" @click="$router.push({ path: '/timingTask' })">修改定时任务</el-button>
                 </div>
                 <div>任务一：</div>
                 <div>任务二：</div>
@@ -132,7 +132,7 @@
                   >
                   </el-table-column>
                   <el-table-column
-                    prop="operName"
+                    prop="houseCode"
                     label="所属仓房编码"
                     align="center"
                   >
@@ -480,37 +480,37 @@ export default {
         {
           name: "产品名称",
           val: [this.info.proName],
-          name1: "产品分类",
-          val1: [this.info.proCategory],
+          // name: "产品分类",
+          // val: [this.info.proName],
+          name1: "所属组织机构",
+          val1: [this.info.orgName],
         },
         {
-          name: "所属组织机构",
-          val: [this.info.orgName],
-          name1: "设备状态",
-          val1: [this.info.eqStatus],
+          name: "设备状态",
+          val: [this.info.eqStatus],
+          name1: "最后上线时间",
+          val1: [this.info.lastOnlineTime],
         },
         {
-          name: "最后上线时间",
-          val: [this.info.lastOnlineTime],
-          name1: "设备标签",
-          val1: [this.info.labelName],
-        },
-        {
-          name: "最后上线时间",
-          val: [this.info.lastOnlineTime],
+          name: "设备标签",
+          val: [this.info.labelName],
           name1: "创建时间",
           val1: [this.info.registerTime],
         },
         {
-          name: "描述",
-          val: [this.info.eqRemark],
-        },
+          name: "所属仓房编码",
+          val: [this.info.houseCode],
+          name1: "描述",
+          val1: [this.info.eqRemark],
+        }
       ]
           }
         })
     },
     // 查看检测信息
     checkDetail(row) {
+      console.log(12);
+      this.$set(this,'checkDialog',true)
       this.checkDialog = true;
     },
     //检测开始

src/views/demo/parameManagement/alarmParame/index.vue

@@ -82,23 +82,24 @@
                   align="center"
                 >
                 </el-table-column>
-                <el-table-column label="操作" width="180" align="center">
+                <el-table-column label="操作" width="280" align="center">
                   <template slot-scope="scope">
                     <el-button
-                      type="text"
+                      plain
                       size="mini"
                       @click="goDetail(scope.row)"
                       >查看</el-button
                     >
                     <el-button
-                      type="text"
+                      type="warning"
                       size="mini"
+                      plain
                       @click="goEdit(scope.row)"
                       >编辑</el-button
                     >
-                    <el-button type="text" v-if="scope.row.offOrOn==0" size="mini" @click="changestate(scope.row,1)">开启</el-button>
-                    <el-button type="text" v-if="scope.row.offOrOn==1" size="mini" @click="changestate(scope.row,0)">关闭</el-button>
-                    <el-button type="text" size="mini" @click="del(scope.row)"
+                    <el-button type="primary" plain v-if="scope.row.offOrOn==0" size="mini" @click="changestate(scope.row,1)">开启</el-button>
+                    <el-button plain v-if="scope.row.offOrOn==1" size="mini" @click="changestate(scope.row,0)">关闭</el-button>
+                    <el-button type="danger" plain size="mini" @click="del(scope.row)"
                       >删除</el-button
                     >
                     <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->

src/views/demo/parameManagement/dataDictionary/index.vue

@@ -107,12 +107,12 @@
                 <template slot-scope="scope">
                   <el-button
                     @click="addChildren(scope.row)"
-                    type="text"
+                    type="primary"
+                    plain
                     size="small"
-                    icon="el-icon-circle-check"
                     >添加子项</el-button
                   >
-                  <el-button type="text" size="small" icon="el-icon-edit"
+                  <el-button type="warning" plain size="small" 
                      @click="editChildren(scope.row,2)">修改</el-button
                   >
                 </template>

src/views/demo/parameManagement/timingTask/index.vue

@@ -84,21 +84,23 @@
                     {{scope.row.onOrOff==0?'否':scope.row.onOrOff==1?'是':scope.row.onOrOff}}
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="180" align="center">
+                <el-table-column label="操作" width="220" align="center">
                   <template slot-scope="scope">
                     <el-button
-                      type="text"
+                      type="primary"
+                      plain
                       size="mini"
                       @click="goDetail(scope.row)"
                       >查看</el-button
                     >
                     <el-button
-                      type="text"
+                      type="warning"
                       size="mini"
+                      plain
                       @click="goEdit(scope.row)"
                       >编辑</el-button
                     >
-                    <el-button type="text" size="mini" @click="del(scope.row)"
+                    <el-button type="danger" plain size="mini" @click="del(scope.row)"
                       >删除</el-button
                     >
                     <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->

src/views/demo/productManage/compontents/addDialog.vue

@@ -185,6 +185,8 @@ export default {
 
           if (this.dialogTitle == "新建产品") {
             params.id = "";
+            params.orgCode=localStorage.getItem("orgCode")
+            params.orgName=localStorage.getItem("orgName")
             api.productSave(params).then((res) => {
               if (res.code == 200) {
                 this.$message.success("新建成功");

src/views/demo/productManage/productInfo/index.vue

@@ -405,12 +405,12 @@ export default {
     },
     // 每页条数改变
     handleSizeChange1(val) {
-      this.pagination.pageSize = val;
+      this.pagination1.pageSize = val;
       this.getList();
     },
     // 当前页改变
     handleCurrentChange1(val) {
-      this.pagination.curPage = val;
+      this.pagination1.curPage = val;
       this.getList();
     },
   },

src/views/demo/system/organization/index.vue

@@ -69,8 +69,8 @@
                 </el-table-column>
                 <el-table-column label="操作" width='180' align="center">
                   <template slot-scope="scope">
-                    <el-button @click="handleCheck(1, scope.$index, scope.row)"  class="fa fa-edit" size="mini">编辑</el-button>
-                    <el-button @click="delecheck( scope.$index, scope.row)"  class="fa fa-remove" size="mini">删除</el-button>
+                    <el-button @click="handleCheck(1, scope.$index, scope.row)" type="warning" plain size="mini">编辑</el-button>
+                    <el-button @click="delecheck( scope.$index, scope.row)"  type="danger" plain size="mini">删除</el-button>
                     <!-- <el-button @click="delecheck( scope.$index, scope.row)" type="detailbtn" class="fa fa-info-circle" size="mini">查看</el-button> -->
                   </template>
                 </el-table-column>

src/views/demo/system/roleManagement/index.vue

@@ -57,9 +57,9 @@
                 </el-table-column>
                 <el-table-column fixed="right" label="操作" width="300" align="center">
                   <template slot-scope="scope">
-                    <el-button @click="handleEdit(1, scope.$index, scope.row)" class="fa fa-edit" size="mini">编辑</el-button>
-                    <el-button @click="delecheck( scope.$index, scope.row)" class="fa fa-remove" size="mini">删除</el-button>
-                    <el-button @click="handleCheck(scope.$index, scope.row)" class="fa fa-info-circle" size="mini">查看</el-button>
+                    <el-button @click="handleEdit(1, scope.$index, scope.row)" type="warning" plain size="mini">编辑</el-button>
+                    <el-button @click="delecheck( scope.$index, scope.row)" type="danger" plain size="mini">删除</el-button>
+                    <el-button @click="handleCheck(scope.$index, scope.row)" type="primary" plain size="mini">查看</el-button>
                     <!-- <el-switch v-model="value" on-text='启用' off-text='禁用' active-value='启用' inactive-value='禁用' active-color="#13ce66" inactive-color="#ff4949"> -->
                     <!-- </el-switch> -->
                   </template>

src/views/demo/system/userManagement/index.vue

@@ -88,8 +88,8 @@
                 </el-table-column> -->
                 <el-table-column fixed="right" label="操作" width="300" align="center">
                   <template slot-scope="scope">
-                    <el-button @click="edit(scope.row,2)" class="fa fa-edit" size="mini">编辑</el-button>
-                    <el-button @click="deleted(scope.row)" class="fa fa-remove" size="mini">删除</el-button>
+                    <el-button @click="edit(scope.row,2)" type="warning" plain size="mini">编辑</el-button>
+                    <el-button @click="deleted(scope.row)" type="danger" plain size="mini">删除</el-button>
 
                     <!-- <el-switch
                     id="switchBtn"

src/views/system/index/page.vue

@@ -19,19 +19,23 @@
             <img src="@/assets/images/bjtj.png" alt="">
             报警统计</div>
           <div class="echartsBox">
-            <div class="topDate">
+            <!-- <div class="topDate">
               <el-date-picker
                 size="mini"
                 v-model="date"
-                type="date"
-                placeholder="选择日期"
+                type="daterange"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
               >
               </el-date-picker>
-            </div>
+            </div> -->
 
             <el-tabs v-model="activeName" @tab-click="handleClick">
-              <el-tab-pane label="1小时" name="1"></el-tab-pane>
-              <el-tab-pane label="1天" name="2"></el-tab-pane>
+              <!-- <el-tab-pane label="1小时" name="1"></el-tab-pane>
+              <el-tab-pane label="1天" name="2"></el-tab-pane> -->
               <el-tab-pane label="7天" name="3"></el-tab-pane>
               <el-tab-pane label="30天" name="4"></el-tab-pane>
             </el-tabs>
@@ -54,6 +58,7 @@
             <el-table
             height="500"
               :data="tableData"
+              :header-cell-style="{ background: '#E9F4F3', color: '#445D5A' }"
               style="width: 100%">
               <el-table-column
                 prop="alarmTypeName"
@@ -69,6 +74,7 @@
               </el-table-column>
               <el-table-column
                 prop="alarmTime"
+                width="160px"
                 align="center"
                 label="时间">
               </el-table-column>
@@ -124,7 +130,7 @@ export default {
       infoForm:{},
       dialogVisible:false,
       tableData:[{}],
-      date: "",
+      date: [],
       topBox: [
         {
           name: "产品数",
@@ -205,23 +211,36 @@ export default {
           num1: "1分钟前/实时",
         },
       ],
-      activeName: "1",
+      activeName: "3",
       option: {
         xAxis: {
           type: "category",
-          data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+          data: [],
+          axisLabel: {
+              interval:0, //坐标刻度之间的显示间隔，默认就可以了（默认是不重叠）
+               rotate:38   //调整数值改变倾斜的幅度（范围-90到90）
+            }
         },
         yAxis: {
           type: "value",
         },
         series: [
           {
-            data: [820, 932, 901, 934, 1290, 1330, 1320],
-            type: "line",
+            
+            data: [],
+            type: "bar",
             smooth: true,
             symbol:'none',
-            lineStyle:{
-              color:'#008775'
+            barMaxWidth: 50,
+            itemStyle:{
+              normal:{
+              color:'#008775',barBorderRadius:8,
+              label:{
+                show:true,
+                position:'top'
+              }
+
+              }
             },
           },
         ],
@@ -282,7 +301,20 @@ export default {
     },
     getHomeAlarm(v){
       api.homeAlarm(localStorage.getItem("orgCode"),v).then(res=>{
-        let data=res.data
+        if(res.code==200){
+          let data=res.data
+          let xAxis=[];
+          let series=[]
+          data.forEach(item=>{
+            xAxis.push(item.alarmTime)
+            series.push(item.alarmCount)
+          })
+          this.option.xAxis.data=xAxis
+          this.option.series[0].data=series
+              let myChart = this.$echarts.init(document.getElementById("myChart"));
+    myChart.setOption(this.option)
+        }
+        
       })
     },
     goMore(){
@@ -419,4 +451,5 @@ export default {
   margin: auto;
   margin-top: -32px;
 }
+
 </style>

src/views/system/login/page.vue

@@ -33,7 +33,7 @@
                     type="text"
                     v-model="formLogin.username"
                     placeholder="用户名">
-                    <i slot="prepend" class="fa fa-user-circle-o"></i>
+                    <i slot="prepend" class="fa fa-user"></i>
                   </el-input>
                 </el-form-item>
                 <el-form-item prop="password">
@@ -41,7 +41,7 @@
                     type="password"
                     v-model="formLogin.password"
                     placeholder="密码">
-                    <i slot="prepend" class="fa fa-keyboard-o"></i>
+                    <i slot="prepend" class="fa fa-lock"></i>
                   </el-input>
                 </el-form-item>
                
@@ -278,8 +278,8 @@ export default {
   }
   // 登录表单
   .page-login--form {
-    width: 25em;
-    height: 23em;
+    width: 28em;
+    height: 26em;
     background-image: url("./image/dengluk.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
@@ -292,9 +292,19 @@ export default {
     // 登录按钮
     .button-login {
       width: 100%;
+      height: 56px;
       background: linear-gradient(0deg, #01E9BD, #00D6B9);
       border-radius: 6px;
     }
+    .el-input{
+    width: 100%;
+background: rgba(255,255,255,0.1100);
+border: 1px solid #6DF6E4;
+box-shadow: 0px 0px 9px 0px rgba(0,87,75,0.3100);
+border-radius: 6px;
+color: #fff;
+height: 57px;
+    }
     // 输入框左边的图表区域缩窄
     .el-input-group__prepend {
       padding: 0px 14px;
@@ -484,5 +494,42 @@ export default {
     //   }
     // }
   }
+.el-input__inner{
+        border: none;
+        height: 57px;
+        line-height: 57px;
+        padding-left: 10px;
+        padding-right: 0;
+        background: transparent; 
+        color:#fff
+    } 
+     .el-input__inner:-webkit-autofill,
+     .el-input__inner:-webkit-autofill:hover,
+     .el-input__inner:-webkit-autofill:focus,
+     .el-input__inner:-webkit-autofill:active {
+        -webkit-transition-delay: 99999s;
+        -webkit-transition: color 99999s ease-out, background-color 99999s ease-out;
+    }  
+    .el-input-group__append, .el-input-group__prepend{
+      background: none !important;
+      border:none !important;
+      color: rgba(255, 255, 255, 0.8) !important;
+      font-size: 22px;
+    }
+    .el-form-item__error{
+      color:#fff
+    }
+        input::-webkit-input-placeholder{
+            color:#fff;
+        }
+        input::-moz-placeholder{   /* Mozilla Firefox 19+ */
+            color:#fff;
+        }
+        input:-moz-placeholder{    /* Mozilla Firefox 4 to 18 */
+            color:#fff;
+        }
+        input:-ms-input-placeholder{  /* Internet Explorer 10-11 */ 
+            color:#fff;
+        }
 }
 </style>