From 3f122cdea47235995c5e64860d90df7f9a131ef3 Mon Sep 17 00:00:00 2001
From: BoBoooooo <17746714@qq.com>
Date: Fri, 19 Jan 2018 17:35:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=202.=E6=96=B0=E5=A2=9E=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E5=BD=93=E6=97=A5=E8=80=83=E5=8B=A4=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=203.=E5=8A=A0=E5=85=A5=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1Echats=E6=9F=B1=E7=8A=B6=E5=9B=BE=EF=BC=8C=E6=97=A5?=
 =?UTF-8?q?=E5=8E=86=E5=9B=BE=EF=BC=88=E5=BE=85=E5=AE=8C=E5=96=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js               |   7 +
 package.json                  |  14 +-
 src/api/KaoQin/Attendance.js  |  10 +-
 src/router/index.js           |   2 +-
 src/views/KaoQin/count.vue    | 251 ++++++++++++++++++++++++----------
 src/views/KaoQin/import.vue   | 166 +++++++++-------------
 src/views/dashboard/index.vue |  13 +-
 src/views/system/users.vue    |   2 +-
 8 files changed, 274 insertions(+), 191 deletions(-)

diff --git a/config/index.js b/config/index.js
index d81c42b..b13c85e 100644
--- a/config/index.js
+++ b/config/index.js
@@ -48,6 +48,13 @@ module.exports = {
         pathRewrite: {
           '^/report': ''//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可
         }
+      },
+      '/music': {
+        target: 'http://music.163.com/api/playlist/detail',//设置你调用的接口域名和端口号 别忘了加http
+        changeOrigin: true,
+        pathRewrite: {
+          '^/music': ''//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可
+        }
       }
     
       
diff --git a/package.json b/package.json
index 0f29888..7aae237 100644
--- a/package.json
+++ b/package.json
@@ -14,23 +14,23 @@
     "axios": "0.17.1",
     "echarts": "^3.8.5",
     "element-ui": "^2.0.11",
+    "file-saver": "1.3.3",
+    "font-awesome": "4.7.0",
     "http-proxy-middleware": "^0.17.3",
     "jquery": "^3.2.1",
     "js-cookie": "2.1.4",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
-    "vue": "2.5.2",
-        "file-saver": "1.3.3",
-        "font-awesome": "4.7.0",
-
-     "screenfull": "3.3.2",
+    "screenfull": "3.3.2",
     "showdown": "1.8.5",
     "simplemde": "1.11.2",
     "sortablejs": "1.7.0",
+    "vue": "2.5.2",
+    "vue-aplayer": "^1.0.1",
     "vue-multiselect": "^2.0.8",
-        "vue-splitpane": "1.0.2",
-    "vuedraggable": "2.15.0",
     "vue-router": "3.0.1",
+    "vue-splitpane": "1.0.2",
+    "vuedraggable": "2.15.0",
     "vuex": "3.0.1"
   },
   "devDependencies": {
diff --git a/src/api/KaoQin/Attendance.js b/src/api/KaoQin/Attendance.js
index 270f9d2..44a7bda 100644
--- a/src/api/KaoQin/Attendance.js
+++ b/src/api/KaoQin/Attendance.js
@@ -24,17 +24,11 @@ export function AttenDetailByPerson(ID){
       })
 }
 
