20200422-zlp-1

园历展示

ruoyi-ui/src/api/benyi/schoolcalendar.js

@@ -9,6 +9,15 @@ export function listSchoolcalendar(query) {
   })
 }
 
+// 查询园历列表
+export function getSchoolCalendars(query) {
+  return request({
+    url: '/benyi/schoolcalendar/getSchoolCalendars',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询园历管理详细
 export function getSchoolcalendar(id) {
   return request({

ruoyi-ui/src/views/benyi/schoolcalendar/index.vue

@@ -96,7 +96,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="标识" align="center" prop="id" />
+      <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column
         label="活动类型"
@@ -292,7 +292,9 @@ export default {
     /** 查询园历管理列表 */
     getList() {
       this.loading = true;
-      listSchoolcalendar(this.queryParams).then(response => {
+      listSchoolcalendar(
+        this.addDateRange(this.queryParams, this.dateRange)
+      ).then(response => {
         this.schoolcalendarList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -321,6 +323,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -342,6 +345,8 @@ export default {
       const id = row.id || this.ids;
       getSchoolcalendar(id).then(response => {
         this.form = response.data;
+        this.scopeOptions = response.scopes;
+        this.form.scope = response.scopeIds;
         this.open = true;
         this.title = "修改园历管理";
       });

ruoyi-ui/src/views/index.vue

@@ -24,12 +24,15 @@
           <!--自定义内容-->
           <div>
             <div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div>
-            <div v-for="item in calendarData">
-              <div v-if="(item.months).indexOf(data.day.split('-').slice(1)[0])!=-1">
-                <div v-if="(item.days).indexOf(data.day.split('-').slice(2).join('-'))!=-1">
-                  <el-tooltip class="item" effect="dark" :content="item.things" placement="right">
-                    <div class="is-selected">{{item.things}}</div>
-                  </el-tooltip>
+            <div v-for="(item,index) in calendarData" :key="index">
+              <div v-if="(item.years).indexOf(data.day.split('-').slice(0)[0])!=-1">
+                <div v-if="(item.months).indexOf(data.day.split('-').slice(1)[0])!=-1">
+                  <div v-if="(item.days).indexOf(data.day.split('-').slice(2).join('-'))!=-1">
+                    <el-tooltip class="item" effect="dark" :content="item.things" placement="right">
+                      <div class="is-selected">{{item.things}}</div>
+                    </el-tooltip>
+                  </div>
+                  <div v-else></div>
                 </div>
                 <div v-else></div>
               </div>
@@ -46,6 +49,7 @@
 import RaddarChart from "./dashboard/RaddarChart";
 import PieChart from "./dashboard/PieChart";
 import BarChart from "./dashboard/BarChart";
+import { getSchoolCalendars } from "@/api/benyi/schoolcalendar";
 
 export default {
   name: "Index",
@@ -56,16 +60,24 @@ export default {
     BarChart
   },
   data() {
-    return {calendarData: [
-                    { months: ['09', '11'],days: ['15'],things: '看电影' },
-                    { months: ['10', '11'], days: ['02'],things: '去公园野炊' },
-                    { months: ['11'], days: ['02'],things: '看星星' },
-                    { months: ['11'], days: ['02'],things: '看月亮' }   
-                ],
-      value: new Date()
+    return {
+      calendarData: [],
+      value: new Date(),
+      // 查询参数
+      queryParams: {}
     };
   },
-  methods: {}
+  created() {
+    this.getSchoolCalendarList();
+  },
+  methods: {
+    /** 查询园历列表 */
+    getSchoolCalendarList() {
+      getSchoolCalendars(this.queryParams).then(response => {
+        this.calendarData = response.calendarData;
+      });
+    }
+  }
 };
 </script>
 

ruoyi-ui/src/views/system/user/profile/userInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form ref="form" :model="user" :rules="rules" label-width="80px">
-    <el-form-item label="用户昵称" prop="nickName">
+    <el-form-item label="用户姓名" prop="nickName">
       <el-input v-model="user.nickName" />
     </el-form-item> 
     <el-form-item label="手机号码" prop="phonenumber">