diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index da74e66c..411364d5 100644 --- 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 index 930f0421..3998a33c 100644 --- 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 index ff0c9fbf..d298ac11 100644 --- 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 new file mode 100644 index 00000000..932ec8cc --- /dev/null +++ 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; + } \ No newline at end of file diff --git a/geochemistrypi/frontend/eslint.config.js b/geochemistrypi/frontend/eslint.config.js index a765afdb..06faf7d5 100644 --- 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 new file mode 100644 index 00000000..93c1556d Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/changruitao.png differ diff --git a/geochemistrypi/frontend/public/imgs/chanyongkang.png b/geochemistrypi/frontend/public/imgs/chanyongkang.png new file mode 100644 index 00000000..13d4a8f0 Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/chanyongkang.png differ diff --git a/geochemistrypi/frontend/public/imgs/dongyating.jpg b/geochemistrypi/frontend/public/imgs/dongyating.jpg new file mode 100644 index 00000000..72dbf5c3 Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/dongyating.jpg differ diff --git a/geochemistrypi/frontend/public/imgs/gaomengqi.png b/geochemistrypi/frontend/public/imgs/gaomengqi.png new file mode 100644 index 00000000..48135e2f Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/gaomengqi.png differ diff --git a/geochemistrypi/frontend/public/imgs/hecan.png b/geochemistrypi/frontend/public/imgs/hecan.png new file mode 100644 index 00000000..aebca3a0 Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/hecan.png differ diff --git a/geochemistrypi/frontend/public/imgs/laihaibin.png b/geochemistrypi/frontend/public/imgs/laihaibin.png new file mode 100644 index 00000000..1e2ebdc8 Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/laihaibin.png differ diff --git a/geochemistrypi/frontend/public/imgs/linzhelan.png b/geochemistrypi/frontend/public/imgs/linzhelan.png new file mode 100644 index 00000000..93ef670c Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/linzhelan.png differ diff --git a/geochemistrypi/frontend/public/imgs/lishuyi.jpg b/geochemistrypi/frontend/public/imgs/lishuyi.jpg new file mode 100644 index 00000000..e7ba1078 Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/lishuyi.jpg differ diff --git a/geochemistrypi/frontend/public/imgs/qiuguoqiang.png b/geochemistrypi/frontend/public/imgs/qiuguoqiang.png new file mode 100644 index 00000000..43752545 Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/qiuguoqiang.png differ diff --git a/geochemistrypi/frontend/public/imgs/sunjianhao.png b/geochemistrypi/frontend/public/imgs/sunjianhao.png new file mode 100644 index 00000000..53741448 Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/sunjianhao.png differ diff --git a/geochemistrypi/frontend/public/imgs/wanghaibin.png b/geochemistrypi/frontend/public/imgs/wanghaibin.png new file mode 100644 index 00000000..fd809c0c Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/wanghaibin.png differ diff --git a/geochemistrypi/frontend/public/imgs/wangjunbo.png b/geochemistrypi/frontend/public/imgs/wangjunbo.png new file mode 100644 index 00000000..30ad98cb Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/wangjunbo.png differ diff --git a/geochemistrypi/frontend/public/imgs/wengpanyan.png b/geochemistrypi/frontend/public/imgs/wengpanyan.png new file mode 100644 index 00000000..55a6e38d Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/wengpanyan.png differ diff --git a/geochemistrypi/frontend/public/imgs/yaosiqi.png b/geochemistrypi/frontend/public/imgs/yaosiqi.png new file mode 100644 index 00000000..37ee1d55 Binary files /dev/null and b/geochemistrypi/frontend/public/imgs/yaosiqi.png differ diff --git a/geochemistrypi/frontend/src/App.vue b/geochemistrypi/frontend/src/App.vue index a088aee9..e62fe5b6 100644 --- a/geochemistrypi/frontend/src/App.vue +++ b/geochemistrypi/frontend/src/App.vue @@ -4,7 +4,7 @@ import NavBar from './components/nav-bar.vue' @@ -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 index bb201932..6d105170 100644 --- 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 index 0c21a0e0..bcbb4858 100644 --- 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 new file mode 100644 index 00000000..2bef0f47 --- /dev/null +++ b/geochemistrypi/frontend/src/views/guide-view/component/group-member.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/geochemistrypi/frontend/src/views/guide-view/component/team-member.vue b/geochemistrypi/frontend/src/views/guide-view/component/team-member.vue new file mode 100644 index 00000000..acf2d473 --- /dev/null +++ b/geochemistrypi/frontend/src/views/guide-view/component/team-member.vue @@ -0,0 +1,259 @@ + + + \ No newline at end of file diff --git a/geochemistrypi/frontend/src/views/guide-view/config/index.ts b/geochemistrypi/frontend/src/views/guide-view/config/index.ts index 2c122b90..77e2b2cf 100644 --- a/geochemistrypi/frontend/src/views/guide-view/config/index.ts +++ b/geochemistrypi/frontend/src/views/guide-view/config/index.ts @@ -1,37 +1,95 @@ -export const memberInfo = [ +export const TechnicalGroup = [ { id: 1, name: 'Jianming Zhao', img: '/imgs/zhaojianming.jpeg', - responsibility: 'Head of Technical Group', - from: 'Zhejiang University, Hangzhou' + other: 'Head of Technical Group', + from: 'Zhejiang University' }, { id: 2, - name: 'Panyan Weng', - img: '/imgs/xiaogou.jpg', - responsibility: 'Frontend developer', - from: 'The University of Sydney, Sydney' + name: 'Chengtu Li', + img: '/imgs/lichengtu.jpg', + from: 'Zhuanzhuan,Beijing' }, { id: 3, - name: 'Jianhao Sun', - img: '/imgs/xiaogou.jpg', - responsibility: 'Head of Product Group', - from: 'China University of Geosciences,Wuhan' + name: 'Yongkang Chan', + img: '/imgs/chanyongkang.png', + from: 'Lanzhou University' }, { id: 4, - name: 'Chengtu Li', - img: '/imgs/lichengtu.jpg', - responsibility: 'Frontend developer', - from: 'Zhuanzhuan,Beijing' + name: 'Ruitao Chang', + img: '/imgs/changruitao.png', + from: 'China University of Geosciences' }, { id: 5, - name: 'Siqi Yao', - img: '/imgs/xiaogou.jpg', - responsibility: 'Member of Product Group', - from: '' + name: 'Mengqi Gao', + img: '/imgs/gaomengqi.png', + from: 'China University of Geosciences' + }, { + id: 6, + name: 'Panyan Weng', + img: '/imgs/wengpanyan.png', + from: 'The University of Sydney' } ] +export const ProductGroup = [{ + id: 1, + name: 'Jianhao Sun', + img: '/imgs/sunjianhao.png', + other: 'Head of Product Group', + from: 'Nanjing University' +}, { + id: 2, + name: 'Junbo Wang', + img: '/imgs/wangjunbo.png', + from: 'China University of Geosciences' +}, { + id: 3, + name: 'Guoqiang Qiu', + img: '/imgs/qiuguoqiang.png', + from: 'Fuzhou University' +}, { + id: 4, + name: 'Haibin Wang', + img: '/imgs/wanghaibin.png', + from: 'The University of Sydney' +}, { + id: 5, + name: 'Haibin Lai', + img: '/imgs/laihaibin.png', + from: 'Southern University of Science and Technology' +}, { + id: 6, + name: 'Siqi Yao', + img: '/imgs/yaosiqi.png', + from: 'Dongguan University Of Technology' +}, { + id: 7, + name: 'Shuyi Li', + img: '/imgs/lishuyi.jpg', + from: 'Communication University of China' +}, { + id: 8, + name: 'Zhelan Lin', + img: '/imgs/linzhelan.png', + from: 'Fuzhou University' +}, { + id: 9, + name: 'Yating Dong', + img: '/imgs/dongyating.jpg', + from: 'Dongguan University Of Technology' +}] + +export const HistoryContributors = [{ + id: 1, + name: 'Haibin Lai', + from: 'Southern University of Science and Technology' +}, { + id: 2, + name: 'Yating Dong', + from: 'Dongguan University Of Technology' +}] diff --git a/geochemistrypi/frontend/src/views/guide-view/guide-page.vue b/geochemistrypi/frontend/src/views/guide-view/guide-page.vue index 2f3fbd45..a661488f 100644 --- a/geochemistrypi/frontend/src/views/guide-view/guide-page.vue +++ b/geochemistrypi/frontend/src/views/guide-view/guide-page.vue @@ -1,55 +1,322 @@ \ No newline at end of file diff --git a/geochemistrypi/frontend/vite.config.js b/geochemistrypi/frontend/vite.config.ts similarity index 100% rename from geochemistrypi/frontend/vite.config.js rename to geochemistrypi/frontend/vite.config.ts diff --git a/package.json b/package.json new file mode 100644 index 00000000..3b033f38 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "@element-plus/icons-vue": "^2.3.1" + } +}