...

package-lock.json

@@ -1285,16 +1285,6 @@
       "integrity": "sha1-yJO3NyHbc2mZQ7/DZTsd63+qSjo=",
       "dev": true
     },
-    "@types/mini-css-extract-plugin": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npm.taobao.org/@types/mini-css-extract-plugin/download/@types/mini-css-extract-plugin-0.9.1.tgz",
-      "integrity": "sha1-1L3eUZcyb8oDnUGPS92gPcdNxFE=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@types/webpack": "*"
-      }
-    },
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz",
@@ -1697,6 +1687,16 @@
           "integrity": "sha1-4a1IbmxUUBY0xsOXxcEh2qODYHw=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1606792371412&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz",
@@ -1723,6 +1723,34 @@
             "unique-filename": "^1.1.1"
           }
         },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz?cache=0&sync_timestamp=1592843133653&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-4.1.0.tgz",
+          "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "dev": true,
+          "optional": true
+        },
         "find-cache-dir": {
           "version": "3.3.1",
           "resolved": "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-3.3.1.tgz",
@@ -1744,6 +1772,25 @@
             "path-exists": "^4.0.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1577797756584&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "locate-path": {
           "version": "5.0.0",
           "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz",
@@ -1808,6 +1855,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1608033349725&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1600532115100&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -1824,6 +1881,18 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.1.2",
+          "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.2.tgz?cache=0&sync_timestamp=1608187944571&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.2.tgz",
+          "integrity": "sha1-XAO2xQ0qX5g8fOuhXFDXjKKymPQ=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -2406,6 +2475,14 @@
       "integrity": "sha1-4eguTz6Zniz9YbFhKA0WoRH4ZCg=",
       "dev": true
     },
+    "axios": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.21.1.tgz?cache=0&sync_timestamp=1608609324963&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.21.1.tgz",
+      "integrity": "sha1-IlY0gZYvTWvemnbVFu8OXTwJsrg=",
+      "requires": {
+        "follow-redirects": "^1.10.0"
+      }
+    },
     "babel-loader": {
       "version": "8.1.0",
       "resolved": "https://registry.npm.taobao.org/babel-loader/download/babel-loader-8.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.1.0.tgz",
@@ -3146,6 +3223,11 @@
         }
       }
     },
+    "claygl": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npm.taobao.org/claygl/download/claygl-1.3.0.tgz",
+      "integrity": "sha1-em4pAyEFGaw1iEj114Bw7SEWhfM="
+    },
     "clean-css": {
       "version": "4.2.3",
       "resolved": "https://registry.npm.taobao.org/clean-css/download/clean-css-4.2.3.tgz",
@@ -4449,6 +4531,23 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "echarts": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.9.0.tgz",
+      "integrity": "sha1-qbm6oD8Doqcx5jQMVb77V6nhNH0=",
+      "requires": {
+        "zrender": "4.3.2"
+      }
+    },
+    "echarts-gl": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/echarts-gl/download/echarts-gl-1.1.2.tgz",
+      "integrity": "sha1-+zhFQDG7ZMka+4TFexqZw3DkVx4=",
+      "requires": {
+        "claygl": "^1.2.1",
+        "zrender": "^4.0.4"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
@@ -5109,8 +5208,7 @@
     "follow-redirects": {
       "version": "1.13.0",
       "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.0.tgz?cache=0&sync_timestamp=1597058070545&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.13.0.tgz",
-      "integrity": "sha1-tC6Nk6Kn7qXtiGM2dtZZe8jjhNs=",
-      "dev": true
+      "integrity": "sha1-tC6Nk6Kn7qXtiGM2dtZZe8jjhNs="
     },
     "for-in": {
       "version": "1.0.2",
@@ -10144,6 +10242,21 @@
       "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
       "dev": true
     },
+    "uppercamelcase": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npm.taobao.org/uppercamelcase/download/uppercamelcase-1.1.0.tgz",
+      "integrity": "sha1-Mk2YprOvx+iolT4QZBUJsOTiP5c=",
+      "requires": {
+        "camelcase": "^1.2.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz?cache=0&sync_timestamp=1603924797555&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
+        }
+      }
+    },
     "uri-js": {
       "version": "4.4.0",
       "resolved": "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.0.tgz?cache=0&sync_timestamp=1598814588153&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.0.tgz",
@@ -10322,6 +10435,14 @@
       "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1600441287086&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz",
       "integrity": "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
     },
