Skip to content

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

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

parents cb36603a cc2cf588
Show whitespace changes
Inline Side-by-side
Showing with 482 additions and 410 deletions
base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java
View file @ a946cb36
......@@ -9,6 +9,9 @@ import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.common.code.DxTypeEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.keys.RedisCacheKeys;
import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptQuery;
import com.mortals.xhx.module.dept.service.DeptService;
......@@ -16,9 +19,12 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.model.MatterQuery;
import com.mortals.xhx.module.matter.model.vo.MatterInfo;
import com.mortals.xhx.module.matter.service.MatterService;
import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.model.SiteMatterEntity;
import com.mortals.xhx.module.site.model.SiteMatterQuery;
import com.mortals.xhx.module.site.service.SiteMatterService;
import com.mortals.xhx.module.site.service.SiteThemeMatterService;
import com.mortals.xhx.module.site.service.SiteThemeService;
import com.mortals.xhx.module.window.model.*;
import com.mortals.xhx.module.window.service.WindowBusinessService;
import com.mortals.xhx.module.window.service.WindowMatterService;
......@@ -69,6 +75,10 @@ public class DemoWebApiController {
private DeptService deptService;
@Autowired
private MatterService matterService;
@Autowired
private SiteThemeService siteThemeService;
@Autowired
private SiteThemeMatterService siteThemeMatterService;
@PostMapping(value = "testGov")
......@@ -111,9 +121,9 @@ public class DemoWebApiController {
public Rest<String> reEventShow() {
List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(new SiteMatterQuery());
for (SiteMatterEntity siteMatterEntity : siteMatterEntities) {
if(ObjectUtils.isEmpty(siteMatterEntity.getEventTypeShow())){
if (ObjectUtils.isEmpty(siteMatterEntity.getEventTypeShow())) {
MatterEntity matterEntity = matterService.get(siteMatterEntity.getMatterId());
if(!ObjectUtils.isEmpty(matterEntity)&&!ObjectUtils.isEmpty(matterEntity.getEventTypeShow())){
if (!ObjectUtils.isEmpty(matterEntity) && !ObjectUtils.isEmpty(matterEntity.getEventTypeShow())) {
siteMatterEntity.setEventTypeShow(matterEntity.getEventTypeShow());
siteMatterService.update(siteMatterEntity);
}
......@@ -133,9 +143,9 @@ public class DemoWebApiController {
for (WindowEntity windowEntity : windowEntities) {
String deptName = windowEntity.getDeptName();
//根据部门名称查询部门
DeptEntity deptEntity = deptService.selectOne(new DeptQuery().name(deptName+"%"));
DeptEntity deptEntity = deptService.selectOne(new DeptQuery().name(deptName + "%"));
if (!ObjectUtils.isEmpty(deptEntity)) {
if (deptEntity.getId() != windowEntity.getDeptId()&&deptEntity.getName().trim().equals(windowEntity.getDeptName().trim())) {
if (deptEntity.getId() != windowEntity.getDeptId() && deptEntity.getName().trim().equals(windowEntity.getDeptName().trim())) {
log.info("部门:{},更新部门id:orgin deptId:{} ,updateDeptId:{}", deptName, windowEntity.getDeptId(), deptEntity.getId());
WindowEntity temp = new WindowEntity();
temp.setId(windowEntity.getId());
......@@ -149,9 +159,9 @@ public class DemoWebApiController {
//更新窗口事项中的部门id
List<WindowMatterEntity> windowMatterEntities = windowMatterService.find(new WindowMatterQuery());
for (WindowMatterEntity windowMatterEntity : windowMatterEntities) {
DeptEntity deptEntity = deptService.selectOne(new DeptQuery().name(windowMatterEntity.getDeptName()+"%"));
DeptEntity deptEntity = deptService.selectOne(new DeptQuery().name(windowMatterEntity.getDeptName() + "%"));
if (!ObjectUtils.isEmpty(deptEntity)) {
if (deptEntity.getId() != windowMatterEntity.getDeptId()&&windowMatterEntity.getDeptName().trim().equals(deptEntity.getName())) {
if (deptEntity.getId() != windowMatterEntity.getDeptId() && windowMatterEntity.getDeptName().trim().equals(deptEntity.getName())) {
WindowMatterEntity temp = new WindowMatterEntity();
temp.setId(windowMatterEntity.getId());
temp.setDeptId(deptEntity.getId());
......@@ -164,9 +174,9 @@ public class DemoWebApiController {
List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(new SiteMatterQuery());
for (SiteMatterEntity siteMatterEntity : siteMatterEntities) {
DeptEntity deptEntity = deptService.selectOne(new DeptQuery().name(siteMatterEntity.getDeptName()+"%"));
DeptEntity deptEntity = deptService.selectOne(new DeptQuery().name(siteMatterEntity.getDeptName() + "%"));
if (!ObjectUtils.isEmpty(deptEntity)) {
if (deptEntity.getId() != siteMatterEntity.getDeptId()&&siteMatterEntity.getDeptName().trim().equals(deptEntity.getName().trim())) {
if (deptEntity.getId() != siteMatterEntity.getDeptId() && siteMatterEntity.getDeptName().trim().equals(deptEntity.getName().trim())) {
SiteMatterEntity temp = new SiteMatterEntity();
temp.setId(siteMatterEntity.getId());
temp.setDeptId(deptEntity.getId());
......@@ -182,6 +192,20 @@ public class DemoWebApiController {
}
@PostMapping(value = "syncThemeMatter")
@UnAuth
public Rest<String> syncThemeMatter(@RequestBody SiteEntity siteEntity) {
siteThemeMatterService.deleteGovBySiteId(siteEntity.getId(), null);
Rest<String> grRest = siteThemeMatterService.syncThemeMatterBySiteId(siteEntity.getId(), "2", null);
log.info("同步站点主题个人事项:" + JSON.toJSONString(grRest));
log.info("同步站点法人主题事项开始.....");
Rest<String> frRest = siteThemeMatterService.syncThemeMatterBySiteId(siteEntity.getId(), "3", null);
log.info("同步站点主题法人事项:" + JSON.toJSONString(frRest));
return Rest.ok();
}
public static void main(String[] args) {
HttpClient http = null;
CookieStore httpCookieStore = new BasicCookieStore();
......
base-manager/src/main/java/com/mortals/xhx/common/utils/MatterTypeHtmlParseUtil.java
View file @ a946cb36
......@@ -204,7 +204,7 @@ public class MatterTypeHtmlParseUtil {
continue;
}
String onclick = element.firstElementChild().attr("onclick");
href = StrUtil.subBetween(onclick, "ywblurl('", "',");
href = StrUtil.subBetween(onclick, "ywblurl('", "'");
if (ObjectUtils.isEmpty(href)) {
continue;
}
......@@ -220,7 +220,7 @@ public class MatterTypeHtmlParseUtil {
String title = element.attr("title");
// String href = element.attr("href");
String onclick = element.attr("onclick");
String href = StrUtil.subBetween(onclick, "ywblurl('", "',");
String href = StrUtil.subBetween(onclick, "ywblurl('", "'");
if (ObjectUtils.isEmpty(href)) {
System.out.println("子项 href is empty!,dom:" + dom.html());
continue;
......@@ -251,7 +251,7 @@ public class MatterTypeHtmlParseUtil {
}
String title = element.attr("title");
String onclick = element.attr("onclick");
String href = StrUtil.subBetween(onclick, "ywblurl('", "',");
String href = StrUtil.subBetween(onclick, "ywblurl('", "'");
if (ObjectUtils.isEmpty(href)) {
continue;
}
......@@ -266,7 +266,7 @@ public class MatterTypeHtmlParseUtil {
}
String title = element.attr("title");
String onclick = element.attr("onclick");
String href = StrUtil.subBetween(onclick, "ywblurl('", "',");
String href = StrUtil.subBetween(onclick, "ywblurl('", "'");
if (ObjectUtils.isEmpty(href)) {
log.info("子项 href is empty!,dom:" + element.html());
continue;
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @ a946cb36
......@@ -85,16 +85,13 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
} else {
domainUrl = "";
}
}
for (AppEntity item : list) {
List<AppEntity> appEntityList = this.find(new AppQuery().appCode(item.getAppCode()), context);
item.setApplianceSiteScope(appEntityList.size());
item.setSiteIdList(appEntityList.stream().map(AppEntity::getSiteId).collect(Collectors.toList()));
//构建访问地址
SiteEntity siteEntity = siteService.getCache(item.getSiteId().toString());
if (!ObjectUtils.isEmpty(siteEntity)) {
//请求地址 http://domian/app/siteCode/appcode/html
if (!ObjectUtils.isEmpty(domainUrl)) {
......@@ -103,7 +100,6 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
} else {
item.setCustUrl(CUSTAPP_ROOT_PATH + "/" + siteEntity.getSiteCode() + "/" + item.getAppCode() + "/" + item.getVersion() + "/");
}
} else {
item.setCustUrl("");
}
......
base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumEntity.java
View file @ a946cb36
......@@ -434,14 +434,14 @@ public class MatterDatumEntity extends MatterDatumVo {
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getMaterialName().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof MatterDatumEntity) {
MatterDatumEntity tmp = (MatterDatumEntity) obj;
if (this.getId() == tmp.getId()) {
if (this.getMaterialName() == tmp.getMaterialName()) {
return true;
}
}
......
base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java
View file @ a946cb36
......@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 事项申请材料
......@@ -58,4 +59,21 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
entity.setDatumFileList(matterDatumFileEntities);
return super.viewAfter(id, model, entity, context);
}
/**
* @param query
* @param model
* @param context
* @return
* @throws AppException
*/
@Override
protected int doListAfter(MatterDatumEntity query, Map<String, Object> model, Context context) throws AppException {
List<MatterDatumEntity> matterDatumEntities = (List<MatterDatumEntity>) model.get(KEY_RESULT_DATA);
//去重复
List<MatterDatumEntity> collect = matterDatumEntities.stream().distinct().collect(Collectors.toList());
model.put(KEY_RESULT_DATA,collect);
return super.doListAfter(query, model, context);
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java
View file @ a946cb36
......@@ -46,11 +46,18 @@ public class SiteTreeSelect implements Serializable {
* 节点名称
*/
private String label;
/**
* 区域编码
*/
private String areaCode;
/**
* 区域名称
*
*/
private String areaName;
/**
* 为区域时 层级
*/
......@@ -115,6 +122,7 @@ public class SiteTreeSelect implements Serializable {
this.icon = "el-icon-wind-power";
this.detailAddress=collect.stream().map(item -> item.getDetailAddress()).collect(Collectors.joining(","));
this.areaCode=collect.stream().map(item -> item.getAreaCode()).collect(Collectors.joining(","));
this.areaName=collect.stream().map(item -> item.getAreaName()).collect(Collectors.joining(","));
this.longitude = collect.stream().map(item -> item.getLongitude()).collect(Collectors.joining(","));
this.latitude = collect.stream().map(item -> item.getLatitude()).collect(Collectors.joining(","));
} else {
......@@ -146,6 +154,7 @@ public class SiteTreeSelect implements Serializable {
node.setSiteCode(jsonObject.getString("siteCode"));
node.setLabel(jsonObject.getString("label"));
node.setAreaCode(jsonObject.getString("areaCode"));
node.setAreaName(jsonObject.getString("areaName"));
node.setIsLeaf(jsonObject.getBoolean("isLeaf"));
node.setLongitude(jsonObject.getString("longitude"));
node.setLatitude(jsonObject.getString("latitude"));
......
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java
View file @ a946cb36
......@@ -64,7 +64,7 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
params.put("type", "1");
params.put("theme", "");
//获取主题重量
//获取主题数量
Rest<Map<String, Integer>> themeMatterRest = MatterTypeHtmlParseUtil.getThemeMatterPage(params, url);
Integer totalTheme = themeMatterRest.getData().get("total");
Integer sum = 0;
......@@ -82,9 +82,9 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
for (int i = 1; i <= pageNum; i++) {
params.put("pageno", String.valueOf(i));
Rest<List<MatterEntity>> restList = null;
if (userType == "2") {
if ( "2".equals(userType)) {
restList = MatterTypeHtmlParseUtil.getGrThemeMatterList(params, url);
} else if (userType == "3") {
} else if ("3".equals(userType)) {
restList = MatterTypeHtmlParseUtil.getFrThemeMatterList(params, url);
}
......
base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
View file @ a946cb36
......@@ -263,7 +263,7 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
}
public static void main(String[] args) throws Exception {
System.out.println(SecurityUtil.md5DoubleEncoding("123456"));
System.out.println(SecurityUtil.md5DoubleEncoding("adminADMIN123!@#"));
}
......
base-manager/src/test/java/com/mortals/httpclient/dept/DeptController.http
View file @ a946cb36
......@@ -3,7 +3,7 @@
POST {{baseUrl}}/dept/list
Content-Type: application/json
{"isBkb":1,"siteId":1,"page":"1","size":"10","orderColList":[{"colName":"sort","sortKind":"desc"}]}
{"siteId":1,"page":"1","size":"-1","orderColList":[{"colName":"sort","sortKind":"desc"}]}
###部门更新与保存
......
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @ a946cb36
......@@ -106,6 +106,13 @@ Content-Type: application/json
{}
###testre
POST {{baseUrl}}/test/syncThemeMatter
Content-Type: application/json
{"id": 1}
###midsign
POST {{baseUrl}}/mid/sign
Content-Type: application/json
......
portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/reportForm.vue
View file @ a946cb36
......@@ -98,6 +98,7 @@ const tHeader = [
"发生时间",
"时长",
"是否准确",
"是否处理"
];
const filterVal = [
"index",
......
portal-manager-ui/admin/src/views/dataAdmin/components/Impossible/index.vue
View file @ a946cb36
......@@ -5,9 +5,12 @@
<a-button :loading="btnLoading" type="primary" class="addclass" @click="handleExportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
<div class="ml20">提交总次数：<span style="color:#1890ff;font-weight: bold;">{{ numObj ? numObj.count : 0 }}次</span></div>
<div class="ml20">回复总次数：<span style="color:#1890ff;font-weight: bold;">{{ numObj ? numObj.reply_count : 0 }}次</span></div>
<div style="font-size:12px;color:#a19a9a;margin-left: 20px;">统计时间段：{{ queryform.time[0] }} ~ {{ queryform.time[1] }}</div>
<div class="ml20">提交总次数：<span style="color:#1890ff;font-weight: bold;">{{ numObj ? numObj.count : 0
}}次</span></div>
<div class="ml20">回复总次数：<span style="color:#1890ff;font-weight: bold;">{{ numObj ? numObj.reply_count : 0
}}次</span></div>
<div style="font-size:12px;color:#a19a9a;margin-left: 20px;">统计时间段：{{ queryform.time[0] }} ~ {{
queryform.time[1] }}</div>
</div>
<a-form :model="queryform" layout="inline">
<a-form-item>
......@@ -16,8 +19,8 @@
<a-form-item>
<a-select v-model="queryform.source" style="width: 140px">
<a-select-option value="">全部来源</a-select-option>
<a-select-option :value="item.value" v-for="item,index in deviceList"
:key="index">{{item.label}}</a-select-option>
<a-select-option :value="item.value" v-for="item, index in deviceList"
:key="index">{{ item.label }}</a-select-option>
</a-select>
</a-form-item>
<a-form-item>
......@@ -38,16 +41,16 @@
onChange: onSelectChange,
}">
<template slot="type" slot-scope="text, record, index">
<div>{{typeList.find(item=>record.type).label}}</div>
<div>{{ typeList.find(item => record.type).label }}</div>
</template>
<template slot="valid" slot-scope="text, record, index">
<div>{{record.valid == 1 ? '是' : '否'}}</div>
<div>{{ record.valid == 1 ? '是' : '否' }}</div>
</template>
<template slot="secrecy" slot-scope="text, record, index">
<div>{{record.secrecy == 1 ? '是' : '否'}}</div>
<div>{{ record.secrecy == 1 ? '是' : '否' }}</div>
</template>
<template slot="status" slot-scope="text, record, index">
<div>{{record.status == 1 ? '是' : '否'}}</div>
<div>{{ record.status == 1 ? '是' : '否' }}</div>
</template>
<template slot="操作" slot-scope="text, record, index">
<a-button type="link" @click="detail(record)">详情</a-button>
......@@ -60,37 +63,37 @@
<div style="margin-bottom: 10px;">建议内容</div>
<a-descriptions layout="vertical" :column="4">
<a-descriptions-item label="问题主题" :span="4">
{{detailData.title}}
{{ detailData.title }}
</a-descriptions-item>
<a-descriptions-item label="具体问题" :span="4">
{{detailData.content}}
{{ detailData.content }}
</a-descriptions-item>
<a-descriptions-item label="业务名称" :span="4">
{{detailData.business}}
{{ detailData.business }}
</a-descriptions-item>
<a-descriptions-item label="办事区县" :span="4">
{{detailData.region}}
{{ detailData.region }}
</a-descriptions-item>
<a-descriptions-item label="单位名称" :span="4">
{{detailData.dept_name}}
{{ detailData.dept_name }}
</a-descriptions-item>
<a-descriptions-item label="真实姓名">
{{detailData.name}}
{{ detailData.name }}
</a-descriptions-item>
<a-descriptions-item label="联系电话">
{{detailData.phone}}
{{ detailData.phone }}
</a-descriptions-item>
<a-descriptions-item label="身份证号">
{{detailData.idcard}}
{{ detailData.idcard }}
</a-descriptions-item>
<a-descriptions-item label="电子邮箱">
{{detailData.email}}
{{ detailData.email }}
</a-descriptions-item>
<a-descriptions-item label="联系地址" :span="4">
{{detailData.address}}
{{ detailData.address }}
</a-descriptions-item>
<a-descriptions-item label="提交时间" :span="4">
{{detailData.create_time}}
{{ detailData.create_time }}
</a-descriptions-item>
</a-descriptions>
</div>
......@@ -98,22 +101,22 @@
<div style="margin-bottom: 10px;">建议答复</div>
<a-descriptions layout="vertical" :column="1">
<a-descriptions-item label="所属部门">
{{detailData.reply_dept}}
{{ detailData.reply_dept }}
</a-descriptions-item>
<a-descriptions-item label="回复内容">
{{detailData.reply_content}}
{{ detailData.reply_content }}
</a-descriptions-item>
<a-descriptions-item label="附件">
<div class="img-dv" v-if="detailData.reply_url && detailData.reply_url.length > 0">
<thumbImage :src="item.url" :index="idx" @click="idx = index" fileType="img"
v-for="item,index in detailData.reply_url" :key="index" />
v-for="item, index in detailData.reply_url" :key="index" />
</div>
</a-descriptions-item>
<a-descriptions-item label="回复人">
{{detailData.reply_people}}
{{ detailData.reply_people }}
</a-descriptions-item>
<a-descriptions-item label="回复时间">
{{detailData.update_time}}
{{ detailData.update_time }}
</a-descriptions-item>
</a-descriptions>
</div>
......@@ -127,17 +130,17 @@
</div>
</template>
<script>
import {
import {
getImpossible,
getImpossibleInfo,
getCountImpossible
} from '@/api/dataAdmin.js'
import image from '@/components/image/thumbImage'
import {
} from '@/api/dataAdmin.js'
import image from '@/components/image/thumbImage'
import {
export2Excel
} from "@/utils/js/exportExcel";
import moment from 'moment'
export default {
} from "@/utils/js/exportExcel";
import moment from 'moment'
export default {
data() {
return {
idx: 0,
......@@ -146,8 +149,8 @@
size: 10,
source: '',
keyword: null,
time: [moment().format('yyyy-MM-DD'),moment().format('yyyy-MM-DD')],
reply:''
time: [moment().format('yyyy-MM-DD'), moment().format('yyyy-MM-DD')],
reply: ''
},
deviceList: [{
label: '微官网',
......@@ -216,9 +219,9 @@
},
{
title: "回复人",
dataIndex: "reply_name",
dataIndex: "reply_people",
align: 'center',
customRender: (text, record, index) => `${record.reply_name || '--'}`
customRender: (text, record, index) => `${record.reply_people || '--'}`
},
{
title: "回复时间",
......@@ -257,17 +260,17 @@
},
async created() {
this.getlist()
let {
data
} = await getCountImpossible()
this.numObj = data
},
methods: {
getlist() {
async getlist() {
getImpossible(this.queryform).then(res => {
this.tabledataSource = res.data.data
this.pagination.total = res.data.total
})
// 统计接口
let {data} = await getCountImpossible(this.queryform)
this.numObj = data || {}
},
changeTablePage(e) {
this.queryform.page = e.current
......@@ -314,7 +317,7 @@
item.type = obj[keys];
}
});
item.status == 1?item.status= '是':item.status= '否'
item.status == 1 ? item.status = '是' : item.status = '否'
});
} else {
let datas = this.$_.cloneDeep(
......@@ -333,14 +336,14 @@
item.type = obj[key];
}
});
item.status == 1?item.status= '是':item.status= '否'
item.status == 1 ? item.status = '是' : item.status = '否'
}
}
const tHeader = []
const filterVal = []
this.tablecolumns.forEach(v=>{
if(v.dataIndex){
this.tablecolumns.forEach(v => {
if (v.dataIndex) {
tHeader.push(v.title)
filterVal.push(v.dataIndex)
}
......@@ -354,23 +357,25 @@
this.btnLoading = false;
},
}
}
}
</script>
<style scoped lang="less">
.form-box {
.form-box {
display: flex;
justify-content: space-between;
margin-bottom: 10px;
.num-dv{
.num-dv {
display: flex;
align-items: center;
.ml20{
.ml20 {
margin-left: 20px;
}
}
}
}
.img-dv {
.img-dv {
display: flex;
flex-wrap: wrap;
......@@ -380,45 +385,44 @@
margin-right: 10px;
margin-bottom: 10px;
}
}
}
/deep/.ant-spin-container{
/deep/.ant-spin-container {
display: block !important;
}
}
/deep/.ant-drawer-body {
/deep/.ant-drawer-body {
background: #f7f7f7;
padding: 15px;
box-sizing: border-box;
min-height: calc(100vh - 55px);
}
}
/deep/td {
/deep/td {
text-align: left;
}
}
/deep/.ant-descriptions-item-label{
/deep/.ant-descriptions-item-label {
color: #1890ff;
}
}
.btn-dv {
.btn-dv {
background-color: #fff;
padding: 15px;
margin-top: 20px;
display: flex;
justify-content: flex-end;
}
}
.content-box {
.content-box {
display: flex;
justify-content: space-between;
width: 100%;
}
}
.content-dv {
.content-dv {
width: calc(50% - 10px);
background: #fff;
border-radius: 10px;
padding: 10px;
}
</style>
\ No newline at end of file
}</style>
\ No newline at end of file
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue
View file @ a946cb36
......@@ -45,11 +45,11 @@
slot="description"
>
<div class="details">
<span><i class="lable">申报人：</i>{{queEvaData.people_name?queEvaData.people_name:'--'}}</span>
<span><i class="lable">评价人：</i>{{queEvaData.people_name?queEvaData.people_name:'--'}}</span>
<span><i class="lable">取号时间:</i>{{queEvaData.taketime?queEvaData.taketime:'--'}}</span>
<span><i class="lable">排队编码：</i>{{queEvaData.flownum?queEvaData.flownum:'--'}}</span>
<span><i class="lable">取号方式：</i>{{queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span>
<span><i class="lable">注册方式：</i>--</span>
<span><i class="lable">注册方式：</i>{{queEvaData.register_type?queEvaData.register_type=="Applets"?'小程序':queEvaData.register_type=="wechat"?'公众号':queEvaData.register_type=="app"?'自助终端':'现场注册':'现场注册'}}</span>
<span><i class="lable">取号设备：</i>{{queEvaData.take_name?queEvaData.take_name:'--'}}</span>
</div>
</div>
......@@ -145,7 +145,7 @@
<!-- <span v-if="queEvaData.content.length==0">--</span> -->
</span>
<span><i class="lable">评价来源：</i>{{queEvaData.source?queEvaData.source:'--'}}</span>
<span><i class="lable">评价设备：</i>--</span>
<span><i class="lable">评价设备：</i>{{queEvaData.devicenum?queEvaData.devicenum:'--'}}</span>
<span><i class="lable">评价状态：</i>{{!queEvaData.evaluatestatus?'--':queEvaData.evaluatestatus==1?'等待评价':queEvaData.evaluatestatus==2?'完成':queEvaData.evaluatestatus==3?'截图有误':queEvaData.evaluatestatus==4?'用户截图签名超时':queEvaData.evaluatestatus==5?'用户评价超时':'收到图片等待签名'}}</span>
<span>
<i class="lable">评价人照片：</i>
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/departmentEvaluation.vue
View file @ a946cb36
......@@ -336,7 +336,7 @@ export default {
option_id,
pjxt,
time: this.BegindAndEndTime,
info: this.searchName,
info: "%"+this.searchName+"%",
hallid:this.hallid,
sectionid:this.sectionid,
...search,
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue
View file @ a946cb36
......@@ -342,7 +342,7 @@ export default {
option_id,
pjxt,
time: this.BegindAndEndTime,
info: this.searchName,
info: "%"+this.searchName+"%",
hallid: this.hallid,
sectionid: this.sectionid,
...search,
......
portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/makeRecordReport.vue
View file @ a946cb36
......@@ -255,7 +255,7 @@ export default {
},
},
{
title: "业务名称",
title: "业务/事项名称",
align: "center",
dataIndex: "business_name",
},
......
portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/recordReportdetails.vue
View file @ a946cb36
......@@ -29,7 +29,7 @@
}}
</p>
<p>
<span>预约方式：</span>{{ orderInfo.up_type=='phone'?'微官网':orderInfo.up_type=='app'?'自助终端':orderInfo.up_type=='tftb'?'天府通办':'--' }}
<span>预约方式：</span>{{ orderInfo.up_type=='phone'?'小程序':orderInfo.up_type=='app'?'自助终端':orderInfo.up_type=='tftb'?'天府通办':'--' }}
</p>
<p>
<span>预约事项：</span>--
......@@ -62,17 +62,13 @@
<div class="box2">
<h1>办理地点</h1>
<h2>
<span
<span style="width: 33.3%;display: block;"
>办理地点:{{
orderInfo.siteinfo && orderInfo.siteinfo.siteName
}}</span
>
<span
>办理窗口:{{
(orderInfo.window && orderInfo.window.join(",")) || "--"
}}</span
>
<span
<span style="display: block;width: 33.3%;word-wrap: break-word;">办理窗口: {{(orderInfo.window && orderInfo.window.join(",")) || "--"}}</span>
<span style="width: 33.3%;display: block;"
>服务热线:{{
orderInfo.siteinfo && orderInfo.siteinfo.siteTel
}}</span
......@@ -80,14 +76,25 @@
</h2>
<h2>
<span
>办理时间:{{
orderInfo.siteinfo &&
Number(orderInfo.siteinfo.amWorkStartTime) | times
Number(orderInfo.siteinfo.amWorkStartTime*1000) | times
}}
~
{{
orderInfo.siteinfo &&
Number(orderInfo.siteinfo.amWorkEndTime*1000) | times
}}
<span style="position: relative;top:-2px">--</span>
{{
orderInfo.siteinfo &&
Number(orderInfo.siteinfo.pmWorkStartTime*1000) | times
}}
~
{{
orderInfo.siteinfo &&
Number(orderInfo.siteinfo.pmWorkEndTime) | times
Number(orderInfo.siteinfo.pmWorkEndTime*1000) | times
}}</span
>
<span
......@@ -116,7 +123,7 @@
<h1>操作信息</h1>
<h2>
<span>操作时间：{{ orderInfo.create_time }}</span>
<span>预约方式：-- </span>
<span>预约方式：{{ orderInfo.up_type=='phone'?'小程序':orderInfo.up_type=='app'?'自助终端':orderInfo.up_type=='tftb'?'天府通办':'--' }} </span>
<span>操作站点：{{orderInfo.siteinfo?orderInfo.siteinfo.siteName:'--'}} </span>
</h2>
</div>
......
portal-manager-ui/admin/src/views/dataAdmin/components/microOfficialWebsite/components/FormDetails.vue
View file @ a946cb36
......@@ -8,11 +8,13 @@
>
<div class="drawerMain">
<div class="drawerMain-top">
<a-avatar :size="64" icon="user" />
<!-- <a-avatar :size="64" icon="user" /> -->
<a-avatar v-if="!userInfo.icon" :size="64" icon="user" />
<img v-else :src="imgBase+userInfo.icon" style="width: 60px;height: 60px;">
<div class="drawer-user">
<span>{{ userInfo.nickname || "--" }}</span>
<span class="userTips">实名认证</span>
<div class="userInfo">{{ userInfo.idcard_Sex }}，四川，成都</div>
<div class="userInfo">{{ userInfo.idcard_Sex?userInfo.idcard_Sex:'--' }}，{{ userInfo.province?userInfo.province:'--'}}，{{userInfo.city?userInfo.city:'--'}}</div>
</div>
<div class="someUserInfo">
<div class="infoBox">
......@@ -45,14 +47,14 @@
<div class="infoBox">
<span class="infoTitle imgBox">身份证人像面：</span>
<span class="infoContent">
<thumbImage v-if="userInfo.z_img" :src="imgBase+'/'+userInfo.z_img" fileType="img" />
<thumbImage v-if="userInfo.z_img" :src="userInfo.z_img" fileType="img" />
<span v-else>--</span>
</span>
</div>
<div class="infoBox">
<span class="infoTitle imgBox">身份证国徽面：</span>
<span class="infoContent">
<thumbImage v-if="userInfo.b_img" :src="imgBase+'/'+userInfo.b_img" fileType="img" />
<thumbImage v-if="userInfo.b_img" :src="userInfo.b_img" fileType="img" />
<span v-else>--</span>
</span>
</div>
......
portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/callRecordForm.vue
View file @ a946cb36
......@@ -31,9 +31,23 @@ import {getSys12345} from "@/api/dataAdmin"
import {
export2Excel
} from "@/utils/js/exportExcel";
const tHeader=[
"序号",
"微信号",
"电话号码",
"拨打位置",
"拨打时间"
];
const filterVal=[
"index",
"nickname",
"phone",
"address",
"create_time"
];
export default {
mixins: [table],
name: "callRecordForm",
name:"callRecordForm",
data() {
return {
tableHeaders: [
......@@ -76,7 +90,8 @@ export default {
BegindAndEndTime: [],
searchName: undefined,
visible: false,
total:0
total:0,
};
},
components: {
......@@ -155,8 +170,8 @@ export default {
}
}
export2Excel(
this.tHeader,
this.filterVal,
tHeader,
filterVal,
data,
"12345拨打记录报表" + this.$moment().format("YYYYMMDDHHmmss")
);
......
portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/pickUpRecord.vue
View file @ a946cb36
......@@ -144,6 +144,11 @@ export default {
return text.type == 1 ? "取件码取件" : "身份证取件";
},
},
{
title: "取件柜名称",
align: "center",
customRender: (text, record, index) => text.qjg_name || "--",
},
{
title: "取件柜编号",
align: "center",
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/APIServe/components/portDocument.vue
View file @ a946cb36
......@@ -3,13 +3,7 @@
<div class="content">
<div class="top">
<h1 class="title_text">{{ detailsForm.interfaceName }}</h1>
<a-button
type="primary"
class="addclass"
@click="$router.go(-1)"
style="margin-bottom: 1rem"
>返回上一级</a-button
>
<a-button type="primary" class="addclass" @click="$router.go(-1)" style="margin-bottom: 1rem">返回上一级</a-button>
</div>
<a-card title="接口信息" :bordered="false" class="card_box">
<a-descriptions>
......@@ -28,21 +22,12 @@
<a-descriptions-item label="content-type">{{
detailsForm.contentType
}}</a-descriptions-item>
<a-descriptions-item label="超时时长"
>{{ detailsForm.timeoutValue }}秒</a-descriptions-item
>
<a-descriptions-item label="超时时长">{{ detailsForm.timeoutValue }}秒</a-descriptions-item>
<a-descriptions-item label="限流策略">{{
detailsForm.limitStrategy == 1 ? "分钟" : "小时"
}}</a-descriptions-item>
<a-descriptions-item
label="访问网络"
v-if="detailsForm && detailsForm.network"
>
<span
v-for="(item, idx) of dict.network"
v-show="detailsForm.network.indexOf(idx) != -1"
:key="idx"
>
<a-descriptions-item label="访问网络" v-if="detailsForm && detailsForm.network">
<span v-for="(item, idx) of dict.network" v-show="detailsForm.network.indexOf(idx) != -1" :key="idx">
{{ item }}
</span>
</a-descriptions-item>
......@@ -55,7 +40,8 @@
<a-descriptions-item label="请求路径">{{
detailsForm.requestUrl
}}</a-descriptions-item>
<br />
<a-descriptions-item label="流控信息">--</a-descriptions-item>
<a-descriptions-item label="授权信息">--</a-descriptions-item>
<a-descriptions-item label="描述" span="{3}">{{
detailsForm.description
}}</a-descriptions-item>
......@@ -63,11 +49,7 @@
</a-card>
<a-card title="请求参数" :bordered="false" class="card_box">
<div class="flex aic jcb mb10">
<a-radio-group
v-model="requestPam.type"
button-style="solid"
disabled
>
<a-radio-group v-model="requestPam.type" button-style="solid" disabled>
<a-radio-button value="path"> 路径参数 </a-radio-button>
<a-radio-button value="headers"> headers </a-radio-button>
<a-radio-button value="query"> query </a-radio-button>
......@@ -78,15 +60,8 @@
<div>{{ detailsForm.inEncrypt == 1 ? "加密" : "不加密" }}</div>
</div>
</div>
<a-table
size="middle"
bordered
:row-key="(record) => record.id"
:locale="{ emptyText: '无' }"
:pagination="false"
:columns="table_columns"
:dataSource="requestPam.table"
>
<a-table size="middle" bordered :row-key="(record) => record.id" :locale="{ emptyText: '无' }" :pagination="false"
:columns="table_columns" :dataSource="requestPam.table">
</a-table>
</a-card>
......@@ -97,15 +72,8 @@
<div>{{ detailsForm.outEncrypt == 1 ? "加密" : "不加密" }}</div>
</div>
</div>
<a-table
size="middle"
bordered
:row-key="(record) => record.id"
:locale="{ emptyText: '无' }"
:pagination="false"
:columns="table_columns"
:dataSource="responsePam.table"
>
<a-table size="middle" bordered :row-key="(record) => record.id" :locale="{ emptyText: '无' }" :pagination="false"
:columns="table_columns" :dataSource="responsePam.table">
</a-table>
</a-card>
......@@ -123,6 +91,11 @@
</pre>
</div>
</a-card>
<a-card title="变更记录" :bordered="false" class="card_box">
<a-table size="middle" bordered :row-key="(record) => record.id" :locale="{ emptyText: '无' }" :pagination="false"
:columns="table_columns_gb" :dataSource="[]">
</a-table>
</a-card>
</div>
</div>
</template>
......@@ -175,6 +148,23 @@ export default {
width: 200,
},
],
table_columns_gb: [
{
title: "版本号",
align: "center",
dataIndex: "name",
},
{
title: "变更说明",
align: "center",
dataIndex: "name",
},
{
title: "变更时间",
align: "center",
dataIndex: "name",
},
],
allResData: null,
errJson: { msg: "请选择待查看产品接口信息", code: -1 },
};
......@@ -286,7 +276,7 @@ export default {
margin-bottom: 1rem;
}
& + .card_box {
&+.card_box {
margin-top: 1rem;
}
}
......@@ -298,21 +288,15 @@ export default {
width: 100%;
height: @headerH;
background: rgb(59, 135, 255);
background: -moz-linear-gradient(
174deg,
background: -moz-linear-gradient(174deg,
rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%
);
background: -webkit-linear-gradient(
174deg,
rgba(108, 53, 247, 1) 85%);
background: -webkit-linear-gradient(174deg,
rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%
);
background: linear-gradient(
174deg,
rgba(108, 53, 247, 1) 85%);
background: linear-gradient(174deg,
rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%
);
rgba(108, 53, 247, 1) 85%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#3b87ff", endColorstr="#6c35f7", GradientType=1);
}
}
......
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