浏览代码

Merge branch 'master' of http://gogs.yaoxiangedu.com/huzh/work

# Conflicts:
#	static/css/group-controlApp.07300f99.css
#	static/css/group-controlApp.2a5d2a89.css
#	static/css/group-controlApp.4a0d85fa.css
#	static/css/group-mainPage.d5a1b3bf.css
#	static/index.html
#	static/js/app.25ab1562.js
#	static/js/group-app.c96982bc.js
#	static/js/group-mainPage.3f30b3ce.js
HZH-PC\HZH 4 年之前
父节点
当前提交
8771916ddf

+ 1 - 1
.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 node_modules
 /dist
-
+static
 # local env files
 .env.local
 .env.*.local

+ 30 - 14
src/components/MainPage/Task/Month.vue

@@ -8,9 +8,14 @@
     margin: 5px;
     /deep/ .el-input{
       display: inline-block;
-      width: 200px;
+      width: 370px;
     }
   }
+  .add-bt{
+    cursor: pointer;
+    font-size: 18px;
+    float: right;
+  }
 }
 </style>
 <template>
@@ -20,9 +25,9 @@
       slot="dateCell"
       slot-scope="{date, data}">
       <div class="day-cell" @click="chooseDay(data)">
-        <p>{{data.day.split('-')[2]}}</p>
-        <div v-if="new Date(data.day).getMonth() + 1 == searchMonth.getMonth() + 1">
-          <p v-for="item in planList[data.day.split('-')[2]]" :key="item.id">
+        <p>{{getDayNum(data.day)}}</p>
+        <div v-if="new Date(data.day).getMonth() == searchMonth.getMonth()">
+          <p v-for="item in planList[getDayNum(data.day)]" :key="item.id">
             {{item.name}}
           </p>
         </div>
@@ -34,10 +39,11 @@
       title="修改计划"
       :visible.sync="visibleChange"
       width="500px">
-      <div>
+      <div v-for="(item, index) in dayPlan" :key="index">
           <label>计划:</label>
-          <el-input placeholder="" v-model="dayPlan.name"></el-input>
+          <el-input placeholder="" v-model="item.name"></el-input>
       </div>
+      <i class="el-icon-circle-plus-outline add-bt" @click="addDayPlan()"></i>
       <span slot="footer" class="dialog-footer">
         <el-button @click="visibleChange = false">取 消</el-button>
         <el-button type="primary" @click="editTask">确 定</el-button>
@@ -60,7 +66,7 @@ export default {
       },
       visibleChange: false,
       planList: {},
-      dayPlan: {}
+      dayPlan: []
 	  }
   },
   created() {
@@ -85,14 +91,24 @@ export default {
       this.visibleChange = false;
     },
     chooseDay(data){
-      this.visibleChange = true;
-      let day = data.day.split('-')[2];
-      if(this.planList[day].length){
-        this.dayPlan = this.planList[day][0];
-      }
-      else{
-        this.dayPlan = {};
+      if(new Date(data.day).getMonth() != this.searchMonth.getMonth()){
+        return;
       }
+      this.visibleChange = true;
+      let day = this.getDayNum(data.day);
+      this.dayPlan = JSON.parse(JSON.stringify(this.planList[day]));
+    },
+    addDayPlan(){
+      this.dayPlan.push({
+        "name": "",
+        "content": "",
+        "year": "",
+        "userId": "",
+        "startTime": "",
+      })
+    },
+    getDayNum(day){
+      return ~~day.split('-')[2];
     }
   }
 }

+ 0 - 1
static/css/app.26091a7d.css

