物业 Web端, 修复格式错误

VUECODE/smart-property-manage/src/api/index.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 硬件数据统计
-export function getHardData () {
+export function getHardData() {
   return request({
     url: '/mq/open',
     method: 'get'
@@ -9,9 +9,9 @@ export function getHardData () {
 }
 
 // 注册用户统计
-export function getSignUser () {
+export function getSignUser() {
   return request({
     url: '/user/count',
     method: 'get'
   })
-}
+}

VUECODE/smart-property-manage/src/components/chart/chart3.vue

@@ -5,12 +5,12 @@
       <div
         v-for="(item,index) in arr"
         :key="index"
+        :class="{active:item.active}"
         @mouseover="item.active = true"
         @mouseout="item.active=false"
-        :class="{active:item.active}"
       >
-        <div>{{item.text}}</div>
-        <div>{{item.num}}</div>
+        <div>{{ item.text }}</div>
+        <div>{{ item.num }}</div>
       </div>
     </div>
   </div>
@@ -20,12 +20,7 @@
 import { mapState, mapActions } from 'vuex'
 
 export default {
-  computed: {
-    ...mapState('trunkIndex', {
-      hardData: item => item.trunkIndex.hardData
-    })
-  },
-  data () {
+  data() {
     return {
       arr: [
         { text: '小区门禁开启', num: '13400次', active: false },
@@ -33,11 +28,16 @@ export default {
         { text: '车辆进入数量', num: '5664辆', active: false },
         { text: '咖啡厅销量', num: '3994次', active: false },
         { text: '智慧食堂销量', num: '5664人次', active: false },
-        { text: '健身房健身', num: '1255人次', active: false },
+        { text: '健身房健身', num: '1255人次', active: false }
       ]
     }
   },
-  created () {
+  computed: {
+    ...mapState('trunkIndex', {
+      hardData: item => item.trunkIndex.hardData
+    })
+  },
+  created() {
     this.GetHardData().then(() => {
       console.log(this.hardData)
       this.hardData.forEach(item => {
@@ -46,14 +46,14 @@ export default {
         } else if (item.message === '单元门开门次数') {
           this.arr[1].num = item.count + '次'
         }
-      });
+      })
       this.arr = JSON.parse(JSON.stringify(this.arr))
     })
   },
   methods: {
     ...mapActions('trunkIndex', [
       'GetHardData'
-    ]),
+    ])
   }
 }
 </script>
@@ -98,4 +98,4 @@ export default {
     }
   }
 }
-</style>
+</style>

VUECODE/smart-property-manage/src/components/chart/chart4.vue

@@ -3,11 +3,11 @@
     <div class="top-title">已合作社区分布图</div>
     <el-amap
       ref="map"
-      vid="amapDemo"
       :center="mapCenter"
       :zoom="7"
+      :map-style="setMapStyle"
+      vid="amapDemo"
       class="amap-demo"
-      :mapStyle="setMapStyle"
     >
       <el-amap-marker
         v-for="(item,index) in markers"
@@ -17,7 +17,7 @@
         :title="item.title"
         :offset="item.offset"
         :content="item.content"
-      ></el-amap-marker>
+      />
     </el-amap>
   </div>
 </template>
@@ -32,7 +32,7 @@ import light2 from '@/assets/light2.png'
 import light3 from '@/assets/light3.png'
 import light4 from '@/assets/light4.png'
 export default {
-  data () {
+  data() {
     return {
       light1,
       light2,
@@ -75,13 +75,13 @@ export default {
       setMapStyle: 'amap://styles/blue'
     }
   },
-  mounted () {
+  mounted() {
     setInterval(() => {
       this.rander()
     }, 1600)
   },
   methods: {
-    rander () {
+    rander() {
       $('.point img').animate({ opacity: 0 }, 800).animate({ opacity: 1 }, 800)
     }
   }
@@ -122,4 +122,4 @@ export default {
     color: white;
   }
 }
-</style>
+</style>

VUECODE/smart-property-manage/src/components/chart/chart5.vue

@@ -12,7 +12,7 @@ export default {
       signUser: item => item.trunkIndex.signUser
     })
   },
-  mounted () {
+  mounted() {
     this.GetSignUser().then(() => {
       this.rander()
     })

VUECODE/smart-property-manage/src/permission.js

@@ -8,37 +8,37 @@ import { getToken } from '@/utils/auth' // 验权
 const whiteList = ['/login'] // 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start()
-  console.log("路径: ", to.path)
-  // if (getToken()) {
-  //   if (to.path === '/login') {
-  //     next({ path: '/' })
-  //     NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
-  //   }else {
-  //     if (store.getters.roles.length === 0) {
-  //       store.dispatch('GetInfo').then(res => { // 拉取用户信息
-  //         next()
-  //       }).catch((err) => {
-  //         store.dispatch('FedLogOut').then(() => {
-  //           Message.error(err || 'Verification failed, please login again')
-  //           next({ path: '/' })
-  //         })
-  //       })
-  //     } else {
-  //       next()
-  //     }
-  //   }
-  // } else {
-  //   // if (to.path === '/') {
-  //   //   next(`/login?redirect=${to.path}`)
-  //   //   NProgress.done()
-  //   // }
-  //   if (whiteList.indexOf(to.path) !== -1) {
-  //     next()
-  //   } else {
-  //     next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
-  //     NProgress.done()
-  //   }
-  // }
+  console.log('路径: ', to.path)
+  if (getToken()) {
+    if (to.path === '/login') {
+      next({ path: '/' })
+      NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
+    } else {
+      if (store.getters.roles.length === 0) {
+        store.dispatch('GetInfo').then(res => { // 拉取用户信息
+          next()
+        }).catch((err) => {
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || 'Verification failed, please login again')
+            next({ path: '/' })
+          })
+        })
+      } else {
+        next()
+      }
+    }
+  } else {
+    // if (to.path === '/') {
+    //   next(`/login?redirect=${to.path}`)
+    //   NProgress.done()
+    // }
+    if (whiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
+      next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+      NProgress.done()
+    }
+  }
   next()
 })
 