-export function SaveNewAtten(data){
-    return fetch({
-        url: '/Attendance/SaveNewAtten',
-        method: 'post',
-        data
-      })
-}
+
 
 export function UpdateAtten(data){
     return fetch({
-        url: '/Attendance/UpdateAtten',
+        url: '/Attendance/SaveAtten',
         method: 'post',
         data
       })
diff --git a/src/router/index.js b/src/router/index.js
index 39bbd27..5c855d9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -76,7 +76,7 @@ export const asyncRouterMap = [
     noDropdown:true,
     meta: { role: ['user','system'],title:"Table" ,icon:'zonghe',father:true},
     meta: { role: ['user','system'],title:"table" ,icon:'zonghe'},
-    children: [{ path: 'import', name: 'table1', component: _import('table/index'), meta: { role: ['user','system']  ,title:"表格"}}]
+    children: [{ path: 'import', name: 'table1', component: _import('table/index'), meta: { role: ['user','system']  ,title:"EasyMock"}}]
   },
   
   {
diff --git a/src/views/KaoQin/count.vue b/src/views/KaoQin/count.vue
index 0df8c9d..6f1fb78 100644
--- a/src/views/KaoQin/count.vue
+++ b/src/views/KaoQin/count.vue
@@ -7,7 +7,7 @@
         <el-tabs :tab-position="tabPosition" style="height: 700px;">
           <el-tab-pane label="个人月报">
             <div class="charts">
-               <div id="main" style="width: 600px;height: 400px;"></div>
+              <div id="myChart" style="width: 600px;height: 400px;"></div>
             </div>
           </el-tab-pane>
           <el-tab-pane label="部门月报"></el-tab-pane>
@@ -18,7 +18,9 @@
         <span slot="label">
           <i class="el-icon-date"></i> 年报</span>
         <el-tabs :tab-position="tabPosition" style="height: 700px;">
-          <el-tab-pane label="个人年报"></el-tab-pane>
+          <el-tab-pane label="个人年报">
+            <div id="main" style="width: 1200px;height: 600px;"></div>
+          </el-tab-pane>
           <el-tab-pane label="部门年报"></el-tab-pane>
 
         </el-tabs>
@@ -28,81 +30,182 @@
   </div>
 </template>
 <script>
-// 引入基本模板
-let echarts = require('echarts/lib/echarts')
-// 引入柱状图组件
-require('echarts/lib/chart/bar')
-// 引入提示框和title组件
-require('echarts/lib/component/tooltip')
-require('echarts/lib/component/title')
-require('echarts/lib/chart/pie')
-
-    export default {
-        name: '',
-        data () {
-            return {
-              tabPosition:'left',
-                charts: '',
-                opinion:['直接访问','邮件营销','联盟广告','视频广告','搜索引擎'],
-                opinionData:[
-                  {value:335, name:'直接访问'},
-                  {value:310, name:'邮件营销'},
-                  {value:234, name:'联盟广告'},
-                  {value:135, name:'视频广告'},
-                  {value:1548, name:'搜索引擎'}
-                ]
-            }
+  // 引入基本模板
+  // 引入 ECharts 主模块
+  var echarts = require('echarts/lib/echarts');
+  // 引入柱状图
+  require('echarts/lib/chart/heatmap');
+    require('echarts/lib/chart/bar');
+        require('echarts/lib/chart/pie');
+
+
+  // 引入提示框和标题组件
+  require('echarts/lib/component/tooltip');
+  require('echarts/lib/component/title');
+
+  require('echarts/lib/chart/scatter');
+
+
+  export default {
+    name: '',
+    data() {
+      return {
+        tabPosition: 'left',
+      }
+    },
+    methods: {
+
+      getVirtulData(year) {
+        year = year || '2018';
+        var date = +echarts.number.parseDate(year + '-01-01');
+        var end = +echarts.number.parseDate((+year + 1) + '-01-01');
+        var dayTime = 3600 * 24 * 1000;
+        var data = [];
+        for (var time = date; time < end; time += dayTime) {
+          data.push([
+            echarts.format.formatTime('yyyy-MM-dd', time),
+            Math.floor(Math.random() * 10000)
+          ]);
+        }
+        return data;
+      },
+
+       drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      let myChart = echarts.init(document.getElementById('myChart'))
+      // 绘制图表
+      myChart.setOption({
+        title: { text: '个人月报' },
+        tooltip: {},
+        xAxis: {
+          data: ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
         },
-        methods:{
-            drawPie(id){
-               this.charts = echarts.init(document.getElementById(id))
-               this.charts.setOption({
-                 tooltip: {
-                   trigger: 'item',
-                   formatter: '{a}<br/>{b}:{c} ({d}%)'
-                 },
-                 legend: {
-                   orient: 'vertical',
-                   x: 'left',
-                   data:this.opinion
-                 },
-                 series: [
-                   {
-                     name:'访问来源',
-                     type:'pie',
-                     radius:['50%','70%'],
-                     avoidLabelOverlap: false,
-                     label: {
-                       normal: {
-                         show: false,
-                         position: 'center'
-                       },
-                       emphasis: {
-                         show: true,
-                         textStyle: {
-                           fontSize: '30',
-                           fontWeight: 'blod'
-                         }
-                       }
-                     },
-                     labelLine: {
-                       normal: {
-                         show: false
-                       }
-                     },
-                     data:this.opinionData
-                   }
-                 ]
-               })
+        yAxis: {},
+        series: [{
+          name: '销量',
+          type: 'bar',
+          data: [5, 20, 36, 10, 10, 20]
+        }]
+      });
+    },
+      // drawPie(id) {
+      //   this.charts = echarts.init(document.getElementById(id))
+      //   this.charts.setOption({
+      //     tooltip: {
+      //       position: 'top'
+      //     },
+      //     calendar: [{
+      //       orient: 'vertical',
+      //       yearLabel: {
+      //         margin: 40
+      //       },
+      //       dayLabel: {
+      //         firstDay: 1,
+      //         nameMap: ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+      //       },
+      //       monthLabel: {
+      //         nameMap: 'cn',
+      //         margin: 20
+      //       },
+      //       cellSize: 40,
+      //       top: 100,
+      //       left: 50,
+      //       range: '2017-04'
+      //     }],
+
+      //     series: [{
+      //       type: 'scatter',
+      //       coordinateSystem: 'calendar',
+      //       calendarIndex: 0,
+      //       symbolSize: function (val) {
+      //         return val[1] / 60;
+      //       },
+      //       data: []
+      //     }]
+      //   })
+      // },
+      drawPie_Year() {
+        let myChart = echarts.init(document.getElementById('main'))
+
+        let data = this.getVirtulData(2018);
+        myChart.setOption({
+
+          title: {
+            top: 30,
+            text: '个人年度报表',
+            left: 'center',
+            textStyle: {
+              color: '#000'
             }
-        },
-      //调用
-        mounted(){
-            this.$nextTick(function() {
-                this.drawPie('main')
-            })
-        }
+          },
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            top: '30',
+            left: '100',
+            data: ['步数', 'Top 12'],
+            textStyle: {
+              color: '#000'
+            }
+          },
+          calendar: [{
+            top: 100,
+            left: 'center',
+            range: ['2018-01-01', '2018-12-31'],
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: '#000',
+                width: 4,
+                type: 'solid'
+              }
+            },
+            yearLabel: {
+              formatter: '{start}  1st',
+              textStyle: {
+                color: '#fff'
+              }
+            },
+            itemStyle: {
+              normal: {
+                color: '#323c48',
+                borderWidth: 1,
+                borderColor: '#111'
+              }
+            }
+          }],
+          series: [{
+              name: '步数',
+              type: 'scatter',
+              coordinateSystem: 'calendar',
+              data: data,
+              symbolSize: function (val) {
+                return val[1] / 500;
+              },
+              itemStyle: {
+                normal: {
+                  color: '#ddb926'
+                }
+              }
+            }
+
+          ]
+        })
+
+
+      }
+    },
+    //调用
+    mounted() {
+      this.$nextTick(function () {
+        // this.drawPie('main1')
+        this.drawPie_Year()
+        this.drawLine()
+      })
     }
+  }
+
 </script>
 <style lang="scss" scoped>
 
diff --git a/src/views/KaoQin/import.vue b/src/views/KaoQin/import.vue
index 60d57ff..aefbd72 100644
--- a/src/views/KaoQin/import.vue
+++ b/src/views/KaoQin/import.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="app-container" id="import_Atten">
 
-    <el-button @click="New()" type="primary" size="small">新增</el-button>
-    <br>
-    <br>
 
     <el-table :data="list" v-loading.body="listLoading" element-loading-text="拼命加载中" border fit highlight-current-row>
       <el-table-column align="center" label='工号' width="95">
@@ -26,7 +23,7 @@
 
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
-          <el-button @click="Edit(scope.row.ID)" type="success" size="small">编辑</el-button>
+          <el-button @click="Edit(scope.row.ID,scope.row.Name)" type="success" size="small">录入</el-button>
 
           <el-button @click="Delete(scope.row.ID)" type="danger" size="small">删除</el-button>
         </template>
@@ -37,38 +34,34 @@
       style="margin-top:5px">
     </el-pagination>
 
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="50%">
+    <el-dialog :title="Title" :visible.sync="dialogFormVisible" width="50%">
       <el-form class="small-space" :model="temp" label-position="left" label-width="70px">
 
-        <el-form-item label="工号">
-          <el-input class="filter-item" v-model="temp.No" placeholder="请输入工号">
-
-          </el-input>
-        </el-form-item>
-        <el-form-item label="姓名">
-          <el-input class="filter-item" v-model="temp.Name" placeholder="请输入姓名">
-
-          </el-input>
+        <el-form-item label="考勤时间">
+          <el-time-select v-model="temp.StartTime" :picker-options="{
+    start: '08:30',
+    step: '00:05',
+    end: '09:30'
+  }" placeholder="上班时间">
+          </el-time-select>
+          <el-time-select v-model="temp.EndTime" :picker-options="{
+    start: '16:30',
+    step: '00:05',
+    end: '17:30'
+  }" placeholder="下班时间">
+          </el-time-select>
         </el-form-item>
