暂时存一下

.env

@@ -1,5 +1,5 @@
 NODE_ENV=production
-VUE_APP_PLATFORM_NAME=XXX平台
+VUE_APP_PLATFORM_NAME=母婴品牌分析系统
 # 开启单点登录
 VUE_APP_SSO=false
 # 开启微应用模式

package-lock.json

@@ -20,6 +20,7 @@
         "cron-parser": "^2.10.0",
         "dayjs": "^1.8.0",
         "dom-align": "1.12.0",
+        "echarts": "^5.5.0",
         "enquire.js": "^2.1.6",
         "js-cookie": "^2.2.0",
         "lodash.get": "^4.4.2",
@@ -9690,6 +9691,20 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "node_modules/echarts": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.0.tgz",
+      "integrity": "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==",
+      "dependencies": {
+        "tslib": "2.3.0",
+        "zrender": "5.5.0"
+      }
+    },
+    "node_modules/echarts/node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -22094,6 +22109,19 @@
       "engines": {
         "node": ">=4"
       }
+    },
+    "node_modules/zrender": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.5.0.tgz",
+      "integrity": "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==",
+      "dependencies": {
+        "tslib": "2.3.0"
+      }
+    },
+    "node_modules/zrender/node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     }
   },
   "dependencies": {
@@ -30310,6 +30338,22 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "echarts": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.0.tgz",
+      "integrity": "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==",
+      "requires": {
+        "tslib": "2.3.0",
+        "zrender": "5.5.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+        }
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -40464,6 +40508,21 @@
           "dev": true
         }
       }
+    },
+    "zrender": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.5.0.tgz",
+      "integrity": "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==",
+      "requires": {
+        "tslib": "2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+        }
+      }
     }
   }
 }

package.json

@@ -10,42 +10,43 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@jeecg/antd-online-mini": "3.4.3-beta2",
-    "ant-design-vue": "^1.7.2",
     "@antv/data-set": "^0.11.4",
-    "viser-vue": "^2.4.8",
+    "@jeecg/antd-online-mini": "3.4.3-beta2",
+    "@tinymce/tinymce-vue": "2.1.0",
+    "@toast-ui/editor": "^2.1.2",
+    "ant-design-vue": "^1.7.2",
     "axios": "^0.18.0",
+    "china-area-data": "^5.0.1",
+    "clipboard": "^2.0.4",
+    "codemirror": "^5.46.0",
+    "cron-parser": "^2.10.0",
     "dayjs": "^1.8.0",
+    "dom-align": "1.12.0",
+    "echarts": "^5.5.0",
     "enquire.js": "^2.1.6",
     "js-cookie": "^2.2.0",
     "lodash.get": "^4.4.2",
     "lodash.pick": "^4.4.0",
     "md5": "^2.2.1",
     "nprogress": "^0.2.0",
+    "qiankun": "^2.5.1",
+    "tinymce": "5.4.1",
+    "viser-vue": "^2.4.8",
     "vue": "^2.6.10",
+    "vue-area-linkage": "^5.1.0",
     "vue-cropper": "^0.5.4",
     "vue-i18n": "^8.7.0",
     "vue-loader": "^15.7.0",
     "vue-ls": "^3.2.0",
-    "vue-router": "^3.0.1",
-    "vuex": "^3.1.0",
-    "vue-print-nb-jeecg": "^1.0.12",
-    "clipboard": "^2.0.4",
     "vue-photo-preview": "^1.1.3",
+    "vue-print-nb-jeecg": "^1.0.12",
+    "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.4",
     "vuedraggable": "^2.20.0",
-    "codemirror": "^5.46.0",
+    "vuex": "^3.1.0",
-    "@tinymce/tinymce-vue": "2.1.0",
-    "tinymce": "5.4.1",
-    "@toast-ui/editor": "^2.1.2",
-    "vue-area-linkage": "^5.1.0",
-    "china-area-data": "^5.0.1",
-    "dom-align": "1.12.0",
-    "xe-utils": "2.4.8",
     "vxe-table": "2.9.13",
     "vxe-table-plugin-antd": "1.8.10",
