Etusivu Tutki Apua
Kirjaudu sisään
feiniao
/
agriculture-one-map
4
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

first

shuhao 2 viikkoa sitten
vanhempi
5832d19ed2
commit
d65322bb51
10 muutettua tiedostoa jossa 18 lisäystä ja 63 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 2 2
      env.config.js
  2. 2 2
      index.html
  3. 1 1
      public/index.html
  4. 3 2
      src/api/config.js
  5. 1 1
      src/components/fnHeader.vue
  6. 0 5
      src/views/AutoLogin.vue
  7. 1 1
      src/views/Login.vue
  8. 4 4
      src/views/warningHome/components/chart_components/chartList.vue
  9. 3 44
      src/views/warningHome/index.vue
  10. 1 1
      src/views/warningHome/warningMap.js

+ 2 - 2
env.config.js
Näytä tiedosto 

@@ -8,13 +8,13 @@ const envConfig = {
 
   },
 
   local: {
 
     NODE_ENV: 'local',
 
-    SERVER: 'http://127.0.0.1:81/',
 
+    SERVER: 'https://feiniaotech-dev.sysuimars.cn/',
 
     PYSERVER: 'https://birds-api-1-2.sysuimars.cn/',
 
     MOCK: 'True'
 
   },
 
   loc: {
 
     NODE_ENV: 'local',
 
-    SERVER: 'http://127.0.0.1:81/',
 
+    SERVER: 'https://feiniaotech-dev.sysuimars.cn/',
 
     PYSERVER: 'https://birds-api-1-2.sysuimars.cn/',
 
     MOCK: 'True'
 
   },

+ 2 - 2
index.html
Näytä tiedosto 

@@ -8,10 +8,10 @@
 
     <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
 
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/qweather-icons@1.3.0/font/qweather-icons.css">
 
     <script src="/js/liveplayer-lib.min.js"></script>
 
-    <title>飞鸟智慧巡园平台</title>
 
+    <title>三门坡镇农业AI监测平台</title>
 
   </head>
 
   <body>
 
     <div id="app"></div>
 
     <script type="module" src="/src/main.js"></script>
 
   </body>
 
-</html> 
+</html>

+ 1 - 1
public/index.html
Näytä tiedosto 

@@ -16,7 +16,7 @@
 
         <link rel="icon" href="favicon.ico" />
 
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/qweather-icons@1.3.0/font/qweather-icons.css">
 
         <script src="<%= BASE_URL %>js/liveplayer-lib.min.js"></script>
 
-        <title>飞鸟智慧巡园平台</title>
 
+        <title>三门坡镇农业AI监测平台</title>
 
     </head>
 
     <body>
 
         <noscript>

+ 3 - 2
src/api/config.js
Näytä tiedosto 

@@ -3,7 +3,8 @@ let serverMock = "https://mock.apipark.cn/m1/4662471-4313509-default/"
 
 let pythonServe = VE_ENV.PYSERVER
 
 // let djiCloudBase = "http://127.0.0.1/";
 
 let djiCloudBase = "https://djiapi.sysuimars.com/";
 
-let oneMapServer = "https://zytt-one-map-api.feiniaotech.com/";
 
+// let oneMapServer = "https://zytt-one-map-api.feiniaotech.com/";
 
+let oneMapServer = "http://127.0.0.1:84/";
 
 
 export const base_url = server + "site/";
 
 export const base_dev_url = server + "mini/";
 
@@ -13,7 +14,7 @@ export const server_mock = serverMock + "site/";
 
 export const dji_cloud_base = djiCloudBase;
 
 export const mini_key = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9";
 
 export const image_url = server + "images/";
 
-export const base_img_url = "https://img.sysuimars.com/";
 
+export const base_img_url = "https://birdseye-img.sysuimars.com/";
 
 export const base_img_url2 = "https://birdseye-img-ali-cdn.sysuimars.com/";
 
 export const base_img_url3 = "https://birdseye-img.sysuimars.com/";
 
 export const base_video_url = "https://minio.sysuimars.com/sysuimars/";

+ 1 - 1
src/components/fnHeader.vue
Näytä tiedosto 

@@ -2,7 +2,7 @@
 
     <div class="header">
 
         <div class="title">
 
           <img class="logo" src="@/assets/images/common/logo.png" alt="" />
 
-          <span>{{headerName||"飞鸟智慧巡园平台"}}</span>
 
+          <span>{{headerName||"三门坡镇农业AI监测平台"}}</span>
 
           <img class="logo-icon" src="@/assets/images/common/logo-icon.png" alt="" />
 
         </div>
 
         <!-- <div class="focus-farm" v-show="!hideSwitch">

+ 0 - 5
src/views/AutoLogin.vue
Näytä tiedosto 

