From 3a8d041d0806a88b0c28176e9cc54203b977cc12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=A3=AE?= <gaosen@thinkenergy.net.cn>
Date: Fri, 11 Mar 2022 16:42:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=83=A8=E7=BD=B2=E7=94=9F=E4=BA=A7=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/src/App.vue                      | 34 -------------------
 webapp/src/config/index.js              | 44 +++++++++++++++++++++++--
 webapp/src/views/dataset/list/index.vue |  1 -
 webapp/src/views/login.vue              | 20 ++++++++++-
 4 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/webapp/src/App.vue b/webapp/src/App.vue
index 3d04fe1..b0c353f 100644
--- a/webapp/src/App.vue
+++ b/webapp/src/App.vue
@@ -7,50 +7,16 @@
 </template>
 
 <script>
-import { dictByName } from '@/api/dict.js';
-import { getToken } from '@/utils/auth';
-import { TokenKey } from '@/settings';
 
 export default {
   name: 'App',
-  watch: {
-    $route() {
-      this.initDic();
-    },
-  },
   mounted() {
     const script = document.createElement('script');
     script.type = 'text/javascript';
     script.src = 'https://s9.cnzz.com/z_stat.php?id=1280834206&web_id=1280834206';
     document.getElementsByTagName('head')[0].appendChild(script);
   },
-  created() {
-    this.initDic();
-  },
   methods: {
-    initDic() {
-      if (!getToken(TokenKey)) {
-        return;
-      }
-      //  数据集类型
-      dictByName('dataset_type').then((res) => {
-        if (res) {
-          this.$store.state.app.datasetType = res.dictDetails;
-        }
-      });
-      // 模型类别
-      dictByName('model_category').then((res) => {
-        if (res) {
-          this.$store.state.app.modelType = res.dictDetails;
-        }
-      });
-      // 标签类型
-      dictByName('label_type').then((res) => {
-        if (res) {
-          this.$store.state.app.labelType = res.dictDetails;
-        }
-      });
-    },
     /**
      * @description: 获取缩放值
      * @param { Void }
diff --git a/webapp/src/config/index.js b/webapp/src/config/index.js
index 3133b92..1ff333a 100644
--- a/webapp/src/config/index.js
+++ b/webapp/src/config/index.js
@@ -38,7 +38,7 @@ export const API_MODULE_NAME = {
 
 // 登录、注册参数配置
 export const loginConfig = {
-  //allowRegister: process.env.NODE_ENV !== 'production', // 是否允许注册
+  // allowRegister: process.env.NODE_ENV !== 'production', // 是否允许注册
   allowRegister: true, // 是否允许注册
 };
 
@@ -77,9 +77,47 @@ export const atlasConfig = {
 };
 
 // demo list
-export const algList = [];
+export const algList = [
+  {
+    id: 10,
+    auxInfo: '健康状态',
+  },
+  {
+    id: 11,
+    auxInfo: '安全预警',
+  },
+  {
+    id: 12,
+    auxInfo: '异常检测',
+  },
+  {
+    id: 13,
+    auxInfo: '其他',
+  },
+];
 
-export const typeList = [];
+export const typeList = [
+  {
+    label: '车端数据',
+    value: 102,
+    code: 102,
+  },
+  {
+    label: '桩端数据',
+    value: 101,
+    code: 101,
+  },
+  {
+    label: '实验数据',
+    value: 105,
+    code: 105,
+  },
+  {
+    label: '其他',
+    value: 106,
+    code: 106,
+  },
+];
 
 // 根据 code 编码放回标注类型（数据集数据类型）
 export const datasetTypeBy = (valueBy) => (value, key) => {
diff --git a/webapp/src/views/dataset/list/index.vue b/webapp/src/views/dataset/list/index.vue
index 43cfb8c..2f9e722 100644
--- a/webapp/src/views/dataset/list/index.vue
+++ b/webapp/src/views/dataset/list/index.vue
@@ -363,7 +363,6 @@ import EditDataset from './edit-dataset';
 import UploadDataFile from './upload-datafile';
 import '../style/list.scss';
 import { datasetTypeBy } from '@/config/index';
-import { dictByName } from '@/api/dict.js';
 
 const defaultForm = {
   id: null,
diff --git a/webapp/src/views/login.vue b/webapp/src/views/login.vue
index 85dade6..f62a1c8 100644
--- a/webapp/src/views/login.vue
+++ b/webapp/src/views/login.vue
@@ -157,7 +157,7 @@ import LoginPublic from '@/components/LoginPublic';
 import { loginConfig } from '@/config';
 import Privacy from './privacy.vue';
 import Agreement from './agreement.vue';
-
+import { dictByName } from '@/api/dict.js';
 export default {
   name: 'Login',
   components: {
@@ -269,6 +269,24 @@ export default {
             .then(() => {
               this.loading = false;
               this.$router.push({ path: '/' });
+
+              dictByName('dataset_type').then((res) => {
+                if (res) {
+                  this.$store.state.app.datasetType = res.dictDetails;
+                }
+              });
+              // 模型类别
+              dictByName('model_category').then((res) => {
+                if (res) {
+                  this.$store.state.app.modelType = res.dictDetails;
+                }
+              });
+              // 标签类型
+              dictByName('label_type').then((res) => {
+                if (res) {
+                  this.$store.state.app.labelType = res.dictDetails;
+                }
+              });
             })
             .catch((err) => {
               const msg = err.message;

From 431d3ccf2caae65b994a823bf80f972163b481d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=A3=AE?= <gaosen@thinkenergy.net.cn>
Date: Sat, 12 Mar 2022 16:55:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=AC=AC=E5=8D=81=E4=B8=80=E5=91=A8bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/src/App.vue                            |  1 -
 webapp/src/layout/components/Navbar/index.vue | 21 +++-------
 webapp/src/router/index.js                    | 37 ++++++++++-------
 webapp/src/views/cloudServing/formPage.vue    |  4 +-
 webapp/src/views/login.vue                    | 20 +---------
 webapp/src/views/register.vue                 |  3 ++
 webapp/src/views/resetpassword.vue            | 40 +++++++++++++++++--
 7 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/webapp/src/App.vue b/webapp/src/App.vue
index b0c353f..3f253c1 100644
--- a/webapp/src/App.vue
+++ b/webapp/src/App.vue
@@ -7,7 +7,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'App',
   mounted() {
diff --git a/webapp/src/layout/components/Navbar/index.vue b/webapp/src/layout/components/Navbar/index.vue
index 673875f..23d4cbf 100644
--- a/webapp/src/layout/components/Navbar/index.vue
+++ b/webapp/src/layout/components/Navbar/index.vue
@@ -1,18 +1,9 @@
-/*
-* Copyright 2019-2020 Zheng Jie
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+/* * Copyright 2019-2020 Zheng Jie * * Licensed under the Apache License, Version 2.0 (the
+"License"); * you may not use this file except in compliance with the License. * You may obtain a
+copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+applicable law or agreed to in writing, software * distributed under the License is distributed on
+an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See
+the License for the specific language governing permissions and * limitations under the License. */
 
 <template>
   <div class="navbar">
diff --git a/webapp/src/router/index.js b/webapp/src/router/index.js
index 0472769..6afca88 100644
--- a/webapp/src/router/index.js
+++ b/webapp/src/router/index.js
@@ -23,6 +23,7 @@ import { userMenus } from '@/api/user';
 import { getToken } from '@/utils/auth'; // getToken from cookie
 import { updateTitle } from '@/utils';
 import MinioClient from '@/utils/minIO';
+import { dictByName } from '@/api/dict.js';
 import constantRoutes from './routes';
 
 const originalPush = VueRouter.prototype.push;
@@ -66,18 +67,6 @@ const loadUserMenus = (next, to) => {
     // 批量服务 -> SDK服务
     // 在线服务 -> API服务
     const _res = res.filter((route) => {
-      // if (route.name === '云端Serving') {
-      //   route.meta.title = '云端部署';
-      //   const list = route.children.filter((item) => !item.hidden);
-      //   list.forEach((i) => {
-      //     if (i?.meta?.title === '在线服务') {
-      //       i.meta.title = 'API服务';
-      //     }
-      //     if (i?.meta?.title === '批量服务') {
-      //       i.meta.title = 'SDK服务';
-      //     }
-      //   });
-      // }
       return route.name !== '模型炼知';
     });
 
@@ -100,10 +89,28 @@ router.beforeEach(async (to, from, next) => {
   if (getToken()) {
     // 全局 minioClient 只初始化一次
     if (!window.minioClient) {
-      const instance = new MinioClient();
-      const minioClient = await instance.init();
-      window.minioClient = minioClient;
+      // const instance = new MinioClient();
+      // const minioClient = await instance.init();
+      // window.minioClient = minioClient;
     }
+    //  获取字典值
+    dictByName('dataset_type').then((res) => {
+      if (res) {
+        store.state.app.datasetType = res.dictDetails;
+      }
+    });
+    // 模型类别
+    dictByName('model_category').then((res) => {
+      if (res) {
+        store.state.app.modelType = res.dictDetails;
+      }
+    });
+    // 标签类型
+    dictByName('label_type').then((res) => {
+      if (res) {
+        store.state.app.labelType = res.dictDetails;
+      }
+    });
     // 已登录且要跳转的页面是登录页
     if (to.path === '/login') {
       next({ path: '/' });
diff --git a/webapp/src/views/cloudServing/formPage.vue b/webapp/src/views/cloudServing/formPage.vue
index 99d5c8e..0254cac 100644
--- a/webapp/src/views/cloudServing/formPage.vue
+++ b/webapp/src/views/cloudServing/formPage.vue
@@ -33,7 +33,7 @@ import BatchServingForm from './components/forms/batchServingForm';
 
 const FORM_MAP = {
   onlineServing: {
-    title: '在线',
+    title: 'API',
     listPageName: 'CloudServing',
     submitFunc: {
       add: onlineAdd,
@@ -41,7 +41,7 @@ const FORM_MAP = {
     },
   },
   batchServing: {
-    title: '批量',
+    title: 'SDK',
     listPageName: 'BatchServing',
     submitFunc: {
       add: batchAdd,
diff --git a/webapp/src/views/login.vue b/webapp/src/views/login.vue
index f62a1c8..85dade6 100644
--- a/webapp/src/views/login.vue
+++ b/webapp/src/views/login.vue
@@ -157,7 +157,7 @@ import LoginPublic from '@/components/LoginPublic';
 import { loginConfig } from '@/config';
 import Privacy from './privacy.vue';
 import Agreement from './agreement.vue';
-import { dictByName } from '@/api/dict.js';
+
 export default {
   name: 'Login',
   components: {
@@ -269,24 +269,6 @@ export default {
             .then(() => {
               this.loading = false;
               this.$router.push({ path: '/' });
-
-              dictByName('dataset_type').then((res) => {
-                if (res) {
-                  this.$store.state.app.datasetType = res.dictDetails;
-                }
-              });
-              // 模型类别
-              dictByName('model_category').then((res) => {
-                if (res) {
-                  this.$store.state.app.modelType = res.dictDetails;
-                }
-              });
-              // 标签类型
-              dictByName('label_type').then((res) => {
-                if (res) {
-                  this.$store.state.app.labelType = res.dictDetails;
-                }
-              });
             })
             .catch((err) => {
               const msg = err.message;
diff --git a/webapp/src/views/register.vue b/webapp/src/views/register.vue
index 4e5ce9b..0c3ac39 100644
--- a/webapp/src/views/register.vue
+++ b/webapp/src/views/register.vue
@@ -419,6 +419,9 @@ export default {
                 ? 'Emails cannot be sent more than three times!'
                 : '邮件发送不能超过三次!';
           }
+          if (msg === '系统繁忙!') {
+            str = this.$i18n.locale === 'en' ? 'The system is busy!' : '系统繁忙!';
+          }
           this.codeLoading = false;
           this.$message({
             message: str || err.message,
diff --git a/webapp/src/views/resetpassword.vue b/webapp/src/views/resetpassword.vue
index 612bf3c..5ee9146 100644
--- a/webapp/src/views/resetpassword.vue
+++ b/webapp/src/views/resetpassword.vue
@@ -34,7 +34,7 @@ the License. * ============================================================= */
       >
         <el-form-item prop="email">
           <el-input
-            v-model="registerForm.email"
+            v-model.trim="registerForm.email"
             auto-complete="on"
             :placeholder="$t('resetPsdEmail')"
           >
@@ -43,7 +43,7 @@ the License. * ============================================================= */
         </el-form-item>
         <el-form-item prop="code">
           <el-input
-            v-model="registerForm.code"
+            v-model.trim="registerForm.code"
             style="width: 57%"
             :placeholder="$t('resetPsdCode')"
           >
@@ -248,6 +248,17 @@ export default {
                 ? 'The email address format is incorrect'
                 : '邮箱地址格式有误';
           }
+
+          if (msg === '邮件发送不能超过三次!') {
+            str =
+              this.$i18n.locale === 'en'
+                ? 'Emails cannot be sent more than three times!'
+                : '邮件发送不能超过三次!';
+          }
+
+          if (msg === '系统繁忙!') {
+            str = this.$i18n.locale === 'en' ? 'The system is busy!' : '系统繁忙!';
+          }
           this.$message({
             message: str || err.message,
             type: 'error',
@@ -278,8 +289,31 @@ export default {
             })
             .catch((err) => {
               this.loading = false;
+              const msg = err.message;
+              let str = '';
+              if (msg === '邮箱验证码已过期!') {
+                str =
+                  this.$i18n.locale === 'en'
+                    ? 'The email verification code has expired!'
+                    : '邮箱验证码已过期!';
+              }
+              if (msg === '系统繁忙!') {
+                str = this.$i18n.locale === 'en' ? 'The system is busy!' : '系统繁忙!';
+              }
+              if (msg === '该邮箱未注册!') {
+                str =
+                  this.$i18n.locale === 'en'
+                    ? 'The email address is not registered!'
+                    : '该邮箱未注册!';
+              }
+              if (msg === '邮箱地址或验证码错误、请重新输入!') {
+                str =
+                  this.$i18n.locale === 'en'
+                    ? 'Email address or verification code is incorrect, please re-enter it!'
+                    : '邮箱地址或验证码错误、请重新输入!';
+              }
               this.$message({
-                message: err.message,
+                message: str || err.message,
                 type: 'error',
               });
             });

From 1b6186ecbb9b42669a45622bd30e2d535bc9423c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=A3=AE?= <gaosen@thinkenergy.net.cn>
Date: Sat, 12 Mar 2022 16:56:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=AC=AC=E5=8D=81=E4=B8=80=E5=91=A8bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/src/router/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/src/router/index.js b/webapp/src/router/index.js
index 6afca88..79b03b3 100644
--- a/webapp/src/router/index.js
+++ b/webapp/src/router/index.js
@@ -89,9 +89,9 @@ router.beforeEach(async (to, from, next) => {
   if (getToken()) {
     // 全局 minioClient 只初始化一次
     if (!window.minioClient) {
-      // const instance = new MinioClient();
-      // const minioClient = await instance.init();
-      // window.minioClient = minioClient;
+      const instance = new MinioClient();
+      const minioClient = await instance.init();
+      window.minioClient = minioClient;
     }
     //  获取字典值
     dictByName('dataset_type').then((res) => {