-        <el-form-item label="性别">
-          <multiselect v-model="selected" :value="temp.Gender" :options="options" :searchable="false" :close-on-select="true" :allow-empty="false"
-            placeholder="请选择性别" :showLabels="false" style="z-index:3;height:30px">
+        <el-form-item label="是否请假">
+          <multiselect v-model="selected" :value="temp.Vacation" :options="options" :searchable="false" :close-on-select="true" :allow-empty="false"
+            placeholder="请选择" :showLabels="false" style="z-index:3;height:20px" label="text">
           </multiselect>
         </el-form-item>
 
 
 
-        <el-form-item label="部门">
-          <el-tree :data="depttree" auto-expand-parent show-checkbox default-expand-all node-key="id" ref="tree" highlight-current
-            :props="defaultProps">
-          </el-tree>
-
-
-        </el-form-item>
-
-        <el-form-item label="职位">
+        <el-form-item label="请假事由" v-if="this.selected.value">
 
-          <el-input class="filter-item" v-model="temp.Workduty" placeholder="请输入职位">
+          <el-input class="filter-item" type="textarea" v-model="temp.Vacation_Reason">
 
           </el-input>
         </el-form-item>
@@ -85,28 +78,38 @@
 
 <script>
   import {
-    GetUsers,
-    DeleteUser,
-    GetUsersDetail,
-    SaveNewUsers,
-    UpdateUsers
+    DeleteAtten,
+    AttenDetailByPerson,
+    UpdateAtten
+  } from "@/api/KaoQin/Attendance";
+  import {
+    GetUsers
   } from "@/api/KaoQin/person";
   import {
     GetDeptTree
   } from "@/api/system/dept";