+    "vue-amap": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npm.taobao.org/vue-amap/download/vue-amap-0.5.10.tgz",
+      "integrity": "sha1-RkUWIDrwwIXUBL2Kyr8kAeSjb/Y=",
+      "requires": {
+        "uppercamelcase": "^1.1.0"
+      }
+    },
     "vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz",
@@ -10349,86 +10470,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.0.0-beta.7",
-      "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.0.0-beta.7.tgz?cache=0&sync_timestamp=1599639254248&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.0.0-beta.7.tgz",
-      "integrity": "sha1-bycm+g4rH7rmeJXEdZO79p8rmrg=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@types/mini-css-extract-plugin": "^0.9.1",
-        "chalk": "^3.0.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^1.2.3",
-        "merge-source-map": "^1.1.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.2.1.tgz",
-          "integrity": "sha1-kK51xCTQCNJiTFvynq0xd+v881k=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-3.0.0.tgz",
-          "integrity": "sha1-P3PCv1JlkfV0zEksUeJFY0n4ROQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz?cache=0&sync_timestamp=1571657176668&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
-          "dev": true,
-          "optional": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1598611725516&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.4.3",
       "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.3.tgz?cache=0&sync_timestamp=1600589412110&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.3.tgz",
@@ -11284,6 +11325,11 @@
           "dev": true
         }
       }
+    },
+    "zrender": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.2.tgz?cache=0&sync_timestamp=1605884142817&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-4.3.2.tgz",
+      "integrity": "sha1-7HQy+UFcgsc1hLa3uMR+GwFiCcY="
     }
   }
 }

package.json

@@ -7,6 +7,7 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
+    "axios": "^0.21.1",
     "core-js": "^3.6.5",
     "echarts": "^4.9.0",
     "echarts-gl": "^1.1.1",

src/App.vue

@@ -3,6 +3,21 @@
         <router-view />
     </div>
 </template>
+<script>
+    export default{
+        methods: {
+            init() {
+                this.$axios.post(`http://121.37.169.186:8010/core/auth/authByCode?code=4e29b3d8-55b6-47cc-b585-e6dafba0c122`)
+                        .then(res => {
+                            localStorage.setItem('token', res.data.data.token);
+                        })
+            },
+        },
+        mounted() {
+            this.init();
+        }
+    }
+</script>
 
 <style lang="scss">
 

src/components/HyHeader.vue

@@ -9,24 +9,31 @@
             <a href="http://221.12.135.185:8090/bigScreen_new/page/hy.html"
                 >基本情况</a
             >
-            <a
-                href="http://hy.ifarmcloud.com/screen/#/yield"
-                :class="{ h_m_active: navTag == 3 }"
+            <router-link to="/yield">
+                <a
+                        href=""
+                        :class="{ h_m_active: navTag == 3 }"
                 >湖羊养殖</a
-            >
+                >
+            </router-link>
             <!-- <a href="http://122.237.98.3:8888/LvShanDaShuJu/page/page_map.html"
                 >智慧养殖</a
             > -->
-            <a
-                href="http://hy.ifarmcloud.com/screen/#/lvShanXiang"
-                :class="{ h_m_active: navTag == 0 }"
-                >吕山牧场</a
-            >
-            <a
-                href="http://hy.ifarmcloud.com/screen/#/butcher"
-                :class="{ h_m_active: navTag == 1 }"
-                >流通销售</a
-            >
+<!--            <router-link>-->
+<!--                <a-->
+<!--                        href="http://124.70.167.1/screen/#/lvShanXiang"-->
+<!--                        :class="{ h_m_active: navTag == 0 }"-->
+<!--                >吕山牧场</a-->
+<!--                >-->
+<!--            </router-link>-->
+            <router-link to="/butcher">
+                <a href="" :class="{ h_m_active: navTag == 1 }">流通销售</a>
+<!--                <a-->
+<!--                        href="http://124.70.167.1/screen/#/butcher"-->
+<!--                        :class="{ h_m_active: navTag == 1 }"-->
+<!--                >流通销售</a-->
+<!--                >-->
+            </router-link>
         </div>
         <div class="rightsidebar">
             <div>
@@ -94,7 +101,7 @@ header {
     font-weight: normal;
     font-stretch: normal;
     letter-spacing: 2px;
-    
+
     color: grey;
     opacity: 0.5;
 }

src/main.js

@@ -10,6 +10,8 @@ import './assets/js/huzhou'
 import './assets/js/changxing'
 import './assets/js/lvshan'
 import 'echarts-gl'
+import axios from 'axios';
+import http from './utils/http';
 
 // import VueAMap from 'vue-amap';
 // Vue.use(VueAMap);
