周教学计划优化 打印优化

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

@@ -43,8 +43,8 @@
 
     <div ref="printMe" class="print-me">
       <h2 style="text-align: center">{{ this.deptName }}班级儿童考勤表</h2>
-      <h4 style="text-align: left">
-        考勤月份：{{ this.month }} ---- 班级总数：{{ this.classcount }} ----
+      <h4 style="text-align: right">
+        考勤月份：{{ this.month }} ------ 班级总数：{{ this.classcount }} ------
         幼儿总数：{{ this.chilidcount }}
       </h4>
       <el-table
@@ -97,7 +97,7 @@ export default {
       // 遮罩层
       loading: true,
       // 总条数
-      total: 0,
+      //total: 0,
       //javascript
       // 表头数据
       tableHead: [
@@ -361,7 +361,7 @@ export default {
                 : parseFloat((res.day31 * 100).toFixed(2)) + "%",
           });
         });
-        this.total = response.total;
+        //this.total = response.total;
         this.loading = false;
       });
     },

ruoyi-ui/src/views/benyi/planweek/table.vue

@@ -11,19 +11,19 @@
             <b class="table-title">{{h.title}}</b>
             {{h.name}}
           </td>-->
-          <td class="w140">
+          <td style="width:20%">
             <b class="table-title">班级：</b>
             {{classname}}
           </td>
-          <td>
+          <td style="width:20%">
             <b class="table-title">月份：</b>
             {{month}}
           </td>
-          <td>
+          <td style="width:20%">
             <b class="table-title">周次：</b>
             第{{zc}}周
           </td>
-          <td colspan="3">
+          <td colspan="3" style="width:40%">
             <b class="table-title">月主题：</b>
             {{monththeme}}
           </td>
