diff --git a/yifengdian-company-report/src/assets/css/index.less b/yifengdian-company-report/src/assets/css/index.less index 7b44320..1f2a451 100644 --- a/yifengdian-company-report/src/assets/css/index.less +++ b/yifengdian-company-report/src/assets/css/index.less @@ -57,6 +57,13 @@ body #app { .yellow{ color: #ff9805; } +.border-btn{ + border-top: 1px solid #E0E9F5; +} +.border-btn-yellow{ + border-bottom: 1px solid #E0E9F5; +} + .card{ background-color: #fff; border-radius: 8px; @@ -133,6 +140,9 @@ body #app { &-left18{ margin-left: 18px; } + &-left25{ + margin-left: 25px; + } &-right12{ margin-right: 12px; } @@ -148,6 +158,9 @@ body #app { &-bot5{ margin-bottom: 5px; } + &-bot12{ + margin-bottom: 12px; + } &-top18{ margin-top: 18px; } @@ -245,6 +258,10 @@ body #app { width: 15px; height: 15px; } + &-20{ + width: 20px; + height: 20px; + } } .required{ position: relative; @@ -258,6 +275,7 @@ body #app { } .text-center{ text-align: center; + } .footer{ diff --git a/yifengdian-company-report/src/router/router_modular/index.js b/yifengdian-company-report/src/router/router_modular/index.js index 502ca8f..c060016 100644 --- a/yifengdian-company-report/src/router/router_modular/index.js +++ b/yifengdian-company-report/src/router/router_modular/index.js @@ -16,7 +16,7 @@ const router_modular = [ path: '/vegetableDetails', name: 'vegetableDetails', component: () => import(/* webpackChunkName: "about" */ '@/views/vegetableDetails.vue'), - title:'产量上报' + title:'企业上报' }, { path: '/home', diff --git a/yifengdian-company-report/src/views/home.vue b/yifengdian-company-report/src/views/home.vue index 2b262ad..5c6649a 100644 --- a/yifengdian-company-report/src/views/home.vue +++ b/yifengdian-company-report/src/views/home.vue @@ -91,9 +91,9 @@
-
+
- draggable image + draggable image
diff --git a/yifengdian-company-report/src/views/vegetableDetails.vue b/yifengdian-company-report/src/views/vegetableDetails.vue index 873c2c8..0f50af0 100644 --- a/yifengdian-company-report/src/views/vegetableDetails.vue +++ b/yifengdian-company-report/src/views/vegetableDetails.vue @@ -1,11 +1,31 @@ @@ -105,6 +136,7 @@ import Toast from "vant/es/toast"; import Dialog from "vant/es/dialog"; import axios from "axios"; import config from "@/config/index"; +import { Image } from "vant"; const baseUrl = process.env.NODE_ENV === "development" ? "" : config.baseUrl.pro; export default { @@ -129,6 +161,8 @@ export default { placeOrgName: null, columns: ["白菜", "土豆", "温州", "嘉兴", "湖州"], list: [], + hisList:[{time:"2024-02",vegetable:"西红柿",PlantingTime:"2024-20",launchTime:"2024-05-26",yield:"200"}, + {time:"2024-02",vegetable:"西红柿",PlantingTime:"2024-20",launchTime:"2024-05-26",yield:"200"}] }; }, mounted() { @@ -164,7 +198,7 @@ export default { method: "post", url: `${baseUrl}/api/sys/dict/data/yifengScreen/dictlist`, data: { - dictType: "vegetable", + dictType: "", }, }) .then((response) => { @@ -183,7 +217,7 @@ export default { }); }, methods: { - onInput(val) {}, + onInput(val) { }, onConfirm(val) { this.vegetableList[this.index].vegetableCategory = val; this.typeShow = false; @@ -366,9 +400,14 @@ export default {