Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

VUECODE/smart-operate-manage/config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8085/operate-api"',
+  BASE_API: '"http://101.132.102.231:8085/operate-api"',
 })

VUECODE/smart-operate-manage/src/components/chart/chart1.vue

@@ -64,7 +64,7 @@ export default {
       })
       chart.guide().html({
         position: ['50%', '50%'],
-        html: '<div class="g2-guide-html"><p class="title">总计</p><p class="value">500</p></div>'
+        html: '<div class="g2-guide-html"><p class="title">总计</p><p class="value">200</p></div>'
       })
       chart.guide().html({
         position: ['50%', '-10%'],
@@ -79,7 +79,7 @@ export default {
 
       chart.on('interval:mouseleave', function () {
         $(".g2-guide-html .title").text('总计')
-        $(".g2-guide-html .value").text(500)
+        $(".g2-guide-html .value").text(200)
       })
       chart.render()
     }

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

@@ -1,6 +1,6 @@
 <template>
   <div id="node3">
-    <div class="title">昨日所有小区智能硬件数据统计</div>
+    <div class="title">今日所有小区智能硬件数据统计</div>
     <div class="table">
       <div v-for="(item,index) in arr" :key="index" @mouseover='item.active = true' @mouseout="item.active=false" :class="{active:item.active}">
         <div>{{item.text}}</div>

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

@@ -1,7 +1,23 @@
 <template>
   <div id="node4">
-    <el-amap ref="map" vid="amapDemo" :center="mapCenter" :zoom="8" class="amap-demo"  :mapStyle='setMapStyle'>
-      <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item.position" :icon='item.icon' :title="item.title"></el-amap-marker>
+    <div class="top-title">已合作社区分布图</div>
+    <el-amap
+      ref="map"
+      vid="amapDemo"
+      :center="mapCenter"
+      :zoom="7"
+      class="amap-demo"
+      :mapStyle="setMapStyle"
+    >
+      <el-amap-marker
+        v-for="(item,index) in markers"
+        :key="index"
+        :position="item.position"
+        :icon="item.icon"
+        :title="item.title"
+        :offset="item.offset"
+        :content="item.content"
+      ></el-amap-marker>
     </el-amap>
   </div>
 </template>
@@ -9,7 +25,7 @@
 <script>
 // import G2 from '@antv/g2'
 // import DataSet from '@antv/data-set'
-// import $ from 'jquery'
+import $ from 'jquery'
 // import AMapUI from 'AMapUI'
 import light1 from '@/assets/light1.png'
 import light2 from '@/assets/light2.png'
@@ -23,134 +39,87 @@ export default {
       light3,
       light4,
       markers: [{
-        position: [119.63803900, 32.58482400],
-        icon: light1, // 添加 Icon 图标 URL
-        title: '悦见山'
+        position: [118.633516, 32.069878],
+        title: '悦见山',
+        offset: [-60, -60],
+        content: `<div class='point'>
+        <img src='${light1}'>
+        <span>悦见山</span>
+        </div>`
       }, {
-        position: [118.29096500, 33.92855800],
-        icon: light2, // 添加 Icon 图标 URL
-        title: '银山'
+        position: [117.161777, 34.154014],
+        title: '致享城',
+        offset: [-60, -60],
+        content: `<div class='point'>
+        <img src='${light2}'>
+        <span>致享城</span>
+        </div>`
       }, {
-        position: [120.07075000, 32.43910000],
-        icon: light3, // 添加 Icon 图标 URL
-        title: '智慧社区'
+        position: [118.753086, 31.972501],
+        title: '智慧社区',
+        offset: [-60, -60],
+        content: `<div class='point'>
+        <img src='${light3}'>
+        <span>智慧社区</span>
+        </div>`
       }, {
-        position: [118.79317400, 32.07443900],
-        icon: light4, // 添加 Icon 图标 URL
-        title: '帝景天誉'
+        position: [120.064082, 30.343891],
+        title: '云谷天境',
+        offset: [-60, -60],
+        content: `<div class='point'>
+        <img src='${light4}'>
+        <span>云谷天境</span>
+        </div>`
       }],
-      mapCenter: [119.63803900, 32.58482400],
+      mapCenter: [118.753086, 31.972501],
       setMapStyle: 'amap://styles/blue'
     }
   },
   mounted () {
-    this.rander()
+    setInterval(() => {
+      this.rander()
+    }, 1600)
   },
   methods: {
     rander () {
-      // AMap.plugin('AMap.DistrictLayer', function () {//异步加载插件
-      //   var DistrictLayer = new AMap.DistrictLayer();
-      //   map.addControl(DistrictLayer);
-      // });
-      // var adCode = 320000;
-      // var depth = 2;
-      // var map = new AMap.Map("node4", {
-      //   zoom: 8,
-      //   center: [119.63803900, 32.58482400],
-      //   pitch: 0,
-      //   viewMode: '3D',
-      // });
-
-      // // 创建省份图层
-      // var disProvince;
-      // function initPro (code, dep) {
-      //   dep = typeof dep == 'undefined' ? 2 : dep;
-      //   adCode = code;
-      //   depth = dep;
-
-      //   disProvince && disProvince.setMap(null);
-
-      //   disProvince = new AMap.DistrictLayer.Province({
-      //     zIndex: 12,
-      //     adcode: [code],
-      //     depth: dep,
-      //     styles: {
-      //       'fill': function (properties) {
-      //         // properties为可用于做样式映射的字段，包含
-      //         // NAME_CHN:中文名称
-      //         // adcode_pro
-      //         // adcode_cit
-      //         // adcode
-      //         var adcode = properties.adcode;
-      //         return getColorByAdcode(adcode);
-      //       },
-      //       'province-stroke': 'cornflowerblue',
-      //       'city-stroke': 'white', // 中国地级市边界
-      //       'county-stroke': 'rgba(255,255,255,0.5)' // 中国区县边界
-      //     }
-      //   });
-
-      //   disProvince.setMap(map);
-      // }
-
-      // // 颜色辅助方法
-      // var colors = {};
-      // var getColorByAdcode = function (adcode) {
-      //   if (!colors[adcode]) {
-      //     var gb = Math.random() * 155 + 50;
-      //     colors[adcode] = 'rgb(' + gb + ',' + gb + ',255)';
-      //   }
-      //   return colors[adcode];
-      // }
-      // initPro(adCode, depth);
-      // map.setMapStyle('amap://styles/blue')
-      // var marker1 = new AMap.Marker({
-      //   position: new AMap.LngLat(119.63803900, 32.58482400),
-      //   offset: new AMap.Pixel(-10, -10),
-      //   icon: this.light1, // 添加 Icon 图标 URL
-      //   title: '悦见山'
-      // });
-      // var marker2 = new AMap.Marker({
-      //   position: new AMap.LngLat(118.29096500, 33.92855800),
-      //   offset: new AMap.Pixel(-10, -10),
-      //   icon: this.light2, // 添加 Icon 图标 URL
-      //   title: '银山'
-      // });
-      // var marker3 = new AMap.Marker({
-      //   position: new AMap.LngLat(120.07075000, 32.43910000),
-      //   offset: new AMap.Pixel(-10, -10),
-      //   icon: this.light3, // 添加 Icon 图标 URL
-      //   title: '智慧社区'
-      // });
-      // var marker4 = new AMap.Marker({
-      //   position: new AMap.LngLat(119.63803900, 32.58482400),
-      //   offset: new AMap.Pixel(-10, -10),
-      //   icon: this.light4, // 添加 Icon 图标 URL
-      //   title: '帝景天誉'
-      // });
-      // var markerList = [marker1, marker2, marker3, marker4];
-      // map.add(markerList);
+      $('.point img').animate({ opacity: 0 }, 800).animate({ opacity: 1 }, 800)
     }
   }
 }
 </script>
 
 <style lang="scss">