-    "cron-parser": "^2.10.0",
+    "xe-utils": "2.4.8",
-    "qiankun": "^2.5.1",
     "xss": "^1.0.13"
   },
   "devDependencies": {
@@ -55,13 +56,13 @@
     "@vue/cli-service": "^3.3.0",
     "@vue/eslint-config-standard": "^4.0.0",
     "babel-eslint": "7.2.3",
+    "compression-webpack-plugin": "^3.1.0",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.1.0",
+    "html-webpack-plugin": "^4.2.0",
     "less": "^3.9.0",
     "less-loader": "^4.1.0",
-    "vue-template-compiler": "^2.6.10",
+    "vue-template-compiler": "^2.6.10"
-    "html-webpack-plugin": "^4.2.0",
-    "compression-webpack-plugin": "^3.1.0"
   },
   "eslintConfig": {
     "root": true,
@@ -99,7 +100,10 @@
       "vue/html-closing-bracket-newline": 0,
       "vue/no-parsing-error": 0,
       "no-tabs": 0,
-      "indent": ["off", 2],
+      "indent": [
+        "off",
+        2
+      ],
       "no-console": 0,
       "space-before-function-paren": 0
     }

public/index.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>XXX平台</title>
+  <title>母婴品牌分析系统</title>
   <link rel="icon" href="<%= BASE_URL %>logo.png">
   <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
   <style>
@@ -139,7 +139,7 @@
       top: 0;
       width: 51%;
       height: 100%;
-      background: #000000;
+      background: #6a6d6d;
       /* Old browsers */
       z-index: 1000;
       -webkit-transform: translateX(0);

src/components/layouts/TabLayout.vue

