726

src/services/znfx.js

@@ -114,3 +114,53 @@ export function GetActualData(params) {
     }
   })
 }
+
+
+//销售订单信息
+export function GetSalesOrder(params) {
+  return request({
+    url: 'http://101.132.114.72:8080/cmnw_trans/fbgk/saleOrderInfoList',
+    method: 'get',
+    params: {
+      ...params
+    }
+  })
+}
+
+//销售订单总体信息
+export function GetSalesOrderSummary(params) {
+  return request({
+    url: 'http://101.132.114.72:8080/cmnw_trans/fbgk/saleOrderSummary',
+    method: 'get',
+    params: {
+      ...params
+    }
+  })
+}
+
+//补贴金额&销售趋势
+export function GetBubsidyAndSaleTrend() {
+  return request({
+    url: 'http://101.132.114.72:8080/cmnw_trans/fbgk/subsidyAndSaleTrend',
+    method: 'get',
+  })
+}
+
+//观测站清单
+export function GetGczList() {
+  return request({
+    url: '/zhwl/list_base',
+    method: 'get'
+  })
+}
+
+//物联监测设备曲线
+
+
+//实验室检测报告
+export function GetSysReport(baseName) { //基地名称
+  return request({
+    url: `/zhwl/list_base_report?baseName=${baseName}`,
+    method: '',
+  })
+}

src/views/deck/pages/zhcj_sub/ZhcjZhgc.vue

@@ -106,9 +106,9 @@
         <span class="box-title2">观测站清单</span>
         <div class="cr-b2">
           <el-table :data="tableData_crb2" class="table-default" height="29vh" @row-click="handlePickGcz">
-            <el-table-column label="名称" prop="name" min-width="90" show-overflow-tooltip/>
+            <el-table-column label="名称" prop="baseName" min-width="90" show-overflow-tooltip/>
             <el-table-column label="乡镇" prop="xz" min-width="90" show-overflow-tooltip/>
-            <el-table-column label="地址" prop="address" min-width="160" show-overflow-tooltip/>
+            <el-table-column label="地址" prop="dz" min-width="160" show-overflow-tooltip/>
           </el-table>
         </div>
         <span class="box-title2">实时告警</span>
@@ -134,15 +134,15 @@
         <span class="box-title2">实验室检测</span>
         <div class="sr-b2">
           <el-table :data="subPageData.sysjc" class="table-default" height="28vh">
-            <el-table-column label="月份" prop="month" min-width="100" show-overflow-tooltip/>
+            <el-table-column label="月份" prop="time" min-width="100" show-overflow-tooltip/>
             <el-table-column label="水质检测" min-width="100" show-overflow-tooltip>
               <template #default="scope">
-                <span class="td-link" @click="handleCheckTest(scope.row.water)">查看</span>
+                <span class="td-link" @click="handleCheckTest(scope.row.szBgURl)">查看</span>
               </template>
             </el-table-column>
             <el-table-column label="土壤检测" min-width="80" show-overflow-tooltip>
               <template #default="scope">
-                <span class="td-link" @click="handleCheckTest(scope.row.mud)">查看</span>
+                <span class="td-link" @click="handleCheckTest(scope.row.trBgURl)">查看</span>
               </template>
             </el-table-column>
           </el-table>
@@ -194,7 +194,7 @@
 
 <script>
 import { setTzl } from '@/echarts/options'
