Skip to content

S
smart_gov_platform
Commit 7d7587b7 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

parents d681b175 6277a333
Show whitespace changes
Inline Side-by-side
Showing with 447 additions and 396 deletions
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteBusinessServiceImpl.java
View file @ 7d7587b7
...@@ -45,8 +45,33 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu ...@@ -45,8 +45,33 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
@Override @Override
protected void findAfter(SiteBusinessEntity params, PageInfo pageInfo, Context context, List<SiteBusinessEntity> list) throws AppException { protected void findAfter(SiteBusinessEntity params, PageInfo pageInfo, Context context, List<SiteBusinessEntity> list) throws AppException {
SiteBusinessQuery siteBusinessQuery = new SiteBusinessQuery();
if (!ObjectUtils.isEmpty(params.getIdNotList())) {
//排除掉已经存在的ids
Iterator<SiteBusinessEntity> iterator = list.iterator();
while (iterator.hasNext()) {
SiteBusinessEntity item = iterator.next();
siteBusinessQuery.siteId(item.getSiteId());
siteBusinessQuery.setParentId(item.getBusinessId());
int count = this.count(siteBusinessQuery, context);
if (count > 0) {
siteBusinessQuery.setIdNotList(params.getIdNotList());
List<SiteBusinessEntity> childs = this.find(siteBusinessQuery);
if (ObjectUtils.isEmpty(childs)) {
//子节点已经全部选中，删除父节点
iterator.remove();
} else {
childs.stream().forEach(item1 -> {
buildChildBusiness(item1);
});
item.setChildren(childs);
buildChildBusiness(item);
}
}
}
} else {
list.stream().peek(item -> { list.stream().peek(item -> {
List<SiteBusinessEntity> childs = this.find(new SiteBusinessQuery().siteId(item.getSiteId()).parentId(item.getBusinessId())); List<SiteBusinessEntity> childs = this.find(siteBusinessQuery.siteId(item.getSiteId()).parentId(item.getBusinessId()));
childs.stream().forEach(item1 -> { childs.stream().forEach(item1 -> {
buildChildBusiness(item1); buildChildBusiness(item1);
}); });
...@@ -56,6 +81,9 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu ...@@ -56,6 +81,9 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
super.findAfter(params, pageInfo, context, list); super.findAfter(params, pageInfo, context, list);
} }
}
private void buildChildBusiness(SiteBusinessEntity item) { private void buildChildBusiness(SiteBusinessEntity item) {
if (!ObjectUtils.isEmpty(item.getBusinessId())) { if (!ObjectUtils.isEmpty(item.getBusinessId())) {
BusinessEntity businessEntity = businessService.get(item.getBusinessId()); BusinessEntity businessEntity = businessService.get(item.getBusinessId());
...@@ -71,7 +99,7 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu ...@@ -71,7 +99,7 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
if (businessEntity.getIsBusiness() == IsBusinessEnum.一级业务.getValue()) { if (businessEntity.getIsBusiness() == IsBusinessEnum.一级业务.getValue()) {
//添加二级业务列表 //添加二级业务列表
List<BusinessEntity> businessEntities = businessService.find(new BusinessQuery().parentId(businessEntity.getId())); List<BusinessEntity> businessEntities = businessService.find(new BusinessQuery().parentId(businessEntity.getId()));
if(!ObjectUtils.isEmpty(businessEntities)){ if (!ObjectUtils.isEmpty(businessEntities)) {
item.setBusinessChildren(businessEntities); item.setBusinessChildren(businessEntities);
} }
} }
...@@ -98,12 +126,11 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu ...@@ -98,12 +126,11 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
.filter(item -> !item.getSiteBusinessName().equals(entity.getBusinessName())) .filter(item -> !item.getSiteBusinessName().equals(entity.getBusinessName()))
.peek(item -> item.setSiteBusinessName(entity.getBusinessName())) .peek(item -> item.setSiteBusinessName(entity.getBusinessName()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if(!ObjectUtils.isEmpty(businessMatterEntities)){ if (!ObjectUtils.isEmpty(businessMatterEntities)) {
businessMatterService.update(businessMatterEntities,context); businessMatterService.update(businessMatterEntities, context);
} }
super.updateAfter(entity, context); super.updateAfter(entity, context);
} }
......
base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http
View file @ 7d7587b7
...@@ -4,10 +4,10 @@ POST {{baseUrl}}/site/business/list ...@@ -4,10 +4,10 @@ POST {{baseUrl}}/site/business/list
Content-Type: application/json Content-Type: application/json
{ {
"idNotList": [11,12], "idNotList": [11,12,17,18,19,20,21],
"siteId": 1, "siteId": 1,
"page":1, "page":1,
"size":10 "size":5
} }
###站点业务列表 ###站点业务列表
......
portal-manager-ui/admin/src/api/dataAdmin.js
View file @ 7d7587b7
...@@ -4,3 +4,9 @@ import http from "../request/http"; ...@@ -4,3 +4,9 @@ import http from "../request/http";
export function censusListInterface(params) { export function censusListInterface(params) {
return http.post("/zwfw/site/model/census/list", params); return http.post("/zwfw/site/model/census/list", params);
} }
//排队办理记录报表接口
export function getQueueData(params){
return http.post("/inter/reportform/quelist",params)
}
\ No newline at end of file
portal-manager-ui/admin/src/views/dataAdmin/components/microOfficialWebsite/components/FormDetails.vue 0 → 100644
View file @ 7d7587b7
<template>
<div>
<a-drawer title="用户详情" placement="right" :closable="false" :visible="visible" closable @close="onClose"
width="600">
<div class="drawerMain">
<div class="drawerMain-top">
<a-avatar :size="64" icon="user" />
<div class="drawer-user">
<span>NICKNAME</span>
<span class="userTips">实名认证</span>
<div class="userInfo">
男，四川，成都
</div>
</div>
<div class="someUserInfo">
<div class="infoBox">
<span class="infoTitle">openid：</span>
<span class="infoContent">OPENID</span>
</div>
<div class="infoBox">
<span class="infoTitle">授权时间：</span>
<span class="infoContent">2022-11-07 16:00:00</span>
</div>
<div class="infoBox">
<span class="infoTitle">最近访问时间：</span>
<span class="infoContent">2022-11-07 16:00:00</span>
</div>
</div>
<a-divider />
<div class="someUserInfo">
<div class="infoBox">
<span class="infoTitle">证件类型：</span>
<span class="infoContent">身份证</span>
</div>
<div class="infoBox">
<span class="infoTitle">姓名：</span>
<span class="infoContent">刘德华</span>
</div>
<div class="infoBox">
<span class="infoTitle">身份证号：</span>
<span class="infoContent">513821199303021234</span>
</div>
<div class="infoBox">
<span class="infoTitle imgBox">身份证人像面：</span>
<span class="infoContent">
<img src="@/assets/images/logo.png" alt="">
</span>
</div>
<div class="infoBox">
<span class="infoTitle imgBox">身份证国徽面：</span>
<span class="infoContent">
<img src="@/assets/images/logo.png" alt="">
</span>
</div>
<div class="infoBox">
<span class="infoTitle">人脸认证：</span>
<span class="infoContent">
<span class="state">已通过</span>
</span>
</div>
<div class="infoBox">
<span class="infoTitle">认证时间：</span>
<span class="infoContent">513821199303021234</span>
</div>
</div>
<a-divider />
<div class="someUserInfo">
<b>区块链信息</b>
<div class="infoBox">
<span class="infoTitle">哈希值：</span>
<span class="infoContent">nd68as4d654q5w4d21ccx1cv5adsdaawqewd1c1c1zsda1s1gd2sa2</span>
</div>
<div class="infoBox">
<span class="infoTitle">区块高度：</span>
<span class="infoContent">2438265</span>
</div>
<div class="infoBox">
<span class="infoTitle">创建时间：</span>
<span class="infoContent">2022-11-07 16:00:00</span>
</div>
</div>
</div>
</div>
</a-drawer>
</div>
</template>
<script>
export default {
name:"FormDetails",
props:{
visible:Boolean
},
methods:{
onClose(){
this.$emit('onClose')
}
}
}
</script>
<style lang="less" scoped>
.drawerMain {
width: 70%;
height: 100%;
margin: 0 auto;
text-align: center;
.drawer-user {
margin: 10px 0;
position: relative;
font-size: 16px;
.userTips {
position: absolute;
top: -2px;
display: inline-block;
color: #1A7AF8;
border: 1px solid #1A7AF8;
font-size: 12px;
border-radius: 4px;
padding: 3px 6px;
margin-left: 10px;
font-weight: 400;
}
.userInfo {
margin-top: 6px;
font-size: 12px;
}
}
.someUserInfo {
.infoBox {
width: 100%;
display: flex;
justify-content: space-between;
margin: 6px 0;
line-height: 25px;
.infoTitle {
display: inline-block;
width: 50%;
text-align: right;
}
.infoContent {
display: inline-block;
width: 48%;
text-align: left;
}
.state {
display: inline-block;
padding: 0 6px;
border: 1px solid #40A850;
border-radius: 4px;
color: #40A850;
}
.imgBox {
line-height: 50px;
}
img {
height: 50px;
width: auto;
}
}
}
}
</style>
\ No newline at end of file
portal-manager-ui/admin/src/views/dataAdmin/components/microOfficialWebsite/microForm.vue
View file @ 7d7587b7
...@@ -45,98 +45,17 @@ ...@@ -45,98 +45,17 @@
</a-table> </a-table>
</div> </div>
<!-- 详情抽屉效果 --> <!-- 详情抽屉效果 -->
<a-drawer title="用户详情" placement="right" :closable="false" :visible="visible" closable @close="onClose" <FormDetails @onClose="onClose" @showDrawer="showDrawer" :visible="visible"/>
width="600">
<div class="drawerMain">
<div class="drawerMain-top">
<a-avatar :size="64" icon="user" />
<div class="drawer-user">
<span>NICKNAME</span>
<span class="userTips">实名认证</span>
<div class="userInfo">
男，四川，成都
</div>
</div>
<div class="someUserInfo">
<div class="infoBox">
<span class="infoTitle">openid：</span>
<span class="infoContent">OPENID</span>
</div>
<div class="infoBox">
<span class="infoTitle">授权时间：</span>
<span class="infoContent">2022-11-07 16:00:00</span>
</div>
<div class="infoBox">
<span class="infoTitle">最近访问时间：</span>
<span class="infoContent">2022-11-07 16:00:00</span>
</div>
</div>
<a-divider />
<div class="someUserInfo">
<div class="infoBox">
<span class="infoTitle">证件类型：</span>
<span class="infoContent">身份证</span>
</div>
<div class="infoBox">
<span class="infoTitle">姓名：</span>
<span class="infoContent">刘德华</span>
</div>
<div class="infoBox">
<span class="infoTitle">身份证号：</span>
<span class="infoContent">513821199303021234</span>
</div>
<div class="infoBox">
<span class="infoTitle imgBox">身份证人像面：</span>
<span class="infoContent">
<img src="@/assets/images/logo.png" alt="">
</span>
</div>
<div class="infoBox">
<span class="infoTitle imgBox">身份证国徽面：</span>
<span class="infoContent">
<img src="@/assets/images/logo.png" alt="">
</span>
</div>
<div class="infoBox">
<span class="infoTitle">人脸认证：</span>
<span class="infoContent">
<span class="state">已通过</span>
</span>
</div>
<div class="infoBox">
<span class="infoTitle">认证时间：</span>
<span class="infoContent">513821199303021234</span>
</div>
</div>
<a-divider />
<div class="someUserInfo">
<b>区块链信息</b>
<div class="infoBox">
<span class="infoTitle">哈希值：</span>
<span class="infoContent">nd68as4d654q5w4d21ccx1cv5adsdaawqewd1c1c1zsda1s1gd2sa2</span>
</div>
<div class="infoBox">
<span class="infoTitle">区块高度：</span>
<span class="infoContent">2438265</span>
</div>
<div class="infoBox">
<span class="infoTitle">创建时间：</span>
<span class="infoContent">2022-11-07 16:00:00</span>
</div>
</div>
</div>
</div>
</a-drawer>
</div> </div>
</template> </template>
<script> <script>
import table from "@/mixins/table"; import table from "@/mixins/table";
import FormDetails from "./components/FormDetails.vue";
export default { export default {
mixins: [table], mixins: [table],
name: "microForm", name: "microForm",
data() { data() {
return { return {
tableHeaders: [ tableHeaders: [
...@@ -206,7 +125,7 @@ export default { ...@@ -206,7 +125,7 @@ export default {
}; };
}, },
components: { components: {
FormDetails
}, },
mounted() { mounted() {
this.setMoment(); this.setMoment();
...@@ -290,77 +209,6 @@ export default { ...@@ -290,77 +209,6 @@ export default {
font-size: 12px; font-size: 12px;
font-weight: 300; font-weight: 300;
} }
.drawerMain {
width: 70%;
height: 100%;
margin: 0 auto;
text-align: center;
.drawer-user {
margin: 10px 0;
position: relative;
font-size: 16px;
.userTips {
position: absolute;
top: -2px;
display: inline-block;
color: #1A7AF8;
border: 1px solid #1A7AF8;
font-size: 12px;
border-radius: 4px;
padding: 3px 6px;
margin-left: 10px;
font-weight: 400;
}
.userInfo {
margin-top: 6px;
font-size: 12px;
}
}
.someUserInfo {
.infoBox {
width: 100%;
display: flex;
justify-content: space-between;
margin: 6px 0;
line-height: 25px;
.infoTitle {
display: inline-block;
width: 50%;
text-align: right;
}
.infoContent {
display: inline-block;
width: 48%;
text-align: left;
}
.state {
display: inline-block;
padding: 0 6px;
border: 1px solid #40A850;
border-radius: 4px;
color: #40A850;
}
.imgBox {
line-height: 50px;
}
img {
height: 50px;
width: auto;
}
}
}
}
</style> </style>
portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/components/FormDetails.vue 0 → 100644
View file @ 7d7587b7
<template>
<div>
<!-- 详情抽屉效果 -->
<a-drawer title="详情" placement="right" :visible="visible" closable @close="onClose" width="90%">
<div class="drawerMain">
<!-- 左侧建议内容 -->
<div class="drawerLeft">
<div class="leftTitle">
建议内容
</div>
<div class="card">
<div class="cardTitle">纠错标题 </div>
<div class="cardContent">关于《四川省2022年公共卫生特别服务岗项目实施方案》(川卫发〔2022〕7号)的问题</div>
</div>
<div class="infoDetail">
<div class="card">
<div class="cardTitle">建议类型 </div>
<div class="cardContent">部门建议</div>
</div>
<div class="card">
<div class="cardTitle">真实姓名</div>
<div class="cardContent">刘昊然 </div>
</div>
<div class="card">
<div class="cardTitle"> 身份证号 </div>
<div class="cardContent"> 513821196302302154</div>
</div>
<div class="card">
<div class="cardTitle"> 电子邮箱 </div>
<div class="cardContent">1512685492@qq.com</div>
</div>
</div>
<div class="card">
<div class="cardTitle"> 联系地址 </div>
<div class="cardContent">四川省成都市高新区天益街1号理想中心1708号</div>
</div>
<div class="card">
<div class="cardTitle"> 事件发生地 </div>
<div class="cardContent">四川省武侯区市武侯一路大地世纪6栋631号</div>
</div>
<div class="card">
<div class="cardTitle"> 具体内容 </div>
<div class="cardContent">《四川省2022年新冠肺炎疫情防控应急岗位招募实施方案》（川卫人教函〔2022〕84号）有关规定，（二）就业支持政策其中：7.
享受应届毕业生相关政策。参加公卫特别岗项目前无工作经历的人员服务满3周年且年度考核合格的，两年内参加机关和企事业单位招录（聘）、自主创业、落户等方面可同等享受应届毕业生相关政策。问题：无工作经历的人员是指从大学毕业到考上本次岗位之间没有交社保为准吗？比如我毕业后找了份工作，而且有交社保一个月再辞职，然后考上本岗位是否能享受后面的应届毕业生身份？
</div>
</div>
<div class="card">
<div class="cardTitle"> 附件 </div>
<div class="cardContent">
<img src="@/assets/images/logo.png" alt="">
<img src="@/assets/images/logo.png" alt="">
<img src="@/assets/images/logo.png" alt="">
<img src="@/assets/images/logo.png" alt="">
</div>
</div>
<div class="infoDetail">
<div class="card">
<div class="cardTitle"> 是否公开 </div>
<div class="cardContent">否</div>
</div>
<div class="card">
<div class="cardTitle"> 是否保密 </div>
<div class="cardContent">否</div>
</div>
<div class="card">
<div class="cardTitle"> 提交日期 </div>
<div class="cardContent">2022-09-01 11:30:00 </div>
</div>
</div>
</div>
<!-- 右侧回复内容 -->
<div class="drawerRight">
<div class="rightTitle">
建议答复
</div>
<div class="card">
<div class="cardTitle">
所属部门<span>（非必选）</span>
</div>
<div class="cardContent">
市税务局
</div>
</div>
<div class="card">
<div class="cardTitle">
回复内容<span>（必填）</span>
</div>
<div class="cardContent">
《四川省2022年新冠肺炎疫情防控应急岗位招募实施方案》（川卫人教函〔2022〕84号）有关规定，（二）就业支持政策其中：7.
享受应届毕业生相关政策。参加公卫特别岗项目前无工作经历的人员服务满3周年且年度考核合格的，两年内参加机关和企事业单位招录（聘）、自主创业、落户等方面可同等享受应届毕业生相关政策。问题：无工作经历的人员是指从大学毕业到考上本次岗位之间没有交社保为准吗？比如我毕业后找了份工作，而且有交社保一个月再辞职，然后考上本岗位是否能享受后面的应届毕业生身份？
</div>
</div>
</div>
</div>
<!-- 底部按钮 -->
<div :style="{
position: 'absolute', right: 0, bottom: 0, width: '100%', borderTop: '1px solid #e9e9e9',
padding: '10px 16px', background: '#fff', textAlign: 'right', zIndex: 1,
}">
<a-button type="primary" @click="onClose">
确定
</a-button>
<a-button :style="{ marginRight: '8px' }" @click="onClose">
取消
</a-button>
</div>
</a-drawer>
</div>
</template>
<script>
export default {
name: 'FormDetails',
props: {
visible: Boolean
},
data() {
return {
};
},
methods: {
onClose() {
this.$emit('onClose')
}
}
}
</script>
<style lang="less" scoped>
/deep/.ant-drawer-content {
background-color: #F3F4F5;
}
.drawerMain {
height: 83vh;
display: flex;
align-items: center;
justify-content: space-between;
.drawerLeft {
width: 49.5%;
height: 100%;
border-radius: 8px;
background-color: #FFF;
box-sizing: border-box;
padding: 15px;
overflow: hidden;
overflow-y: auto;
.leftTitle {
font-weight: bold;
}
.card {
line-height: 25px;
.cardTitle {
color: #0377FF;
font-weight: bold;
margin: 8px 0;
}
}
.infoDetail {
display: flex;
align-items: center;
justify-content: space-between;
}
}
.drawerLeft::-webkit-scrollbar {
display: none;
}
.drawerRight {
width: 49.5%;
height: 100%;
border-radius: 8px;
background-color: #FFF;
box-sizing: border-box;
padding: 15px;
.rightTitle {
font-weight: bold;
color: #e30000;
}
.card {
line-height: 25px;
.cardTitle {
font-weight: bold;
margin: 8px 0;
span {
color: #e30000;
}
}
}
}
}
</style>
\ No newline at end of file
portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/networkForm.vue
View file @ 7d7587b7
...@@ -42,120 +42,13 @@ ...@@ -42,120 +42,13 @@
</template> </template>
</a-table> </a-table>
</div> </div>
<!-- 详情抽屉效果 --> <FormDetails @onClose="onClose" @showDrawer="showDrawer" :visible="visible"/>
<a-drawer title="详情" placement="right" :closable="false" :visible="visible" closable @close="onClose" width="90%">
<div class="drawerMain">
<!-- 左侧建议内容 -->
<div class="drawerLeft">
<div class="leftTitle">
建议内容
</div>
<div class="card">
<div class="cardTitle">纠错标题 </div>
<div class="cardContent">关于《四川省2022年公共卫生特别服务岗项目实施方案》(川卫发〔2022〕7号)的问题</div>
</div>
<div class="infoDetail">
<div class="card">
<div class="cardTitle">建议类型 </div>
<div class="cardContent">部门建议</div>
</div>
<div class="card">
<div class="cardTitle">真实姓名</div>
<div class="cardContent">刘昊然 </div>
</div>
<div class="card">
<div class="cardTitle"> 身份证号 </div>
<div class="cardContent"> 513821196302302154</div>
</div>
<div class="card">
<div class="cardTitle"> 电子邮箱 </div>
<div class="cardContent">1512685492@qq.com</div>
</div>
</div>
<div class="card">
<div class="cardTitle"> 联系地址 </div>
<div class="cardContent">四川省成都市高新区天益街1号理想中心1708号</div>
</div>
<div class="card">
<div class="cardTitle"> 事件发生地 </div>
<div class="cardContent">四川省武侯区市武侯一路大地世纪6栋631号</div>
</div>
<div class="card">
<div class="cardTitle"> 具体内容 </div>
<div class="cardContent">《四川省2022年新冠肺炎疫情防控应急岗位招募实施方案》（川卫人教函〔2022〕84号）有关规定，（二）就业支持政策其中：7.
享受应届毕业生相关政策。参加公卫特别岗项目前无工作经历的人员服务满3周年且年度考核合格的，两年内参加机关和企事业单位招录（聘）、自主创业、落户等方面可同等享受应届毕业生相关政策。问题：无工作经历的人员是指从大学毕业到考上本次岗位之间没有交社保为准吗？比如我毕业后找了份工作，而且有交社保一个月再辞职，然后考上本岗位是否能享受后面的应届毕业生身份？
</div>
</div>
<div class="card">
<div class="cardTitle"> 附件 </div>
<div class="cardContent">
<img src="@/assets/images/logo.png" alt="">
<img src="@/assets/images/logo.png" alt="">
<img src="@/assets/images/logo.png" alt="">
<img src="@/assets/images/logo.png" alt="">
</div>
</div>
<div class="infoDetail">
<div class="card">
<div class="cardTitle"> 是否公开 </div>
<div class="cardContent">否</div>
</div>
<div class="card">
<div class="cardTitle"> 是否保密 </div>
<div class="cardContent">否</div>
</div>
<div class="card">
<div class="cardTitle"> 提交日期 </div>
<div class="cardContent">2022-09-01 11:30:00 </div>
</div>
</div>
</div>
<!-- 右侧回复内容 -->
<div class="drawerRight">
<div class="rightTitle">
建议答复
</div>
<div class="card">
<div class="cardTitle">
所属部门<span>（非必选）</span>
</div>
<div class="cardContent">
市税务局
</div>
</div>
<div class="card">
<div class="cardTitle">
回复内容<span>（必填）</span>
</div>
<div class="cardContent">
《四川省2022年新冠肺炎疫情防控应急岗位招募实施方案》（川卫人教函〔2022〕84号）有关规定，（二）就业支持政策其中：7.
享受应届毕业生相关政策。参加公卫特别岗项目前无工作经历的人员服务满3周年且年度考核合格的，两年内参加机关和企事业单位招录（聘）、自主创业、落户等方面可同等享受应届毕业生相关政策。问题：无工作经历的人员是指从大学毕业到考上本次岗位之间没有交社保为准吗？比如我毕业后找了份工作，而且有交社保一个月再辞职，然后考上本岗位是否能享受后面的应届毕业生身份？
</div>
</div>
</div>
</div>
<!-- 底部按钮 -->
<div :style="{
position: 'absolute', right: 0, bottom: 0, width: '100%', borderTop: '1px solid #e9e9e9',
padding: '10px 16px', background: '#fff', textAlign: 'right', zIndex: 1,
}">
<a-button type="primary" @click="onClose">
确定
</a-button>
<a-button :style="{ marginRight: '8px' }" @click="onClose">
取消
</a-button>
</div>
</a-drawer>
</div> </div>
</template> </template>
<script> <script>
import table from "@/mixins/table"; import table from "@/mixins/table";
import FormDetails from "./components/FormDetails.vue";
export default { export default {
mixins: [table], mixins: [table],
name: "networkForm", name: "networkForm",
...@@ -241,7 +134,7 @@ export default { ...@@ -241,7 +134,7 @@ export default {
}; };
}, },
components: { components: {
FormDetails
}, },
mounted() { mounted() {
this.setMoment(); this.setMoment();
...@@ -292,7 +185,6 @@ export default { ...@@ -292,7 +185,6 @@ export default {
/deep/.ant-spin-container { /deep/.ant-spin-container {
display: block; display: block;
} }
.header_box { .header_box {
padding-bottom: 1rem; padding-bottom: 1rem;
display: flex; display: flex;
...@@ -324,79 +216,10 @@ export default { ...@@ -324,79 +216,10 @@ export default {
} }
} }
} }
.tabFont { .tabFont {
font-size: 12px; font-size: 12px;
font-weight: 300; font-weight: 300;
} }
/deep/.ant-drawer-content {
background-color: #F3F4F5;
}
.drawerMain {
height: 83vh;
display: flex;
align-items: center;
justify-content: space-between;
.drawerLeft {
width: 49.5%;
height: 100%;
border-radius: 8px;
background-color: #FFF;
box-sizing: border-box;
padding: 15px;
overflow: hidden;
overflow-y: auto;
.leftTitle {
font-weight: bold;
}
.card {
line-height: 25px;
.cardTitle {
color: #0377FF;
font-weight: bold;
margin: 8px 0;
}
}
.infoDetail {
display: flex;
align-items: center;
justify-content: space-between;
}
}
.drawerLeft::-webkit-scrollbar {
display: none;
}
.drawerRight {
width: 49.5%;
height: 100%;
border-radius: 8px;
background-color: #FFF;
box-sizing: border-box;
padding: 15px;
.rightTitle {
font-weight: bold;
color: #e30000;
}
.card {
line-height: 25px;
.cardTitle {
font-weight: bold;
margin: 8px 0;
span{
color: #e30000;
}
}
}
}
}
</style> </style>
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue
View file @ 7d7587b7
...@@ -10,62 +10,29 @@ ...@@ -10,62 +10,29 @@
</div> </div>
<span> <span>
<a-select default-value="001"> <a-select default-value="001">
<!-- <a-select-option
v-for="(item, index) of selectOptions"
:key="index"
:value="item.value"
>
{{ item.label }}
</a-select-option> -->
<a-select-option value="001"> 设备001 </a-select-option> <a-select-option value="001"> 设备001 </a-select-option>
<a-select-option value="002"> 设备002 </a-select-option> <a-select-option value="002"> 设备002 </a-select-option>
</a-select> </a-select>
<a-select default-value="001"> <a-select default-value="001">
<!-- <a-select-option
v-for="(item, index) of selectOptions"
:key="index"
:value="item.value"
>
{{ item.label }}
</a-select-option> -->
<a-select-option value="001"> 状态001 </a-select-option> <a-select-option value="001"> 状态001 </a-select-option>
<a-select-option value="002"> 状态002 </a-select-option> <a-select-option value="002"> 状态002 </a-select-option>
</a-select> </a-select>
<a-range-picker <a-range-picker format="YYYY年MM月DD日" class="range_picker_style" @change="rangePickerChange"
format="YYYY年MM月DD日" v-model="BegindAndEndTime">
class="range_picker_style"
@change="rangePickerChange"
v-model="BegindAndEndTime"
>
</a-range-picker> </a-range-picker>
<a-input <a-input v-model="searchName" placeholder="请输入排队编号或申报人姓名搜索">
v-model="searchName"
placeholder="请输入排队编号或申报人姓名搜索"
>
<a-icon slot="prefix" type="search" /> <a-icon slot="prefix" type="search" />
</a-input> </a-input>
<a-button type="primary">搜索</a-button> <a-button type="primary">搜索</a-button>
</span> </span>
</div> </div>
<div class="main"> <div class="main">
<a-table <a-table size="small" bordered :row-key="(record) => record.id" :row-selection="{
size="small"
bordered
:row-key="(record) => record.id"
:row-selection="{
selectedRowKeys: tableSelectedKeys, selectedRowKeys: tableSelectedKeys,
onChange: onSelectChange, onChange: onSelectChange,
}" }" :scroll="{ y: 590 }" :pagination="tablePagination" @change="pagTableChange" :loading="tableLoading"
:scroll="{ y: 590 }" :columns="tableHeaders" :dataSource="tableSourceData">
:pagination="tablePagination"
@change="pagTableChange"
:loading="tableLoading"
:columns="tableHeaders"
:dataSource="tableSourceData"
>
<template slot="shenbaoren" slot-scope="text, record, index"> <template slot="shenbaoren" slot-scope="text, record, index">
<a-button type="link" @click="openDeclarant">{{ text }}</a-button> <a-button type="link" @click="openDeclarant">{{ text }}</a-button>
</template> </template>
...@@ -81,9 +48,7 @@ ...@@ -81,9 +48,7 @@
}}</a-button> }}</a-button>
</template> </template>
<template slot="operation" slot-scope="text, record, index"> <template slot="operation" slot-scope="text, record, index">
<a-button type="link" @click="openHandlingDetails" <a-button type="link" @click="openHandlingDetails">详细信息{{ record.id }}</a-button>
>详细信息{{ record.id }}</a-button
>
</template> </template>
</a-table> </a-table>
<UserInfo ref="UserInfo" /> <UserInfo ref="UserInfo" />
...@@ -100,6 +65,7 @@ import UserInfo from "./components/userInfo.vue"; ...@@ -100,6 +65,7 @@ import UserInfo from "./components/userInfo.vue";
import BusinessInfo from "./components/businessInfo.vue"; import BusinessInfo from "./components/businessInfo.vue";
import WorkpeopleInfo from "./components/workpeopleInfo.vue"; import WorkpeopleInfo from "./components/workpeopleInfo.vue";
import HandlingDetails from "./components/HandlingDetails.vue"; import HandlingDetails from "./components/HandlingDetails.vue";
import { getQueueData } from "@/api/dataAdmin";
export default { export default {
mixins: [table], mixins: [table],
name: "PortalAdminVueQueueRecord", name: "PortalAdminVueQueueRecord",
...@@ -207,6 +173,7 @@ export default { ...@@ -207,6 +173,7 @@ export default {
}, },
mounted() { mounted() {
this.setMoment(); this.setMoment();
this.getQueueDataArr()
for (let key = 0; key < 20; key++) { for (let key = 0; key < 20; key++) {
this.tableSourceData.push({ this.tableSourceData.push({
id: `00${key + 1}`, id: `00${key + 1}`,
...@@ -225,6 +192,12 @@ export default { ...@@ -225,6 +192,12 @@ export default {
} }
}, },
methods: { methods: {
// 获取列表数据
getQueueDataArr() {
getQueueData().then(res => {
console.log(res)
})
},
openDeclarant() { openDeclarant() {
this.$refs.UserInfo.modalInfo.title = "用户信息"; this.$refs.UserInfo.modalInfo.title = "用户信息";
this.$refs.UserInfo.modalInfo.width = "25%"; this.$refs.UserInfo.modalInfo.width = "25%";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment