HZH 4 years ago
parent
commit
e0a953d1d9

+ 3 - 3
package-lock.json

@@ -9539,9 +9539,9 @@
       }
     },
     "rp-element": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/rp-element/-/rp-element-1.0.3.tgz",
-      "integrity": "sha512-kLH8S8QdtUPc9BrLzeXT9JZOALX8xNHx3ACsMxQBnpD7WtVKF/4ZgiwbxlJ54/sTxqGmVBpHMkQkAqxxBRugNg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/rp-element/-/rp-element-1.0.4.tgz",
+      "integrity": "sha512-oneuKs5mPsLNV5oR4w7Di3pn+ZpUciBelgRn2gG6dRBEM9Qtz9pYdgUmfa8fVwttNJjxlZ9U8J90K471ZiE5ew==",
       "requires": {
         "vue": "^2.6.11"
       }

+ 35 - 0
src/api/month.js

@@ -0,0 +1,35 @@
+import axios from 'axios';
+import qs from 'qs'
+//获取某月计划
+export function getMonthPlan(params){
+    return axios.get('/weekly/listCurrentMonth',{
+        params: params
+    }).then(result => result.data)
+}
+
+//新增
+export function addPlan(item) {
+    return axios({
+        method: 'post',
+        url: '/weekly/add',
+        data: qs.stringify(item)
+    }).then(res => res.data)
+}
+
+//修改
+export function updatePlan(item) {
+    return axios({
+        method: 'post',
+        url: '/weekly/update',
+        data: qs.stringify(item)
+    }).then(res => res.data)
+}
+
+//删除
+export function deletePlan(item) {
+    return axios({
+        method: 'post',
+        url: '/weekly/delete',
+        data: qs.stringify(item)
+    }).then(res => res)
+}

+ 25 - 10
src/components/MainPage/Task/Month.vue

@@ -21,9 +21,11 @@
       slot-scope="{date, data}">
       <div class="day-cell" @click="chooseDay(data)">
         <p>{{data.day.split('-')[2]}}</p>
-        <p v-if="new Date(data.day).getMonth() + 1 == searchMonth.getMonth() + 1">
-          {{planList[data.day.split('-')[2] - 1]?planList[data.day.split('-')[2] - 1].name:''}}
-        </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">
+            {{item.name}}
+          </p>
+        </div>
       </div>
     </template>
   </el-calendar>
@@ -45,6 +47,7 @@
 </template>
 
 <script>
