Merge branch 'dev' of ssh://git.omniview.pro:256/fangdi/housemanage/web/majorproject into dev

src/router/getMicRouters.js

@@ -6,7 +6,7 @@ import yangpu from '@/router/yangpuRoutes.json'
 
 async function GetRoutes(router) {
   let env = process.env.NODE_ENV
-  console.log(env)
+  // console.log(env)
   let MicRouters
   switch (env) {
   // case env.indexOf('pudong') > -1: // 根据当前打包的项目调用该项目对应的路由

src/server/ajax.js

@@ -34,8 +34,8 @@ const reponseCodeHandler = (res) => {
       router.push({ name: 'upperLimitErr' })
     }else if (code == '710' || code == '720') {
       if(Common.oneOf(res.config.method.toLocaleLowerCase(), ['post', 'put', 'delete'])){
-        Modal.error({
-          title: '提交错误',
+        Modal.warning({
+          title: '提示',
           content: !res.data.msg?'':res.data.msg,
           okText: '确认',
           cancelText: '取消',
@@ -47,8 +47,8 @@ const reponseCodeHandler = (res) => {
       // router.push({ name: 'networkErr' })
     } else{
       if(Common.oneOf(currentMethod.toLocaleLowerCase(), ['post', 'put', 'delete'])){
-        Modal.error({
-          title: '提交错误',
+        Modal.warning({
+          title: '提示',
           content: '系统异常',
           okText: '确认',
           cancelText: '取消',

src/views/home/IndustrySupervision.vue

@@ -48,6 +48,7 @@ export default {
   created(){
 
     this.getIndustrySupervision().then(res => {
+      // console.log(res)
       let obj = this.$com.confirm(res, 'data.content', [])
       this.taskList[0].value = obj.processingCount || 0
       this.taskList[1].value = obj.completedCount || 0

src/views/login.vue

@@ -5,7 +5,7 @@
       <h3 style="color: #40a9ff;">{{logoName}}</h3>
       <a-form :form="form">
         <a-form-item>
-          <a-input  v-decorator="['username']" placeholder="用户名">
+          <a-input  v-decorator="['username',{ validateTrigger:'blur',  rules: [ { required: true,validator: validate} ] }]" placeholder="用户名">
             <a-icon
               slot="prefix"
               type="user"
@@ -14,7 +14,7 @@
           </a-input>
         </a-form-item>
         <a-form-item>
-          <a-input  v-decorator="['pwd']" type="password" placeholder="密码">
+          <a-input  v-decorator="['pwd',{ validateTrigger:'blur',  rules: [ { required: true,validator: validate} ] }]" type="password" placeholder="密码">
             <a-icon
               slot="prefix"
               type="lock"
@@ -66,30 +66,42 @@ export default {
         }
       })
     },
+    //必填验证
+    validate(rule, value, callback){
+      if (!value && typeof value!='number') {
+        callback('必填！')
+      }else{
+        callback()
+      }
+    },
     login() {
-      const params = {
-        'username': this.form.getFieldValue('username'), 
-        'pwd': encryptDes(this.form.getFieldValue('pwd'))
-      } 
-      this.$ajax.post({
-        url: this.$api.POST_LOGIN,
-        params,
-      }).then(res => { 
-        const store = JSON.parse(sessionStorage.getItem('VuexStore')) 
-        if (store) store.content = ''
-        sessionStorage.setItem('VuexStore', JSON.stringify(store))
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          const params = {
+            'username': this.form.getFieldValue('username'), 
+            'pwd': encryptDes(this.form.getFieldValue('pwd'))
+          } 
+          this.$ajax.post({
+            url: this.$api.POST_LOGIN,
+            params,
+          }).then(res => { 
+            const store = JSON.parse(sessionStorage.getItem('VuexStore')) 
+            if (store) store.content = ''
+            sessionStorage.setItem('VuexStore', JSON.stringify(store))
         
-        // 当前登录的账号密码的返回值
-        if (res.code == 200) { 
-          res.token = this.$com.confirm(res, 'data.content', [])
-          // console.log(res.token)
-          this.$cookie.set('token', 'bearer ' + res.token.access_token)
-          this.$cookie.set('userName', res.name) // 存储当前账号的用户名
-          this.$router.push({
-            path: '/portal-home'
+            // 当前登录的账号密码的返回值
+            if (res.code == 200) { 
+              res.token = this.$com.confirm(res, 'data.content', [])
+              // console.log(res.token)
+              this.$cookie.set('token', 'bearer ' + res.token.access_token)
+              this.$cookie.set('userName', res.name) // 存储当前账号的用户名
+              this.$router.push({
+                path: '/portal-home'
+              })
+            } else {
+              // this.$message.error(res.msg)
+            }
           })
-        } else {
-          this.$message.error(res.msg)
         }
       })
     },