Merge pull request #398 from ZJUEarthData/dev/trenki

feat、The addition of an introductory page
ZJUEarthData · Nov 19, 2024 · 70881d1 · 70881d1
2 parents b07c6e9 + 5d1e29d
commit 70881d1
Show file tree

Hide file tree

Showing 35 changed files with 823 additions and 64 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -44,7 +44,7 @@ repos:
         name: Large Files Checker
         description: Checks for large files added to git.
         types: [file]
-        exclude: ^node_modules/
+        exclude: (^node_modules/|^geochemistrypi/frontend/public/imgs/|^geochemistrypi/frontend/src/assets/imgs/)
 
   - repo: https://github.com/pycqa/flake8
     rev: 6.0.0

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -40,6 +40,7 @@
     "dify.js",
     ("https://udify.app/embed.min.js", {"defer": "true", "id": "T76i6OWatem8lTEs"}),
 ]
+html_css_files = ["custom.css"]
 html_theme_options = {
     "top_of_page_button": "edit",
     "sidebar_hide_name": True,

diff --git a/docs/source/python_apis/geochemistrypi.data_mining.utils.rst b/docs/source/python_apis/geochemistrypi.data_mining.utils.rst
@@ -28,6 +28,14 @@ geochemistrypi.data\_mining.utils.mlflow\_utils module
    :undoc-members:
    :show-inheritance:
 
+geochemistrypi.data\_mining.utils.toggle\_address\_status module
+----------------------------------------------------------------
+
+.. automodule:: geochemistrypi.data_mining.utils.toggle_address_status
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

diff --git a/docs/source/static/custom.css b/docs/source/static/custom.css
@@ -0,0 +1,19 @@
+
+  #dify-chatbot-bubble-button {
+    background-color: #1C64F2 !important;
+    width: 200px !important;
+  }
+
+  #dify-chatbot-bubble-button>div::after {
+    content: 'Chatbot 聊天机器人';
+    display: inline-block;
+    margin-left: 8px;
+    color: #fff;
+    font-size: 16px;
+
+  }
+
+  #dify-chatbot-bubble-window {
+    width: 40rem !important;
+    height: 64rem !important;
+  }
diff --git a/geochemistrypi/frontend/eslint.config.js b/geochemistrypi/frontend/eslint.config.js
@@ -16,7 +16,8 @@ export default [
       'space-before-function-paren': 0,
       'generator-star-spacing': 'off',
       'object-curly-spacing': 0, // Enforce consistent spacing within curly braces
-      'array-bracket-spacing': 0 // square brackets
+      'array-bracket-spacing': 0, // square brackets
+      'no-irregular-whitespace':0
     }
   }
 ]
diff --git a/geochemistrypi/frontend/public/imgs/changruitao.png b/geochemistrypi/frontend/public/imgs/changruitao.png
diff --git a/geochemistrypi/frontend/public/imgs/chanyongkang.png b/geochemistrypi/frontend/public/imgs/chanyongkang.png
diff --git a/geochemistrypi/frontend/public/imgs/dongyating.jpg b/geochemistrypi/frontend/public/imgs/dongyating.jpg
diff --git a/geochemistrypi/frontend/public/imgs/gaomengqi.png b/geochemistrypi/frontend/public/imgs/gaomengqi.png
diff --git a/geochemistrypi/frontend/public/imgs/hecan.png b/geochemistrypi/frontend/public/imgs/hecan.png
diff --git a/geochemistrypi/frontend/public/imgs/laihaibin.png b/geochemistrypi/frontend/public/imgs/laihaibin.png
diff --git a/geochemistrypi/frontend/public/imgs/linzhelan.png b/geochemistrypi/frontend/public/imgs/linzhelan.png
diff --git a/geochemistrypi/frontend/public/imgs/lishuyi.jpg b/geochemistrypi/frontend/public/imgs/lishuyi.jpg
diff --git a/geochemistrypi/frontend/public/imgs/qiuguoqiang.png b/geochemistrypi/frontend/public/imgs/qiuguoqiang.png
diff --git a/geochemistrypi/frontend/public/imgs/sunjianhao.png b/geochemistrypi/frontend/public/imgs/sunjianhao.png
diff --git a/geochemistrypi/frontend/public/imgs/wanghaibin.png b/geochemistrypi/frontend/public/imgs/wanghaibin.png
diff --git a/geochemistrypi/frontend/public/imgs/wangjunbo.png b/geochemistrypi/frontend/public/imgs/wangjunbo.png
diff --git a/geochemistrypi/frontend/public/imgs/wengpanyan.png b/geochemistrypi/frontend/public/imgs/wengpanyan.png
diff --git a/geochemistrypi/frontend/public/imgs/yaosiqi.png b/geochemistrypi/frontend/public/imgs/yaosiqi.png
diff --git a/geochemistrypi/frontend/src/App.vue b/geochemistrypi/frontend/src/App.vue
@@ -4,7 +4,7 @@ import NavBar from './components/nav-bar.vue'
 </script>
 
 <template>
