Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/api/ghss/jctb.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request.js'
+export function GetDateList(params) {
+    return request({
+        url: '/apply/gdbh/jctb/date/list',
+        method: 'get',
+        params
+    })
+}
+export function GetQueryOne(params) {
+    return request({
+        url: '/apply/jsc/QueryOne',
+        method: 'get',
+        params
+    })
+}

src/views/farmlandProtection/components/jbxx.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <div class="detailList">
+      <div class="dbBtn">查看前后影像对比</div>
       <el-descriptions :column="1" border>
         <el-descriptions-item
           label="图斑编号"
@@ -85,7 +86,16 @@ export default {
 /deep/ .el-descriptions .is-bordered .el-descriptions-item__cell {
   padding: 3px;
 }
-.detailList{
+.detailList {
   margin-top: 10px;
+  .dbBtn {
+    width: 136px;
+    height: 33px;
+    background-color:#0f7ac8;
+    line-height: 33px;
+    text-align: center;
+    margin-bottom: 10px;
+    cursor: pointer;
+  }
 }
 </style>

src/views/farmlandProtection/components/jclxqk.vue

@@ -4,9 +4,9 @@
       <el-select v-model="yearsVal" placeholder="请选择">
         <el-option
           v-for="item in yearsOpt"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+          :key="item.quarter"
+          :label="item.quarter"
+          :value="item.quarter"
         >
         </el-option>
       </el-select>
@@ -57,7 +57,7 @@
             <span style="color: #fff">监测面积</span>
           </div>
           <div>
-            <span class="numberColor">{{  sdata.jcmj }}km²</span>
+            <span class="numberColor">{{ sdata.jcmj }}km²</span>
           </div>
         </div>
       </div>
@@ -100,6 +100,7 @@
 import Statistics from "./statistics";
 import { GetXzqhTree } from "@/api/map";
 import { QueryOne, QueryList } from "@/api/cockpitNew";
+import { GetDateList,GetQueryOne } from "@/api/ghss/jctb.js";
 export default {
   components: {
     Statistics,
@@ -153,36 +154,7 @@ export default {
           unit: "km²",
         },
       ],
-      yearsOpt: [
-        {
-          value: "2024年",
-          label: "2024年",
-        },
-        {
-          value: "2024年第一季度",
-          label: "2024年第一季度",
-        },
-        {
-          value: "2024年第二季度",
-          label: "2024年第二季度",
-        },
-        {
-          value: "2024年第三季度",
-          label: "2024年第三季度",
-        },
-        {
-          value: "2024年第四季度",
-          label: "2024年第四季度",
-        },
-        {
-          value: "2023年",
-          label: "2023年",
-        },
-        {
-          value: "2023年第一季度",
-          label: "2023年第一季度",
-        },
-      ],
+      yearsOpt: [],//检测图斑时间季度
       monitorOpt: [
         {
           value: "全部监测类型",
@@ -221,6 +193,11 @@ export default {
           //   store.setRegionTree(this.xzqTreeData);
         }
       });
+
+      GetDateList().then((res) => {
+        this.yearsOpt = res.data;
+        console.log(res, "???????????");
+      });
     },
     getData() {
       this.getzl();