+import { getMonthPlan,addPlan,updatePlan,deletePlan } from '@/api/month';
 export default {
   name: 'Month',
   components: {
@@ -52,28 +55,40 @@ export default {
   data () {
     return {
       searchMonth: new Date(),
+      params:{
+        startTime: ''
+      },
       visibleChange: false,
-      planList: [{
-        name: 'sss'
-      },{
-        name: 'sss2e22'
-      }],
+      planList: {},
       dayPlan: {}
 	  }
   },
+  created() {
+    this.getMonthPlan();
+  },
   watch: {
     searchMonth(val) {
+      this.params.startTime = val.getTime();
+      this.getMonthPlan();
     }
   },
   methods: {
+    getMonthPlan(){
+      getMonthPlan(this.params).then((data) => {
+        this.planList = {};
+        for(let key in data.data){
+          this.$set(this.planList,key,data.data[key]);
+        }
+      })
+    },
     editTask(){
       this.visibleChange = false;
     },
     chooseDay(data){
       this.visibleChange = true;
       let day = data.day.split('-')[2];
-      if(this.planList[day - 1]){
-        this.dayPlan = this.planList[day - 1];
+      if(this.planList[day].length){
+        this.dayPlan = this.planList[day][0];
       }
       else{
         this.dayPlan = {};

+ 1 - 1
static/css/app.839ffb07.css → static/css/app.4a31600b.css

@@ -1 +1 @@
-*{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-10c6205a]{width:100%;height:100%}
+*{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-fd6d3dae]{width:100%;height:100%}

File diff suppressed because it is too large
+ 0 - 0
static/css/group-app.f21ef492.css


+ 1 - 0
static/css/group-controlApp.07300f99.css

@@ -0,0 +1 @@
+.notfound[data-v-5e73da99]{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-5e73da99]{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-5e73da99]{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-5e73da99]: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-5e73da99]:nth-child(2),.notfound form>div[data-v-5e73da99]:nth-child(3),.notfound form>div[data-v-5e73da99]:nth-child(4){margin:35px 70px}.notfound form button[data-v-5e73da99]{width:100%;margin-top:20px}.notfound .error[data-v-5e73da99]{color:red}

+ 0 - 0
static/css/group-controlApp.0e433876.css


File diff suppressed because it is too large
+ 0 - 0
static/css/group-mainPage.874abc43.css


File diff suppressed because it is too large
+ 0 - 0
static/css/group-mainPage.b5ba0a98.css


BIN
static/img/loginTitle.4e7ad108.png


+ 1 - 1
static/index.html

@@ -31,4 +31,4 @@
           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.0e433876.css rel=prefetch><link href=/css/group-mainPage.874abc43.css rel=prefetch><link href=/js/group-app.0ab1845a.js rel=prefetch><link href=/js/group-controlApp.1d6faa4a.js rel=prefetch><link href=/js/group-mainPage.512dfcc6.js rel=prefetch><link href=/css/app.839ffb07.css rel=preload as=style><link href=/css/chunk-vendors.635bc84a.css rel=preload as=style><link href=/js/app.74bacfd9.js rel=preload as=script><link href=/js/chunk-vendors.7c048ce1.js rel=preload as=script><link href=/css/chunk-vendors.635bc84a.css rel=stylesheet><link href=/css/app.839ffb07.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.7c048ce1.js></script><script src=/js/app.74bacfd9.js></script></body></html>
+      }</script><link href=/css/group-app.f21ef492.css rel=prefetch><link href=/css/group-controlApp.07300f99.css rel=prefetch><link href=/css/group-mainPage.b5ba0a98.css rel=prefetch><link href=/js/group-app.24a0147e.js rel=prefetch><link href=/js/group-controlApp.68a8ad45.js rel=prefetch><link href=/js/group-mainPage.6738d6ed.js rel=prefetch><link href=/css/app.4a31600b.css rel=preload as=style><link href=/css/chunk-vendors.635bc84a.css rel=preload as=style><link href=/js/app.c730d06d.js rel=preload as=script><link href=/js/chunk-vendors.7c048ce1.js rel=preload as=script><link href=/css/chunk-vendors.635bc84a.css rel=stylesheet><link href=/css/app.4a31600b.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.7c048ce1.js></script><script src=/js/app.c730d06d.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
static/js/app.74bacfd9.js


File diff suppressed because it is too large
+ 0 - 0
static/js/app.c730d06d.js


+ 0 - 1
static/js/group-app.0ab1845a.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}}]);

+ 1 - 0
static/js/group-app.24a0147e.js

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

+ 0 - 1
static/js/group-controlApp.1d6faa4a.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["group-controlApp"],{"47d1":function(e,n){n.yo=function(){alert("Yo Coder!")},n.hello=function(){alert("Hello Coder!")}},"4edd":function(e,n,t){},b9fe:function(e,n,t){"use strict";var o=t("4edd"),c=t.n(o);c.a},f078:function(e,n,t){"use strict";t.r(n);var o=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",{staticClass:"home-page"})},c=[],r=(t("47d1"),{name:"UserTest",components:{},data:function(){return{}},created:function(){},methods:{}}),a=r,u=(t("b9fe"),t("2877")),s=Object(u["a"])(a,o,c,!1,null,"443ee0fb",null);n["default"]=s.exports}}]);

File diff suppressed because it is too large
+ 0 - 0
static/js/group-controlApp.68a8ad45.js


File diff suppressed because it is too large
+ 0 - 0
static/js/group-mainPage.512dfcc6.js


File diff suppressed because it is too large
+ 0 - 0
static/js/group-mainPage.6738d6ed.js


Some files were not shown because too many files changed in this diff