-
+  import {
+    parseTime
+  } from '@/utils/index'
   import Multiselect from 'vue-multiselect'
 
   export default {
     data() {
       return {
-        selected: null,
-        options: ['男', '女'],
-        depttree: [],
-        textMap: {
-          update: "编辑",
-          create: "新增"
+        Title: "",
+        selected: {
+          'text': '否',
+          'value': 0
         },
+        options: [{
+            'text': '是',
+            'value': 1
+          },
+          {
+            'text': '否',
+            'value': 0
+          }
+        ],
         listQuery: {
           totalCount: "",
           pageSize: "10",
@@ -116,24 +119,16 @@
         dialogStatus: "",
         list: null,
         listLoading: true,
-        RoleID: "",
-
         temp: {
           ID: "",
-          No: "",
-          Name: "",
-          Gender: "",
-          Workduty: "",
-          DeptName: "",
-          DeptID: "",
-          phone: "",
+          PersonId: "",
+          Date: '',
+          StartTime: '',
+          EndTime: '',
+          Vacation: "",
+          Vacation_Reason: "",
           IsDeleted: false
-        },
-        defaultProps: {
-          children: "children",
-          label: "text"
-        },
-
+        }
       };
     },
     components: {
@@ -142,10 +137,7 @@
 
     created() {
       this.fetchData(this.listQuery);
-      GetDeptTree().then(response => {
-        this.depttree = JSON.parse(response.data);
 
-      });
     },
     methods: {
       handleSizeChange(val) {
@@ -158,33 +150,16 @@
         this.fetchData(this.listQuery);
 
       },
-
       fetchData(params) {
         this.listLoading = true;
         GetUsers(params).then(response => {
-               this.list = response.data.rows;
-        this.listQuery.totalCount = response.data.total;
-                  this.listLoading = false;
+          this.list = response.data.rows;
+          this.listQuery.totalCount = response.data.total;
+          this.listLoading = false;
 
         });
       },
-      New() {
-        this.temp = {
-          No: "",
-          DeptID: "",
-          Workduty: "",
-          Gender: "",
-          Name: "",
-          Phone: "",
-          IsDeleted: false
-        };
-        this.selected = null;
-        this.dialogFormVisible = true;
 
-        this.$refs.tree.setCheckedKeys([])
-
-        this.dialogStatus = "create";
-      },
       Delete(ID) {
         this.$confirm("确认删除?", "提示", {
           confirmButtonText: "确定",
@@ -194,41 +169,34 @@
           DeleteUser(ID).then(response => {
 
 
-            this.fetchData();
+        this.fetchData(this.listQuery);
           });
         });
       },
-      Edit(ID) {
+      Edit(ID, Name) {
         this.dialogStatus = "update";
         this.dialogFormVisible = true;
-
-        GetUsersDetail(ID).then(response => {
-
+        this.Title = Name;
+        this.temp.Date = parseTime(new Date());
+        AttenDetailByPerson(ID).then(response => {
           this.temp = response.data;
-          this.$refs.tree.setCheckedKeys([this.temp.DeptID]);
-          this.selected = this.temp.Gender;
-        });
-      },
-
-      create() {
-        this.temp.DeptID = this.$refs.tree.getCheckedKeys().join(',');
-        this.temp.Gender = this.selected;
-        SaveNewUsers(this.temp).then(response => {
-
-          this.dialogFormVisible = false;
+          if(this.temp.PersonId!=null){
+          this.selected.value = this.temp.Vacation;
+          }
+                          this.temp.PersonId = ID;
 
-          this.fetchData();
         });
+
       },
-      update() {
-        this.temp.Gender = this.selected;
-        this.temp.DeptID = this.$refs.tree.getCheckedKeys().join(',');
 
-        UpdateUsers(this.temp).then(response => {
+      update() {
+        this.temp.Vacation = this.selected.value;
+        this.temp.Date = parseTime(new Date());
+        UpdateAtten(this.temp).then(response => {
 
           this.dialogFormVisible = false;
 
-          this.fetchData();
+        this.fetchData(this.listQuery);
         });
       }
     }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index b2d8549..6c9ce01 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="dashboard-container">
+    <!-- <Aplayer></Aplayer> -->
       <github-corner></github-corner>
     <el-row>
       <el-col :span="6">
@@ -70,6 +71,7 @@
 
 <script>
 import GithubCorner from '@/components/GithubCorner'
+import Aplayer from 'vue-aplayer'
 
   import {
     mapGetters
@@ -85,6 +87,7 @@ import GithubCorner from '@/components/GithubCorner'
         weather: null,
         loading: false,
         report: null,
+        music:null
 
       }
     },
@@ -96,7 +99,7 @@ import GithubCorner from '@/components/GithubCorner'
         'AllRouters'
       ])
     },
-    components:{GithubCorner},
+    components:{GithubCorner,Aplayer},
     methods: {
       getImage(url) {
         if (url !== undefined) {
@@ -119,6 +122,13 @@ import GithubCorner from '@/components/GithubCorner'
         axios.get('/report/hot').then(response => {
           this.report = response.data.recent
      
+        })
+      },
+      GetMusic(){
+             axios.get('/music?id=3778678&limit=30').then(response => {
+          this.music = response.data
+          console.log(this.music)
+     
         })
       }
     },
@@ -126,6 +136,7 @@ import GithubCorner from '@/components/GithubCorner'
       this.GetNowTime()
       this.GetWeather()
       this.GetReport()
+      // this.GetMusic()
 
     }
   }
diff --git a/src/views/system/users.vue b/src/views/system/users.vue
index 6a4122f..8add22d 100644
--- a/src/views/system/users.vue
+++ b/src/views/system/users.vue
@@ -89,7 +89,7 @@
             </el-option>
           </el-select> -->
           <multiselect v-model="selected" :value="temp.RoleID" :options="options" :searchable="false" :close-on-select="true" :allow-empty="false"
-            label="RoleName" placeholder="请选择角色" track-by="RoleName" :showLabels="false">
+            label="RoleName" placeholder="请选择角色" track-by="ID" :showLabels="false">
           </multiselect>
         </el-form-item>
       </el-form>