细节优化

BoBoooooo · May 25, 2018 · 70e0427 · 70e0427
1 parent 0cd1259
commit 70e0427
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 44 deletions.
diff --git a/src/views/KaoQin/count.vue b/src/views/KaoQin/count.vue
@@ -13,7 +13,7 @@
 
             <div class="charts">
 
-              <div id="myChart" style="width: 1000px;height: 600px;position:relative"></div>
+              <div id="myChart" style="width: 600px;height: 400px;position:relative"></div>
 
  <el-card style="width:150px;position:absolute;left:650px;top:150px" v-show="vacation!==''">
               <h4>
@@ -127,7 +127,6 @@ export default {
 
         calendar: [
           {
-            top: "middle",
             left: "center",
 
             orient: "vertical",
@@ -226,6 +225,7 @@ export default {
     },
     drawPersonYear() {
       let myChart = echarts.init(document.getElementById("main"), "vintage");
+            let that = this;
 
       myChart.setOption({
     
@@ -237,11 +237,9 @@ export default {
               res = `<span>上班时间:${
                 params.value[2]
               }</span><br><span>下班时间:${params.value[3]}</span>`;
-            if (params.seriesIndex == 1) {
+            if (params.seriesIndex == 0) {
               for (let i = 0; i < that.tooltipdata_year.length; i++) {
                 let obj = that.tooltipdata_year[i];
-                console.log(obj[0]);
-                console.log(params.value[0]);
                 if (obj[0] == params.value[0] && obj[1] != 1) {
                   res = `<span>上班时间:${obj[3]}</span><br><span>下班时间:${
                     obj[4]
@@ -289,7 +287,7 @@ export default {
           min: 0,
           max: 2,
           calculable: true,
-          seriesIndex: [1],
+          seriesIndex: [0],
           orient: "horizontal",
           left: "center",
           bottom: 20,
@@ -305,38 +303,15 @@ export default {
         },
 
         series: [
-          {
-            name: "显示",
-            type: "scatter",
-            coordinateSystem: "calendar",
-            calendarIndex: 0,
-            data: this.data_year,
-            symbolSize: 1,
-            label: {
-              normal: {
-                show: true,
-                formatter: function(params) {
-                  console.log(params);
-                  var d = echarts.number.parseDate(params.value[0]);
-                  let no = params.data[4];
-                  if (no !== 1)
-                    return (
-                      d.getDate() +
-                      "\n\n" +
-                      params.data[2] +
-                      "~" +
-                      params.data[3]
-                    );
-                  else if (no == 1) {
-                    return d.getDate() + "\n\n" + params.data[5];
-                  }
-                },
-                textStyle: {
-                  color: "#000"
-                }
-              }
-            }
-          },
+          // {
+          //   name: "显示",
+          //   type: "scatter",
+          //   coordinateSystem: "calendar",
+          //   calendarIndex: 0,
+          //   data: this.data_year,
+          //   symbolSize: 5
+    
+          // },
           {
             name: "考勤",
             type: "heatmap",
@@ -346,10 +321,9 @@ export default {
             data: this.heatmapdata_year
           }
         ]
-      });
+      },true);
     },
     setMonth(val) {
-      console.log(val);
       this.params.month = val;
     },
 

diff --git a/src/views/KaoQin/person.vue b/src/views/KaoQin/person.vue
@@ -31,7 +31,7 @@
           {{scope.row.Workduty}}
         </template>
       </el-table-column>
-      <el-table-column label="入职时间" align="center">
+      <!-- <el-table-column label="入职时间" align="center">
         <template slot-scope="scope">
           {{scope.row.Workduty}}
         </template>
@@ -40,7 +40,7 @@
         <template slot-scope="scope">
           {{scope.row.Phone}}
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column label="操作" align="center" min-width="110px">
         <template slot-scope="scope">

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
@@ -7,7 +7,7 @@
         <el-card :body-style="{ padding: '15px 0px',height:'300px'}">
                 <img src="https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif?imageView2/1/w/100/h/100" style="border-radius:80px" >
 
-          <div class="dashboard-text">人事考勤管理系统 v1.0</div>
+          <div class="dashboard-text">人事考勤管理系统</div>
           <div class="bottom clearfix">
             <!-- <div class='dashboard-text'>{{name}} -->
             <!-- <span v-for='role in roles' :key='role'>{{role}}</span> -->

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
@@ -2,7 +2,7 @@
   <div class="login-container">
     <el-form autoComplete="on" :model="loginForm"  ref="loginForm" label-position="left" label-width="0px"
       class="card-box login-form">
-      <h3 class="title"> <img style="width:7%" src='/logo.ico'> Anshare</h3>
+      <h3 class="title"> <img style="width:7%" src='/logo.ico'>&nbsp;人事考勤管理系统</h3>
 
 
       <el-form-item prop="username">