-  <header>
+  <header v-if="!$route.meta.noNav">
     <NavBar />
   </header>
 

diff --git a/geochemistrypi/frontend/src/assets/imgs/about_bg.jpg b/geochemistrypi/frontend/src/assets/imgs/about_bg.jpg
diff --git a/geochemistrypi/frontend/src/assets/imgs/ddeColorfulLogo.png b/geochemistrypi/frontend/src/assets/imgs/ddeColorfulLogo.png
diff --git a/geochemistrypi/frontend/src/assets/imgs/ddeLogo.png b/geochemistrypi/frontend/src/assets/imgs/ddeLogo.png
diff --git a/geochemistrypi/frontend/src/assets/imgs/hecan.png b/geochemistrypi/frontend/src/assets/imgs/hecan.png
diff --git a/geochemistrypi/frontend/src/assets/imgs/zhangzhou.png b/geochemistrypi/frontend/src/assets/imgs/zhangzhou.png
diff --git a/geochemistrypi/frontend/src/components/nav-bar.vue b/geochemistrypi/frontend/src/components/nav-bar.vue
@@ -15,8 +15,21 @@ import { RouterLink } from 'vue-router'
           </svg><!--]--></i>Github</a>
       <a href="https://geochemistrypi.readthedocs.io/en/latest/" target="_blank">Docs</a>
       <RouterLink to="/guide">About us </RouterLink>