VUECODE/smart-property-manage/src/store/getters.js

@@ -6,6 +6,6 @@ const getters = {
   name: state => state.user.name,
   roles: state => state.user.roles,
   userData: state => state.user.userData,
-  trunkIndex: state => state.trunkIndex.trunkIndex,
+  trunkIndex: state => state.trunkIndex.trunkIndex
 }
 export default getters

VUECODE/smart-property-manage/src/store/modules/community.js

@@ -21,7 +21,8 @@ const community = {
       state.list = list
     },
     Insert_LIST: (state, detail) => {
-      state.list = [detail, ...list]
+      // state.list = [detail, ...list]
+      state.list = [detail, ...state.list]
     },
     UpdateList: (state, detail) => {
       state.list = state.list.map(item => {

VUECODE/smart-property-manage/src/store/modules/trunkIndex.js

@@ -18,7 +18,7 @@ const trunkIndex = {
   },
   actions: {
     // 硬件数据统计
-    GetHardData ({ commit }) {
+    GetHardData({ commit }) {
       return new Promise((resolve, reject) => {
         getHardData().then(response => {
           const data = response.data
@@ -31,7 +31,7 @@ const trunkIndex = {
     },
 
     // 注册用户统计
-    GetSignUser ({ commit }) {
+    GetSignUser({ commit }) {
       return new Promise((resolve, reject) => {
         getSignUser().then(response => {
           const data = response.data

VUECODE/smart-property-manage/src/store/modules/user.js

@@ -68,7 +68,7 @@ const user = {
     SendCode({ commit, state }, userName) {
       return new Promise((resolve, reject) => {
         sendCode(userName).then(response => {
-          //const data = response.message
+          // const data = response.message
           // resolve(data)
           resolve(response)
         }).catch(error => {

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -4,15 +4,15 @@
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
         <el-upload
-          class="upload-demo"
-          action="https://jsonplaceholder.typicode.com/posts/"
           :on-preview="handlePreview"
           :on-remove="handleRemove"
           :before-remove="beforeRemove"
-          multiple
           :limit="3"
           :on-exceed="handleExceed"
-          :file-list="fileList">
+          :file-list="fileList"
+          class="upload-demo"
+          action="https://jsonplaceholder.typicode.com/posts/"
+          multiple>
           <el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button>
           <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>

VUECODE/smart-property-manage/src/views/building/index.vue

@@ -5,7 +5,6 @@
       <el-form-item label="楼盘库">
         <el-select placeholder="栋">
           <el-option label="区域一" value="shanghai" />
-          <el-option label="区域二" value="beijing" />
         </el-select>
         <el-select placeholder="单元">
           <el-option label="区域一" value="shanghai" />
@@ -89,8 +88,8 @@ export default {
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`)
     },
-    dialogBatchImport(){
-      this.$router.push({ name: 'batch-import'})
+    dialogBatchImport() {
+      this.$router.push({ name: 'batch-import' })
     }
   }
 }

VUECODE/smart-property-manage/src/views/layout/components/Navbar.vue

@@ -9,7 +9,7 @@
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
         <span style="position: relative;top: -15px;right:5px;">{{ userData.userName }}</span>
-        <img :src="userData.headPortrait" class="user-avatar" v-if="userData.headPortrait != '' && userData.headPortrait != undefined">
+        <img v-if="userData.headPortrait != '' && userData.headPortrait != undefined" :src="userData.headPortrait" class="user-avatar">
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
@@ -42,10 +42,10 @@ export default {
     ])
   },
   methods: {
-    toggleSideBar () {
+    toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
     },
-    logout () {
+    logout() {
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })

VUECODE/smart-property-manage/src/views/login/index.vue

@@ -1,53 +1,53 @@
 <template>
   <div class="login-container">
     <div class="login-box">
-    <el-form
-      ref="loginForm"
-      :model="loginForm"
-      :rules="loginRules"
-      class="login-form"
-      auto-complete="on"
-      label-position="left"
-    >
-      <div class="logo">
-        <img
-          src="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1543283673332.png?Expires=1545111060&OSSAccessKeyId=LTAIkc75dpkJw8Lb&Signature=HqQy2E2tWJ4Vbc8HClE3jqPTx0s%3D"
-        >
-      </div>
-      <h3 class="title">智慧社区物业平台</h3>
-      <el-form-item prop="username">
-        <span class="svg-container">
-          <svg-icon icon-class="user"/>
-        </span>
-        <el-input
-          v-model="loginForm.username"
-          name="username"
-          type="text"
-          auto-complete="on"
-          placeholder="请输入手机号"
-        />
-      </el-form-item>
-      <div class="pwdSend">
-        <el-form-item prop="password">
+      <el-form
+        ref="loginForm"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        auto-complete="on"
+        label-position="left"
+      >
+        <div class="logo">
+          <img
+            src="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1543283673332.png?Expires=1545111060&OSSAccessKeyId=LTAIkc75dpkJw8Lb&Signature=HqQy2E2tWJ4Vbc8HClE3jqPTx0s%3D"
+          >
+        </div>
+        <h3 class="title">智慧社区物业平台</h3>
+        <el-form-item prop="username">
+          <span class="svg-container">
+            <svg-icon icon-class="user"/>
+          </span>
           <el-input
-            v-model="loginForm.password"
-            name="password"
+            v-model="loginForm.username"
+            name="username"
             type="text"
             auto-complete="on"
-            placeholder="请输入验证码"
-            @keyup.enter.native="handleLogin"
+            placeholder="请输入手机号"
           />
         </el-form-item>
-        <el-button type="primary" @click="sendCode();" v-if="isCodeNum == false">发送验证码</el-button>
-        <el-button type="primary" disabled v-else>{{ codeNum + '秒后重新获取' }}</el-button>
-      </div>
-      <el-button
-        :loading="loading"
-        type="primary"
-        style="width:100%;"
-        @click.native.prevent="handleLogin"
-      >登录</el-button>
-    </el-form>
+        <div class="pwdSend">
+          <el-form-item prop="password">
+            <el-input
+              v-model="loginForm.password"
+              name="password"
+              type="text"
+              auto-complete="on"
+              placeholder="请输入验证码"
+              @keyup.enter.native="handleLogin"
+            />
+          </el-form-item>
+          <el-button v-if="isCodeNum == false" type="primary" @click="sendCode();">发送验证码</el-button>
+          <el-button v-else type="primary" disabled>{{ codeNum + '秒后重新获取' }}</el-button>
+        </div>
+        <el-button
+          :loading="loading"
+          type="primary"
+          style="width:100%;"
+          @click.native.prevent="handleLogin"
+        >登录</el-button>
+      </el-form>
     </div>
     <span class="bottom-desc">Copyright © 南京荟房网络科技有限公司, All Rights Reserved.</span>
   </div>
@@ -58,7 +58,7 @@ import { isvalidUsername, validatCode } from '@/utils/validate'
 
 export default {
   name: 'Login',
-  data () {
+  data() {
     const validateUsername = (rule, value, callback) => {
       if (!isvalidUsername(value)) {
         callback(new Error('请输入正确的手机号'))
@@ -90,20 +90,20 @@ export default {
   },
   watch: {
     $route: {
-      handler: function (route) {
+      handler: function(route) {
         this.redirect = route.query && route.query.redirect
       },
       immediate: true
     }
   },
   methods: {
-    handleLogin () {
+    handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
           this.$store.dispatch('Login', this.loginForm).then((res) => {
             if (res.code === '0') {
-              console.log('登陆结果: ',res)
+              console.log('登陆结果: ', res)
               this.loading = false
               // this.$router.push({ path: this.redirect || '/index' })
               this.$router.push({ name: 'index' })
@@ -118,30 +118,29 @@ export default {
           return false
         }
       })
-       this.$router.push({ path: this.redirect || '/index' })
+      this.$router.push({ path: this.redirect || '/index' })
     },
-    sendCode () {
+    sendCode() {
       // 默认为1, 1表示不成功
-      let resCode = 1;
+      let resCode = 1
       this.$store.dispatch('SendCode', this.loginForm.username).then((res) => {
-        // 成功则为 0 
+        // 成功则为 0
         resCode = res.code
         // 为0发送成功
         if (resCode === '0') {
           this.codeNum = 60
           this.isCodeNum = true
-          let time = setInterval(()=> {
+          const time = setInterval(() => {
             if (this.codeNum === 1) {
               clearInterval(time)
               this.isCodeNum = false
             }
-            this.codeNum --
+            this.codeNum--
           }, 1000)
         }
       }).catch(() => {
         console.log('error sendcode')
       })
-
     }
   }
 }
@@ -160,7 +159,7 @@ $light_gray: #eee;
     left: 39.5%;
     color: #fff
   }
-  
+
   .login-box{
     position: absolute;
     width: 400px;

VUECODE/smart-property-manage/src/views/owner/index.vue

@@ -5,7 +5,7 @@
 
 <script>
 export default {
-  
+
 }
 </script>