1

.env.development

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 页面标题
 VUE_APP_TITLE = 若依管理系统
 
@@ -9,3 +10,16 @@ VUE_APP_BASE_API = 'http://103.150.181.107:8080/'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+=======
+# 页面标题
+VUE_APP_TITLE = 若依管理系统
+
+# 开发环境配置
+ENV = 'development'
+
+# 若依管理系统/开发环境
+VUE_APP_BASE_API = 'http://103.150.181.107:8080/'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
+>>>>>>> 63f2f84b02ec59a1c8d2dea6bd07de6a1692dc33

README.md

@@ -1,5 +1,7 @@
 ## 开发
 
+HitSheep加油！！
+
 ```bash
 # 克隆项目
 git clone http://39.105.160.25:10880/sifu-gogs/post-ui.git

src/router/index.js

@@ -79,6 +79,7 @@ export const constantRoutes = [
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
+    
     children: [
       {
         path: 'profile',

src/views/dashboard/messageManager.vue

@@ -0,0 +1,51 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}">1</div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+const animationDuration = 6000
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, '消息列表')
+    }
+  }
+}
+</script>

src/views/index_v1.vue

@@ -23,9 +23,12 @@
           <bar-chart />
         </div>
       </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <messageManager />
+        </div>
+      </el-col>1
     </el-row>
-
-    
   </div>
 </template>
 
@@ -35,6 +38,7 @@ import LineChart from './dashboard/LineChart'
 import RaddarChart from './dashboard/RaddarChart'
 import PieChart from './dashboard/PieChart'
 import BarChart from './dashboard/BarChart'
+import messageManager from './dashboard/messageManager'
 
 const lineChartData = {
   newVisitis: {
@@ -62,7 +66,8 @@ export default {
     LineChart,
     RaddarChart,
     PieChart,
-    BarChart
+    BarChart,
+    messageManager
   },
   data() {
     return {

src/views/message/addMessage.vue

@@ -0,0 +1,7 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" >添加消息</div>
+</template>
+
+<script>
+
+</script>

src/views/message/messageList.vue

@@ -0,0 +1,24 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" >
+    <div class="up">
+
+    </div>
+    <el-input v-model="input" placeholder="请输入内容"></el-input>
+
+
+
+    <div class="down">
+
+    </div>
+  </div>
+</template>
+
+<script>
+
+</script>
+
+<style>
+ .up{
+  
+}
+</style>