-      <RouterLink to="/"><span class="link-start">Get started</span></RouterLink>
-      <RouterLink to="/">Sign in</RouterLink>
+      <!-- <RouterLink to="/"><span class="link-start">Get started</span></RouterLink>
+      <RouterLink to="/">Sign in</RouterLink> -->
+      <RouterLink to="/" style="margin-left: 60px;"><svg width="30" height="30" viewBox="0 0 30 30" fill="none"
+          xmlns="http://www.w3.org/2000/svg">
+          <path
+            d="M27.6667 30L17.1667 19.5C16.3333 20.1667 15.375 20.6944 14.2917 21.0833C13.2083 21.4722 12.0556 21.6667 10.8333 21.6667C7.80556 21.6667 5.24306 20.6181 3.14583 18.5208C1.04861 16.4236 0 13.8611 0 10.8333C0 7.80556 1.04861 5.24306 3.14583 3.14583C5.24306 1.04861 7.80556 0 10.8333 0C13.8611 0 16.4236 1.04861 18.5208 3.14583C20.6181 5.24306 21.6667 7.80556 21.6667 10.8333C21.6667 12.0556 21.4722 13.2083 21.0833 14.2917C20.6944 15.375 20.1667 16.3333 19.5 17.1667L30 27.6667L27.6667 30ZM10.8333 18.3333C12.9167 18.3333 14.6875 17.6042 16.1458 16.1458C17.6042 14.6875 18.3333 12.9167 18.3333 10.8333C18.3333 8.75 17.6042 6.97917 16.1458 5.52083C14.6875 4.0625 12.9167 3.33333 10.8333 3.33333C8.75 3.33333 6.97917 4.0625 5.52083 5.52083C4.0625 6.97917 3.33333 8.75 3.33333 10.8333C3.33333 12.9167 4.0625 14.6875 5.52083 16.1458C6.97917 17.6042 8.75 18.3333 10.8333 18.3333Z"
+            fill="#F25B28" />
+        </svg>
+      </RouterLink>
+      <RouterLink to="/"><svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <path
+            d="M10.5 18.375C9.975 18.375 9.53125 18.1938 9.16875 17.8312C8.80625 17.4688 8.625 17.025 8.625 16.5C8.625 15.975 8.80625 15.5312 9.16875 15.1688C9.53125 14.8063 9.975 14.625 10.5 14.625C11.025 14.625 11.4688 14.8063 11.8313 15.1688C12.1938 15.5312 12.375 15.975 12.375 16.5C12.375 17.025 12.1938 17.4688 11.8313 17.8312C11.4688 18.1938 11.025 18.375 10.5 18.375ZM19.5 18.375C18.975 18.375 18.5312 18.1938 18.1688 17.8312C17.8062 17.4688 17.625 17.025 17.625 16.5C17.625 15.975 17.8062 15.5312 18.1688 15.1688C18.5312 14.8063 18.975 14.625 19.5 14.625C20.025 14.625 20.4688 14.8063 20.8312 15.1688C21.1938 15.5312 21.375 15.975 21.375 16.5C21.375 17.025 21.1938 17.4688 20.8312 17.8312C20.4688 18.1938 20.025 18.375 19.5 18.375ZM15 27C18.35 27 21.1875 25.8375 23.5125 23.5125C25.8375 21.1875 27 18.35 27 15C27 14.4 26.9625 13.8188 26.8875 13.2563C26.8125 12.6938 26.675 12.15 26.475 11.625C25.95 11.75 25.425 11.8438 24.9 11.9062C24.375 11.9688 23.825 12 23.25 12C20.975 12 18.825 11.5125 16.8 10.5375C14.775 9.5625 13.05 8.2 11.625 6.45C10.825 8.4 9.68125 10.0938 8.19375 11.5312C6.70625 12.9688 4.975 14.05 3 14.775V15C3 18.35 4.1625 21.1875 6.4875 23.5125C8.8125 25.8375 11.65 27 15 27ZM15 30C12.925 30 10.975 29.6062 9.15 28.8187C7.325 28.0312 5.7375 26.9625 4.3875 25.6125C3.0375 24.2625 1.96875 22.675 1.18125 20.85C0.39375 19.025 0 17.075 0 15C0 12.925 0.39375 10.975 1.18125 9.15C1.96875 7.325 3.0375 5.7375 4.3875 4.3875C5.7375 3.0375 7.325 1.96875 9.15 1.18125C10.975 0.39375 12.925 0 15 0C17.075 0 19.025 0.39375 20.85 1.18125C22.675 1.96875 24.2625 3.0375 25.6125 4.3875C26.9625 5.7375 28.0312 7.325 28.8187 9.15C29.6062 10.975 30 12.925 30 15C30 17.075 29.6062 19.025 28.8187 20.85C28.0312 22.675 26.9625 24.2625 25.6125 25.6125C24.2625 26.9625 22.675 28.0312 20.85 28.8187C19.025 29.6062 17.075 30 15 30ZM12.975 3.1875C14.025 4.9375 15.45 6.34375 17.25 7.40625C19.05 8.46875 21.05 9 23.25 9C23.6 9 23.9375 8.98125 24.2625 8.94375C24.5875 8.90625 24.925 8.8625 25.275 8.8125C24.225 7.0625 22.8 5.65625 21 4.59375C19.2 3.53125 17.2 3 15 3C14.65 3 14.3125 3.01875 13.9875 3.05625C13.6625 3.09375 13.325 3.1375 12.975 3.1875ZM3.6375 11.2125C4.9125 10.4875 6.025 9.55 6.975 8.4C7.925 7.25 8.6375 5.9625 9.1125 4.5375C7.8375 5.2625 6.725 6.2 5.775 7.35C4.825 8.5 4.1125 9.7875 3.6375 11.2125Z"
+            fill="#F25B28" />
+        </svg>
+      </RouterLink>
     </div>
   </nav>
 </template>
@@ -37,12 +50,15 @@ import { RouterLink } from 'vue-router'
 
   .nav-link {
     display: flex;
+    align-items: center;
 
     a {
       color: #fff;
       margin-right: 45px;
       line-height: 36px;
-      font-size: 24px;
+      font-size: 20px;
+      display: flex;
+      align-items: center;
 
       &:last-of-type {
         margin-right: 0px;

diff --git a/geochemistrypi/frontend/src/main.ts b/geochemistrypi/frontend/src/main.ts
@@ -1,6 +1,6 @@
 import './assets/style/main.scss'
 import 'element-plus/dist/index.css'
-
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 
@@ -13,3 +13,6 @@ app.use(createPinia())
 app.use(router)
 
 app.mount('#app')
+for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+    app.component(key, component)
+  }
diff --git a/geochemistrypi/frontend/src/router/index.ts b/geochemistrypi/frontend/src/router/index.ts
@@ -8,11 +8,18 @@ const router = createRouter({
       path: '/',
       name: 'home',
       component: HomeView
+    },{
+      path: '/guide',
+      name: 'guide',
+      component: () => import('../views/guide/guide-index.vue')
     },
     {
-      path: '/guide',
-      name: 'about',
-      component: () => import('../views/guide-view/guide-page.vue')
+      path: '/guide-view',
+      name: 'guideView',
+      component: () => import('../views/guide-view/guide-page.vue'),
+      meta:{
+        noNav:true
+      }
     }
   ]
 })

