From d89ef19138fbee26b5b04536107e885cb280dcaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=90=AA?= <727393967@qq.com>
Date: Fri, 13 Sep 2024 13:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E6=9D=A1=E9=A2=9C=E8=89=B2=E9=9A=8F?=
 =?UTF-8?q?=E6=9C=BA=E6=96=B9=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dataTransfer.js                       |  10 ++
 src/api/home.js                               |  10 ++
 src/components/container.vue                  |   2 +-
 src/components/public/Footer.vue              |   4 +-
 src/components/public/Header.vue              |   8 +
 src/style/gloable.scss                        |   2 +
 src/views/dataSearch.vue                      |  21 ++-
 src/views/dataTransfer/sampleDataset.vue      |   3 +
 .../sampleViews/formViews/SampleList.vue      |   6 +-
 src/views/dataTransfer/voyageReg.vue          |  67 ++++++++-
 src/views/dicManage/dataSampleType.vue        |   8 +-
 src/views/dicManage/docType.vue               |   8 +-
 src/views/dicManage/platformType.vue          |   8 +-
 src/views/dicManage/sharedUnit.vue            |   8 +-
 src/views/dicManage/visitorUnit.vue           |   8 +-
 src/views/home.vue                            | 141 ++++++++++--------
 src/views/login.vue                           |   2 +-
 static/images/logo_map.png                    | Bin 0 -> 9640 bytes
 18 files changed, 229 insertions(+), 87 deletions(-)
 create mode 100644 static/images/logo_map.png

diff --git a/src/api/dataTransfer.js b/src/api/dataTransfer.js
index bbb4fa6..e1ae153 100644
--- a/src/api/dataTransfer.js
+++ b/src/api/dataTransfer.js
@@ -294,3 +294,13 @@ export function voyageRegPeopleUpload(data) {
     data
   })
 }
+
+// 批量导入航次数据
+export function voyageRegImport(data) {
+  return request({
+    url: '/voyage/reg/upload.htm',
+    method: 'post',
+    type: 'multipart/form-data',
+    data
+  })
+}
diff --git a/src/api/home.js b/src/api/home.js
index f7cfd84..b45201e 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -86,3 +86,13 @@ export function getParamsList(query) {
     params: query
   })
 }
+
+// 首页统计数据
+export function statisticsNums(data) {
+  return request({
+    url: '/report/main.htm',
+    method: 'post',
+    type: 'application/x-www-form-urlencoded',
+    data
+  })
+}
diff --git a/src/components/container.vue b/src/components/container.vue
index 08d3f96..8201ff2 100644
--- a/src/components/container.vue
+++ b/src/components/container.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Header v-if="name!='biologyIndex' && name!='genovariation' && name!='physicalIndex' && name!='physicalDataSearchCTD' && name!='physicalDataDelivery' && name!='phoneVideoIndex'" />
+    <Header v-if="name!='biologyIndex' && name!='genovariation' && name!='physicalIndex' && name!='physicalDataSearchCTD' && name!='physicalDataDelivery' && name!='phoneVideoIndex' && name!='dataSearch'" />
     <div class="container container_a">
       <router-view />
     </div>
diff --git a/src/components/public/Footer.vue b/src/components/public/Footer.vue
index c509bfe..c3d6ae6 100644
--- a/src/components/public/Footer.vue
+++ b/src/components/public/Footer.vue
@@ -9,10 +9,10 @@
           <ul>
 
             <li><router-link to="/">首页</router-link></li>
-            <li><router-link to="/">样品发现</router-link></li>
+<!--            <li><router-link to="/">样品发现</router-link></li>-->
             <li><router-link to="/">数据资源</router-link></li>
             <li><router-link to="/">在线服务</router-link></li>
-            <li><router-link to="/container/news">新闻动态</router-link></li>
+<!--            <li><router-link to="/container/news">新闻动态</router-link></li>-->
             <li><router-link to="/">通知公告</router-link></li>
             <li><router-link to="/">联系我们</router-link></li>
           </ul>
