From 3eb45a33b561da68c6ba910f974eeedcfee69a86 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 5 Aug 2022 11:25:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todayAttendanceDetail.html                | 37 +++++++++----------
 .../attendanceClassesManage.js                |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html b/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html
index 10997a268..ab10dce8a 100755
--- a/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html
+++ b/public/components/property/todayAttendanceDetail/todayAttendanceDetail.html
@@ -1,5 +1,4 @@
-<div id="todayAttendanceDetailModel" class="modal fade" tabindex="-1" role="dialog"
-     aria-labelledby="todayAttendanceDetailModelLabel" aria-hidden="true">
+<div id="todayAttendanceDetailModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="todayAttendanceDetailModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
@@ -15,27 +14,27 @@
                             <div class="table-responsive" style="margin-top:15px">
                                 <table class="table table-striped">
                                     <thead>
-                                    <tr>
-                                        <th class="text-center"><span><vc:i18n name="名称" namespace="todayAttendanceDetail"></vc:i18n></span></th>
-                                        <th class="text-center"><span><vc:i18n name="状态" namespace="todayAttendanceDetail"></vc:i18n></span></th>
-                                        <th class="text-center"><span><vc:i18n name="考勤时间" namespace="todayAttendanceDetail"></vc:i18n></span></th>
-                                        <th class="text-center"><span><vc:i18n name="打卡时间" namespace="todayAttendanceDetail"></vc:i18n></span></th>
-                                        <th class="text-center"><span><vc:i18n name="抓拍" namespace="todayAttendanceDetail"></vc:i18n></span></th>
-                                    </tr>
+                                        <tr>
+                                            <th class="text-center"><span><vc:i18n name="名称" namespace="todayAttendanceDetail"></vc:i18n></span></th>
+                                            <th class="text-center"><span><vc:i18n name="状态" namespace="todayAttendanceDetail"></vc:i18n></span></th>
+                                            <th class="text-center"><span><vc:i18n name="考勤时间" namespace="todayAttendanceDetail"></vc:i18n></span></th>
+                                            <th class="text-center"><span><vc:i18n name="打卡时间" namespace="todayAttendanceDetail"></vc:i18n></span></th>
+                                            <th class="text-center"><span><vc:i18n name="抓拍" namespace="todayAttendanceDetail"></vc:i18n></span></th>
+                                        </tr>
                                     </thead>
                                     <tbody>
-                                    <tr v-for="detail in todayAttendanceDetailInfo.attendanceClassesTaskDetails">
-                                        <td class="text-center">{{detail.specName}}</td>
-                                        <td class="text-center">{{detail.state}}</td>
-                                        <td class="text-center">{{detail.value}}</td>
-                                        <td class="text-center">{{detail.checkTime}}</td>
-                                        <td class="text-right ">
-                                            <span v-for="_photo in detail.photos">
+                                        <tr v-for="detail in todayAttendanceDetailInfo.attendanceClassesTaskDetails">
+                                            <td class="text-center">{{detail.specName}}</td>
+                                            <td class="text-center">{{detail.stateName}}</td>
+                                            <td class="text-center">{{detail.value}}</td>
+                                            <td class="text-center">{{detail.checkTime}}</td>
+                                            <td class="text-right ">
+                                                <span v-for="_photo in detail.photos">
                                                 <img style="width: 60px; height: 60px;" v-bind:src="_photo.url"
                                                      v-on:click="openFile(_photo)">
                                             </span>
-                                        </td>
-                                    </tr>
+                                            </td>
+                                        </tr>
                                     </tbody>
                                 </table>
                             </div>
@@ -46,4 +45,4 @@
         </div>
     </div>
     <vc:create path="common/viewImage"></vc:create>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/property/attendanceClassesManage/attendanceClassesManage.js b/public/pages/property/attendanceClassesManage/attendanceClassesManage.js
index 022c06ad5..58409347c 100755
--- a/public/pages/property/attendanceClassesManage/attendanceClassesManage.js
+++ b/public/pages/property/attendanceClassesManage/attendanceClassesManage.js
@@ -44,7 +44,7 @@
                 param.params.classesId = param.params.classesId.trim();
                 param.params.classesName = param.params.classesName.trim();
                 //发送get请求