@@ -19,6 +21,8 @@ import 'echarts-gl'
 //   v: '1.4.4',
 //   uiVersion: '1.0'
 // })
+Vue.prototype.$axios = axios;
+Vue.prototype.$http = http;
 
 Vue.prototype.$echarts = echarts
 
@@ -28,7 +32,7 @@ new Vue({
   router,
   store,
   mounted() {
-    var timer
+    var timer;
     window.onresize = () => {
         if(timer) clearTimeout(timer)
         timer = setTimeout(() => {

src/utils/http.js

@@ -0,0 +1,78 @@
+import axios from 'axios';
+import Qs from 'qs';
+
+// 请求超时时间
+axios.defaults.timeout = 1000000;
+
+axios.defaults.baseURL = 'http://121.37.169.186:8010/farm-huyang';
+
+// post 请求头
+axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+
+//请求拦截器
+axios.interceptors.request.use(
+  config => {
+    const token = localStorage.getItem('token');
+    // token && (config.headers.Authorization = token);
+
+    config.headers = {
+      'Content-Type' : 'application/x-www-form-urlencoded',
+      'X-auth-token' : token
+    }
+    config.headers['Content-Type'] = "application/x-www-form-urlencoded";
+    return config
+  },
+  error => {
+    return Promise.error(error);
+  }
+);
+
+// 相应拦截器
+
+axios.interceptors.response.use(
+  response => {
+    if(response.status === 200) {
+      return Promise.resolve(response)
+    } else {
+      return Promise.reject(response)
+    }
+  },
+  error => {
+    return Promise.error(error);
+  }
+);
+
+// get 方法
+
+export function get(url, params) {
+  return new Promise((resolve, reject) => {
+    axios.get(url, {params: params})
+      .then(res => {
+        resolve(res.data);
+      })
+      .catch(err => {
+        reject(err.data);
+      })
+  })
+}
+
+// post 方法
+
+export function post(url, params) {
+  return new Promise((resolve, reject) => {
+    axios.post(url, Qs.stringify(params))
+      .then(res => {
+        resolve(res.data);
+      })
+      .catch(err => {
+        reject(err.data);
+      })
+  })
+
+}
+
+
+export default  {
+  get,
+  post
+}

src/views/Butcher/Butcher.vue

@@ -93,11 +93,11 @@
                             <input
                                 type="text"
                                 class="input"
-                                v-model.number="searchStr"
+                                v-model="searchStr"
                             />
                             <i class="icon_search" @click="search"></i>
                         </main>
-                        <div class="container">
+                        <div :class="['container', retrospectInfo.length == 4 ? 'container1' : '']">
                             <div
                                 v-for="(item, index) in retrospectInfo"
                                 :key="index"
@@ -194,7 +194,7 @@ export default {
     },
     data() {
         return {
-            searchStr: "00008",
+            searchStr: "",
             isShowMap: true,
             sheepPriceList: [
                 {
@@ -268,11 +268,6 @@ export default {
                     time: "11月30日",
                 },
                 {
-                    title: "排酸",
-                    list: ["排酸时间：11月30日"],
-                    time: "11月30日",
-                },
-                {
                     title: "分割",
                     list: ["分割时间：11月30日"],
                     time: "11月30日",
@@ -304,11 +299,6 @@ export default {
                     time: "11月30日",
                 },
                 {
-                    title: "排酸",
-                    list: ["排酸时间：11月30日"],
-                    time: "11月30日",
-                },
-                {
                     title: "入库",
                     list: ["入库时间：11月30日"],
                     time: "11月30日",
@@ -323,20 +313,65 @@ export default {
     },
     created() {
         document.title = "湖羊产业";
-        if (Math.floor(Math.random()*10) % 2 == 0) {
-                this.retrospectInfo = this.retrospectInfo1;
-            } else {
-                this.retrospectInfo = this.retrospectInfo2;
-            }
+        if (this.searchStr % 2 == 0) {
+            this.retrospectInfo = this.retrospectInfo1;
+        } else {
+            this.retrospectInfo = this.retrospectInfo2;
+        }
     },
     methods: {
         search() {
-            console.log(Math.floor(Math.random()*10));
-            if (this.searchStr % 2 == 0) {
-                this.retrospectInfo = this.retrospectInfo1;
-            } else {
-                this.retrospectInfo = this.retrospectInfo2;
-            }
+            // if (this.searchStr % 2 == 0) {
+            //     this.retrospectInfo = this.retrospectInfo1;
+            // } else {
+            //     this.retrospectInfo = this.retrospectInfo2;
+            // }
+            let params = {
+                searchStr: this.searchStr,
+                pageSize: 10,
+                pageNum: 1
+            };
+            this.$http.post(`product-traceability/list`, params)
+            .then(res => {
+                let data = res.content[0];
+                console.log(data);
+                this.retrospectInfo = [];
+                let sg = {
+                    title: '收购',
+                    list: ['来源:' + data.placeOrigin , '收购重量:' + data.sheepWeight, '收购时间:' + data.acquisitionTime],
+                    time: data.acquisitionTime.split(' ')[0]
+                };
+                let jy = {
+                    title: '检疫',
+                    list: ['检疫结果:' + data.quarantineResult, '检疫时间:' + data.quarantineTime],
+                    time: data.quarantineTime.split(' ')[0]
+                };
+                let tz = {
+                    title: '屠宰',
+                    list: ['屠宰时间:' + data.slaughterTime],
+                    time: data.slaughterTime.split(' ')[0]
+                };
+                let fg = {};
+                if(data.splitTime) {
+                    fg = {
+                        title: '分割',
+                        list: ['分割时间:' + data.splitTime],
+                        time: data.splitTime.split(' ')[0]
+                    };
+                }
+                let ys = {
+                    title: '运输',
+                    list: ['运输单号', data.saleNo],
+                };
+                this.retrospectInfo.push(sg);
+                this.retrospectInfo.push(jy);
+                this.retrospectInfo.push(tz);
+                if(data.splitTime) {
+                    this.retrospectInfo.push(fg);
+                }
+                this.retrospectInfo.push(ys);
+                console.log(this.retrospectInfo);
+            })
         },
         eClick(params) {
             console.log(params)
@@ -547,7 +582,7 @@ export default {
                         // border: 1px solid #797979;
                         margin: 80px 0;
                         flex-grow: 1;
-                        background: url(../../assets/bg_main.png) no-repeat;
+                        background: url(../../assets/bg_main4.png) no-repeat;
                         background-size: 100% 100%;
 
                         > div {
@@ -570,29 +605,29 @@ export default {
                             }
                         }
                         > .item_1 {
-                            left: 0.7%;
-                            top: 4.7%;
+                            left: 2.7%;
+                            top: 67.7%;
                         }
                         > .item_2 {
-                            left: 13.2%;
-                            top: 69%;
+                            left: 23.2%;
+                            top: 5.5%;
                         }
                         > .item_3 {
-                            left: 27.3%;
-                            top: 5.5%;
+                            left: 43.3%;
+                            top: 67.7%;
                         }
                         > .item_4 {
-                            left: 40.4%;
-                            top: 69.3%;
+                            left: 63.4%;
+                            top: 5.5%;
                         }
                         > .item_5 {
-                            left: 64.3%;
-                            top: 5.4%;
-                        }
-                        > .item_6 {
-                            left: 79.8%;
-                            top: 68.9%;
+                            left: 85.3%;
+                            top: 67.7%;
                         }
+                        /*> .item_6 {*/
+                        /*    left: 79.8%;*/
+                        /*    top: 68.9%;*/
+                        /*}*/
 
                         > span {
                             font-size: 35px;
@@ -600,28 +635,88 @@ export default {
                         }
                         > .time_1 {
                             left: 5.2%;
-                            top: 57%;
+                            top: 38%;
                         }
                         > .time_2 {
-                            left: 18.3%;
-                            top: 37%;
+                            left: 25.3%;
+                            top: 55%;
                         }
                         > .time_3 {
-                            left: 32%;
-                            top: 57%;
-                        }
-                        > .time_4 {
                             left: 45.6%;
                             top: 37%;
                         }
-                        > .time_5 {
-                            left: 69.1%;
+                        > .time_4 {
+                            left: 65.6%;
                             top: 57%;
                         }
-                        > .time_6 {
-                            left: 84.7%;
+                        > .time_5 {
+                            left: 86.1%;
+                            top: 38%;
+                        }
+                    }
+                    > .container1 {
+                        background: url(../../assets/bg_main5.png) no-repeat;
+                        background-size: 100% 100%;
+                        > div {
+                            // border: 1px solid rgb(243, 14, 14);
+                            display: inline-block;
+                            width: 15.1%;
+                            height: 27.3%;
+                            box-sizing: border-box;
+                            position: absolute;
+                            color: #333333;
+                            > h3 {
+                                text-align: center;
+                            }
+                            > .row {
+                                font-weight: normal;
+                                font-size: 25px;
+                                overflow: hidden;
+                                white-space: nowrap;
+                                text-overflow: ellipsis;
+                            }
+                        }
+                        > .item_1 {
+                            left: 4.7%;
+                            top: 3.7%;
+                        }
+                        > .item_2 {
+                            left: 30.2%;
+                            top: 68.5%;
+                        }
+                        > .item_3 {
+                            left: 55.3%;
+                            top: 3.7%;
+                        }
+                        > .item_4 {
+                            left: 78.4%;
+                            top: 68.5%;
+                        }
+                        /*> .item_6 {*/
+                        /*    left: 79.8%;*/
+                        /*    top: 68.9%;*/
+                        /*}*/
+
+                        > span {
+                            font-size: 35px;
+                            position: absolute;
+                        }
+                        > .time_1 {
+                            left: 5.2%;
+                            top: 55%;
+                        }
+                        > .time_2 {
+                            left: 30.3%;
                             top: 37%;
                         }
+                        > .time_3 {
+                            left: 56.6%;
+                            top: 55%;
+                        }
+                        > .time_4 {
+                            left: 65.6%;
+                            top: 57%;
+                        }
                     }
                 }
                 .mapContainer {
@@ -662,4 +757,4 @@ export default {
         }
     }
 }
-</style>
+</style>

src/views/Yield/Yield.vue

@@ -60,25 +60,26 @@
                 <img src="../../assets/9bce2ea1dc3f5a0faeae227ad9ee24c.png" style="height: 100%; width: 100%">
             </div>
             <div class="right">
-                <div class="warp">
-                    <div class="cell cell1">
+                <div class="warp" style="width: 40%;">
+                    <div class="cell cell1" style="margin-bottom: 20px;">
                         <img
                             src="../../assets/u871.jpg"
                             width="80%"
                             height="80%"
                         />
                     </div>
-                    <div class="cell e_cell">
-                        <E-Right1 style="height: 100%"></E-Right1>
+                    <div class="cell cell1" style="margin-bottom: 20px;">
+                        <img
+                                src="../../assets/u871.jpg"
+                                width="80%"
+                                height="80%"
+                        />
                     </div>
+                    <div class="jump" @click="jump">吕山牧场</div>
                 </div>
                 <div class="warp">
-                    <div class="cell cell2">
-                        <img
-                            src="../../assets/u871.jpg"
-                            width="80%"
-                            height="80%"
-                        />
+                    <div class="cell e_cell" style="margin-bottom: 30px;">
+                        <E-Right1 style="height: 100%"></E-Right1>
                     </div>
                     <div class="cell e_cell">
                         <E-Right2 style="height: 100%"></E-Right2>
@@ -135,7 +136,11 @@ export default {
     created() {
         document.title = "湖羊养殖";
     },
-    methods: {},
+    methods: {
+        jump() {
+            this.$router.push('/LvShanXiang');
+        }
+    },
 };
 </script>
 
@@ -210,7 +215,7 @@ export default {
                     }
                 }
             }
-            
+
         }
         > .center {
             width: 30%;
@@ -220,26 +225,44 @@ export default {
             width: 35%;
             // border: 1px solid rgb(23, 131, 116);
             display: flex;
-            flex-direction: column;
+            /*flex-direction: column;*/
             justify-content: space-between;
             > .warp {
-                height: 48%;
-                display: flex;
-                justify-content: space-between;
+                width: 54%;
+                height: 100%;
+                /*display: flex;*/
+                /*justify-content: space-between;*/
                 > .cell {
-                    width: 40.5%;
+                    width: 100%;
                     background-image: url(../../assets/download.png);
                     background-size: 100% 100%;
                     background-repeat: no-repeat;
                 }
                 > .e_cell {
-                    width: 57%;
+                    /*width: 57%;*/
+                    height: 48%;
                 }
                 > .cell1,
                 .cell2 {
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
+                    height: 40%;
+                    > img {
+                        padding: 10% 0 0 11%;
+                    }
+                    /*display: flex;*/
+                    /*align-items: center;*/
+                    /*justify-content: center;*/
+                }
+                > .jump {
+                    width: 100%;
+                    height: 10%;
+                    line-height: 100px;
+                    font-size: 60px !important;
+                    opacity: 1 !important;
+                    color: #00fcff !important;
+                    text-align: center;
+                    cursor: pointer;
+                    border: 4px solid #53bafd;
+                    border-radius: 10px;
                 }
             }
         }
@@ -267,4 +290,4 @@ export default {
         }
     }
 }
-</style>
+</style>