Skip to content

S
smart_gov_platform
Commit c4d7cd11 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 0daef7bb f17f31c7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 671 additions and 470 deletions
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
View file @ c4d7cd11
...@@ -83,6 +83,32 @@ ...@@ -83,6 +83,32 @@
:placeholder="`请选择${v.fieldName}`" :placeholder="`请选择${v.fieldName}`"
valueFormat="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
/> />
<!-- 年选择器 -->
<a-date-picker
mode="year"
v-else-if="v.fieldType == 'year'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="YYYY"
format="YYYY"
:open="isopen"
@openChange="handYearChange"
@panelChange="(value) => panelYearChange(value, v)"
/>
<!-- 月选择器 -->
<a-month-picker
v-else-if="v.fieldType == 'month'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="M"
/>
<!-- 周选择器 -->
<a-week-picker
v-else-if="v.fieldType == 'week'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="YYYY-WW"
/>
<!-- 多行文本输入框 --> <!-- 多行文本输入框 -->
<a-textarea <a-textarea
v-else-if="v.fieldType == 'textarea'" v-else-if="v.fieldType == 'textarea'"
...@@ -170,6 +196,8 @@ export default { ...@@ -170,6 +196,8 @@ export default {
appId: "", appId: "",
appInfoFieldList: [], appInfoFieldList: [],
}, },
isopen: false,
year: null,
}; };
}, },
computed: { computed: {
...@@ -269,6 +297,17 @@ export default { ...@@ -269,6 +297,17 @@ export default {
changeCheckBox(vals, row) { changeCheckBox(vals, row) {
row.fieldValue = vals.join(","); row.fieldValue = vals.join(",");
}, },
handYearChange(open) {
if (open) {
this.isopen = true;
} else {
this.isopen = false;
}
},
panelYearChange(value, row) {
row.fieldValue = this.$moment(value).format("YYYY");
this.isopen = false;
},
}, },
}; };
</script> </script>
......
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue
View file @ c4d7cd11
...@@ -98,6 +98,19 @@ const fieldTypeItem = [ ...@@ -98,6 +98,19 @@ const fieldTypeItem = [
value: "date", value: "date",
label: "日期选择框", label: "日期选择框",
}, },
{
value: "year",
label: "年选择框",
},
{
value: "month",
label: "月选择框",
},
{
value: "week",
label: "周选择框",
},
{ {
value: "radio", value: "radio",
label: "单选框", label: "单选框",
...@@ -136,15 +149,12 @@ export default { ...@@ -136,15 +149,12 @@ export default {
try { try {
let Obj = JSON.parse(value); let Obj = JSON.parse(value);
let isjson = let isjson =
typeof Obj == "object" &&
Object.prototype.toString.call(Obj).toLowerCase() == Object.prototype.toString.call(Obj).toLowerCase() ==
"[object object]" && "[object object]" && Object.keys(Obj).length;
Object.keys(Obj).length;
!value.length;
if (isjson) { if (isjson) {
callback(); callback();
} else { } else {
callback(new Error("输入的JSON对象格式")); callback(new Error("请输入JSON对象格式"));
} }
} catch (err) { } catch (err) {
callback(new Error("输入的JSON数据格式有误")); callback(new Error("输入的JSON数据格式有误"));
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoFieldVo.java
View file @ c4d7cd11
package com.mortals.xhx.module.app.model.vo; package com.mortals.xhx.module.app.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.AppDatasetQuery;
import com.mortals.xhx.module.app.model.AppInfoFieldEntity; import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
import com.mortals.xhx.module.app.model.AppInfoFieldQuery;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* 自助终端应用信息字段视图对象 * 自助终端应用信息字段视图对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-11-28
*/ */
@Data
public class AppInfoFieldVo extends BaseEntityLong { public class AppInfoFieldVo extends BaseEntityLong {
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AppInfoFieldQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<AppInfoFieldQuery> andConditionList;
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoTempleteFieldVo.java
View file @ c4d7cd11
package com.mortals.xhx.module.app.model.vo; package com.mortals.xhx.module.app.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.AppDatasetQuery;
import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity; import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity;
import com.mortals.xhx.module.app.model.AppInfoTempleteFieldQuery;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -9,6 +13,12 @@ import java.util.List; ...@@ -9,6 +13,12 @@ import java.util.List;
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-11-28
*/ */
@Data
public class AppInfoTempleteFieldVo extends BaseEntityLong { public class AppInfoTempleteFieldVo extends BaseEntityLong {
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<AppInfoTempleteFieldQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<AppInfoTempleteFieldQuery> andConditionList;
} }
\ No newline at end of file
portal-manager-ui/admin/src/App.vue
View file @ c4d7cd11
...@@ -69,4 +69,7 @@ export default { ...@@ -69,4 +69,7 @@ export default {
.ant-calendar-next-year-btn::after { .ant-calendar-next-year-btn::after {
border-color: rgba(0, 0, 0, 1) !important; border-color: rgba(0, 0, 0, 1) !important;
} }
.ant-progress-text {
color: #fff !important;
}
</style> </style>
\ No newline at end of file
portal-manager-ui/admin/src/api/user.js
View file @ c4d7cd11
...@@ -20,9 +20,3 @@ export function changePassword(params) { ...@@ -20,9 +20,3 @@ export function changePassword(params) {
export function editPassword(params) { export function editPassword(params) {
return http.post(`${baseURL}/zwfw/user/reset/password`, params); return http.post(`${baseURL}/zwfw/user/reset/password`, params);
} }
// 获取图形验证码
export function createCode(params) {
return http.post(`${baseURL}/zwfw/securitycode/createCode`, params, {
responseType: "blob",
});
}
portal-manager-ui/admin/src/assets/css/common.less
View file @ c4d7cd11
...@@ -631,18 +631,20 @@ img { ...@@ -631,18 +631,20 @@ img {
tr, th,td{ tr, th,td{
border:none !important; border:none !important;
} }
// .ant-table-body-inner{
// &::-webkit-scrollbar{ // 表格鼠标移入显示滚动条
// display: none; .ant-table-body,.ant-table-body-inner{
// } &::-webkit-scrollbar{
// } display: none;
// :hover{ }
// .ant-table-body-inner{ }
// &::-webkit-scrollbar{ :hover{
// display: block; .ant-table-body,.ant-table-body-inner{
// } &::-webkit-scrollbar{
// } display:block;
// } }
}
}
} }
.ant-table-thead th { .ant-table-thead th {
background: linear-gradient(0deg, #f9fbff 0%, #cbddff 78%); background: linear-gradient(0deg, #f9fbff 0%, #cbddff 78%);
...@@ -760,18 +762,18 @@ img { ...@@ -760,18 +762,18 @@ img {
} }
} }
// 表格鼠标移入显示滚动条 // 表格鼠标移入显示滚动条
.ant-table { // .ant-table {
.ant-table-body,.ant-table-body-inner{ // .ant-table-body,.ant-table-body-inner{
&::-webkit-scrollbar{ // &::-webkit-scrollbar{
display: none; // display: none;
} // }
} // }
:hover{ // :hover{
.ant-table-body,.ant-table-body-inner{ // .ant-table-body,.ant-table-body-inner{
&::-webkit-scrollbar{ // &::-webkit-scrollbar{
display:block; // display:block;
} // }
} // }
} // }
} // }
\ No newline at end of file \ No newline at end of file
portal-manager-ui/admin/src/directive/index.js
View file @ c4d7cd11
import Storage from "@/utils/js/Storage"; // import Storage from "@/utils/js/Storage";
import store from "@/store"; import store from "@/store";
// 修改密码权限 // 修改密码权限
export const permission = { export const permission = {
......
portal-manager-ui/admin/src/request/request.js
View file @ c4d7cd11
...@@ -39,7 +39,6 @@ axios.interceptors.response.use( ...@@ -39,7 +39,6 @@ axios.interceptors.response.use(
// 取出数据 // 取出数据
let { code, msg } = response.data; let { code, msg } = response.data;
if (code === -1) { if (code === -1) {
console.log(response.data);
message.error({ message.error({
content: msg, content: msg,
maxCount: 1, maxCount: 1,
...@@ -49,7 +48,14 @@ axios.interceptors.response.use( ...@@ -49,7 +48,14 @@ axios.interceptors.response.use(
store.commit("user/reset"); store.commit("user/reset");
router.push("/"); router.push("/");
} }
} else if (code === 401) { } else if (
code === 401 ||
code === 201 ||
code === 101 ||
code === 102 ||
code === 9001 ||
code === 9002
) {
message.error({ message.error({
content: msg, content: msg,
maxCount: 1, maxCount: 1,
......
portal-manager-ui/admin/src/views/dataActuary/behaviour/pathanalyse/pathAnalyse.vue
View file @ c4d7cd11
<template> <template>
<!-- 路径分析 --> <!-- 路径分析 -->
<div class="page"> <div class="page">
<a-form-model :model="queryform" :label-col="labelCol" :wrapper-col="wrapperCol" layout="inline"> <a-form-model
<a-form-model-item> :model="queryform"
<a-select v-model="queryform.productId" style="width: 200px" placeholder="选择产品"> :label-col="labelCol"
<a-select-option :value="item.id" v-for="(item,index) in product" :key="index"> :wrapper-col="wrapperCol"
{{item.title}} layout="inline"
</a-select-option> >
</a-select> <a-form-model-item>
</a-form-model-item> <a-select
<a-form-model-item> v-model="queryform.productId"
<a-range-picker valueFormat="yyyy-MM-DD" v-model="time" style="width: 300px" :allowClear="false"/> style="width: 200px"
</a-form-model-item> placeholder="选择产品"
<a-form-model-item> >
<a-button type="primary" class="addclass" @click="getData"> <a-select-option
开始分析 :value="item.id"
</a-button> v-for="(item, index) in product"
</a-form-model-item> :key="index"
</a-form-model> >
<div id="path"></div> {{ item.title }}
</div> </a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item>
<a-range-picker
valueFormat="yyyy-MM-DD"
v-model="time"
style="width: 300px"
:allowClear="false"
/>
</a-form-model-item>
<a-form-model-item>
<a-button type="primary" class="addclass" @click="getData">
开始分析
</a-button>
</a-form-model-item>
</a-form-model>
<div id="path"></div>
</div>
</template> </template>
<script> <script>
import * as echarts from 'echarts' import * as echarts from "echarts";
import product from "../mixins/product" import product from "../mixins/product";
import {getWayAccessAnalyse} from '@/api/dataActuary.js' import { getWayAccessAnalyse } from "@/api/dataActuary.js";
import moment from 'moment'; import moment from "moment";
export default { export default {
mixins:[product], mixins: [product],
data() { data() {
return { return {
queryform: { queryform: {
productId: 1, productId: 1,
dateTimeStart:moment().format('yyyy-MM-DD'), dateTimeStart: moment().format("yyyy-MM-DD"),
dateTimeEnd:moment().format('yyyy-MM-DD') dateTimeEnd: moment().format("yyyy-MM-DD"),
}, },
time:[moment().format('yyyy-MM-DD'),moment().format('yyyy-MM-DD')], time: [moment().format("yyyy-MM-DD"), moment().format("yyyy-MM-DD")],
product:[{ product: [
title:'排队机', {
id:1 title: "排队机",
}], id: 1,
labelCol: { },
span: 1 ],
}, labelCol: {
wrapperCol: { span: 1,
span: 14 },
}, wrapperCol: {
} span: 14,
}, },
mounted() { myChart: null,
this.getData() };
}, },
methods: { created() {
getData() { this.$nextTick(() => {
this.queryform.dateTimeStart = this.time ? this.time[0] : null this.getData();
this.queryform.dateTimeStart = this.time ? this.time[1] : null });
getWayAccessAnalyse(this.queryform).then(res=>{ },
let data = res.data.data.map(item=>({name:item.name})) methods: {
let links = res.data.links.map(item=>({ getData() {
source:item.sourceName, this.queryform.dateTimeStart = this.time ? this.time[0] : null;
target:item.targetName, this.queryform.dateTimeStart = this.time ? this.time[1] : null;
value:item.value, getWayAccessAnalyse(this.queryform).then((res) => {
lineStyle:{ let data = res.data.data.map((item, i) =>
color:'source' item.code != "/sceneSignIn"
} ? {
})) name: item.name,
this.init(data,links) }
}) : ""
}, );
uniqueFunc(arr, uniId){ let links = res.data.links.map((item) => ({
const res = new Map(); source: item.sourceName,
return arr.filter((item) => !res.has(item[uniId]) && res.set(item[uniId], 1)); target: item.targetName,
}, value: item.value,
init(data,links) { lineStyle: {
let chartDom = document.getElementById('path') color: "source",
let myChart = echarts.init(chartDom); },
myChart.setOption({ }));
series: { data = data.filter((v) => v);
type: 'sankey', links = links.filter((v) => v.target != "首页");
layout: 'none', this.init(data, links);
emphasis: { });
focus: 'adjacency' },
}, uniqueFunc(arr, uniId) {
color:['#FFCAC4','#6D86DE','#409AFE','#4DB3EA','#07CF8C'], const res = new Map();
nodeWidth:10, return arr.filter(
data: data, (item) => !res.has(item[uniId]) && res.set(item[uniId], 1)
links: links );
} },
}) init(data, links) {
} if (
} this.myChart != null &&
}; this.myChart != "" &&
this.myChart != undefined
) {
this.myChart.dispose(); //销毁
}
this.myChart = echarts.init(document.getElementById("path"));
this.myChart.setOption({
series: {
type: "sankey",
layout: "none",
emphasis: {
focus: "adjacency",
},
color: ["#FFCAC4", "#6D86DE", "#409AFE", "#4DB3EA", "#07CF8C"],
nodeWidth: 10,
data: data,
links: links,
},
});
window.addEventListener("resize", () => {
if (this.myChart) {
this.myChart.resize();
}
});
},
},
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.page{ .page {
height: calc(100% - 50px); height: calc(100% - 50px);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
/deep/.ant-form { /deep/.ant-form {
padding: 15px; padding: 15px;
} }
#path{ #path {
flex: 1; flex: 1;
width: 70%; width: 70%;
margin: 0 auto; margin: 0 auto;
} }
} }
</style> </style>
\ No newline at end of file
portal-manager-ui/admin/src/views/dataActuary/dataActuary.vue
View file @ c4d7cd11
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
handleJump(url) { handleJump(url) {
if (url.includes("http") || url.includes("https")) { if (url.includes("http") || url.includes("https")) {
let siteid = Storage.get(2, "siteId") || 0; let siteid = Storage.get(2, "siteId") || 0;
location.href = `${url}?token=${this.token}&siteid=${siteid}`; window.open(`${url}?token=${this.token}&siteid=${siteid}`, "_blank");
} else { } else {
this.$router.push(url); this.$router.push(url);
} }
......
portal-manager-ui/admin/src/views/dataAdmin/components/Impossible/index.vue
View file @ c4d7cd11
...@@ -308,6 +308,7 @@ export default { ...@@ -308,6 +308,7 @@ export default {
// 查看信息 // 查看信息
checkInfo(id) { checkInfo(id) {
this.loading = true;
getImpossibleInfo({ getImpossibleInfo({
id: id, id: id,
}).then((res) => { }).then((res) => {
...@@ -316,6 +317,7 @@ export default { ...@@ -316,6 +317,7 @@ export default {
this.$refs.FormDetails.fromData = data; this.$refs.FormDetails.fromData = data;
this.visible = true; this.visible = true;
} }
this.loading = false;
}); });
}, },
}, },
......
portal-manager-ui/admin/src/views/dataAdmin/components/easyPoliticsShow/PoliticsShow.vue
View file @ c4d7cd11
...@@ -96,7 +96,7 @@ const filterVal = [ ...@@ -96,7 +96,7 @@ const filterVal = [
"organization", "organization",
"customerDesignPictures", "customerDesignPictures",
"customerDesignVideos", "customerDesignVideos",
"memberLevel", "levelName",
"lastLoginTime", "lastLoginTime",
"status", "status",
]; // 导出的表头字段名，需要导出表格字段名 ]; // 导出的表头字段名，需要导出表格字段名
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/departmentEvaluation.vue
View file @ c4d7cd11
...@@ -383,6 +383,7 @@ export default { ...@@ -383,6 +383,7 @@ export default {
}, },
// 详情 // 详情
async checkInfo(id) { async checkInfo(id) {
this.loading = true;
let res = await getEvaData({ id }); let res = await getEvaData({ id });
if (res.code == 1) { if (res.code == 1) {
let { data } = res; let { data } = res;
...@@ -390,6 +391,7 @@ export default { ...@@ -390,6 +391,7 @@ export default {
this.detailsInfo = data; this.detailsInfo = data;
this.detailsVisible = true; this.detailsVisible = true;
} }
this.loading = false;
}, },
// 删除 // 删除
handleDel(id) { handleDel(id) {
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/matterEvaluation.vue
View file @ c4d7cd11
...@@ -380,12 +380,14 @@ export default { ...@@ -380,12 +380,14 @@ export default {
}, },
// 详情 // 详情
async checkInfo(id) { async checkInfo(id) {
this.loading = true;
let res = await getQueEvaData({ id }); let res = await getQueEvaData({ id });
if (res.code == 1) { if (res.code == 1) {
let { data } = res; let { data } = res;
this.detailsInfo = data; this.detailsInfo = data;
this.detailsVisible = true; this.detailsVisible = true;
} }
this.loading = false;
}, },
// 删除 // 删除
handleDel(id) { handleDel(id) {
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue
View file @ c4d7cd11
...@@ -381,6 +381,7 @@ export default { ...@@ -381,6 +381,7 @@ export default {
}, },
// 详情 // 详情
async checkInfo(id) { async checkInfo(id) {
this.loading = true;
let res = await getEvaData({ id }); let res = await getEvaData({ id });
if (res.code == 1) { if (res.code == 1) {
let { data } = res; let { data } = res;
...@@ -388,6 +389,7 @@ export default { ...@@ -388,6 +389,7 @@ export default {
this.detailsInfo = data; this.detailsInfo = data;
this.detailsVisible = true; this.detailsVisible = true;
} }
this.loading = false;
}, },
// 删除 // 删除
handleDel(id) { handleDel(id) {
......
portal-manager-ui/admin/src/views/dataAdmin/components/fillRecordReport/fillForm.vue
View file @ c4d7cd11
...@@ -209,31 +209,15 @@ export default { ...@@ -209,31 +209,15 @@ export default {
// 获取报表 // 获取报表
async getPrintList() { async getPrintList() {
this.loading = true; this.loading = true;
let pramse = { let { total, data } = await this.getDataList();
page: this.current, this.total = total;
size: this.size, this.tableData = data;
siteId: this.siteId, this.$emit("update", { total, time: this.searchForm.time });
type: this.searchForm.status,
createTimeStart: this.searchForm.time[0],
createTimeEnd: this.searchForm.time[1],
};
if (this.searchForm.type == 1) {
pramse.matterName = `%${this.searchForm.searchName}%`;
} else {
pramse.materialName = `%${this.searchForm.searchName}%`;
}
let res = await getPrintList(pramse);
if (res.code == 1) {
let { data, total } = res.data;
this.total = total;
this.tableData = data;
this.$emit("update", { total, time: this.searchForm.time });
}
this.loading = false; this.loading = false;
}, },
// 获取导出数据 // 获取数据函数
async getExportPrintList() { async getDataList(searchForm) {
let list = []; let list = [];
let listTotal = 0; let listTotal = 0;
let pramse = { let pramse = {
...@@ -243,6 +227,7 @@ export default { ...@@ -243,6 +227,7 @@ export default {
type: this.searchForm.status, type: this.searchForm.status,
createTimeStart: this.searchForm.time[0], createTimeStart: this.searchForm.time[0],
createTimeEnd: this.searchForm.time[1], createTimeEnd: this.searchForm.time[1],
...searchForm,
}; };
if (this.searchForm.type == 1) { if (this.searchForm.type == 1) {
pramse.matterName = `%${this.searchForm.searchName}%`; pramse.matterName = `%${this.searchForm.searchName}%`;
...@@ -250,10 +235,10 @@ export default { ...@@ -250,10 +235,10 @@ export default {
pramse.materialName = `%${this.searchForm.searchName}%`; pramse.materialName = `%${this.searchForm.searchName}%`;
} }
let res = await getPrintList(pramse); let res = await getPrintList(pramse);
if (res.data.code == 1) { if (res.code == 1) {
let { data, total } = res.data.data; let { data, total } = res.data;
list = data;
listTotal = total; listTotal = total;
list = data;
} }
return { return {
data: list, data: list,
...@@ -304,7 +289,7 @@ export default { ...@@ -304,7 +289,7 @@ export default {
"填单记录报表" + this.$moment().format("YYYYMMDDHHmmss") "填单记录报表" + this.$moment().format("YYYYMMDDHHmmss")
); );
} else { } else {
this.dataSection(this.getExportPrintList, {}, (data) => { this.dataSection(this.getDataList, {}, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning("暂无数据");
return; return;
......
portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/makeRecordReport.vue
View file @ c4d7cd11
...@@ -383,11 +383,13 @@ export default { ...@@ -383,11 +383,13 @@ export default {
}, },
// 详情 // 详情
async checkInfo({ id }) { async checkInfo({ id }) {
this.loading = true;
let res = await getOrderinfo({ id }); let res = await getOrderinfo({ id });
if (res.code == 1) { if (res.code == 1) {
this.detailsInfo = res.data; this.detailsInfo = res.data;
this.visible = true; this.visible = true;
} }
this.loading = false;
}, },
}, },
}; };
......
portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/callRecordForm.vue
View file @ c4d7cd11
...@@ -32,8 +32,8 @@ import { mapState } from "vuex"; ...@@ -32,8 +32,8 @@ import { mapState } from "vuex";
import storage from "@/utils/js/Storage"; import storage from "@/utils/js/Storage";
import { export2Excel } from "@/utils/js/exportExcel"; import { export2Excel } from "@/utils/js/exportExcel";
import { getSys12345 } from "@/api/dataAdmin"; import { getSys12345 } from "@/api/dataAdmin";
const tHeader = ["序号", "微信号", "电话号码", "拨打位置", "拨打时间"]; // 导出的表头名信息 const tHeader = ["微信号", "电话号码", "拨打位置", "拨打时间"]; // 导出的表头名信息
const filterVal = ["index", "nickname", "phone", "address", "create_time"]; // 导出的表头字段名，需要导出表格字段名 const filterVal = ["nickname", "phone", "address", "create_time"]; // 导出的表头字段名，需要导出表格字段名
export default { export default {
components: {}, components: {},
data() { data() {
......
portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/letterRecordForm.vue
View file @ c4d7cd11
...@@ -50,7 +50,6 @@ import FormDetails from "./components/FormDetails.vue"; ...@@ -50,7 +50,6 @@ import FormDetails from "./components/FormDetails.vue";
import { export2Excel } from "@/utils/js/exportExcel"; import { export2Excel } from "@/utils/js/exportExcel";
import { adminList, letterInfo } from "@/api/dataAdmin"; import { adminList, letterInfo } from "@/api/dataAdmin";
const tHeader = [ const tHeader = [
"序号",
"工单编号", "工单编号",
"信件标题", "信件标题",
"信件类别", "信件类别",
...@@ -64,7 +63,6 @@ const tHeader = [ ...@@ -64,7 +63,6 @@ const tHeader = [
"办理部门", "办理部门",
]; // 导出的表头名信息 ]; // 导出的表头名信息
const filterVal = [ const filterVal = [
"index",
"LetterCode", "LetterCode",
"strTitle", "strTitle",
"strType", "strType",
...@@ -294,6 +292,18 @@ export default { ...@@ -294,6 +292,18 @@ export default {
if (this.selectedRowKeys.length && this.excelData.length) { if (this.selectedRowKeys.length && this.excelData.length) {
// 深度克隆避免影响页面表格展示 // 深度克隆避免影响页面表格展示
let data = this.$_.cloneDeep(this.excelData); let data = this.$_.cloneDeep(this.excelData);
for (let item of data) {
item.strGender =
item.strGender == 0 ? "无" : item.strGender == 1 ? "男" : "女";
item.source =
item.source == 1
? "微官网"
: item.source == 2
? "自助服务系统"
: item.source == 3
? "数字填单系统"
: "无";
}
export2Excel( export2Excel(
this.tHeader, this.tHeader,
this.filterVal, this.filterVal,
...@@ -306,6 +316,18 @@ export default { ...@@ -306,6 +316,18 @@ export default {
this.$message.warning("暂无数据"); this.$message.warning("暂无数据");
return; return;
} }
for (let item of data) {
item.strGender =
item.strGender == 0 ? "无" : item.strGender == 1 ? "男" : "女";
item.source =
item.source == 1
? "微官网"
: item.source == 2
? "自助服务系统"
: item.source == 3
? "数字填单系统"
: "无";
}
export2Excel( export2Excel(
this.tHeader, this.tHeader,
this.filterVal, this.filterVal,
...@@ -343,12 +365,14 @@ export default { ...@@ -343,12 +365,14 @@ export default {
}, },
// 查看信息 // 查看信息
checkInfo(id) { checkInfo(id) {
this.loading = true;
letterInfo({ id }).then((res) => { letterInfo({ id }).then((res) => {
if (res.code == 1) { if (res.code == 1) {
let { data } = res; let { data } = res;
this.$refs.FormDetails.fromData = data; this.$refs.FormDetails.fromData = data;
this.visible = true; this.visible = true;
} }
this.loading = false;
}); });
}, },
}, },
......
portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/networkForm.vue
View file @ c4d7cd11
...@@ -377,6 +377,7 @@ export default { ...@@ -377,6 +377,7 @@ export default {
// 查看信息 // 查看信息
checkInfo(id) { checkInfo(id) {
this.loading = true;
getWLLZInfo({ getWLLZInfo({
id: id, id: id,
}).then((res) => { }).then((res) => {
...@@ -385,6 +386,7 @@ export default { ...@@ -385,6 +386,7 @@ export default {
this.$refs.FormDetails.fromData = data; this.$refs.FormDetails.fromData = data;
this.visible = true; this.visible = true;
} }
this.loading = false;
}); });
}, },
}, },
......
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/callRecord.vue
View file @ c4d7cd11
...@@ -372,6 +372,7 @@ export default { ...@@ -372,6 +372,7 @@ export default {
// 查看用户信息 // 查看用户信息
async checkUser(row) { async checkUser(row) {
this.loading = true;
let res = await getPeopleanalyse({ let res = await getPeopleanalyse({
idcard: row.people_idcard, idcard: row.people_idcard,
peopleid: row.peopleid, peopleid: row.peopleid,
...@@ -381,11 +382,13 @@ export default { ...@@ -381,11 +382,13 @@ export default {
let { data } = res; let { data } = res;
this.userInfo = { ...row, ...data }; this.userInfo = { ...row, ...data };
} }
this.loading = false;
this.userInfoVisible = true; this.userInfoVisible = true;
}, },
// 查看业务信息 // 查看业务信息
async checkBusiness(row) { async checkBusiness(row) {
this.loading = true;
let res = await getBusinessEvent({ let res = await getBusinessEvent({
businessid: row.businessid, businessid: row.businessid,
time: this.searchForm.time, time: this.searchForm.time,
...@@ -397,10 +400,12 @@ export default { ...@@ -397,10 +400,12 @@ export default {
this.businessInfo = data; this.businessInfo = data;
this.analysisVisible = true; this.analysisVisible = true;
} }
this.loading = false;
}, },
// 查看工作人员 // 查看工作人员
async checkWorkman(id) { async checkWorkman(id) {
this.loading = true;
let res = await getWorkmananalyse({ let res = await getWorkmananalyse({
workmanid: id, workmanid: id,
time: this.searchForm.time, time: this.searchForm.time,
...@@ -410,11 +415,13 @@ export default { ...@@ -410,11 +415,13 @@ export default {
}); });
let { data } = res; let { data } = res;
this.workerInfo = { ...data, ...result.data }; this.workerInfo = { ...data, ...result.data };
this.loading = false;
this.workerInfoVisible = true; this.workerInfoVisible = true;
}, },
// 查看详细信息 // 查看详细信息
async checkInfo(id) { async checkInfo(id) {
this.loading = true;
let res = await getQueueInfo({ let res = await getQueueInfo({
id, id,
}); });
...@@ -423,6 +430,7 @@ export default { ...@@ -423,6 +430,7 @@ export default {
this.detailsInfo = data; this.detailsInfo = data;
this.detailsVisible = true; this.detailsVisible = true;
} }
this.loading = false;
}, },
// 勾选表格 // 勾选表格
......
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue
View file @ c4d7cd11
...@@ -365,6 +365,7 @@ export default { ...@@ -365,6 +365,7 @@ export default {
// 查看用户信息 // 查看用户信息
async checkUser(row) { async checkUser(row) {
this.loading = true;
let res = await getPeopleanalyse({ let res = await getPeopleanalyse({
idcard: row.people_idcard, idcard: row.people_idcard,
peopleid: row.peopleid, peopleid: row.peopleid,
...@@ -374,11 +375,13 @@ export default { ...@@ -374,11 +375,13 @@ export default {
let { data } = res; let { data } = res;
this.userInfo = { ...row, ...data }; this.userInfo = { ...row, ...data };
} }
this.loading = false;
this.userInfoVisible = true; this.userInfoVisible = true;
}, },
// 查看业务信息 // 查看业务信息
async checkBusiness(row) { async checkBusiness(row) {
this.loading = true;
let res = await getBusinessEvent({ let res = await getBusinessEvent({
businessid: row.businessid, businessid: row.businessid,
time: this.searchForm.time, time: this.searchForm.time,
...@@ -390,10 +393,12 @@ export default { ...@@ -390,10 +393,12 @@ export default {
this.businessInfo = data; this.businessInfo = data;
this.analysisVisible = true; this.analysisVisible = true;
} }
this.loading = false;
}, },
// 查看工作人员 // 查看工作人员
async checkWorkman(id) { async checkWorkman(id) {
this.loading = true;
let res = await getWorkmananalyse({ let res = await getWorkmananalyse({
workmanid: id, workmanid: id,
time: this.searchForm.time, time: this.searchForm.time,
...@@ -403,11 +408,13 @@ export default { ...@@ -403,11 +408,13 @@ export default {
}); });
let { data } = res; let { data } = res;
this.workerInfo = { ...data, ...result.data }; this.workerInfo = { ...data, ...result.data };
this.loading = false;
this.workerInfoVisible = true; this.workerInfoVisible = true;
}, },
// 查看详细信息 // 查看详细信息
async checkInfo(id) { async checkInfo(id) {
this.loading = true;
let res = await getQueueInfo({ let res = await getQueueInfo({
id, id,
}); });
...@@ -416,6 +423,7 @@ export default { ...@@ -416,6 +423,7 @@ export default {
this.detailsInfo = data; this.detailsInfo = data;
this.detailsVisible = true; this.detailsVisible = true;
} }
this.loading = false;
}, },
// 勾选表格 // 勾选表格
......
portal-manager-ui/admin/src/views/dataAdmin/components/sampleRecordReport/sampleForm.vue
View file @ c4d7cd11
...@@ -37,8 +37,10 @@ ...@@ -37,8 +37,10 @@
<div class="ellipsis" :title="text"> <div class="ellipsis" :title="text">
{{ text ? text : "--" }} {{ text ? text : "--" }}
</div> </div>
<div class="ellipsis" :title="record.materiaFullName"> <div class="ellipsis" :title="record.materialFullName">
样表全称：{{ record.materiaFullName ? record.materiaFullName : "--" }} 样表全称：{{
record.materialFullName ? record.materialFullName : "--"
}}
</div> </div>
</template> </template>
<!-- 类型 --> <!-- 类型 -->
...@@ -173,31 +175,15 @@ export default { ...@@ -173,31 +175,15 @@ export default {
// 获取报表 // 获取报表
async getBillList() { async getBillList() {
this.loading = true; this.loading = true;
let pramse = { let { total, data } = await this.getDataList();
page: this.current, this.total = total;
size: this.size, this.tableData = data;
siteId: this.siteId, this.$emit("update", { total, time: this.searchForm.time });
type: this.searchForm.status,
operTimeStart: this.searchForm.time[0],
operTimeEnd: this.searchForm.time[1],
};
if (this.searchForm.type == 1) {
pramse.matterName = `%${this.searchForm.searchName}%`;
} else {
pramse.materialName = `%${this.searchForm.searchName}%`;
}
let res = await getBillList(pramse);
if (res.code == 1) {
let { data, total } = res.data;
this.total = total;
this.tableData = data;
this.$emit("update", { total, time: this.searchForm.time });
}
this.loading = false; this.loading = false;
}, },
// 获取导出数据 // 获取数据函数
async getExportPrintList() { async getDataList(searchForm) {
let list = []; let list = [];
let listTotal = 0; let listTotal = 0;
let pramse = { let pramse = {
...@@ -207,6 +193,7 @@ export default { ...@@ -207,6 +193,7 @@ export default {
type: this.searchForm.status, type: this.searchForm.status,
operTimeStart: this.searchForm.time[0], operTimeStart: this.searchForm.time[0],
operTimeEnd: this.searchForm.time[1], operTimeEnd: this.searchForm.time[1],
...searchForm,
}; };
if (this.searchForm.type == 1) { if (this.searchForm.type == 1) {
pramse.matterName = `%${this.searchForm.searchName}%`; pramse.matterName = `%${this.searchForm.searchName}%`;
...@@ -216,8 +203,8 @@ export default { ...@@ -216,8 +203,8 @@ export default {
let res = await getBillList(pramse); let res = await getBillList(pramse);
if (res.code == 1) { if (res.code == 1) {
let { data, total } = res.data; let { data, total } = res.data;
list = data;
listTotal = total; listTotal = total;
list = data;
} }
return { return {
data: list, data: list,
...@@ -257,7 +244,7 @@ export default { ...@@ -257,7 +244,7 @@ export default {
"样表记录报表" + this.$moment().format("YYYYMMDDHHmmss") "样表记录报表" + this.$moment().format("YYYYMMDDHHmmss")
); );
} else { } else {
this.dataSection(this.getExportPrintList, {}, (data) => { this.dataSection(this.getDataList, {}, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning("暂无数据");
return; return;
......
portal-manager-ui/admin/src/views/dataAdmin/dataAdmin.vue
View file @ c4d7cd11
...@@ -11,22 +11,12 @@ ...@@ -11,22 +11,12 @@
class="flex items-center justify-between flex-shrink-0 pl-[10px] pr-[10px]" class="flex items-center justify-between flex-shrink-0 pl-[10px] pr-[10px]"
> >
<div <div
:class="['tab-item', { active: active == 'CensusType_1' }]" v-for="v in CensusTypeList"
@click="changeCensusType('CensusType_1')" :key="v.type"
:class="['tab-item', { active: active == v.type }]"
@click="changeCensusType(v.type)"
> >
聚焦服务 {{ v.name }}
</div>
<div
:class="['tab-item', { active: active == 'CensusType_2' }]"
@click="changeCensusType('CensusType_2')"
>
聚焦协同
</div>
<div
:class="['tab-item', { active: active == 'CensusType_3' }]"
@click="changeCensusType('CensusType_3')"
>
聚焦监管
</div> </div>
</div> </div>
<div <div
...@@ -91,6 +81,20 @@ export default { ...@@ -91,6 +81,20 @@ export default {
data() { data() {
return { return {
siteId: Storage.get(2, "siteId"), siteId: Storage.get(2, "siteId"),
CensusTypeList: [
{
type: "CensusType_1",
name: "聚焦服务",
},
{
type: "CensusType_2",
name: "聚焦协同",
},
{
type: "CensusType_3",
name: "聚焦监管",
},
],
CensusType_1: [], // 服务 CensusType_1: [], // 服务
CensusType_2: [], // 协同 CensusType_2: [], // 协同
CensusType_3: [], // 监管 CensusType_3: [], // 监管
......
portal-manager-ui/admin/src/views/home/components/changePassword.vue
View file @ c4d7cd11
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
import { changePassWord } from "@/utils/js/validate"; import { changePassWord } from "@/utils/js/validate";
import { changePassword, LogoutInterface } from "@/api/user"; import { changePassword, LogoutInterface } from "@/api/user";
import { mapMutations } from "vuex"; import { mapMutations } from "vuex";
import { encrypt } from "@/utils"; // import { encrypt } from "@/utils";
import storage from "@/utils/js/Storage";
export default { export default {
props: { props: {
visibleEditPwd: { visibleEditPwd: {
...@@ -98,10 +99,15 @@ export default { ...@@ -98,10 +99,15 @@ export default {
let _this = this; let _this = this;
this.$refs.formData.validate(async (valid) => { this.$refs.formData.validate(async (valid) => {
if (valid) { if (valid) {
// let obj = {
// loginName: encrypt(this.form.loginName),
// oldPwd: encrypt(this.form.oldPwd),
// newPwd: encrypt(this.form.newPwd),
// };
let obj = { let obj = {
loginName: encrypt(this.form.loginName), loginName: this.form.loginName,
oldPwd: encrypt(this.form.oldPwd), oldPwd: this.form.oldPwd,
newPwd: encrypt(this.form.newPwd), newPwd: this.form.newPwd,
}; };
let res = await changePassword(obj); let res = await changePassword(obj);
let { code } = res; let { code } = res;
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/APIServe/components/portDocument.vue
View file @ c4d7cd11
...@@ -236,6 +236,7 @@ export default { ...@@ -236,6 +236,7 @@ export default {
} }
.Container { .Container {
width: 100%;
background: #f5f5f5; background: #f5f5f5;
.content { .content {
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditPwd.vue
View file @ c4d7cd11
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
:model="form" :model="form"
:rules="rules" :rules="rules"
ref="formData" ref="formData"
:label-col="{ span: 5 }" :label-col="{ span: 6 }"
:wrapper-col="{ span: 19 }" :wrapper-col="{ span: 18 }"
> >
<a-form-model-item label="用户名" prop="loginName"> <a-form-model-item label="用户名" prop="loginName">
<a-input <a-input
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
<div slot="footer"> <div slot="footer">
<a-button style="margin-left: 10px" @click="handleClose">取消</a-button> <a-button style="margin-left: 10px" @click="handleClose">取消</a-button>
<a-button type="primary" class="addclass" @click="handleOk">确定</a-button> <a-button type="primary" class="addclass" @click="handleOk"
>确定</a-button
>
</div> </div>
</a-modal> </a-modal>
</div> </div>
...@@ -45,6 +47,7 @@ ...@@ -45,6 +47,7 @@
<script> <script>
import { changeAccount, changePassWord } from "@/utils/js/validate"; import { changeAccount, changePassWord } from "@/utils/js/validate";
import { editPassword } from "@/api/user"; import { editPassword } from "@/api/user";
// import { encrypt } from "@/utils";
export default { export default {
props: { props: {
visibleEditPwd: { visibleEditPwd: {
...@@ -98,7 +101,15 @@ export default { ...@@ -98,7 +101,15 @@ export default {
handleOk() { handleOk() {
this.$refs.formData.validate(async (valid) => { this.$refs.formData.validate(async (valid) => {
if (valid) { if (valid) {
let res = await editPassword(this.form); // let obj = {
// loginName: encrypt(this.form.loginName),
// newPwd: encrypt(this.form.newPwd),
// };
let obj = {
loginName: this.form.loginName,
newPwd: this.form.newPwd,
};
let res = await editPassword(obj);
if (res.code === 1) { if (res.code === 1) {
this.$message.success("密码修改成功"); this.$message.success("密码修改成功");
this.handleClose(); this.handleClose();
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditUser.vue
View file @ c4d7cd11
...@@ -69,6 +69,7 @@ import { getListByParentId } from "@/api/area.js"; ...@@ -69,6 +69,7 @@ import { getListByParentId } from "@/api/area.js";
import { userSave } from "@/api/userManagement.js"; import { userSave } from "@/api/userManagement.js";
import { TreeSelect } from "ant-design-vue"; import { TreeSelect } from "ant-design-vue";
const SHOW_PARENT = TreeSelect.SHOW_PARENT; //SHOW_ALL, SHOW_PARENT, SHOW_CHILD const SHOW_PARENT = TreeSelect.SHOW_PARENT; //SHOW_ALL, SHOW_PARENT, SHOW_CHILD
// import { encrypt } from "@/utils";
export default { export default {
data() { data() {
return { return {
...@@ -180,6 +181,7 @@ export default { ...@@ -180,6 +181,7 @@ export default {
...this.form, ...this.form,
areaNames: JSON.stringify(this.form.areaNames), areaNames: JSON.stringify(this.form.areaNames),
areaCodes: this.form.areaNames.map((v) => v.areaCode).join(","), areaCodes: this.form.areaNames.map((v) => v.areaCode).join(","),
// loginName: encrypt(this.form.loginName),
}); });
let { code, msg } = res; let { code, msg } = res;
if (code === 1) { if (code === 1) {
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/addUser.vue
View file @ c4d7cd11
...@@ -80,7 +80,9 @@ ...@@ -80,7 +80,9 @@
</a-form-model> </a-form-model>
<div slot="footer"> <div slot="footer">
<a-button style="margin-left: 10px" @click="resetForm">重置</a-button> <a-button style="margin-left: 10px" @click="resetForm">重置</a-button>
<a-button type="primary" class="addclass" @click="onSubmit">确定</a-button> <a-button type="primary" class="addclass" @click="onSubmit"
>确定</a-button
>
</div> </div>
</a-modal> </a-modal>
</div> </div>
...@@ -91,6 +93,7 @@ import { changeAccount, changePassWord } from "@/utils/js/validate"; ...@@ -91,6 +93,7 @@ import { changeAccount, changePassWord } from "@/utils/js/validate";
import { getListByParentId } from "@/api/area.js"; import { getListByParentId } from "@/api/area.js";
import { userSave } from "@/api/userManagement.js"; import { userSave } from "@/api/userManagement.js";
import { TreeSelect } from "ant-design-vue"; import { TreeSelect } from "ant-design-vue";
// import { encrypt } from "@/utils";
const SHOW_PARENT = TreeSelect.SHOW_PARENT; //SHOW_ALL, SHOW_PARENT, SHOW_CHILD const SHOW_PARENT = TreeSelect.SHOW_PARENT; //SHOW_ALL, SHOW_PARENT, SHOW_CHILD
export default { export default {
data() { data() {
...@@ -189,6 +192,8 @@ export default { ...@@ -189,6 +192,8 @@ export default {
...this.form, ...this.form,
areaCodes: this.form.areaCodes.join(","), areaCodes: this.form.areaCodes.join(","),
areaNames: JSON.stringify(this.changeSelect), areaNames: JSON.stringify(this.changeSelect),
// loginName: encrypt(this.form.loginName),
// loginPwd: encrypt(this.form.loginPwd),
}); });
let { code, msg } = res; let { code, msg } = res;
if (code === 1) { if (code === 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