-#node4 {
-  .g2-guide-html {
-    color: #a4b6c5;
-    .title {
-      text-align: "ceter";
-    }
-    .value {
-      text-align: center;
-    }
+#node4{
+  border-radius: 5px;
+}
+.top-title{
+  width: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  text-align: center;
+  margin-top: 30px;
+  z-index: 20;
+  color: #A6B9C8;
+  font-size: 18px;
+}
+.point{
+  position: relative;
+  width: 120px;
+  height: 120px;
+  img{
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
   }
-  .g2-guide-title {
-    color: #a4b6c5;
-    .title {
-      font-size: 16px;
-    }
+  span{
+    position: absolute;
+    top: 80%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+    font-size: 12px;
+    color: white;
   }
 }
 </style>

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

@@ -32,6 +32,30 @@ export default {
         padding: [80, 20, 30, 40]
       });
       chart.source(data);
+      console.log(chart)
+      chart.axis('xField', {
+        line: {
+          lineWidth: 1, // 设置线的宽度
+          stroke: 'red', // 设置线的颜色
+          lineDash: [3, 3] // 设置虚线样
+        },
+        tickLine: {
+          lineWidth: 2,
+          length: 10,
+          stroke: 'red',
+          alignWithLabel: true
+        },
+        label: {
+          textStyle: {
+            textAlign: 'center', // 文本对齐方向，可取值为： start middle end
+            fill: '#fff', // 文本的颜色
+            fontSize: '12', // 文本大小
+            fontWeight: 'bold', // 文本粗细
+            rotate: 30,
+            textBaseline: 'top' // 文本基准线，可取 top middle bottom，默认为middle
+          },
+        }
+      });
       chart.scale('', {
         tickInterval: 200
       });
@@ -39,6 +63,11 @@ export default {
         position: ['5%', '-25%'],
         html: '<div class="chart5-title"><p class="title">注册用户统计</p></div>'
       })