diff --git a/src/components/public/Header.vue b/src/components/public/Header.vue
index 84d8c52..faa87f9 100644
--- a/src/components/public/Header.vue
+++ b/src/components/public/Header.vue
@@ -261,6 +261,14 @@ export default {
         Cookies.set('JSESSIONID', res.map.FrameSessionId);
         this.isLogin = res.login
         localStorage.setItem('isLogin', res.login)
+        const dicts = res.map.FrameDictArray
+        let treatmentStateDict = []
+        dicts.forEach(item => {
+          if (item.dict_name === 'SampleStatus') {
+            treatmentStateDict.push(item)
+          }
+        })
+        localStorage.setItem('treatmentStateDict', JSON.stringify(treatmentStateDict))
         if (this.isLogin) {
           this.menuList = this.adminMenu
         } else {
diff --git a/src/style/gloable.scss b/src/style/gloable.scss
index 0a2fc68..bc76d5d 100644
--- a/src/style/gloable.scss
+++ b/src/style/gloable.scss
@@ -162,6 +162,8 @@ color:#0ba1e4;
     overflow: hidden;
     margin-bottom: 20px;
     margin-top: 10px;
+    display: flex;
+    justify-content: space-between;
     .filter-item {
         display: inline-block;
         vertical-align: middle;
diff --git a/src/views/dataSearch.vue b/src/views/dataSearch.vue
index 1a80636..ebf2f45 100644
--- a/src/views/dataSearch.vue
+++ b/src/views/dataSearch.vue
@@ -134,7 +134,8 @@
         <img src="../../static/images/arrow_nav1.png" alt="">
       </div>
       <div class="right">
-        <div id="cesiumContainerData" style="height: calc(100vh - 90px);width:100%;" />
+        <div id="cesiumContainerData" style="height: 100vh;width:100%;" />
+        <el-image class="logo" src="../../static/images/logo_map.png" @click="goHome" />
       </div>
     </div>
     <!--  航次名称弹窗-->
@@ -790,6 +791,9 @@ export default {
         this.chooseLine.polyline.width = 5
         this.chooseLine.polyline.material = this.chooseLine.oldMaterial
       }
+    },
+    goHome() {
+      this.$router.push({name: 'home'})
     }
   }
 }
