Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/pc-admin

package.json

@@ -22,7 +22,6 @@
     "tinymce": "^5.0.12",
     "vue": "^2.6.6",
     "vue-amap": "^0.5.9",
-    "vue-echarts": "^4.0.1",
     "vue-router": "^3.0.2",
     "vuex": "^3.1.0",
     "wangeditor": "^3.1.1"

src/components/SelectBuilding.vue

@@ -0,0 +1,49 @@
+<template>
+  <el-select v-model="val" filterable placeholder="请选择">
+    <el-option
+      v-for="item in buildings"
+      :key="item.buildingId"
+      :label="item.buildingName"
+      :value="item.buildingId">
+    </el-option>
+  </el-select>
+</template>
+
+<script>
+import { mapState, mapActions } from 'vuex'
+
+export default {
+  name: 'SelectBuilding',
+  props: [ 'value' ],
+  data () {
+    return {
+      cacheVal: null,
+    }
+  },
+  computed: {
+    ...mapState({
+      buildings: s => s.buildings || [],
+    }),
+    val: {
+      get() {
+        return this.value || this.cacheVal
+      },
+      set (nw) {
+        this.cacheVal = nw
+        this.$emit('input', nw)
+      }
+    },
+  },
+  created () {
+    if (!this.buildings || !this.buildings.length) {
+      this.getBuildings()
+    }
+  },
+  methods: {
+    ...mapActions([
+      'getBuildings',
+    ]),
+  },
+}
+</script>
+

src/components/charts/VisitingDayLine.vue