-                vc.http.apiGet('attendanceClasses.listAttendanceClassess',
+                vc.http.apiGet('/attendanceClasses.listAttendanceClassess',
                     param,
                     function(json, res) {
                         var _attendanceClassesManageInfo = JSON.parse(json);

From 58f26f3cdfed15ac3a28076328b6fb49fee59ee4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 5 Aug 2022 16:57:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addReportCustomComponentFooter.html       | 101 ++++++++----------
 .../editReportCustomComponent.html            |   2 +-
 2 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/public/components/dev/addReportCustomComponentFooter/addReportCustomComponentFooter.html b/public/components/dev/addReportCustomComponentFooter/addReportCustomComponentFooter.html
index 2f5e29715..152321b0d 100644
--- a/public/components/dev/addReportCustomComponentFooter/addReportCustomComponentFooter.html
+++ b/public/components/dev/addReportCustomComponentFooter/addReportCustomComponentFooter.html
@@ -1,61 +1,54 @@
-<div id="addReportCustomComponentFooterModel" class="modal fade" tabindex="-1" role="dialog"
-  aria-labelledby="exampleModalLabel" aria-hidden="true">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-body">
-        <h3 class="m-t-none m-b "><span><vc:i18n name="添加" namespace="addReportCustomComponentFooter"></vc:i18n></span></h3>
-        <div class="ibox-content">
-          <div>
-            <div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span><vc:i18n name="名称" namespace="addReportCustomComponentFooter"></vc:i18n></span></label>
-                <div class="col-sm-10">
-                  <input v-model="addReportCustomComponentFooterInfo.name" type="text" :placeholder="vc.i18n('必填，请填写名称','addReportCustomComponentFooter')"
-                    class="form-control">
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span><vc:i18n name="查询方式" namespace="addReportCustomComponentFooter"></vc:i18n></span></label>
-                <div class="col-sm-10">
-                  <select class="custom-select" v-model="addReportCustomComponentFooterInfo.queryModel">
-                    <option selected disabled value="">{{vc.i18n('必填','addReportCustomComponentFooter')}}，请选择查询方式</option>
+<div id="addReportCustomComponentFooterModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b "><span><vc:i18n name="添加" namespace="addReportCustomComponentFooter"></vc:i18n></span></h3>
+                <div class="ibox-content">
+                    <div>
+                        <div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="名称" namespace="addReportCustomComponentFooter"></vc:i18n></span></label>
+                                <div class="col-sm-10">
+                                    <input v-model="addReportCustomComponentFooterInfo.name" type="text" :placeholder="vc.i18n('必填，请填写名称','addReportCustomComponentFooter')" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="查询方式" namespace="addReportCustomComponentFooter"></vc:i18n></span></label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addReportCustomComponentFooterInfo.queryModel">
+                    <option selected disabled value="">{{vc.i18n('必填，请选择查询方式','addReportCustomComponentFooter')}}</option>
                     <option value="1">sql</option>
                     <option value="2">java</option>
                   </select>
-                </div>
-              </div>
-              <div class="form-group row" v-if="addReportCustomComponentFooterInfo.queryModel == 1">
-                <label class="col-sm-2 col-form-label">sql</label>
-                <div class="col-sm-10">
-                  <textarea v-model="addReportCustomComponentFooterInfo.componentSql" rows="15" :placeholder="vc.i18n('选填，请填写执行','addReportCustomComponentFooter')sql"
-                    class="form-control"></textarea>
-                </div>
-              </div>
-              <div class="form-group row" v-if="addReportCustomComponentFooterInfo.queryModel == 2">
-                <label class="col-sm-2 col-form-label">java</label>
-                <div class="col-sm-10">
-                  <textarea v-model="addReportCustomComponentFooterInfo.javaScript" rows="15" :placeholder="vc.i18n('选填，请填写执行','addReportCustomComponentFooter')java脚本代码"
-                    class="form-control"></textarea>
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span><vc:i18n name="描述" namespace="addReportCustomComponentFooter"></vc:i18n></span></label>
-                <div class="col-sm-10">
-                  <textarea v-model="addReportCustomComponentFooterInfo.remark" type="text" :placeholder="vc.i18n('选填，请填写描述','addReportCustomComponentFooter')"
-                    class="form-control"></textarea>
-                </div>
-              </div>
+                                </div>
+                            </div>
+                            <div class="form-group row" v-if="addReportCustomComponentFooterInfo.queryModel == 1">
+                                <label class="col-sm-2 col-form-label">sql</label>
+                                <div class="col-sm-10">
+                                    <textarea v-model="addReportCustomComponentFooterInfo.componentSql" rows="15" :placeholder="vc.i18n('选填，请填写执行sql','addReportCustomComponentFooter')" class="form-control"></textarea>
+                                </div>
+                            </div>
+                            <div class="form-group row" v-if="addReportCustomComponentFooterInfo.queryModel == 2">
+                                <label class="col-sm-2 col-form-label">java</label>
+                                <div class="col-sm-10">
+                                    <textarea v-model="addReportCustomComponentFooterInfo.javaScript" rows="15" :placeholder="vc.i18n('选填，请填写执行java脚本代码','addReportCustomComponentFooter')" class="form-control"></textarea>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="描述" namespace="addReportCustomComponentFooter"></vc:i18n></span></label>
+                                <div class="col-sm-10">
+                                    <textarea v-model="addReportCustomComponentFooterInfo.remark" type="text" :placeholder="vc.i18n('选填，请填写描述','addReportCustomComponentFooter')" class="form-control"></textarea>
+                                </div>
+                            </div>
 
-              <div class="ibox-content">
-                <button class="btn btn-primary float-right" type="button"
-                  v-on:click="saveReportCustomComponentFooterInfo()"><i class="fa fa-check"></i>&nbsp;保存</button>
-                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                  data-dismiss="modal"><span><vc:i18n name="取消" namespace="addReportCustomComponentFooter"></vc:i18n></span></button>
-              </div>
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveReportCustomComponentFooterInfo()"><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal"><span><vc:i18n name="取消" namespace="addReportCustomComponentFooter"></vc:i18n></span></button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/dev/editReportCustomComponent/editReportCustomComponent.html b/public/components/dev/editReportCustomComponent/editReportCustomComponent.html
index aff1d5499..aede8ce4d 100644
--- a/public/components/dev/editReportCustomComponent/editReportCustomComponent.html
+++ b/public/components/dev/editReportCustomComponent/editReportCustomComponent.html
@@ -64,4 +64,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file