@@ -801,14 +805,14 @@ export default {
   height: 100%;
   .shuju_con {
     width: 100%;
-    height: calc(100vh - 90px);
+    height: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
     .left {
       position: relative;
       width: 570px;
-      height: 100%;
+      height: 100vh;
       background: #fff;
       box-sizing: border-box;
       padding: 50px 30px;
@@ -966,6 +970,16 @@ export default {
     .right {
       width: 100%;
       height: 100%;
+      position: relative;
+
+      .logo {
+        width: 60px;
+        height: 60px;
+        cursor: pointer;
+        position: absolute;
+        bottom: 20px;
+        right: 20px;
+      }
     }
   }
 }
@@ -990,4 +1004,5 @@ export default {
   color: #fff;
   background: none !important;
 }
+
 </style>
diff --git a/src/views/dataTransfer/sampleDataset.vue b/src/views/dataTransfer/sampleDataset.vue
index 5ae56d6..c29652c 100644
--- a/src/views/dataTransfer/sampleDataset.vue
+++ b/src/views/dataTransfer/sampleDataset.vue
@@ -9,6 +9,9 @@
       </el-breadcrumb>
     </div>
     <div class="filter-container">
+      <div class="search">
+
+      </div>
       <div class="checkBtn flex">
         <el-button
           v-for="item in btnList"
diff --git a/src/views/dataTransfer/sampleViews/formViews/SampleList.vue b/src/views/dataTransfer/sampleViews/formViews/SampleList.vue
index 089d1be..c349345 100644
--- a/src/views/dataTransfer/sampleViews/formViews/SampleList.vue
+++ b/src/views/dataTransfer/sampleViews/formViews/SampleList.vue
@@ -130,7 +130,7 @@
             <el-col :span="8">
               <el-form-item label="处理状态" prop="sample_status">
                 <el-select v-model="form.sample_status" filterable placeholder="" style="width: 100%;">
-                  <el-option v-for="item in sampleStatusDicts" :key="item" :label="item" :value="item"/>
+                  <el-option v-for="item in sampleStatusDicts" :key="item.dict_text" :label="item.dict_text" :value="item.dict_value"/>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -311,7 +311,7 @@ export default {
       // 公开期限下拉数据
       publishRuleDicts: ['公开获取', '延期公开(6个月)', '延期公开(12个月)', '延期公开(24个月)', '不公开'],
       // 公开期限下拉数据
-      sampleStatusDicts: ['原始数据', '预处理数据', '后处理数据'],
+      sampleStatusDicts: [],
       // 标签类型下拉数据
       tagTypes: ['应急搜捞', '全球深渊深潜计划', '崖州湾共享航次', '基金委共享航次'],
       inputVisible: false,
@@ -329,6 +329,8 @@ export default {
   },
   created() {
     this.getData()
+    const treatmentStateDict = localStorage.getItem('treatmentStateDict')
+    this.sampleStatusDicts = JSON.parse(treatmentStateDict)
   },
   methods: {
     // 获取列表数据
diff --git a/src/views/dataTransfer/voyageReg.vue b/src/views/dataTransfer/voyageReg.vue
index 17f9965..92c838f 100644
--- a/src/views/dataTransfer/voyageReg.vue
+++ b/src/views/dataTransfer/voyageReg.vue
@@ -9,16 +9,40 @@
       </el-breadcrumb>
     </div>
     <div class="filter-container">
-      <div class="checkBtn">
-        <el-button type="primary" size="medium" @click="handleAdd">航次数据录入</el-button>
+      <div class="search">
+        <el-input placeholder="模糊查询" v-model="params.query" style="width: 300px;">
+          <el-button slot="append" icon="el-icon-search" @click="getData"></el-button>
+        </el-input>
+      </div>
+      <div class="checkBtn" style="display: flex">
+        <el-button type="primary" size="medium" @click="handleAdd" style="margin-right: 10px;">航次数据录入</el-button>
+        <el-upload
+          class="upload-btn"
+          ref="upload"
+          action="action"
+          :multiple="false"
+          :show-file-list="false"
+          :http-request="uploadReg"
+          :before-upload="beforeUploadReg"
+        >
+          <el-button :loading="loadingRegBtn">{{ textReg }}</el-button>
+        </el-upload>
       </div>
     </div>
     <el-table ref="tableData" v-loading="loading" stripe border :data="tableData" :header-cell-style="{ background: '#dddfe6',color: '#555960',textAlign: 'center' }" :cell-style="{ textAlign: 'center' }">
       <el-table-column type="index" label="#" width="50"/>
       <el-table-column prop="voyage_name" label="航次名称" />
       <el-table-column prop="ship_name" label="科考船舶" />
-      <el-table-column prop="voyage_start_date" label="离港日期" />
-      <el-table-column prop="voyage_end_date" label="返港日期" />
+      <el-table-column prop="voyage_start_date" label="离港日期">
+        <template slot-scope="scope">
+          <span>{{ scope.row.voyage_start_date ? scope.row.voyage_start_date.slice(0,10) : '' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="voyage_end_date" label="返港日期">
+        <template slot-scope="scope">
+          <span>{{ scope.row.voyage_end_date ? scope.row.voyage_end_date.slice(0,10) : '' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="voyage_officer" label="首席" />
       <el-table-column prop="member_total" label="参航人数" />
       <el-table-column prop="funding_org" label="资助机构" />
@@ -347,7 +371,7 @@ import {
   voyageRegNav,
   uploadNavigation,
   voyageRegPeople,
-  voyageRegPeopleDelete, voyageRegPeopleEdit, voyageRegPeopleUpload
+  voyageRegPeopleDelete, voyageRegPeopleEdit, voyageRegPeopleUpload, voyageRegImport
 } from '@/api/dataTransfer'
 import { time } from '@/utils/validate'
 
@@ -360,7 +384,8 @@ export default {
       params: {
         start: 0,
         limit: 10,
-        group: 10
+        group: 10,
+        query: ''
       },
       pageNum: 1,
       // 列表数据
@@ -448,7 +473,10 @@ export default {
       rulesPeople: {},
       sexOptions: ['男', '女', '保密'],
       textPeople: '上传参航人员',
-      loadingPeopleBtn: false
+      loadingPeopleBtn: false,
+      // 航次数据批量导入
+      loadingRegBtn: false,
+      textReg: '航次数据批量导入'
     }
   },
   created() {
@@ -766,6 +794,31 @@ export default {
         this.textPeople = '上传参航人员'
       })
     },
+    // 航次数据批量导入
+    beforeUploadReg(file) { // 上传文件之前钩子
+      const type = file.name.split('.')[1]
+      if (type !== 'xlsx') {
+        this.$message({ type: 'error', message: '只支持xlsx文件格式！' })
+        return false
+      }
+    },
+    uploadReg(param) {
+      this.loadingRegBtn = true
+      this.textReg = '数据处理中'
+      const formData = new FormData()
+      formData.append('file', param.file)
+      voyageRegImport(formData).then(res => {
+        if (res.errorCode === 0) {
+          this.loadingRegBtn = false
+          this.textReg = '航次数据批量导入'
+          this.$message.success('导入成功！')
+          this.getData()
+        }
+      }).cache(() => {
+        this.loadingRegBtn = false
+        this.textReg = '航次数据批量导入'
+      })
+    },
   },
   watch: {
     dynamicTags2(arr) {
diff --git a/src/views/dicManage/dataSampleType.vue b/src/views/dicManage/dataSampleType.vue
index bb16a16..417b3cc 100644
--- a/src/views/dicManage/dataSampleType.vue
+++ b/src/views/dicManage/dataSampleType.vue
@@ -9,6 +9,11 @@
       </el-breadcrumb>
     </div>
     <div class="filter-container">
+      <div class="search">
+        <el-input placeholder="模糊查询" v-model="params.query" style="width: 300px;">
+          <el-button slot="append" icon="el-icon-search" @click="getData"></el-button>
+        </el-input>
+      </div>
       <div class="checkBtn">
         <el-button type="primary" size="medium" @click="handleAdd">数据样品类型录入</el-button>
       </div>
@@ -85,7 +90,8 @@ export default {
       params: {
         start: 0,
         limit: 10,
-        group: 10
+        group: 10,
+        query: ''
       },
       pageNum: 1,
       // 列表数据
diff --git a/src/views/dicManage/docType.vue b/src/views/dicManage/docType.vue
index 68f5609..8b0fd19 100644
--- a/src/views/dicManage/docType.vue
+++ b/src/views/dicManage/docType.vue
@@ -9,6 +9,11 @@
       </el-breadcrumb>
     </div>
     <div class="filter-container">
+      <div class="search">
+        <el-input placeholder="模糊查询" v-model="params.query" style="width: 300px;">
+          <el-button slot="append" icon="el-icon-search" @click="getData"></el-button>
+        </el-input>
+      </div>
       <div class="checkBtn">
         <el-button type="primary" size="medium" @click="handleAdd">设备类型录入</el-button>
       </div>
@@ -85,7 +90,8 @@ export default {
       params: {
         start: 0,
         limit: 10,
-        group: 10
+        group: 10,
+        query: ''
       },
       pageNum: 1,
       // 列表数据
diff --git a/src/views/dicManage/platformType.vue b/src/views/dicManage/platformType.vue
index ee20423..ad696e1 100644
--- a/src/views/dicManage/platformType.vue
+++ b/src/views/dicManage/platformType.vue
@@ -9,6 +9,11 @@
       </el-breadcrumb>
     </div>
     <div class="filter-container">
+      <div class="search">
+        <el-input placeholder="模糊查询" v-model="params.query" style="width: 300px;">
+          <el-button slot="append" icon="el-icon-search" @click="getData"></el-button>
+        </el-input>
+      </div>
       <div class="checkBtn">
         <el-button type="primary" size="medium" @click="handleAdd">平台类型录入</el-button>
       </div>
@@ -85,7 +90,8 @@ export default {
       params: {
         start: 0,
         limit: 10,
-        group: 10
+        group: 10,
+        query: ''
       },
       pageNum: 1,
       // 列表数据
diff --git a/src/views/dicManage/sharedUnit.vue b/src/views/dicManage/sharedUnit.vue
index e89a52a..38de828 100644
--- a/src/views/dicManage/sharedUnit.vue
+++ b/src/views/dicManage/sharedUnit.vue
@@ -9,6 +9,11 @@
       </el-breadcrumb>
     </div>
     <div class="filter-container">
+      <div class="search">
+        <el-input placeholder="模糊查询" v-model="params.query" style="width: 300px;">
+          <el-button slot="append" icon="el-icon-search" @click="getData"></el-button>
+        </el-input>
+      </div>
       <div class="checkBtn">
         <el-button type="primary" size="medium" @click="handleAdd">共享单位录入</el-button>
       </div>
@@ -101,7 +106,8 @@ export default {
       params: {
         start: 0,
         limit: 10,
-        group: 10
+        group: 10,
+        query: ''
       },
       pageNum: 1,
       // 列表数据
diff --git a/src/views/dicManage/visitorUnit.vue b/src/views/dicManage/visitorUnit.vue
index f2cbe71..933d51f 100644
--- a/src/views/dicManage/visitorUnit.vue
+++ b/src/views/dicManage/visitorUnit.vue
@@ -9,6 +9,11 @@
       </el-breadcrumb>
     </div>
     <div class="filter-container">
+      <div class="search">
+        <el-input placeholder="模糊查询" v-model="params.query" style="width: 300px;">
+          <el-button slot="append" icon="el-icon-search" @click="getData"></el-button>
+        </el-input>
+      </div>
       <div class="checkBtn">
         <el-button type="primary" size="medium" @click="handleAdd">新增参航单位</el-button>
       </div>
@@ -79,7 +84,8 @@ export default {
       params: {
         start: 0,
         limit: 10,
-        group: 10
+        group: 10,
+        query: ''
       },
       pageNum: 1,
       // 列表数据
diff --git a/src/views/home.vue b/src/views/home.vue
index 2d811d2..dd4389b 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -18,11 +18,11 @@
             </div>
             <div class="left2">
               <div class="left2_1">
-                <p>56,204</p>
+                <p>{{ statistics.DataTotal }}</p>
                 <span>数据样品数</span>
               </div>
               <div class="left2_1">
-                <p>260</p>
+                <p>{{ statistics.DatasetTotal }}</p>
                 <span>数据集个数</span>
               </div>
             </div>
@@ -33,23 +33,23 @@
             </div>
             <div class="right2">
               <div class="right2_1">
-                <p>204</p>
+                <p>{{ statistics.VoyageTotal }}</p>
                 <span>航次个数</span>
               </div>
               <div class="right2_1">
-                <p>360</p>
+                <p>{{ statistics.DayTotal }}</p>
                 <span>航次天数</span>
               </div>
               <div class="right2_1">
-                <p>204</p>
+                <p>{{ statistics.ShenHaiTotal }}</p>
                 <span>“深海勇士”号潜次数</span>
               </div>
               <div class="right2_1">
-                <p>204</p>
+                <p>{{ statistics.FenDouTotal }}</p>
                 <span>“奋斗者”号潜次数</span>
               </div>
               <div class="right2_1">
-                <p>5,623</p>
+                <p>{{ statistics.MileageTotal }}</p>
                 <span>航行里程</span>
               </div>
             </div>
@@ -155,6 +155,7 @@
         </div>
       </div>
     </div>
+
     <div class="dongtai">
 
       <el-row>
@@ -171,19 +172,32 @@
       </el-row>
       <div class="dongtai_bot">
         <ul>
-          <li v-for="(item, index) in newsList" :key="index" @click="turnPage('news')">
+          <li v-for="(item, index) in dataUpdateList" :key="index" @click="turnDetailPage(item)">
             <div class="date">
-              <p>{{ item.day }}</p>
-              <span>{{ item.date }}</span>
+              <p>{{ item.voyage_end_date.slice(8,10) }}</p>
+              <span>{{ item.voyage_end_date.slice(0,7) }}</span>
             </div>
             <div class="des">
-              <p>{{ item.title }}</p>
-              <span>{{ item.des }}</span>
+              <p>{{ item.voyage_name }}</p>
+              <span>{{ item.voyage_remark }}</span>
+            </div>
+          </li>
+        </ul>
+        <ul>
+          <li v-for="(item, index) in sampleDataUpdateList" :key="index">
+            <div class="date">
+              <p>{{ item.create_time.slice(8,10) }}</p>
+              <span>{{ item.create_time.slice(0,7) }}</span>
+            </div>
+            <div class="des">
+              <p>{{ item.dataset_name }}</p>
+              <span>{{ item.job_type }}</span>
             </div>
           </li>
         </ul>
       </div>
     </div>
+
     <div class="gongju">
       <div class="gongju_top">
         <img src="../../static/images/shuju5.png" alt="">
@@ -216,9 +230,10 @@
 
 <script>
 import Footer from '../components/public/Footer'
-import { getVoyage, getVoyageLine, getParamsList } from '../api/home'
+import { getVoyage, getVoyageLine, getParamsList, statisticsNums } from '../api/home'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/swiper-bundle.css'
+import { sampleDatasetList, voyageRegList } from '@/api/dataTransfer'
 const Cesium = window.Cesium
 
 export default {
@@ -230,6 +245,7 @@ export default {
   },
   data() {
     return {
+      statistics: {},
       movementTimer: null,
       iconImgW: require('../../static/images/14-w.png'),
       map: null,
@@ -267,50 +283,8 @@ export default {
       },
       chooseIndex: -1,
       voyageList: [],
-      newsList: [
-        {
-          title:
-            '深海工程菌SS-DY31-Ⅱ-W1306-BC-1 样品数据发布，包含4个目、7个科、15个属的共1232个样品数据。',
-          des: '海底热液循环可以改变海水和洋壳的化学组成，也会影响洋壳的增生和冷却过程，对于理解...',
-          day: '25',
-          date: '2023-03'
-        },
-        {
-          title:
-            '深海工程菌SS-DY31-Ⅱ-W1306-BC-1 样品数据发布，包含4个目、7个科、15个属的共1232个样品数据。',
-          des: '海底热液循环可以改变海水和洋壳的化学组成，也会影响洋壳的增生和冷却过程，对于理解...',
-          day: '25',
-          date: '2023-03'
-        },
-        {
-          title:
-            '深海工程菌SS-DY31-Ⅱ-W1306-BC-1 样品数据发布，包含4个目、7个科、15个属的共1232个样品数据。',
-          des: '海底热液循环可以改变海水和洋壳的化学组成，也会影响洋壳的增生和冷却过程，对于理解...',
-          day: '25',
-          date: '2023-03'
-        },
-        {
-          title:
-            '深海工程菌SS-DY31-Ⅱ-W1306-BC-1 样品数据发布，包含4个目、7个科、15个属的共1232个样品数据。',
-          des: '海底热液循环可以改变海水和洋壳的化学组成，也会影响洋壳的增生和冷却过程，对于理解...',
-          day: '25',
-          date: '2023-03'
-        },
-        {
-          title:
-            '深海工程菌SS-DY31-Ⅱ-W1306-BC-1 样品数据发布，包含4个目、7个科、15个属的共1232个样品数据。',
-          des: '海底热液循环可以改变海水和洋壳的化学组成，也会影响洋壳的增生和冷却过程，对于理解...',
-          day: '25',
-          date: '2023-03'
-        },
-        {
-          title:
-            '深海工程菌SS-DY31-Ⅱ-W1306-BC-1 样品数据发布，包含4个目、7个科、15个属的共1232个样品数据。',
-          des: '海底热液循环可以改变海水和洋壳的化学组成，也会影响洋壳的增生和冷却过程，对于理解...',
-          day: '25',
-          date: '2023-03'
-        }
-      ],
+      dataUpdateList: [],
+      sampleDataUpdateList: [],
       viewer: null,
       color: [Cesium.Color.RED, Cesium.Color.GREEN, Cesium.Color.BLUE, Cesium.Color.CHARTREUSE, Cesium.Color.DARKBLUE],
       // 地图图层基础地址
@@ -326,6 +300,9 @@ export default {
   created() {
     this.getVoyageList()
     this.getParams()
+    this.getStatisticsNums()
+    this.dataUpdate()
+    this.sampleDataUpdate()
   },
   mounted() {
     // this.initCesium()
@@ -496,14 +473,44 @@ export default {
       this.chooseIndex = i
       this.drawLine(i, item.tsy_id, item.points)
     },
-    // 页面跳转
-    turnPage(val, a) {
-      if (!a) {
-        this.$router.push({ name: val })
-      } else {
-        window.open(val, '_blank')
-      }
+    // 统计数据
+    getStatisticsNums() {
+      statisticsNums().then(res => {
+        this.statistics = res.map
+      })
     },
+    // 数据更新动态
+    dataUpdate() {
+      voyageRegList({
+        start: 0,
+        limit: 3,
+        group: 10,
+        order: 'voyage_end_date',
+        type: 'DESC'
+      }).then(res => {
+        this.dataUpdateList = res.page.records
+      })
+    },
+    // 跳转到航次详情页
+    turnDetailPage(item) {
+      this.$router.push({
+        name: 'dataDetail',
+        query: {
+          voyage_name: item.voyage_name
+        }
+      })
+    },
+    // 样品数据引用动态
+    sampleDataUpdate() {
+      sampleDatasetList({
+        start: 0,
+        limit: 3,
+        group: 10,
+      }).then(res => {
+        console.log(res)
+        this.sampleDataUpdateList = res.page.records
+      })
+    }
   }
 }
 </script>
@@ -1073,9 +1080,11 @@ export default {
     .dongtai_bot {
       width: 85%;
       height: auto;
+      display: flex;
+      justify-content: space-between;
 
       ul {
-        width: 100%;
+        width: 45%;
         height: auto;
         display: flex;
         flex-wrap: wrap;
@@ -1083,7 +1092,7 @@ export default {
 
         li {
           margin-bottom: 35px;
-          width: 48%;
+          width: 100%;
           height: 170px;
           background: #fff;
           border-radius: 10px;
diff --git a/src/views/login.vue b/src/views/login.vue
index 0f2b6b4..caf9138 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -76,7 +76,7 @@ export default {
           initInfo().then(res => {
             Cookies.set('JSESSIONID', res.map.FrameSessionId);
             this.isLogin = res.login
-            location.href = '/'
+            location.href = './'
           })
         } else {
           this.$message.error(res.errorMsg)
diff --git a/static/images/logo_map.png b/static/images/logo_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab04e777445cdecd3f289473bb1efe32dac4eff8
GIT binary patch
literal 9640
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%0D$Oo(PBunJ({emju$iseYJ=pxT*X#wo|Ss>L(RQt
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

literal 0
HcmV?d00001