@@ -1,88 +0,0 @@
-<template>
-  <v-chart class="x-chart" :options="options" autoresize></v-chart>
-</template>
-
-<script>
-import 'echarts/lib/chart/line'
-import 'echarts/lib/component/title'
-import 'echarts/lib/component/dataZoom'
-import 'echarts/lib/component/tooltip'
-
-export default {
-  name: 'visiting-day-line',
-  components: {
-    // vChart: () => import('vue-echarts'),
-  },
-  props: [
-    'source',
-  ],
-  data () {
-    return {
-      opts: {
-        title: { text: '日访问量' },
-        tooltip: {
-          formatter: (params, ticket, callback) => {
-            const { visiteDate, amount } = params.data
-            const tip = `${visiteDate}: ${amount}`
-            callback(ticket, tip)
-            return tip
-          }
-        },
-        xAxis: { type: 'category' },
-        yAxis: { name: '人/日' },
-        series: [
-          {
-            type: 'line',
-            smooth: true,
-            encode: {
-              x: 'visiteDate',
-              y: 'amount',
-            },
-          },
-        ],
-        dataZoom: [
-          {
-            type: 'inside',
-            show: true,
-            start: 0,
-            end: 100,
-          },
-          // {
-          //   type: 'slider',
-          //   show: true,
-          //   start: 0,
-          //   end: 100,
-          // }
-        ],
-        dataset: {
-          sourceHeader: false,
-          dimensions: ['visiteDate', 'amount'],
-        },
-      }
-    }
-  },
-  computed: {
-    options () {
-      return {
-        ...this.opts,
-        title: {
-          ...this.opts.title,
-        },
-        dataset: {
-          ...this.opts.dataset,
-          source: this.source || [],
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.x-chart {
-  margin: 0 auto;
-  width: 100%;
-  height: 100%;
-}
-</style>
-

src/components/charts/VisitingDayTable.vue

@@ -1,93 +0,0 @@
-<template>
-  <div>
-    <h3 style="margin: 0">访客记录</h3>
-    <el-table
-      :data="dataSet"
-      stripe
-      style="width: 100%">
-      <el-table-column
-        label="日期"
-        width="180">
-        <template slot-scope="scope">
-          <span>{{formatDate(scope.row.visiteDate)}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="姓名"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="carStyle"
-        label="车辆">
-      </el-table-column>
-      <el-table-column
-        prop="deviceName"
-        label="采集设备">
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      small
-      style="margin-top:10px;"
-      layout="prev, pager, next"
-      :page-size="pageNavi.size"
-      :total="pageNavi.total"
-      :current-page="pageNavi.current"
-      @current-change="changePage"
-    >
-    </el-pagination>
-  </div>
-</template>
-
-<script>
-import dayjs from 'dayjs'
-
-export default {
-  name: 'visiting-day-table',
-  props: [
-    'source',
-    'page',
-  ],
-  data() {
-    return {
-      sampleData: [
-        { visiteDate: '2019-02-15 17:00', name: '张一', carStyle: '奔驰', channel: '搜房' },
-        { visiteDate: '2019-02-15 16:40', name: '张二', carStyle: '奔驰', channel: '搜房' },
-        { visiteDate: '2019-02-15 16:30', name: '张三', carStyle: '奔驰', channel: '搜房' },
-        { visiteDate: '2019-02-15 15:50', name: '张四', carStyle: '奔驰', channel: '搜房' },
-        { visiteDate: '2019-02-15 15:40', name: '张五', carStyle: '奔驰', channel: '搜房' },
-        { visiteDate: '2019-02-15 15:20', name: '张六', carStyle: '奔驰', channel: '搜房' },
-        { visiteDate: '2019-02-15 15:10', name: '张七', carStyle: '奔驰', channel: '搜房' },
-        { visiteDate: '2019-02-15 15:00', name: '张八', carStyle: '奔驰', channel: '搜房' },
-      ],
-      defPage: {
-        current: 1,
-        size: 10,
-        total: 0,
-      }
-    }
-  },
-  computed: {
-    pageNavi () {
-      return {
-        ...this.defPage,
-        ...(this.page || {})
-      }
-    },
-    dataSet () {
-      return this.source || this.sampleData
-    }
-  },
-  methods: {
-    changePage (nwPg) {
-      this.$emit('page-change', nwPg)
-    },
-    formatDate(dt) {
-      if (!dt || dt.indexOf('0001-') > -1) return ''
-
-      return dayjs(dt).format('YYYY-MM-DD HH:mm')
-    }
-  }
-}
-</script>
-

src/components/charts/XLine.vue

@@ -1,11 +1,17 @@
 <template>
-   <div ref="thirdChart" ></div>
+  <div ref="echart" ></div>
 </template>
 <script>
 import Echarts from "echarts";
+
 export default {
   name: "XLine",
-  props: ["value"],
+  props: {
+    value: {
+      type: Object,
+      default: () => {},
+    },
+  },
   data() {
     return {
       chart: undefined,
@@ -50,23 +56,37 @@ export default {
     };
   },
   watch: {
-    value (val) {
-      this.renderChart(val)
+    value: {
+      handler(val) {
+        this.renderChart(val)
+      },
+      immediate: true,
+      deep: true,
     },
   },
   mounted() {
-    if (!this.chart) {
-      this.chart = Echarts.init(this.$refs.thirdChart);
-      this.renderChart(this.value)
-    }
+    this.renderChart(this.value || {})
   },
   methods: {
+    initChats () {
+      if (!this.chart && this.$refs.echart) {
+        this.chart = Echarts.init(this.$refs.echart);
+      }
+
+      if (this.chart) {
+        return Promise.resolve(this.chart)
+      } else {
+        return Promise.reject()
+      }
+    },
     renderChart(val) {
-      // 绘制图表
-      this.chart.setOption({
-        ...this.defaultOpts,
-        ...val
-      });
+      this.initChats().then((echart) => {
+        // 绘制图表
+        echart.setOption({
+          ...this.defaultOpts,
+          ...val
+        });
+      })
     }
   }
 };

src/main.js

@@ -5,6 +5,7 @@ import XMIcon from '@/components/XMIcon.vue'
 import XMRightLay from '@/components/XMRightLay.vue'
 import XMSearchForm from '@/components/XMSearchForm.vue'
 import RichEditor from '@/components/RichEditor.vue'
+import SelectBuilding from '@/components/SelectBuilding'
 
 import App from './App.vue'
 import router from './router'
@@ -27,6 +28,7 @@ Vue.component('xm-icon', XMIcon)
 Vue.component('xm-rtl', XMRightLay)
 Vue.component('xm-search', XMSearchForm)
 Vue.component('rich-editor', RichEditor)
+Vue.component('select-building', SelectBuilding)
 Vue.use(VueAMap)
 
 VueAMap.initAMapApiLoader({

src/store/system.js

@@ -10,6 +10,7 @@ export default {
     },
     menus: [],
     user: {},
+    buildings: [],
   },
   mutations: {
     updateUser(state, user) {
@@ -17,6 +18,9 @@ export default {
         ...state.user,
         ...user,
       }
+    },
+    updateBuildings(state, buildings) {
+      state.buildings = buildings || []
     }
   },
   actions: {
@@ -54,6 +58,21 @@ export default {
         localStorage.removeItem('x-token')
         commit('updateUser', {})
       })
-    }
+    },
+    getBuildings ({ commit }) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.building.list,
+          params: { pageSize: 999 },
+        }).then((data) => {
+          commit('updateBuildings',  data.records)
+          resolve(data)
+        }).catch(({ message }) => {
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
   }
 }

src/views/carouselFigure/advertisementEdit.vue

@@ -25,11 +25,11 @@
       <el-form-item label="标题：">
         <el-input v-model="form.title"></el-input>
       </el-form-item>
-      <el-form-item label="发布位置：">
+      <!-- <el-form-item label="发布位置：">
         <el-select v-model="form.showPosition" placeholder="请选择">
           <el-option v-for="(item,i) in showPositionList" :key="i" :label="item.name" :value="item.value"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="类型：">
         <el-select v-model="form.contentType" placeholder="请选择">
           <el-option v-for="(t,i) in contentTypeList" :key="i" :label="t.name" :value="t.value"></el-option>

src/views/indexEcharts/index.vue

@@ -20,6 +20,7 @@
       </div>
     </el-col>
   </el-row>
+  <select-building></select-building>
   <p class="title under-line" @click="toUserSource()">用户来源</p>
   <span class="title-desc under-line" @click="toUserSource()">最近7天</span>
   <el-row :gutter="20" :style="{ height: '560px',margin:'20px 0',border:'1px solid #eee',borderRadius:'5px'}">

vue.config.js

@@ -4,7 +4,7 @@ module.exports = {
     port: 8080,
     proxy: {
       '/api': {
-        target: 'http://192.168.0.131:8080',
+        target: 'http://192.168.0.11:8080',
         // target: 'http://localhost:8080',
         changeOrigin: true,
         // pathRewrite: {