diff --git a/geochemistrypi/frontend/src/views/guide-view/component/group-member.vue b/geochemistrypi/frontend/src/views/guide-view/component/group-member.vue
@@ -0,0 +1,102 @@
+<template>
+	<div class="group-member">
+		<div class="name">
+			<svg width="44" height="30" viewBox="0 0 44 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+				<path
+					d="M0 29.6666V24.5791C0 23.5403 0.259722 22.5778 0.779167 21.6916C1.29861 20.8055 2.01667 20.1333 2.93333 19.675C3.36111 19.4611 3.77361 19.2625 4.17083 19.0791C4.59861 18.8958 5.04167 18.7278 5.5 18.575V29.6666H0ZM7.33333 16.8333C5.80556 16.8333 4.50694 16.2986 3.4375 15.2291C2.36806 14.1597 1.83333 12.8611 1.83333 11.3333C1.83333 9.80554 2.36806 8.50692 3.4375 7.43748C4.50694 6.36803 5.80556 5.83331 7.33333 5.83331C8.86111 5.83331 10.1597 6.36803 11.2292 7.43748C12.2986 8.50692 12.8333 9.80554 12.8333 11.3333C12.8333 12.8611 12.2986 14.1597 11.2292 15.2291C10.1597 16.2986 8.86111 16.8333 7.33333 16.8333ZM7.33333 13.1666C7.85278 13.1666 8.28056 12.9986 8.61667 12.6625C8.98333 12.2958 9.16667 11.8528 9.16667 11.3333C9.16667 10.8139 8.98333 10.3861 8.61667 10.05C8.28056 9.68331 7.85278 9.49998 7.33333 9.49998C6.81389 9.49998 6.37083 9.68331 6.00417 10.05C5.66806 10.3861 5.5 10.8139 5.5 11.3333C5.5 11.8528 5.66806 12.2958 6.00417 12.6625C6.37083 12.9986 6.81389 13.1666 7.33333 13.1666ZM7.33333 29.6666V24.5333C7.33333 23.4944 7.59306 22.5472 8.1125 21.6916C8.6625 20.8055 9.38056 20.1333 10.2667 19.675C12.1611 18.7278 14.0861 18.025 16.0417 17.5666C17.9972 17.0778 19.9833 16.8333 22 16.8333C24.0167 16.8333 26.0028 17.0778 27.9583 17.5666C29.9139 18.025 31.8389 18.7278 33.7333 19.675C34.6194 20.1333 35.3222 20.8055 35.8417 21.6916C36.3917 22.5472 36.6667 23.4944 36.6667 24.5333V29.6666H7.33333ZM11 26H33V24.5333C33 24.1972 32.9083 23.8916 32.725 23.6166C32.5722 23.3416 32.3583 23.1278 32.0833 22.975C30.4333 22.15 28.7681 21.5389 27.0875 21.1416C25.4069 20.7139 23.7111 20.5 22 20.5C20.2889 20.5 18.5931 20.7139 16.9125 21.1416C15.2319 21.5389 13.5667 22.15 11.9167 22.975C11.6417 23.1278 11.4125 23.3416 11.2292 23.6166C11.0764 23.8916 11 24.1972 11 24.5333V26ZM22 15C19.9833 15 18.2569 14.2819 16.8208 12.8458C15.3847 11.4097 14.6667 9.68331 14.6667 7.66665C14.6667 5.64998 15.3847 3.92359 16.8208 2.48748C18.2569 1.05137 19.9833 0.333313 22 0.333313C24.0167 0.333313 25.7431 1.05137 27.1792 2.48748C28.6153 3.92359 29.3333 5.64998 29.3333 7.66665C29.3333 9.68331 28.6153 11.4097 27.1792 12.8458C25.7431 14.2819 24.0167 15 22 15ZM22 11.3333C23.0083 11.3333 23.8639 10.9819 24.5667 10.2791C25.3 9.54581 25.6667 8.67498 25.6667 7.66665C25.6667 6.65831 25.3 5.80276 24.5667 5.09998C23.8639 4.36665 23.0083 3.99998 22 3.99998C20.9917 3.99998 20.1208 4.36665 19.3875 5.09998C18.6847 5.80276 18.3333 6.65831 18.3333 7.66665C18.3333 8.67498 18.6847 9.54581 19.3875 10.2791C20.1208 10.9819 20.9917 11.3333 22 11.3333ZM36.6667 16.8333C35.1389 16.8333 33.8403 16.2986 32.7708 15.2291C31.7014 14.1597 31.1667 12.8611 31.1667 11.3333C31.1667 9.80554 31.7014 8.50692 32.7708 7.43748C33.8403 6.36803 35.1389 5.83331 36.6667 5.83331C38.1944 5.83331 39.4931 6.36803 40.5625 7.43748C41.6319 8.50692 42.1667 9.80554 42.1667 11.3333C42.1667 12.8611 41.6319 14.1597 40.5625 15.2291C39.4931 16.2986 38.1944 16.8333 36.6667 16.8333ZM36.6667 13.1666C37.1861 13.1666 37.6139 12.9986 37.95 12.6625C38.3167 12.2958 38.5 11.8528 38.5 11.3333C38.5 10.8139 38.3167 10.3861 37.95 10.05C37.6139 9.68331 37.1861 9.49998 36.6667 9.49998C36.1472 9.49998 35.7042 9.68331 35.3375 10.05C35.0014 10.3861 34.8333 10.8139 34.8333 11.3333C34.8333 11.8528 35.0014 12.2958 35.3375 12.6625C35.7042 12.9986 36.1472 13.1666 36.6667 13.1666ZM38.5 29.6666V18.575C38.9583 18.7278 39.3861 18.8958 39.7833 19.0791C40.2111 19.2625 40.6389 19.4611 41.0667 19.675C41.9833 20.1333 42.7014 20.8055 43.2208 21.6916C43.7403 22.5778 44 23.5403 44 24.5791V29.6666H38.5Z"
+					fill="#F25B28" />
+			</svg>
+			<span class="text">{{ memberInfp.name }}</span>
+		</div>
+		<div class="list-wrapper">
+			<div class="member-box" v-for="item in memberInfp.list" :key="item.id">
+				<div class="member-img"><img :src="item.img" /></div>
+				<div class="member-name">{{ item.name }}</div>
+				<div class="member-other" v-if="item.other">{{ item.other }}</div>
+				<div class="member-from">{{ item.from }}</div>
+			</div>
+		</div>
+	</div>
+</template>
+<script lang="ts" setup>
+import { defineProps } from 'vue'
+const memberInfp = defineProps(['name', 'list'])
+</script>
+<style lang="scss" scoped>
+.group-member {
+	margin-bottom: 60px;
+	.name {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20px;
+
+		.text {
+			font-size: 36px;
+			font-weight: 500;
+			line-height: 52px;
+			text-align: left;
+			color: #0E140F;
+			margin-left: 40px;
+		}
+	}
+
+	.list-wrapper {
+		border-radius: 80px;
+		background: #FBD3C461;
+		padding: 80px 110px 0 110px;
+		display: flex;
+		flex-wrap: wrap;
+
+		.member-box {
+			width: calc(100%/3);
+			height: 380px;
+			text-align: center;
+
+			.member-img {
+				width: 164px;
+				margin: 0 auto;
+				border-radius: 38px;
+				overflow: hidden;
+				margin-bottom: 24px;
+
+				img {
+					width: 164px;
+					height: 164px;
+					object-fit: cover;
+				}
+			}
+
+			.member-name {
+				font-size: 20px;
+				font-weight: 600;
+				line-height: 38px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				&:before {
+					display: inline-block;
+					height: 20px;
+					content: "";
+					width: 20px;
+					border: 2px solid #F25B28;
+					border-radius: 10px;
+					margin-right: 8px;
+				}
+			}
+
+			.member-other {
+				font-size: 20px;
+				font-weight: 500;
+				line-height: 30px;
+				color: #F25B28;
+			}
+
+			.member-from {
+				font-size: 20px;
+				font-weight: 400;
+				line-height: 38px;
+			}
+		}
+	}
+}
+</style>