@@ -52,7 +52,6 @@ setAccountByTime();
 
 
 // 直接调用登录接口，不做表单校验
 
 const doAutoLogin = async () => {
 
-    try {
 
         const res = await VE_API.system.login(form);
 
         if (res.code == 0) {
 
             const { token, userName, djiCloudToken } = res.data;
 
@@ -67,10 +66,6 @@ const doAutoLogin = async () => {
 
             // 登录成功后直接跳转到预警首页（与 Login.vue 一致）
 
             router.push({ name: "warningHome" });
 
         }
 
-    } catch (e) {
 
-        // 自动登录失败时，跳到手动登录页
 
-        router.push({ name: "AuthenticLogin" });
 
-    }
 
 };
 
 
 onMounted(() => {

+ 1 - 1
src/views/Login.vue
Näytä tiedosto 

@@ -11,7 +11,7 @@
 
     <div class="head">
 
       <div class="logo"></div>
 
       <div class="title">
 
-        飞鸟智慧巡园平台
 
+        三门坡镇农业AI监测平台
 
       </div>
 
     </div>
 
     <div class="ve_container">

+ 4 - 4
src/views/warningHome/components/chart_components/chartList.vue
Näytä tiedosto 

@@ -1,7 +1,7 @@
 
 <template>
 
     <div class="chart-list">
 
         <div class="chart-item">
 
-            <chart-box :name="`平泉街道${selectedCategory.category}占比统计`">
 
+            <chart-box :name="`三门坡镇${selectedCategory.category}占比统计`">
 
                 <div class="box-content">
 
                     <div class="chart-dom">
 
                         <pie-chart :chartData="pieChartData" :totalArea="totalArea"></pie-chart>
 
@@ -23,7 +23,7 @@
 
             </chart-box>
 
         </div>
 
         <div class="chart-item">
 
-            <chart-box :name="`平泉街道物候进程分布`">
 
+            <chart-box :name="`三门坡镇物候进程分布`">
 
                 <template #title-right>
 
                     <el-select
 
                         v-model="selectedPieItem"
 
@@ -43,7 +43,7 @@
 
             </chart-box>
 
         </div>
 
         <div class="chart-item">
 
-            <chart-box :name="`平泉街道非农化非粮化面积统计`">
 
+            <chart-box :name="`三门坡镇非农化非粮化面积统计`">
 
                 <div class="box-content">
 
                     <div class="chart-dom">
 
                         <bar-chart
 
@@ -218,7 +218,7 @@ const fetchYieldChartData = () => {
 
             if (res.code === 0 && res.data && res.data.length > 0) {
 
                 // 计算总种植面积
 
                 const total = res.data.reduce((sum, item) => sum + (item.plantArea || 0), 0);
 
-                
+
 
                 // 转换接口数据为柱状图格式
 
                 const categories = res.data.map((item) => item.name);
 
                 const values = res.data.map((item) => parseFloat(item.plantArea.toFixed(1)));

+ 3 - 44
src/views/warningHome/index.vue
Näytä tiedosto 

@@ -16,7 +16,7 @@
 
                             />
 
                         </div>
 
                     </div> -->
 
-                    <div class="address-box">四川省-简阳市-平泉街道</div>
 
+                    <div class="address-box">海南省-琼山区-三门坡镇</div>
 
                     <div class="btn-box" @click="handleClick">智慧果园</div>
 
                 </div>
 
             </div>
 
@@ -115,7 +115,7 @@ onMounted(async () => {
 
     // 使用 nextTick 确保 DOM 已经渲染完成，地图容器有正确的尺寸
 
     await nextTick();
 
 
-    warningMap.initMap(store.getters.userinfo.location, mapRef.value);
 
+    warningMap.initMap("POINT(110.5125011950405 19.695262155184544)", mapRef.value);
 
 
     // 地图初始化后，更新地图尺寸以确保正确渲染
 
     if (warningMap.kmap && warningMap.kmap.map) {
 
@@ -142,7 +142,7 @@ onMounted(async () => {
 
     }
 
 
     // 胜华村的村界
 
-    getVillageBoundary()
 
+    // getVillageBoundary()
 
 
     eventBus.emit("warningMap:init", warningMap.kmap);
 
 
@@ -391,48 +391,7 @@ const props1 = {
 
     },
 
 };
 
 
-const fetchFarmList = (phenologyIds) => {
 
-    const params = {
 
-        year: currentYear.value,
 
-        quarter: currentQuarter.value,
 
-        phenologyIds: phenologyIds || [],
 
-    };
 
-    return new Promise((resolve, reject) => {
 
-        VE_API.warning
 
-            .fetchFarmList(params)
 
-            .then((res) => {
 
-                if (res.code === 0 && res.data && res.data.length > 0) {
 
-                    // 将接口数据转换为地图需要的格式
 
-                    const cropData = res.data.map((item) => {
 
-                        // 组合作物名称和物候期名称作为 label
 
-                        const label = item.phenologyName
 
-                            ? `${item.speciesName}-${item.phenologyName}`
 
-                            : item.speciesName;
 
-
 
-                        return {
 
-                            ...item,
 
-                            label: label,
 
-                            color: item.speciesColor || "#2199F8",
 
-                            centerPoint: item.point, // 使用 point 作为 centerPoint
 
-                        };
 
-                    });
 
 
-                    // 渲染作物数据到地图
 
-                    distributionLayer.initData(cropData, "label");
 
-                    resolve(cropData);
 
-                } else {
 
-                    // 接口返回空数据时，清空地图
 
-                    distributionLayer.initData([]);
 
-                    resolve([]);
 
-                }
 
-            })
 
-            .catch((error) => {
 
-                // 错误时也清空地图
 
-                distributionLayer.initData([]);
 
-                reject(error);
 
-            });
 
-    });
 
-};
 
 
 const selectedAreaCode = ref(null);
 
 const selectedAreaName = ref(null);

+ 1 - 1
src/views/warningHome/warningMap.js
Näytä tiedosto 

@@ -17,7 +17,7 @@ class HomeMap {
 
   }
 
 
   initMap(location, target) {
 
-    let level = 9;
 
+    let level = 13;
 
     let coordinate = util.wktCastGeom(location).getFirstCoordinate();
 
     this.kmap = new KMap.Map(target, level, coordinate[0], coordinate[1], null, 7, 22);
 
     // this.addMapListen()