@@ -1 +0,0 @@
-*{outline:0;padding:0;margin:0}*,:after,:before{-webkit-box-sizing:border-box;box-sizing:border-box}body,html{width:100%;height:100%;min-width:1200px;min-height:720px;font-size:14px;font-family:Helvetica Neue,Luxi Sans,DejaVu Sans,Tahoma,Hiragino Sans GB,STHeiti,Microsoft YaHei}ol,ul{list-style:none;margin-top:0;margin-bottom:10px}:link img,:visited img,a img{border:0}caption,th{text-align:left}.ng-cloak,.ng-hide:not(.ng-hide-animate),.x-ng-cloak,[data-ng-cloak],[ng-cloak],[ng\:cloak],[x-ng-cloak]{display:none!important}ng\:form{display:block}.cursor-pointer{cursor:pointer}i{font-style:normal}h4{font-size:14px}button.btn:active,button.btn:focus,button.btn:focus:active{outline:none}label{display:inline-block;max-width:100%;font-weight:700}a{color:#337ab7;text-decoration:none}img{vertical-align:middle}#app[data-v-5f2f570d]{width:100%;height:100%}

文件差异内容过多而无法显示
+ 0 - 0
static/css/chunk-vendors.635bc84a.css


文件差异内容过多而无法显示
+ 0 - 0
static/css/group-app.941369c8.css


+ 0 - 1
static/css/group-controlApp.4a0d85fa.css

@@ -1 +0,0 @@
-.notfound[data-v-ad9aeacc]{margin:0;height:100%;overflow:hidden;font-family:Libre Franklin,sans-serif;font-size:62.5%;background-image:-webkit-gradient(linear,left bottom,left top,from(#e8f4f8),to(#add8e6));background-image:linear-gradient(0deg,#e8f4f8,#add8e6)}.notfound .sun[data-v-ad9aeacc]{position:absolute;top:4em;left:4em;width:100px;height:100px;border-radius:50%;background-image:radial-gradient(circle at 50%,#fff 50%,#f5de19);-webkit-box-shadow:0 0 40px #f5de19,inset 0 0 100px #f5de19;box-shadow:0 0 40px #f5de19,inset 0 0 100px #f5de19;-webkit-animation:sun 5s linear infinite;animation:sun 5s linear infinite}.notfound form[data-v-ad9aeacc]{width:500px;height:450px;background:#fff;-webkit-box-shadow:0 5px 10px 1px #e0e0e0;box-shadow:0 5px 10px 1px #e0e0e0;border-radius:5px;position:relative;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);text-align:center;padding:50px 20px}.notfound form>div[data-v-ad9aeacc]:first-child{height:74px;background:url(../img/loginTitle.4e7ad108.png) no-repeat 50%;border-bottom:1px solid #e8e7ef;margin-bottom:15px}.notfound form>div[data-v-ad9aeacc]:nth-child(2),.notfound form>div[data-v-ad9aeacc]:nth-child(3),.notfound form>div[data-v-ad9aeacc]:nth-child(4){margin:35px 70px}.notfound form button[data-v-ad9aeacc]{width:100%;margin-top:20px}.notfound .error[data-v-ad9aeacc]{color:red}

文件差异内容过多而无法显示
+ 0 - 0
static/css/group-mainPage.ab5d575a.css


二进制
static/favicon.ico


二进制
static/fonts/element-icons.535877f5.woff


二进制
static/fonts/element-icons.732389de.ttf


二进制
static/img/loginTitle.4e7ad108.png


+ 0 - 34
static/index.html

@@ -1,34 +0,0 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>TODO</title><script>function IEVersion() {
-          var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串  
-          var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器  
-          var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器  
-          var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
-          if(isIE) {
-              var reIE = new RegExp("MSIE (\\d+\\.\\d+);");
-              reIE.test(userAgent);
-              var fIEVersion = parseFloat(RegExp["$1"]);
-              if(fIEVersion == 7) {
-                  return 7;
-              } else if(fIEVersion == 8) {
-                  return 8;
-              } else if(fIEVersion == 9) {
-                  return 9;
-              } else if(fIEVersion == 10) {
-                  return 10;
-              } else {
-                  return 6;//IE版本<=7
-              }   
-          } else if(isEdge) {
-              return 12;//edge
-          } else if(isIE11) {
-              return 11; //IE11  
-          }else{
-              return -1;//不是ie浏览器
-          }
-      }
-      var version = IEVersion();
-      if(version != -1 && version < 10) {
-          if(window.confirm("您的浏览器版本过低,推荐使用IE10及以上浏览器或者chrome浏览器,点击确定下载chrome安装浏览器。若是360等浏览器,开启兼容模式")){
-              window.open("/download/44.0.2403.89_chrome_installer.exe", "_blank");
-          }
-      }</script><link href=/css/group-app.941369c8.css rel=prefetch><link href=/css/group-controlApp.4a0d85fa.css rel=prefetch><link href=/css/group-mainPage.ab5d575a.css rel=prefetch><link href=/js/group-app.9ea37f96.js rel=prefetch><link href=/js/group-controlApp.5c670233.js rel=prefetch><link href=/js/group-mainPage.0fb475e7.js rel=prefetch><link href=/css/app.26091a7d.css rel=preload as=style><link href=/css/chunk-vendors.635bc84a.css rel=preload as=style><link href=/js/app.df8b070e.js rel=preload as=script><link href=/js/chunk-vendors.d09a40a8.js rel=preload as=script><link href=/css/chunk-vendors.635bc84a.css rel=stylesheet><link href=/css/app.26091a7d.css rel=stylesheet></head><body><noscript><strong>We're sorry but my-project doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.d09a40a8.js></script><script src=/js/app.df8b070e.js></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
static/js/app.df8b070e.js


文件差异内容过多而无法显示
+ 0 - 0
static/js/chunk-vendors.d09a40a8.js


+ 0 - 1
static/js/group-app.9ea37f96.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["group-app"],{"541d":function(n,t,a){},aefc:function(n,t,a){"use strict";var s=a("541d"),e=a.n(s);e.a},fb03:function(n,t,a){"use strict";a.r(t);var s=function(){var n=this,t=n.$createElement;n._self._c;return n._m(0)},e=[function(){var n=this,t=n.$createElement,a=n._self._c||t;return a("div",{staticClass:"notfound"},[a("div",{staticClass:"error"},[a("span",[n._v("Page not found")]),a("span",[n._v("404")]),a("span")]),a("div",{staticClass:"sun"})])}],c=(a("aefc"),a("2877")),r={},i=Object(c["a"])(r,s,e,!1,null,"56d59a93",null);t["default"]=i.exports}}]);

文件差异内容过多而无法显示
+ 0 - 0
static/js/group-controlApp.5c670233.js


文件差异内容过多而无法显示
+ 0 - 0
static/js/group-mainPage.0fb475e7.js


部分文件因为文件数量过多而无法显示