@@ -183,7 +183,7 @@
        * @param title 要修改的新标题
        */
       changeTitle(title) {
-        let projectTitle = "XXX平台"
+        let projectTitle = "母婴品牌分析系统"
         // 首页特殊处理
         if (this.$route.path === indexKey) {
           document.title = projectTitle

src/components/layouts/UserLayout.vue

@@ -42,12 +42,12 @@
     .container {
       width: 100%;
       min-height: 100%;
-      // background: #f0f2f5 url(~@/assets/lol.jpeg) no-repeat ;
+      //拉伸 扑满
-      background: #5b9dff ;
+      // background: #f0f2f5 url(~@/assets/back.png) no-repeat ;
+      background: #5b9dff;
       background-size: 100%;
       padding: 110px 0 144px;
       position: relative;
-
       a {
         text-decoration: none;
       }

src/components/menu/SideMenu.vue

@@ -1,7 +1,7 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="208px"
+    width="250px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">

src/components/page/GlobalHeader.vue

@@ -11,14 +11,6 @@
         class="trigger"
         :type="collapsed ? 'menu-fold' : 'menu-unfold'"
         @click="toggle"></a-icon>
-      <a-icon
-        v-else
-        class="trigger"
-        :type="collapsed ? 'menu-unfold' : 'menu-fold'"
-        @click="toggle"/>
-
-      <span v-if="device === 'desktop'">欢迎使用</span>
-      <span v-else>Jeecg-Boot</span>
 
       <user-menu :theme="theme"/>
     </div>

src/components/tools/Logo.vue

@@ -20,7 +20,7 @@ export default {
   props: {
     title: {
       type: String,
-      default: 'XXX平台',
+      default: '母婴品牌分析系统',
       required: false
     },
     showTitle: {

src/views/cyl/index.vue

@@ -0,0 +1,8 @@
+<template>
+    <div>
+      数据管理部分
+    </div>
+  </template>
+  
+  <script>
+  </script>

src/views/cyl/test1.vue

@@ -0,0 +1,8 @@
+<template>
+    <div>
+        测试文件1
+    </div>
+</template>
+
+<script>
+</script>

src/views/cyl/test2.vue

@@ -0,0 +1,8 @@
+<template>
+    <div>
+        测试文件2
+    </div>
+</template>
+
+<script>
+</script>

src/views/cyl/test3.vue

@@ -0,0 +1,8 @@
+<template>
+    <div>
+        测试文件3
+    </div>
+</template>
+
+<script>
+</script>

src/views/dashboard/Analysis.vue

@@ -1,8 +1,47 @@
 <template>
-  <div>
+  <div id="chart" style="width: 600px; height: 400px;"></div>
-    这是首页
-  </div>
 </template>
 
 <script>
+import * as echarts from 'echarts';
+
+export default {
+  name: 'Chart',
+  mounted() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      const chart = echarts.init(document.getElementById('chart'))
+
+      const option = {
+        title: {
+          text: '图表测试'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        legend: {
+          data: ['销量']
+        },
+        xAxis: {
+          type: 'category',
+          data: ['衬衫', '羊毛衫', '雪纺衫', '裤子', '高跟鞋', '袜子']
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            name: '销量',
+            type: 'bar',
+            data: [5, 20, 36, 10, 10, 20]
+          }
+        ]
+      }
+
+      chart.setOption(option)
+    }
+  }
+}
 </script>

src/views/system/modules/UserModal.vue

@@ -40,17 +40,6 @@
           <a-input placeholder="请输入用户姓名" v-model="model.realname" />
         </a-form-model-item>
 
-        <a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workNo">
-          <a-input placeholder="请输入工号" v-model="model.workNo" />
-        </a-form-model-item>
-
-        <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-          <a-input placeholder="请输入手机号码" v-model="model.phone" />
-        </a-form-model-item>
-
-        <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>
-        </a-form-model-item>
 
         <a-form-model-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
           <j-multi-select-tag
@@ -61,68 +50,24 @@
           </j-multi-select-tag>
         </a-form-model-item>
 
-        <!--部门分配-->
-        <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
-        </a-form-model-item>
-
-        <!--租户分配-->
-        <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <j-multi-select-tag
-                  :disabled="disableSubmit"
-                  v-model="model.relTenantIds"
-                  :options="tenantsOptions"
-                  placeholder="请选择租户">
-          </j-multi-select-tag>
-        </a-form-model-item>
 
         <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-radio-group  v-model="model.userIdentity"  @change="identityChange">
             <a-radio :value="1">普通用户</a-radio>
-            <a-radio :value="2">上级</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-show="departIdShow==true">
+      
-          <j-multi-select-tag
-                  :disabled="disableSubmit"
-                  v-model="model.departIds"
-                  :options="nextDepartOptions"
-                  placeholder="请选择负责部门">
-          </j-multi-select-tag>
-        </a-form-model-item>
 
         <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
         </a-form-model-item>
 
-        <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-date-picker
-                  style="width: 100%"
-                  placeholder="请选择生日"
-                  v-model="model.birthday"
-                  :format="dateFormat"
-                  :getCalendarContainer="node => node.parentNode"/>
-        </a-form-model-item>
-
-        <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select  v-model="model.sex"  placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
-            <a-select-option :value="1">男</a-select-option>
-            <a-select-option :value="2">女</a-select-option>
-          </a-select>
-        </a-form-model-item>
 
         <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
           <a-input placeholder="请输入邮箱" v-model="model.email" />
         </a-form-model-item>
 
-        <a-form-model-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
+    
-          <a-input placeholder="请输入座机" v-model="model.telephone" />
-        </a-form-model-item>
-
-        <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-dict-select-tag  v-model="model.activitiSync"  placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>
-        </a-form-model-item>
-
       </a-form-model>
     </a-spin>
 
@@ -163,7 +108,7 @@
         validatorRules:{
           username:[{required: true, message: '请输入用户账号!'},
             {validator: this.validateUsername,}],
-          password: [{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
+          password: [{required: true,message: '请输入密码!'},
             {validator: this.validateToNextPassword,trigger: 'change'}],
           confirmpassword: [{required: true, message: '请重新输入登录密码!',},
             { validator: this.compareToFirstPassword,}],

src/views/user/Login.vue

@@ -1,21 +1,26 @@
 <template>
   <div class="main">
+    <div style="text-align: center; margin-bottom: 24px;font-size: 40px;">
+      母婴品牌分析系统
+    </div>
     <a-form-model class="user-layout-login" @keyup.enter.native="handleSubmit">
       <!-- 登录修改 -->
-      <login-account ref="alogin" @validateFail="validateFail" @success="requestSuccess" @fail="requestFailed"></login-account>
+      <login-account ref="alogin" @validateFail="validateFail" @success="requestSuccess"
-
+        @fail="requestFailed"></login-account>
       <a-form-model-item>
         <a-checkbox @change="handleRememberMeChange" default-checked>自动登录</a-checkbox>
       </a-form-model-item>
 
       <a-form-item style="margin-top:24px">
-        <a-button size="large"  type="primary"  htmlType="submit"  class="login-button"  :loading="loginBtn"  @click.stop.prevent="handleSubmit" :disabled="loginBtn">确定
+        <a-button size="large" type="primary" htmlType="submit" class="login-button" :loading="loginBtn"
+          @click.stop.prevent="handleSubmit" :disabled="loginBtn">确定
         </a-button>
       </a-form-item>
 
     </a-form-model>
 
-    <two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess" @cancel="stepCaptchaCancel"></two-step-captcha>
+    <two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess"
+      @cancel="stepCaptchaCancel"></two-step-captcha>
     <login-select-tenant ref="loginSelect" @success="loginSelectOk"></login-select-tenant>
   </div>
 </template>
@@ -33,170 +38,168 @@ import LoginAccount from './LoginAccount'
 import LoginPhone from './LoginPhone'
 
 export default {
-    components: {
+  components: {
-      LoginSelectTenant,
+    LoginSelectTenant,
-      TwoStepCaptcha,
+    TwoStepCaptcha,
-      ThirdLogin,
+    ThirdLogin,
-      LoginAccount,
+    LoginAccount,
-      LoginPhone
+    LoginPhone
+  },
+  data() {
+    return {
+      customActiveKey: 'tab1',
+      rememberMe: true,
+      loginBtn: false,
+      requiredTwoStepCaptcha: false,
+      stepCaptchaVisible: false,
+      encryptedString: {
+        key: "",
+        iv: "",
+      },
+    }
+  },
+  created() {
+    Vue.ls.remove(ACCESS_TOKEN)
+    this.getRouterData();
+    this.rememberMe = true
+  },
+  methods: {
+    handleTabClick(key) {
+      this.customActiveKey = key
     },
-    data () {
+    handleRememberMeChange(e) {
-      return {
+      this.rememberMe = e.target.checked
-        customActiveKey: 'tab1',
+    },
-        rememberMe: true,
+    /**跳转到登录页面的参数-账号获取*/
-        loginBtn: false,
+    getRouterData() {
-        requiredTwoStepCaptcha: false,
+      this.$nextTick(() => {
-        stepCaptchaVisible: false,
+        let temp = this.$route.params.username || this.$route.query.username || ''
-        encryptedString:{
+        if (temp) {
-          key:"",
+          this.$refs.alogin.acceptUsername(temp)
-          iv:"",
+        }
-        },
+      })
+    },
+
+    //登录
+    handleSubmit() {
+      this.loginBtn = true;
+      if (this.customActiveKey === 'tab1') {
+        // 使用账户密码登录
+        this.$refs.alogin.handleLogin(this.rememberMe)
+      } else {
+        //手机号码登录
+        this.$refs.plogin.handleLogin(this.rememberMe)
       }
     },
-    created() {
+    // 校验失败
-      Vue.ls.remove(ACCESS_TOKEN)
+    validateFail() {
-      this.getRouterData();
+      this.loginBtn = false;
-      this.rememberMe = true
+    },
+    // 登录后台成功
+    requestSuccess(loginResult) {
+      this.$refs.loginSelect.show(loginResult)
+    },
+    //登录后台失败
+    requestFailed(err) {
+      let description = ((err.response || {}).data || {}).message || err.message || "请求出现错误，请稍后再试"
+      this.$notification['error']({
+        message: '登录失败',
+        description: description,
+        duration: 4,
+      });
+      this.loginBtn = false;
+    },
+    loginSelectOk() {
+      this.loginSuccess()
+    },
+    //登录成功
+    loginSuccess() {
+      this.$router.push({ path: "/dashboard/analysis" }).catch(() => {
+        console.log('登录跳转首页出错,这个错误从哪里来的')
+      })
+      this.$notification.success({
+        message: '欢迎',
+        description: `${timeFix()}，欢迎回来`,
+      });
     },
-    methods:{
-      handleTabClick(key){
-        this.customActiveKey = key
-      },
-      handleRememberMeChange(e){
-        this.rememberMe = e.target.checked
-      },
-      /**跳转到登录页面的参数-账号获取*/
-      getRouterData(){
-        this.$nextTick(() => {
-          let temp = this.$route.params.username || this.$route.query.username || ''
-          if (temp) {
-            this.$refs.alogin.acceptUsername(temp)
-          }
-        })
-      },
 
-      //登录
+    stepCaptchaSuccess() {
-      handleSubmit () {
+      this.loginSuccess()
-        this.loginBtn = true;
+    },
-        if (this.customActiveKey === 'tab1') {
+    stepCaptchaCancel() {
-          // 使用账户密码登录
+      this.Logout().then(() => {
-          this.$refs.alogin.handleLogin(this.rememberMe)
+        this.loginBtn = false
-        } else {
+        this.stepCaptchaVisible = false
-          //手机号码登录
+      })
-          this.$refs.plogin.handleLogin(this.rememberMe)
+    },
-        }
+    //获取密码加密规则
-      },
+    getEncrypte() {
-      // 校验失败
+      var encryptedString = Vue.ls.get(ENCRYPTED_STRING);
-      validateFail(){
+      if (encryptedString == null) {
-        this.loginBtn = false;
+        getEncryptedString().then((data) => {
-      },
+          this.encryptedString = data
-      // 登录后台成功
-      requestSuccess(loginResult){
-        this.$refs.loginSelect.show(loginResult)
-      },
-      //登录后台失败
-      requestFailed (err) {
-        let description = ((err.response || {}).data || {}).message || err.message || "请求出现错误，请稍后再试"
-        this.$notification[ 'error' ]({
-          message: '登录失败',
-          description: description,
-          duration: 4,
         });
-        //账户密码登录错误后更新验证码
+      } else {
-        if(this.customActiveKey === 'tab1' && description.indexOf('密码错误')>0){
+        this.encryptedString = encryptedString;
-          this.$refs.alogin.handleChangeCheckCode()
-        }
-        this.loginBtn = false;
-      },
-      loginSelectOk(){
-        this.loginSuccess()
-      },
-      //登录成功
-      loginSuccess () {
-        this.$router.push({ path: "/dashboard/analysis" }).catch(()=>{
-          console.log('登录跳转首页出错,这个错误从哪里来的')
-        })
-        this.$notification.success({
-          message: '欢迎',
-          description: `${timeFix()}，欢迎回来`,
-        });
-      },
-
-      stepCaptchaSuccess () {
-        this.loginSuccess()
-      },
-      stepCaptchaCancel () {
-        this.Logout().then(() => {
-          this.loginBtn = false
-          this.stepCaptchaVisible = false
-        })
-      },
-      //获取密码加密规则
-      getEncrypte(){
-        var encryptedString = Vue.ls.get(ENCRYPTED_STRING);
-        if(encryptedString == null){
-          getEncryptedString().then((data) => {
-            this.encryptedString = data
-          });
-        }else{
-          this.encryptedString = encryptedString;
-        }
       }
-
     }
 
   }
+
+}
 </script>
 <style lang="less" scoped>
-  .user-layout-login {
+.user-layout-login {
-    background-color: aliceblue;
+  background-color: aliceblue;
-    padding: 40px;
+  padding: 40px;
-    label {
+
-      font-size: 14px;
+  label {
-    }
+    font-size: 14px;
+  }
+
   .getCaptcha {
-      display: block;
+    display: block;
-      width: 100%;
+    width: 100%;
-      height: 40px;
+    height: 40px;
-    }
+  }
 
   .forge-password {
-      font-size: 14px;
+    font-size: 14px;
-    }
+  }
 
-    button.login-button {
+  button.login-button {
-      padding: 0 15px;
+    padding: 0 15px;
-      font-size: 16px;
+    font-size: 16px;
-      height: 40px;
+    height: 40px;
-      width: 100%;
+    width: 100%;
-    }
+  }
 
   .user-login-other {
-      text-align: left;
+    text-align: left;
-      margin-top: 24px;
+    margin-top: 24px;
-      line-height: 22px;
+    line-height: 22px;
 
     .item-icon {
-        font-size: 24px;
+      font-size: 24px;
-        color: rgba(0,0,0,.2);
+      color: rgba(0, 0, 0, .2);
-        margin-left: 16px;
+      margin-left: 16px;
-        vertical-align: middle;
+      vertical-align: middle;
-        cursor: pointer;
+      cursor: pointer;
-        transition: color .3s;
+      transition: color .3s;
 
       &:hover {
-          color: #1890ff;
+        color: #1890ff;
-        }
-      }
-
-    .register {
-        float: right;
       }
     }
+
+    .register {
+      float: right;
+    }
   }
+}
 </style>
 <style>
-  .valid-error .ant-select-selection__placeholder{
+.valid-error .ant-select-selection__placeholder {
-    color: #f5222d;
+  color: #f5222d;
-  }
+}
 </style>

src/views/user/LoginAccount.vue

@@ -98,11 +98,6 @@
             this.Login(loginParams).then((res) => {
               this.$emit('success', res.result)
             }).catch((err) => {
-              //update-begin-author: taoyan date:20220425 for: 登录页面，当输入验证码错误时，验证码图片要刷新一下，而不是保持旧的验证码图片不变 #41
-              if(err && err.code===412){
-                this.handleChangeCheckCode();
-              }
-              //update-end-author: taoyan date:20220425 for: 登录页面，当输入验证码错误时，验证码图片要刷新一下，而不是保持旧的验证码图片不变 #41
               this.$emit('fail', err)
             });
           }else{

src/views/user/LoginSelectTenant.vue

@@ -96,11 +96,6 @@ export default {
         let multi_depart = loginResult.multi_depart
         //0:无部门 1:一个部门 2:多个部门
         if(multi_depart==0){
-          this.$notification.warn({
-            message: '提示',
-            description: `您尚未归属部门,请确认账号信息`,
-            duration:3
-          });
           this.isMultiDepart = false
         }else if(multi_depart==2){
           this.visible=true

yarn.lock

@@ -4765,6 +4765,14 @@
     "jsbn" "~0.1.0"
     "safer-buffer" "^2.1.0"
 
+"echarts@^5.5.0":
+  "integrity" "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw=="
+  "resolved" "https://registry.npmmirror.com/echarts/-/echarts-5.5.0.tgz"
+  "version" "5.5.0"
+  dependencies:
+    "tslib" "2.3.0"
+    "zrender" "5.5.0"
+
 "ee-first@1.1.1":
   "integrity" "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
   "resolved" "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
@@ -11554,6 +11562,11 @@
   "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"
   "version" "1.13.0"
 
+"tslib@2.3.0":
+  "integrity" "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+  "resolved" "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz"
+  "version" "2.3.0"
+
 "tty-browserify@0.0.0":
   "integrity" "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
   "resolved" "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
@@ -12633,3 +12646,10 @@
     "is-ci" "^1.0.10"
     "normalize-path" "^1.0.0"
     "strip-indent" "^2.0.0"
+
+"zrender@5.5.0":
+  "integrity" "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w=="
+  "resolved" "https://registry.npmmirror.com/zrender/-/zrender-5.5.0.tgz"
+  "version" "5.5.0"
+  dependencies:
+    "tslib" "2.3.0"