sunjianxi
/
cycgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能修改

Browse Source
master
sunjianxi 1 year ago
parent 1f5b1965c5
commit c4f5dba707
7 changed files with 78 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java
  2. 1
      src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java
  3. 14
      src/main/java/net/mingsoft/cms/entity/DutyStandbyEntity.java
  4. 14
      src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java
  5. 25
      src/main/webapp/template/1/default/index.htm
  6. 22
      src/main/webapp/template/1/default/zhibanbeiqing-detail.htm
  7. 33
      src/main/webapp/template/1/default/zhibanbeiqing-list.htm

1
src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java
Unescape View File

@ -76,6 +76,7 @@ public class DutyStandbyAction extends BaseFileAction {
@ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"),
@ApiImplicitParam(name = "dutyDate", value = "值班日期", required =false,paramType="query"),
@ApiImplicitParam(name = "monitor", value = "带班长", required =false,paramType="query"),
@ApiImplicitParam(name = "deputyMonitor", value = "副带班长", required =false,paramType="query"),
@ApiImplicitParam(name = "policeDuty", value = "民警值班员", required =false,paramType="query"),
@ApiImplicitParam(name = "auxiliaryPoliceDuty", value = "辅警值班员", required =false,paramType="query"),
@ApiImplicitParam(name = "blDutyPerson", value = "北岭值班人员", required =false,paramType="query"),

1
src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java
Unescape View File

@ -69,6 +69,7 @@ public class DutyStandbyAction extends BaseAction {
@ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"),
@ApiImplicitParam(name = "dutyDate", value = "值班日期", required =false,paramType="query"),
@ApiImplicitParam(name = "monitor", value = "带班长", required =false,paramType="query"),
@ApiImplicitParam(name = "deputyMonitor", value = "副带班长", required =false,paramType="query"),
@ApiImplicitParam(name = "policeDuty", value = "民警值班员", required =false,paramType="query"),
@ApiImplicitParam(name = "auxiliaryPoliceDuty", value = "辅警值班员", required =false,paramType="query"),
@ApiImplicitParam(name = "blDutyPerson", value = "北岭值班人员", required =false,paramType="query"),

14
src/main/java/net/mingsoft/cms/entity/DutyStandbyEntity.java
Unescape View File

@ -51,6 +51,12 @@ public class DutyStandbyEntity extends BaseEntity {
@ExcelProperty("带班长")
private String monitor;
/**
* 副带班长
*/
@ExcelProperty("副带班长")
private String deputyMonitor;
/**
* 民警值班员
*/
@ -144,4 +150,12 @@ public class DutyStandbyEntity extends BaseEntity {
public void setContentId(String contentId) {
this.contentId = contentId;
}
public String getDeputyMonitor() {
return deputyMonitor;
}
public void setDeputyMonitor(String deputyMonitor) {
this.deputyMonitor = deputyMonitor;
}
}

14
src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java
Unescape View File

@ -50,6 +50,12 @@ public class DutyStandbyExcel implements Serializable {
@ExcelProperty("带班长")
private String monitor;
/**
* 副带班长
*/
@ExcelProperty("副带班长")
private String deputyMonitor;
/**
* 民警值班员
*/
@ -108,4 +114,12 @@ public class DutyStandbyExcel implements Serializable {
public void setBlDutyPerson(String blDutyPerson) {
this.blDutyPerson = blDutyPerson;
}
public String getDeputyMonitor() {
return deputyMonitor;
}
public void setDeputyMonitor(String deputyMonitor) {
this.deputyMonitor = deputyMonitor;
}
}

25
src/main/webapp/template/1/default/index.htm
Unescape View File

@ -626,16 +626,18 @@
</div>
<div class="right_top_con">
<div class="right_top_con_h">
<div style="width:16%">带班长</div>
<div style="width:28%">民警值班员</div>
<div style="width:28%">辅警值班员</div>
<div style="width:28%">北岭值班员</div>
<div style="width:14%">带班长</div>
<div style="width:14%">副班长</div>
<div style="width:24%">民警值班员</div>
<div style="width:24%">辅警值班员</div>
<div style="width:24%">北岭值班员</div>
</div>
<div class="right_top_con_tr">
<div class="right_top_con_tr_monitor" style="width:16%"></div>
<div class="right_top_con_tr_deputyMonitor" style="width:28%"></div>
<div class="right_top_con_tr_operator" style="width:28%"></div>
<div class="right_top_con_tr_dutyPerson" style="width:28%"></div>
<div class="right_top_con_tr_monitor" style="width:14%"></div>
<div class="right_top_con_tr_deputyMonitor" style="width:14%"></div>
<div class="right_top_con_tr_policeDuty" style="width:24%"></div>
<div class="right_top_con_tr_operator" style="width:24%"></div>
<div class="right_top_con_tr_dutyPerson" style="width:24%"></div>
</div>
</div>
</div>
@ -975,7 +977,8 @@
const { rows } = res.data.data
if (rows.length) {
$('.right_top_con_tr_monitor').text(rows[0].monitor)
$('.right_top_con_tr_deputyMonitor').text(rows[0].policeDuty)
$('.right_top_con_tr_deputyMonitor').text(rows[0].deputyMonitor)
$('.right_top_con_tr_policeDuty').text(rows[0].policeDuty)
$('.right_top_con_tr_operator').text(rows[0].auxiliaryPoliceDuty)
$('.right_top_con_tr_dutyPerson').text(rows[0].blDutyPerson)
}
@ -988,6 +991,10 @@
$('.right_top_con_tr_deputyMonitor').text('/')
$('.right_top_con_tr_deputyMonitor').css("color", "#999999")
}
if ($('.right_top_con_tr_policeDuty').text() == '') {
$('.right_top_con_tr_policeDuty').text('/')
$('.right_top_con_tr_policeDuty').css("color", "#999999")
}
if ($('.right_top_con_tr_operator').text() == '') {
$('.right_top_con_tr_operator').text('/')
$('.right_top_con_tr_operator').css("color", "#999999")

22
src/main/webapp/template/1/default/zhibanbeiqing-detail.htm
Unescape View File

@ -50,19 +50,21 @@
<div>日</div>
</div>
<div class="tableHeader" field="${field.id}">
<div style="width:14%;border-right:1px solid #E2E2E2">日期</div>
<div style="width:14%;border-right:1px solid #E2E2E2">带班长</div>
<div style="width:24%;border-right:1px solid #E2E2E2">民警值班员</div>
<div style="width:24%;border-right:1px solid #E2E2E2">辅警值班员</div>
<div style="width:24%">北岭值班员</div>
<div style="width:13%;border-right:1px solid #E2E2E2">日期</div>
<div style="width:13%;border-right:1px solid #E2E2E2">带班长</div>
<div style="width:13%;border-right:1px solid #E2E2E2">副带班长</div>
<div style="width:20.5%;border-right:1px solid #E2E2E2">民警值班员</div>
<div style="width:20.5%;border-right:1px solid #E2E2E2">辅警值班员</div>
<div style="width:21%">北岭值班员</div>
</div>
<div class="tableBody" id="zhiban">
<div class="tableBody_item" v-for="item in dutyStandbyList" :key="item.id" :style="item.dutyDate == date?{color:'red',fontWeight:'bold'}:{}">
<div :style="{width:'14%',color:item.dutyDate?'':'#999999'}">{{item.dutyDate || '/'}}</div>
<div :style="{width:'14%',color:item.monitor?'':'#999999'}">{{item.monitor || '/'}}</div>
<div :style="{width:'24%',color:item.policeDuty?'':'#999999'}">{{item.policeDuty || '/'}}</div>
<div :style="{width:'24%',color:item.auxiliaryPoliceDuty?'':'#999999'}">{{item.auxiliaryPoliceDuty || '/'}}</div>
<div :style="{width:'24%',color:item.blDutyPerson?'':'#999999'}">{{item.blDutyPerson || '/'}}</div>
<div :style="{width:'13%',color:item.dutyDate?'':'#999999'}">{{item.dutyDate || '/'}}</div>
<div :style="{width:'13%',color:item.monitor?'':'#999999'}">{{item.monitor || '/'}}</div>
<div :style="{width:'13%',color:item.monitor?'':'#999999'}">{{item.deputyMonitor || '/'}}</div>
<div :style="{width:'20.5%',color:item.policeDuty?'':'#999999'}">{{item.policeDuty || '/'}}</div>
<div :style="{width:'20.5%',color:item.auxiliaryPoliceDuty?'':'#999999'}">{{item.auxiliaryPoliceDuty || '/'}}</div>
<div :style="{width:'21%',color:item.blDutyPerson?'':'#999999'}">{{item.blDutyPerson || '/'}}</div>
</div>
</div>
</div>

33
src/main/webapp/template/1/default/zhibanbeiqing-list.htm
Unescape View File

@ -51,16 +51,18 @@
<div style="display:flex;flex-direction:column;align-items:center;position:relative" v-show="checked == '值班备勤'">
<div class="tableBox">
<div class="tableHeader">
<div style="width:16%;border-right:1px solid #E2E2E2">带班长</div>
<div style="width:28%;border-right:1px solid #E2E2E2">民警值班员</div>
<div style="width:28%;border-right:1px solid #E2E2E2">辅警值班员</div>
<div style="width:28%">北岭值班员</div>
<div style="width:14%;border-right:1px solid #E2E2E2">带班长</div>
<div style="width:14%;border-right:1px solid #E2E2E2">副带班长</div>
<div style="width:24%;border-right:1px solid #E2E2E2">民警值班员</div>
<div style="width:24%;border-right:1px solid #E2E2E2">辅警值班员</div>
<div style="width:24%">北岭值班员</div>
</div>
<div class="tableBody">
<div class="right_top_con_tr_monitor" style="width:16%"></div>
<div class="right_top_con_tr_deputyMonitor" style="width:28%"></div>
<div class="right_top_con_tr_operator" style="width:28%"></div>
<div class="right_top_con_tr_dutyPerson" style="width:28%"></div>
<div class="right_top_con_tr_monitor" style="width:14%"></div>
<div class="right_top_con_tr_deputyMonitor" style="width:14%"></div>
<div class="right_top_con_tr_policeDuty" style="width:24%"></div>
<div class="right_top_con_tr_operator" style="width:24%"></div>
<div class="right_top_con_tr_dutyPerson" style="width:24%"></div>
</div>
</div>
<ul style="width:1140px">
@ -145,18 +147,23 @@
const { rows } = res.data.data
if (rows.length) {
$('.right_top_con_tr_monitor').text(rows[0].monitor)
$('.right_top_con_tr_deputyMonitor').text(rows[0].policeDuty)
$('.right_top_con_tr_deputyMonitor').text(rows[0].deputyMonitor)
$('.right_top_con_tr_policeDuty').text(rows[0].policeDuty)
$('.right_top_con_tr_operator').text(rows[0].auxiliaryPoliceDuty)
$('.right_top_con_tr_dutyPerson').text(rows[0].blDutyPerson)
}
if ($('.right_top_con_tr_monitor').text() == '') {
$('.right_top_con_tr_monitor').text('/')
$('.right_top_con_tr_monitor').css("color", "#999999")
}
if ($('.right_top_con_tr_deputyMonitor').text() == '') {
$('.right_top_con_tr_deputyMonitor').text('/')
$('.right_top_con_tr_deputyMonitor').css("color", "#999999")
}
if ($('.right_top_con_tr_monitor').text() == '') {
$('.right_top_con_tr_monitor').text('/')
$('.right_top_con_tr_monitor').css("color", "#999999")
}
if ($('.right_top_con_tr_policeDuty').text() == '') {
$('.right_top_con_tr_policeDuty').text('/')
$('.right_top_con_tr_policeDuty').css("color", "#999999")
}
if ($('.right_top_con_tr_operator').text() == '') {
$('.right_top_con_tr_operator').text('/')
$('.right_top_con_tr_operator').css("color", "#999999")

Write Preview
Loading…
Cancel
Save