-
+import { GetGczList,GetSysReport } from '@/services/znfx'
 export default {
   name: 'ZhcjZhgc',
   data() {
@@ -326,11 +326,10 @@ export default {
       this.tableData_crb1 = resArr
     },
     getTableCrb2() {
-      let resArr = []
-      for(let i=1; i<10; i++) {
-        resArr.push({name: '宝岛基地'+i, xz: 'XXX镇', address: 'XXXXXXXXXXXXXXXX'})
-      }
-      this.tableData_crb2 = resArr
+      GetGczList().then(res => {
+        console.log(res.data)
+        this.tableData_crb2 = res.data
+      })
     },
     getTableCrb3() {
       this.tableData_crb3 = [
@@ -357,15 +356,14 @@ export default {
     },
     handlePickGcz(row) {
       this.toggleSubPage(true)
-      this.getSubData(row.name)
+      this.getSubData(row.baseName)
     },
     getSubData(name) {    // 获取观测站子页面数据
       this.subPageData.title = name
-      let sysjcArr= []
-      for(let i=1; i<15; i++) {
-        sysjcArr.push({ month: '2023.3', water: '', mud: ''})
-      }
-      this.subPageData.sysjc = sysjcArr
+      GetSysReport(name).then(res => {
+        console.log(res.data)
+        this.subPageData.sysjc = res.data
+      })
       let chartArr = []
       for(let i=1; i<5; i++) {
         chartArr.push([
@@ -390,7 +388,7 @@ export default {
       this.subPageShow = subShow
     },
     handleCheckTest(url) {
-      console.log(url)
+      window.open(url)
     },
     switchChartData(type) {
       let len = this.subPageData.chartData.length
@@ -552,7 +550,7 @@ export default {
           color: #fff;
           writing-mode: vertical-rl;
         }
-        
+
       }
     }
     .l2p2-rows {
@@ -783,4 +781,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/deck/pages/znfx_sub/ZnfxNcpzl.vue

@@ -256,16 +256,8 @@ export default {
     this.sort_rcxc.year = new Date().getFullYear()
     this.getMonthArr()
     this.sort_rcxc.month = new Date().getMonth()+1
-
-    GetPassRateAndCount().then(res => {
-        this.data_clb1.forEach(i => {
-            i.heGeLV = res.data[i.key].heGeLV
-            i.zongShu = res.data[i.key].zongShu
-        })
-    })
-    GetProjectStatictics().then(res => {
-      this.data_clb3 = res.data
-    })
+    this.getDataClb1()
+    this.getDataClb3()
     this.toQuery()
   },
   methods: {
@@ -297,6 +289,19 @@ export default {
     openCheckList() {
       this.listShow_check = true
     },
+    getDataClb1(){
+      GetPassRateAndCount().then(res => {
+        this.data_clb1.forEach(i => {
+          i.heGeLV = res.data[i.key].heGeLV
+          i.zongShu = res.data[i.key].zongShu
+        })
+      })
+    },
+    getDataClb3(){
+      GetProjectStatictics().then(res => {
+        this.data_clb3 = res.data
+      })
+    },
     toQuery(){
         GetActualData(this.check_sort).then(res => {
           this.data_clb2 = res.data

src/views/deck/pages/znfx_sub/ZnfxNzjy.vue

@@ -69,7 +69,7 @@
           <el-select v-model="sort_xsdd.month" placeholder="请选择月" class="select-default" popper-class="select-default-popper">
             <el-option v-for="item in monthArr" :key="item" :label="item+'月份'" :value="item"></el-option>
           </el-select>
-          <el-select v-model="sort_xsdd.shop" placeholder="门店" class="select-default" popper-class="select-default-popper">
+          <el-select v-model="sort_xsdd.enterpriseName" placeholder="门店" class="select-default" popper-class="select-default-popper">
             <el-option v-for="item in 5" :key="item" :label="item" :value="item"></el-option>
           </el-select>
         </div>
@@ -81,12 +81,12 @@
           </li>
         </ul>
         <el-table :data="data_xsdd.tableData" class="table-default" height="28vh">
-          <el-table-column label="门店" prop="shop" min-width="80" show-overflow-tooltip/>
-          <el-table-column label="采购人" prop="purchaser" min-width="65" show-overflow-tooltip/>
-          <el-table-column label="商品名称" prop="goodsName" min-width="85" show-overflow-tooltip/>
-          <el-table-column label="数量" prop="count" min-width="50" show-overflow-tooltip/>
-          <el-table-column label="单价(元)" prop="price" min-width="70" show-overflow-tooltip/>
-          <el-table-column label="时间" prop="time" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="门店" prop="enterpriseName" min-width="80" show-overflow-tooltip/>
+          <el-table-column label="采购人" prop="contactMan" min-width="65" show-overflow-tooltip/>
+          <el-table-column label="商品名称" prop="productName" min-width="85" show-overflow-tooltip/>
+          <el-table-column label="数量" prop="saleQty" min-width="50" show-overflow-tooltip/>
+          <el-table-column label="单价(元)" prop="salePrice" min-width="70" show-overflow-tooltip/>
+          <el-table-column label="时间" prop="saleTime" min-width="90" show-overflow-tooltip/>
         </el-table>
       </div>
       <span class="box-title2">销售趋势</span>
@@ -107,6 +107,7 @@
 
 <script>
 import { setYyqdfx, setXsqs } from '@/echarts/options'
+import { GetSalesOrder,GetSalesOrderSummary,GetBubsidyAndSaleTrend } from '@/services/znfx'
 
 export default {
   name: 'ZnfxNzjy',
@@ -151,7 +152,9 @@ export default {
       sort_xsdd: {
         year: '',
         month: '',
-        shop: ''
+        enterpriseName: '',
+        pageNum: '1',
+        pageSize: '10'
       },
       yearArr: [],
       monthArr: [],
@@ -198,6 +201,16 @@ export default {
     this.sort_xsdd.month = new Date().getMonth()+1
     setYyqdfx(document.getElementById('chart-clb3'), this.data_yyqd.chart)
     setXsqs(document.getElementById('chart-crb3'), this.data_xsqs.chart)
+    //todo 拿到地址后参数对应上
+    GetSalesOrder(this.sort_xsdd).then(res => {
+      this.data_xsdd.tableData = res.data
+    })
+    GetSalesOrderSummary(this.sort_xsdd).then(res => {
+      this.data_xsdd.overview = res.data
+    })
+    GetBubsidyAndSaleTrend().then(res => {
+      console.log(res.data)
+    })
   },
   methods: {
     getRecentYears() {
@@ -370,4 +383,4 @@ export default {
     margin-top: 20px;
   }
 }
-</style>
+</style>