mirror of
https://gitee.com/java110/MicroCommunityWeb.git
synced 2026-02-24 05:46:03 +08:00
Merge remote-tracking branch 'origin/master' into xinghong-dev
This commit is contained in:
xiaogang
commit
9dd9829afb
@ -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> 保存</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> 保存</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>
|
||||
@ -64,4 +64,4 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -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>
|
||||
@ -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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user