Merge branch 'wzh083' of https://gitea.aiotagro.com/liupengcheng/admin-jxn-testing into dev

src/router/index.js

@@ -5,13 +5,19 @@ import Login from '../views/login/login.vue'
 import local from '../utils/local'
 
 Vue.use(VueRouter)
+
 const routes = [
     {
         path: '/login',
         component: Login,
         meta: { title: '登录', activeMenu: '/login' }
-      },
+    },
     {
+        path: '/',
+        component: Layout,
+        redirect: '/login',
+        meta: { title: '', activeMenu: '/login' }
+    }, {
         // 首页
         path: '/index',
         component: Layout,

src/views/archive-information/archive-information.vue

@@ -103,10 +103,11 @@
         class="demo-ruleForm"
         style="padding-left: 20px; box-sizing: border-box"
       >
-        <el-form-item label="名称" prop="pic">
+        <div style="height: 40px"></div>
+        <el-form-item label="名称" prop="pic1">
           <el-input
             type="text"
-            v-model="searchForm.pic"
+            v-model="searchForm.pic1"
             placeholder="请输入名称"
           />
         </el-form-item>
@@ -158,11 +159,24 @@
       </span>
     </el-dialog>
     <el-dialog :visible.sync="dialogVisible" width="40%">
+      <div
+        style="
+          color: black;
+          font-weight: bold;
+          font-size: 20px;
+          padding-left: 2%;
+          border-bottom: 2px solid #f1f1f1;
+          padding-bottom: 18px;
+          margin-bottom: 20px;
+        "
+      >
+        平台认证
+      </div>
       <el-form
         :model="searchForm"
         status-icon
         ref="searchForm"
-        label-width="110px"
+        label-width="80px"
         class="demo-ruleForm"
         style="padding-left: 20px; box-sizing: border-box"
       >
@@ -170,7 +184,7 @@
           <el-input
             type="text"
             v-model="searchForm.pic"
-            placeholder="请输入平台名称"
+            placeholder="请输入平台名称（爱农智慧牧场）"
           />
         </el-form-item>
         <el-form-item
@@ -181,7 +195,7 @@
           <el-input
             type="text"
             v-model="searchForm.title"
-            placeholder="请输入手机号"
+            placeholder="请输入手机号（爱农智慧牧场）"
           />
         </el-form-item>
         <el-form-item
@@ -192,7 +206,7 @@
           <el-input
             type="password"
             v-model="searchForm.address"
-            placeholder="请输入密码"
+            placeholder="请输入密码（爱农智慧牧场）"
           />
         </el-form-item>
         <el-form-item
@@ -209,7 +223,7 @@
           <el-input
             type="text"
             v-model="searchForm.address1"
-            placeholder="请输入获取编码"
+            placeholder="请输入获取数据唯一编码"
           />
         </el-form-item>
       </el-form>
@@ -233,7 +247,8 @@ export default {
       dialogVisible: false,
       searchForm: {
         farm: '',
-        number: ''
+        number: '',
+        pic: '爱农智慧牧场'
       },
       evalue: '',
       tableData: [
@@ -426,4 +441,7 @@ export default {
 /deep/.el-form-item__content {
   margin-bottom: 20px;
 }
+/deep/.el-dialog__body {
+  padding: 0px 10px 10px 10px;
+}
 </style>