+      chart.guide().html({
+        position: ['90%', '-15%'],
+        html: `<div class="chart-right-btn"><span>18/11/27</span>&nbsp;<i class='el-icon-date'></i></div>`
+      })
+
       chart.interval().position('type*sales').color('type', function (val) {
         if (val === '总户数' || val === '家属') {
           return '#53F9FF';
@@ -58,4 +87,16 @@ export default {
     color: #a4b6c5;
   }
 }
+.chart-right-btn{
+  padding: 0px 8px;
+  display: flex;
+  border: 1px solid #a4b6c5;
+  border-radius: 9px;
+  justify-content: center;
+  align-items: center;
+  span,i{
+    font-size: 10px;
+    color: #a4b6c5;
+  }
+}
 </style>

VUECODE/smart-operate-manage/src/components/chart/chart6.vue

@@ -60,6 +60,10 @@ export default {
       chart.tooltip({
         crosshairs: true
       });
+      chart.guide().html({
+        position: ['90%', '-15%'],
+        html: `<div class="chart-right-btn"><span>日活跃量</span>&nbsp;<i class='el-icon-arrow-down'></i></div>`
+      })
       chart.area().position('year*value').color('type', function (val) { return '#53F9FF' }).shape('smooth');
       chart.line().position('year*value').color('type', function (val) { return '#53F9FF' }).size(2).shape('smooth');
       chart.guide().html({

VUECODE/smart-operate-manage/src/components/chart/chart7.vue

@@ -36,6 +36,10 @@ export default {
         position: ['5%', '-25%'],
         html: '<div class="chart7-title"><p class="title">内容运营统计</p></div>'
       })
+      chart.guide().html({
+        position: ['90%', '-15%'],
+        html: `<div class="chart-right-btn"><span>发布数量</span>&nbsp;<i class='el-icon-arrow-down'></i></div>`
+      })
       chart.interval().position('type*sales').color('type', function (val) {
         if (val === '公告') {
           return '#53F9FF';

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

@@ -5,7 +5,7 @@ import 'nprogress/nprogress.css'// Progress 进度条样式
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // 验权
 
-const whiteList = ['/login','/index'] // 不重定向白名单
+const whiteList = ['/login'] // 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start()
   if (getToken()) {

VUECODE/smart-operate-manage/src/views/index/index.vue

@@ -57,6 +57,7 @@ export default {
       margin: 8px;
       background: #2c343a;
       border-radius: 5px;
+      overflow: hidden;
     }
   }
   .middle {

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

@@ -1,18 +1,20 @@
 <template>
   <el-menu class="navbar" mode="horizontal">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
+    <hamburger
+      :toggle-click="toggleSideBar"
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+    />
+    <breadcrumb/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
-        <span>{{ userData.userName }}</span>
+        <span style="position: relative;top: -15px;right:5px">{{ userData.userName }}</span>
         <img :src="userData.headPortrait" class="user-avatar" v-if="userData.headPortrait != ''">
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
         <router-link class="inlineBlock" to="/">
-          <el-dropdown-item>
-            首页
-          </el-dropdown-item>
+          <el-dropdown-item>首页</el-dropdown-item>
         </router-link>
         <el-dropdown-item divided>
           <span style="display:block;" @click="logout">注销</span>
@@ -40,10 +42,10 @@ export default {
     ])
   },
   methods: {
-    toggleSideBar() {
+    toggleSideBar () {
       this.$store.dispatch('ToggleSideBar')
     },
-    logout() {
+    logout () {
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })
@@ -57,11 +59,14 @@ export default {
   height: 50px;
   line-height: 50px;
   border-radius: 0px !important;
+  background-color:#1f2d3d;
+  border: 0px;
   .hamburger-container {
     line-height: 58px;
     height: 50px;
     float: left;
     padding: 0 10px;
+    color: #fff;
   }
   .screenfull {
     position: absolute;
@@ -90,6 +95,9 @@ export default {
         font-size: 12px;
       }
     }
+    span{
+      color: #fff;
+    }
   }
 }
 </style>

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

@@ -1,13 +1,30 @@
 <template>
   <div class="login-container">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
-      <img src="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1543283673332.png?Expires=1545111060&OSSAccessKeyId=LTAIkc75dpkJw8Lb&Signature=HqQy2E2tWJ4Vbc8HClE3jqPTx0s%3D">
+    <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" />
+          <svg-icon icon-class="user"/>
         </span>
-        <el-input v-model="loginForm.username" name="username" type="text" auto-complete="on" placeholder="请输入手机号" />
+        <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">
@@ -17,13 +34,17 @@
             type="text"
             auto-complete="on"
             placeholder="请输入验证码"
-            @keyup.enter.native="handleLogin" />
+            @keyup.enter.native="handleLogin"
+          />
         </el-form-item>
         <el-button type="primary" @click="sendCode();">发送验证码</el-button>
       </div>
-      <el-button :loading="loading" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
-        登录
-      </el-button>
+      <el-button
+        :loading="loading"
+        type="primary"
+        style="width:100%;"
+        @click.native.prevent="handleLogin"
+      >登录</el-button>
     </el-form>
   </div>
 </template>
@@ -135,6 +156,12 @@ $light_gray: #eee;
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.logo{
+  text-align:center;
+  img{
+    margin-bottom:10px;
+  }
+}
 $bg: #2d3a4b;
 $dark_gray: #889aa4;
 $light_gray: #eee;