From 867c285530394aa3dd26542c5201cdb439b5c069 Mon Sep 17 00:00:00 2001
From: juwei001 <974220104@qq.com>
Date: Mon, 29 Apr 2024 16:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=94=AC=E8=8F=9C=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/zdyf.js                               |  16 ++
 .../next/dialog-module/zdyf-left/yfclz.vue    | 150 ++++++++----------
 .../zdyf-right/kyll/keyEnterprises.vue        |   2 +-
 .../screen-content-left/zdyf-left/index.vue   |  38 +----
 .../screen-content-right/hsyf-right/index.vue |   1 -
 .../screen-content-right/szyf-right/index.vue |   8 -
 .../screen-content-right/zdyf-right/index.vue |   1 -
 7 files changed, 87 insertions(+), 129 deletions(-)

diff --git a/src/api/zdyf.js b/src/api/zdyf.js
index 2c82632..330d625 100644
--- a/src/api/zdyf.js
+++ b/src/api/zdyf.js
@@ -84,6 +84,13 @@ export function seedCompanyDetail (id) {
     method: 'GET'
   })
 }
+// 种都力量-企业详情
+export function getVegetableOutputListDetail () {
+  return request({
+    url: '/api/resi/partymember/screenenterpriseoutput/yifengScreen/getVegetableOutputListDetail',
+    method: 'GET'
+  })
+}
 
 // 党组织数量
 export function prcCollectionListForGov (params) {
@@ -94,3 +101,12 @@ export function prcCollectionListForGov (params) {
     params
   })
 }
+// 党组织数量
+export function getVegetableOutputList (params) {
+  return request({
+    url: '/api/resi/partymember/screenenterpriseoutput/yifengScreen/getVegetableOutputList',
+    method: 'GET',
+    data: params,
+    params
+  })
+}
diff --git a/src/views/next/dialog-module/zdyf-left/yfclz.vue b/src/views/next/dialog-module/zdyf-left/yfclz.vue
index 0b9ef1f..e8d7853 100644
--- a/src/views/next/dialog-module/zdyf-left/yfclz.vue
+++ b/src/views/next/dialog-module/zdyf-left/yfclz.vue
@@ -18,13 +18,13 @@
                   <div class="content-left-list">
                     <div
                       v-for="item in titleList"
-                      :key="item.id"
+                      :key="item.vegetableCategory"
                       @click="onDatils(item)"
                       :class="`content-left-list-item ${