@@ -283,12 +283,6 @@ export default {
 <style lang="scss">
 .table-container {
   padding: 30px 10%;
-  .w140 {
-    width: 140px;
-  }
-  .w200 {
-    width: 200px;
-  }
   .title {
     margin: 0;
     font-size: 18px;

ruoyi-ui/src/views/benyi/thememonthplan/table.vue

@@ -17,19 +17,19 @@
             <b class="table-title">{{h.title}}</b>
             {{h.name}}
           </td>-->
-          <td>
+          <td style="width: 20%">
             <b class="table-title">班级：</b>
             {{ classname }}
           </td>
-          <td>
+          <td style="width: 15%">
             <b class="table-title">月份：</b>
             {{ month }}
           </td>
-          <td colspan="2">
+          <td colspan="2" style="width: 45%">
             <b class="table-title">月主题：</b>
             {{ monththeme }}
           </td>
-          <td>
+          <td style="width: 20%">
             <b class="table-title">制表人：</b>
             {{ tbr }}
           </td>
@@ -48,9 +48,7 @@
             <span>{{ monththeme }}</span>
           </td>
           <td class="align-center">{{ item.zc }}</td>
-          <td class="align-center">
-            {{ item.starttime }}---{{ item.endtime }}
-          </td>
+          <td class="align-center">{{ item.starttime }}至{{ item.endtime }}</td>
           <td class="align-center">
             {{ themeactivityFormat(item.activityid) }}
           </td>

ruoyi-ui/src/views/benyi/themetermplan/table.vue

@@ -17,15 +17,15 @@
             <b class="table-title">{{h.title}}</b>
             {{h.name}}
           </td>-->
-          <td class="w140">
+          <td style="width: 20%">
             <b class="table-title">班级：</b>
             {{ classname }}
           </td>
-          <td>
+          <td style="width: 60%">
             <b class="table-title">学期：</b>
             {{ xnxqFormat(xnxq) }}
           </td>
-          <td class="w200">
+          <td style="width: 20%">
             <b class="table-title">制定人：</b>
             {{ tbr }}
           </td>
@@ -39,7 +39,15 @@
           <td class="align-center">
             <span>{{ item.month }}</span>
           </td>
-          <td class="align-center" v-html="themeFormat(item.themeconent)"></td>
+          <td class="align-center">
+            <router-link
+            style="margin:10px"
+              v-for="(index, item) in item.themeconent.split(';')"
+              :key="item"
+              :to="url + (Number(index) + Number(99999))"
+              >{{ themeFormat(index) }}</router-link
+            >
+          </td>
           <td>{{ item.remark }}</td>
         </tr>
         <tr>
@@ -70,6 +78,8 @@ export default {
   name: "TermTable",
   data() {
     return {
+      //url
+      url: "/benyi_course/tremplan/themestudy/",
       //学年学期
       xnxqOptions: [],
       //主题
@@ -118,23 +128,11 @@ export default {
       return this.selectDictLabel(this.xnxqOptions, xnxq);
     },
     // 主题--字典状态字典翻译
-    themeFormat(themeids) {
-      if (themeids != "" && themeids != null) {
-        var ilength = themeids.split(";").length - 1;
-        var names = "";
-        for (var i = 1; i < ilength; i++) {
-          var themeId = themeids.split(";")[i];
-          names =
-            names +
-            "<a target='_bank' href='/benyi_course/tremplan/themestudy/" +
-            (Number(99999) + Number(themeId)) +
-            "'>" +
-            this.selectMoeDictLabel(this.themeOptions, themeId) +
-            "</a>" +
-            " ";
-        }
-        //this.selectDictLabel(this.scopeOptions, row.xnxq);
-        return names;
+    themeFormat(themeid) {
+      if (themeid != "" && themeid != null) {
+        //console.log(themeid);
+        var name = this.selectMoeDictLabel(this.themeOptions, themeid);
+        return name;
       }
       return "";
     },
@@ -176,12 +174,6 @@ export default {
 <style lang="scss">
 .table-container {
   padding: 30px 10%;
-  .w140 {
-    width: 140px;
-  }
-  .w200 {
-    width: 200px;
-  }
   .title {
     margin: 0;
     font-size: 18px;

ruoyi-ui/src/views/benyi/themeweekplan/table.vue

@@ -1,9 +1,15 @@
 <template>
   <div class="table-container" ref="printMe">
-    <h2 class="title">{{title}}</h2>
+    <h2 class="title">{{ title }}</h2>
     <div class="table">
       <div class="print no-print">
-        <el-button type="primary" plain size="mini" icon="el-icon-printer" @click="prints"></el-button>
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          icon="el-icon-printer"
+          @click="prints"
+        ></el-button>
       </div>
       <table>
         <tr class="align-center">
@@ -11,48 +17,52 @@
             <b class="table-title">{{h.title}}</b>
             {{h.name}}
           </td>-->
-          <td>
+          <td style="width: 15%">
             <b class="table-title">班级：</b>
-            {{classname}}
+            {{ classname }}
           </td>
-          <td>
-            <b class="table-title">月份：</b>
-            {{month}}
-          </td>
-          <td>
-            <b class="table-title">周次：</b>
-            第{{zc}}周
-          </td>
-          <td>
-            <b class="table-title">月主题：</b>
-            {{monththeme}}
-          </td>
-          <td>
+          <td style="width: 15%">
             <b class="table-title">制表人：</b>
-            {{tbr}}
+            {{ tbr }}
+          </td>
+          <td style="width: 35%">
+            <b class="table-title">月主题：</b>
+            {{ monththeme }}
+          </td>
+          <td style="width: 15%">
+            <b class="table-title">月份：</b>
+            {{ month }}
+          </td>
+          <td style="width: 20%">
+            <b class="table-title">周次：</b>
+            第{{ zc }}周
           </td>
         </tr>
         <tr class="align-center table-bg">
           <td v-for="h in bodyData.title" :key="h.prop">
-            <b>{{h.label}}</b>
+            <b>{{ h.label }}</b>
           </td>
         </tr>
         <tr v-for="item in bodyData.weekplanitemList" :key="item.daytime">
-          <td v-if="item.theme" :rowspan="bodyData.weekplanitemList.length" class="align-center">
-            <span>{{item.theme}}</span>
+          <td
+            v-if="item.theme"
+            :rowspan="bodyData.weekplanitemList.length"
+            class="align-center"
+          >
+            <span>{{ item.theme }}</span>
           </td>
-          <td class="align-center">{{item.daytime}} / 星期{{item.zhou}}</td>
-          <td>{{themeactivityFormat(item.activityid)}}</td>
-          <td class="align-center">{{fzxzFormat(item.fzxz)}}</td>
-          <td>{{item.jzzc}}</td>
+          <td class="align-center">{{ item.daytime }} / 星期{{ item.zhou }}</td>
+          <td>{{ themeactivityFormat(item.activityid) }}</td>
+          <td class="align-center">{{ fzxzFormat(item.fzxz) }}</td>
+          <td>{{ item.jzzc }}</td>
         </tr>
         <tr>
           <td class="align-center">备注</td>
-          <td colspan="4">{{bz}}</td>
+          <td colspan="4">{{ bz }}</td>
         </tr>
         <tr>
           <td class="align-center">主管审批</td>
-          <td colspan="4">{{spyj}}</td>
+          <td colspan="4">{{ spyj }}</td>
         </tr>
       </table>
       <!-- <p
@@ -150,7 +160,7 @@ export default {
       queryParams_MonPlan: {
         xnxq: undefined,
         month: undefined,
-        classid:undefined,
+        classid: undefined,
         status: "2",
       },
       queryParams_MonPlanItem: {
@@ -236,7 +246,7 @@ export default {
         //查找活动id
         this.queryParams_MonPlan.month = response.data.month;
         this.queryParams_MonPlan.xnxq = response.data.xnxq;
-        this.queryParams_MonPlan.classid=response.data.classid;
+        this.queryParams_MonPlan.classid = response.data.classid;
         listMonthplan(this.queryParams_MonPlan).then((resMonPlan) => {
           //console.log(resMonPlan.rows);
           //获取的月主题

ruoyi-ui/src/views/system/user/index.vue

@@ -252,7 +252,7 @@
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="v-dialog u-dialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row :gutter="10">
+        <el-row :gutter="16">
           <el-col :xs="24" :sm="24" :md="12">
             <el-form-item label="用户姓名" prop="nickName">
               <el-input v-model="form.nickName" placeholder="请输入用户姓名" />