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

src/views/login/login.vue

@@ -87,9 +87,10 @@
                   >
                 </p>
                 <p>
-                  <el-link @click="handlerClick('register')">注册账号</el-link
+                  <el-link @click="handlerClick('register')"
+                    ><span style="color: black">注册账号</span></el-link
                   >/<el-link @click="handlerClick('forgotpwd')"
-                    >忘记密码</el-link
+                    ><span style="color: black">忘记密码</span></el-link
                   >
                 </p>
               </div>
@@ -120,7 +121,7 @@
                     style="color: #409eff; font-size: 14px; font-size: 12px"
                     class="el-icon-question"
                   ></i>
-                  获取分子育种检测方案
+                  <span style="color: #409eff">获取分子育种检测方案</span>
                 </el-link>
               </div>
               <!-- 下面的绑定与联系我们 -->
@@ -566,7 +567,7 @@ export default {
       })
       if (local.get('token_sd')) {
         setTimeout(() => {
-          this.$router.push('/disease-resistance/disease-resistance')
+          this.$router.push('/index/index')
         }, 1500)
       }
     },

src/views/quick-Search/quick-Search.vue

@@ -33,7 +33,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="list-box">
+    <div class="list-box" v-if="showtable">
       <el-table
         :data="tableData"
         style="width: 100%"
@@ -82,6 +82,23 @@
         </el-pagination>
       </div>
     </div>
+    <div
+      v-loading="loading"
+      element-loading-text="加载中"
+      v-else
+      style="
+        width: 100%;
+        text-align: center;
+        padding: 50px 0px 50px 0px;
+        background: white;
+      "
+    >
+      <img
+        style="width: 80%"
+        src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/iot_breed/farm/2024/08/307d7b147050a9475b2580aa1d1ae44476.jpg"
+        alt=""
+      />
+    </div>
     <el-dialog :visible.sync="dialogVisible" width="40%">
       <div style="text-align: center">
         <div class="btmstyle">1</div>
@@ -90,7 +107,15 @@
           <div>养殖场:234</div>
           <div>品种信息:43223</div>
         </div>
-        <div style="text-align: left; padding: 30px 0px 18px 14px;font-weight: bold;">11</div>
+        <div
+          style="
+            text-align: left;
+            padding: 30px 0px 18px 14px;
+            font-weight: bold;
+          "
+        >
+          11
+        </div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="mini">关闭</el-button>
@@ -108,7 +133,9 @@
 export default {
   data() {
     return {
-      dialogVisible: true,
+      loading: false,
+      showtable: false,
+      dialogVisible: false,
       searchForm: {
         a: '',
         b: '',
@@ -184,10 +211,18 @@ export default {
     }
   },
   methods: {
-    detailClick() {},
+    detailClick() {
+      this.$router.push('/phylogeneticAnalysis/evolutionaryTree')
+    },
     report() {},
     // 搜索
-    searchClick() {},
+    searchClick() {
+      this.loading = true
+      setTimeout(() => {
+        this.loading = false
+        this.showtable = true
+      }, 1500)
+    },
     // 重置
     resetClick() {
       for (const key in this.searchForm) {