-                        currentId === item.id ? 'action' : ''
+                        currentId === item.vegetableCategory ? 'action' : ''
                       }`"
                     >
-                      {{ item.name }}
+                      {{ item.vegetableCategory }}
                     </div>
                   </div>
                 </div>
@@ -35,16 +35,16 @@
                     v-for="(item, index) in numList"
                     :key="'item' + index"
                   >
-                    <div class="title">{{ item.company }}</div>
+                    <div class="title">{{ item.placeOrgName }}</div>
                     <div class="content">
                       <div>
-                        种植时间：<span class="txt">{{ item.zzDate }}</span>
+                        种植时间：<span class="txt">{{ item.growTime }}</span>
                       </div>
                       <div>
-                        上市时间：<span class="txt">{{ item.ssDate }}</span>
+                        上市时间：<span class="txt">{{ item.marketTime }}</span>
                       </div>
                       <div>
-                        产量：<span class="txt">{{ item.num }}</span>
+                        产量：<span class="txt">{{ item.output }}</span>
                       </div>
                     </div>
                   </div>
@@ -59,102 +59,75 @@
 </template>
 
 <script>
-import { mapGetters, mapActions } from "vuex";
-import { partyPlacePage, partyPlace } from "@/api/hsyf";
+import { mapGetters, mapActions } from 'vuex'
+import { getVegetableOutputListDetail } from '@/api/zdyf'
 export default {
-  name: "",
-  data() {
+  name: '',
+  data () {
     return {
-      dialogTitle: "移风菜篮子",
+      dialogTitle: '移风菜篮子',
       currentId: 0,
-      titleList: [
-        {
-          name: "土豆",
-          id: 0,
-        },
-        {
-          name: "白菜",
-          id: 1,
-        },
-        {
-          name: "生菜",
-          id: 2,
-        },
-        {
-          name: "西红柿",
-          id: 3,
-        },
-        {
-          name: "西蓝花",
-          id: 4,
-        },
-      ],
-      numList: [
-        {
-          company: "XXXX种植基地有限公司",
-          zzDate: "2024-01-10",
-          ssDate: "2024-03-20",
-          num: "120万吨",
-        },
-        {
-          company: "XXXX种植基地有限公司",
-          zzDate: "2024-01-10",
-          ssDate: "2024-03-20",
-          num: "120万吨",
-        },
-        {
-          company: "XXXX种植基地有限公司",
-          zzDate: "2024-01-10",
-          ssDate: "2024-03-20",
-          num: "120万吨",
-        },
-        {
-          company: "XXXX种植基地有限公司",
-          zzDate: "2024-01-10",
-          ssDate: "2024-03-20",
-          num: "120万吨",
-        },
-        {
-          company: "XXXX种植基地有限公司",
-          zzDate: "2024-01-10",
-          ssDate: "2024-03-20",
-          num: "120万吨",
-        },
-      ],
+      titleList: [],
+      numList: [],
       loading: false,
-      info: { description: "" },
-    };
+      info: { description: '' }
+    }
   },
   computed: {
-    ...mapGetters(["yfclz"]),
+    ...mapGetters(['yfclz'])
   },
   components: {},
-  mounted() {},
-  created() {
-    // partyPlacePage({ page: 1, limit: 100, type: 1 }).then((res) => {
-    //   this.currentId = res.data.list.id
-    //   this.titleList = res.data.list
-    //   if (this.titleList.length > 0) {
-    //     this.onDatils(this.titleList[0])
-    //   }
-    // })
+  mounted () {},
+  created () {
+    getVegetableOutputListDetail().then((res) => {
+      this.titleList = res.data
+      this.numList = res.data[0].detailList.map((item1) => {
+        return {
+          ...item1,
+          growTime: this.formatDateTime(new Date(item1.growTime)),
+          marketTime: this.formatDateTime(new Date(item1.marketTime))
+        }
+      })
+      this.currentId = res.data[0].vegetableCategory
+      // this.titleList = res.data.list
+      // if (this.titleList.length > 0) {
+      //   this.onDatils(this.titleList[0])
+      // }
+    })
   },
   methods: {
     ...mapActions({
-      showGlobalDialog: "showGlobalDialog",
+      showGlobalDialog: 'showGlobalDialog'
     }),
-    closeDialog() {
-      this.showGlobalDialog("");
+    closeDialog () {
+      this.showGlobalDialog('')
+    },
+    formatDateTime (date) {
+      function padZero (num) {
+        return num < 10 ? '0' + num : num
+      }
+      var year = date.getFullYear()
+      var month = padZero(date.getMonth() + 1)
+      var day = padZero(date.getDate())
+
+      return year + '-' + month + '-' + day
     },
-    onDatils(item) {
-      this.currentId = item.id;
+    onDatils (item) {
+      this.currentId = item.vegetableCategory
+      this.numList = item.detailList.map((item1) => {
+        return {
+          ...item1,
+          growTime: this.formatDateTime(new Date(item1.growTime)),
+          marketTime: this.formatDateTime(new Date(item1.marketTime))
+        }
+      })
       // partyPlace(item.id).then((res) => {
       //   // console.log('res::', res);
       //   this.info = res.data
       // })
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -194,7 +167,8 @@ export default {
 
       .title-container {
         align-items: center;
-        background: url("~@/assets/images/common/dialog-header-yfclz.png") no-repeat;
+        background: url("~@/assets/images/common/dialog-header-yfclz.png")
+          no-repeat;
         // background: url("~@/assets/images/common/dialog-header-big-red.png")
         //   no-repeat;
         // background-size: 100% 100%;
@@ -273,7 +247,7 @@ export default {
     }
     &-right {
       width: calc(100% - 165px);
-      padding-left:39px;
+      padding-left: 39px;
       margin-top: 68px;
       height: 636px;
       box-sizing: border-box;
diff --git a/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprises.vue b/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprises.vue
index 7bf98c4..d18ae25 100644
--- a/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprises.vue
+++ b/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprises.vue
@@ -85,7 +85,7 @@ export default {
   components: {},
   watch: {},
   created () {
-    seedCompanyList({ pageNo: 1, pages: 100 }).then((res) => {
+    seedCompanyList({ pageNo: 1, pages: 100, type: '1' }).then((res) => {
       this.list = res.data
     })
   },
diff --git a/src/views/next/screen-content-left/zdyf-left/index.vue b/src/views/next/screen-content-left/zdyf-left/index.vue
index ae13758..5494862 100644
--- a/src/views/next/screen-content-left/zdyf-left/index.vue
+++ b/src/views/next/screen-content-left/zdyf-left/index.vue
@@ -173,7 +173,7 @@
           <div style="height: 180px; overflow: hidden">
             <vue-seamless-scroll
               :class-option="optionHover1"
-              :data="shichangList"
+              :data="yfclzList"
             >
               <div class="scroll-box" @click="openClz">
                 <div
@@ -182,8 +182,8 @@
                   :key="'dyfc' + index"
                 >
                   <div class="npdt-yfclz-row">
-                    <div>{{ item.name }}</div>
-                    <div>{{ item.num && item.num.toFixed(2) }}</div>
+                    <div>{{ item.vegetableCategory }}</div>
+                    <div>{{ item.output && item.output.toFixed(2) }}</div>
                   </div>
                 </div>
               </div>
@@ -197,7 +197,7 @@
 
 <script>
 import { mapActions } from 'vuex'
-import { prcCollectionListForGov } from '@/api/zdyf'
+import { prcCollectionListForGov, getVegetableOutputList } from '@/api/zdyf'
 export default {
   data () {
     return {
@@ -233,32 +233,7 @@ export default {
           jzr: 1
         }
       ],
-      yfclzList: [
-        {
-          name: '豌豆荚',
-          num: 460
-        },
-        {
-          name: '白玉菇',
-          num: 389
-        },
-        {
-          name: '生菜球',
-          num: 322
-        },
-        {
-          name: '秋葵',
-          num: 266
-        },
-        {
-          name: '苦菊',
-          num: 198
-        },
-        {
-          name: '白菜',
-          num: 890
-        }
-      ],
+      yfclzList: [],
       optionHover1: {
         step: 0.5, // 数值越大速度滚动越快
         limitMoveNum: 6, // 开始无缝滚动的数据量 this.dataList.length
@@ -334,6 +309,9 @@ export default {
           })
         }
       })
+      getVegetableOutputList().then(res => {
+        this.yfclzList = res.data
+      })
     },
     getDayScTData () {
       prcCollectionListForGov({
diff --git a/src/views/next/screen-content-right/hsyf-right/index.vue b/src/views/next/screen-content-right/hsyf-right/index.vue
index 377cd7d..08676b6 100644
--- a/src/views/next/screen-content-right/hsyf-right/index.vue
+++ b/src/views/next/screen-content-right/hsyf-right/index.vue
@@ -25,7 +25,6 @@
                 <div>
                   {{ item.topic }}
                 </div>
-                <!-- <div>{{ item.publishPartyOrgName }}</div> -->
               </section>
             </div>
           </div>
diff --git a/src/views/next/screen-content-right/szyf-right/index.vue b/src/views/next/screen-content-right/szyf-right/index.vue
index 0310c98..4a3eb32 100644
--- a/src/views/next/screen-content-right/szyf-right/index.vue
+++ b/src/views/next/screen-content-right/szyf-right/index.vue
@@ -21,14 +21,6 @@
       <screen-title-sz>
         <div slot="left" class="screen-title-left">“移”治风采</div>
       </screen-title-sz>
-      <!-- <div class="card-item-sjcl">
-        <div class="item" v-for="(item, index) in monitorList" :key="index">
-          <img :src="item.src" alt="" />
-          <span class="time">{{ item.time }}</span>
-          <div class="name">{{ item.name }}</div>
-        </div>
-      </div> -->
-
       <div style="overflow: hidden; margin: 16px 16px 21px 16px">
         <vue-seamless-scroll :class-option="optionHover" :data="partList">
           <div class="card-item-dyfc">
diff --git a/src/views/next/screen-content-right/zdyf-right/index.vue b/src/views/next/screen-content-right/zdyf-right/index.vue
index 898d3ae..70402b4 100644
--- a/src/views/next/screen-content-right/zdyf-right/index.vue
+++ b/src/views/next/screen-content-right/zdyf-right/index.vue
@@ -275,7 +275,6 @@ export default {
       this.yfwlList = res.data.list
     })
     seedPowerCompanyList({}).then((res) => {
-      // console.log('res::', res);
       this.yjyList = res.data.list
     })
   },