Skip to content

S
smart_gov_platform
Commit 11f4238d authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 8180135f f3e14666
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 764 additions and 803 deletions
base-manager-ui/admin/src/pages/basicset/business/business.vue
View file @ 11f4238d
<template> <template>
<div class="business flex_row p15"> <div class="business p15">
<sitetree @getSite="handleClick" @clickArea="clickArea" /> <sitetree @getSite="handleClick" @clickArea="clickArea" />
<!-- <div class="line"></div> --> <!-- <div class="line"></div> -->
<div class="right ff"> <div class="right ff">
<a-tabs default-active-key="1"> <a-tabs :default-active-key="1" @change="handleChange">
<a-tab-pane forceRender key="1" tab="业务管理"> <a-tab-pane forceRender :key="1" tab="业务管理">
<BusinessTabs1 ref="BusinessTabs1" /> <BusinessTabs1 ref="BusinessTabs1" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane forceRender key="2" tab="事项管理"> <a-tab-pane forceRender :key="2" tab="事项管理">
<BusinessTabs2 ref="BusinessTabs2" /> <BusinessTabs2 ref="BusinessTabs2" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane forceRender key="3" tab="业务事项关联"> <a-tab-pane forceRender :key="3" tab="业务事项关联">
<BusinessTabs3 ref="BusinessTabs3" /> <BusinessTabs3 ref="BusinessTabs3" />
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
...@@ -37,36 +35,49 @@ export default { ...@@ -37,36 +35,49 @@ export default {
}, },
data() { data() {
return {}; return {
siteId: "", // 站点id
};
}, },
methods: { methods: {
// 选择站点 // 选择站点
handleClick(val) { handleClick(siteInfo) {
this.siteId = siteInfo.id;
if (this.$refs.BusinessTabs1) { if (this.$refs.BusinessTabs1) {
this.$refs.BusinessTabs1.getSiteBusinessData({ siteId: val.id }); this.$refs.BusinessTabs1.getSiteInfo(siteInfo.id);
this.$refs.BusinessTabs1.getSiteInfo(val);
} }
if (this.$refs.BusinessTabs2) { if (this.$refs.BusinessTabs2) {
this.$refs.BusinessTabs2.getMatterSiteData({ siteId: val.id }); this.$refs.BusinessTabs2.getSiteInfo(siteInfo.id);
this.$refs.BusinessTabs2.getSiteInfo(val);
} }
if (this.$refs.BusinessTabs3) { if (this.$refs.BusinessTabs3) {
this.$refs.BusinessTabs3.getSiteBusinessData({ siteId: val.id }); this.$refs.BusinessTabs3.getSiteInfo(siteInfo.id);
this.$refs.BusinessTabs3.getMatterSiteData({ siteId: val.id });
this.$refs.BusinessTabs3.getBusinessMatterData({ siteId: val.id });
this.$refs.BusinessTabs3.getSiteInfo(val);
} }
}, },
// 点击区域 // 点击区域
clickArea() { clickArea() {
this.$refs.BusinessTabs1.getSiteInfo(""); this.siteId = "";
this.$refs.BusinessTabs1.getEmpty(); this.$refs.BusinessTabs1.getEmpty();
this.$refs.BusinessTabs2.getSiteInfo("");
this.$refs.BusinessTabs2.getEmpty(); this.$refs.BusinessTabs2.getEmpty();
this.$refs.BusinessTabs3.getSiteInfo("");
this.$refs.BusinessTabs3.getEmpty(); this.$refs.BusinessTabs3.getEmpty();
}, },
// 切开tab
handleChange(key) {
if (this.siteId) {
switch (key) {
case 1:
console.log(this.siteId);
this.$refs.BusinessTabs1.getSiteInfo(this.siteId);
break;
case 2:
this.$refs.BusinessTabs2.getSiteInfo(this.siteId);
break;
case 3:
this.$refs.BusinessTabs3.getSiteInfo(this.siteId);
break;
}
}
},
}, },
}; };
</script> </script>
...@@ -75,25 +86,13 @@ export default { ...@@ -75,25 +86,13 @@ export default {
.business { .business {
width: 100%; width: 100%;
height: 89vh; height: 89vh;
// .line { display: flex;
// width: 18px;
// background-color: #f0f2f5;
// margin-top: -20px;
// position: relative;
// &::after {
// content: "";
// width: 15px;
// height: 20px;
// background-color: #f0f2f5;
// position: absolute;
// bottom: -20px;
// }
// }
/deep/.ant-tabs-nav-container { /deep/.ant-tabs-nav-container {
border-bottom: 1px solid rgb(224, 224, 224) !important; border-bottom: 1px solid rgb(224, 224, 224) !important;
} }
.right { .right {
width: 100%; width: 85%;
position: relative; position: relative;
margin-left: 18px; margin-left: 18px;
&::after { &::after {
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue
View file @ 11f4238d
...@@ -3,8 +3,21 @@ ...@@ -3,8 +3,21 @@
<div class="left"> <div class="left">
<div class="header"> <div class="header">
<h3 class="titel">站点业务列表</h3> <h3 class="titel">站点业务列表</h3>
<a-button type="danger" @click="handleDelAll"> 批量移除 </a-button> <div class="control">
<a-button class="add-btn" @click="showModal"> 新增业务 </a-button> <div>
<a-button type="danger" @click="handleDelAll"> 批量移除 </a-button>
<a-button class="add-btn" @click="showModal"> 新增业务 </a-button>
</div>
<div class="business-control">
<a-input-search
placeholder="请输入业务名称搜索"
enter-button="搜索"
v-model="serchSiteBusiness"
@search="onSearchLeft"
allowClear
/>
</div>
</div>
</div> </div>
<div class="table-content"> <div class="table-content">
<!-- 表格 --> <!-- 表格 -->
...@@ -54,33 +67,11 @@ ...@@ -54,33 +67,11 @@
</template> </template>
</a-table> </a-table>
</div> </div>
<!-- 分页 -->
<!-- <div class="pagination" v-if="leftTotal">
<a-pagination
v-model="leftCurrent"
:show-total="(total) => `共 ${total} 条`"
:total="leftTotal"
@change="changeLeft"
show-less-items
show-size-changer
show-quick-jumper
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div> -->
</div> </div>
<!-- 右 --> <!-- 右 -->
<div class="right"> <div class="right">
<div class="header"> <div class="header">
<h3 class="titel">一体化业务列表</h3> <h3 class="titel">一体化业务列表</h3>
<!-- <a-radio-group
class="titel"
v-model="businessType"
@change="onChangeBusiness"
>
<a-radio-button :value="0"> 一体化业务列表 </a-radio-button>
<a-radio-button :value="1"> 自建业务列表 </a-radio-button>
</a-radio-group> -->
<div class="control"> <div class="control">
<div> <div>
<a-button type="primary" @click="handleAddAll"> 批量加入 </a-button> <a-button type="primary" @click="handleAddAll"> 批量加入 </a-button>
...@@ -145,21 +136,6 @@ ...@@ -145,21 +136,6 @@
</template> </template>
</a-table> </a-table>
</div> </div>
<!-- 分页 -->
<!-- <div class="pagination" v-if="rightTotal">
<a-pagination
v-model="rightCurrent"
size="small"
:show-total="(total) => `共 ${total} 条`"
:total="rightTotal"
@change="changeRight"
show-less-items
show-size-changer
show-quick-jumper
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChangeRight"
/>
</div> -->
</div> </div>
<!-- 新增对话框 --> <!-- 新增对话框 -->
<addprofession <addprofession
...@@ -253,20 +229,22 @@ export default { ...@@ -253,20 +229,22 @@ export default {
serchData: "", serchData: "",
siteId: "", // 站点id siteId: "", // 站点id
businessIds: "", // 业务id businessIds: "", // 业务id
serchSiteBusiness: "", // 左边站点业务名称搜索
}; };
}, },
created() { created() {},
this.getBusinessListData();
},
methods: { methods: {
// 获取站点 // 获取站点
getSiteInfo(val) { getSiteInfo(siteId) {
this.siteId = val.id; Object.assign(this.$data, this.$options.data()); //获取data源对象，覆盖当前data对象状态
this.siteId = siteId;
this.getSiteBusinessData();
this.getBusinessListData();
}, },
getEmpty() { getEmpty() {
this.businessData = []; Object.assign(this.$data, this.$options.data()); //获取data源对象，覆盖当前data对象状态
this.leftTotal = 0;
}, },
// 去掉空children // 去掉空children
delChildren(arr) { delChildren(arr) {
return arr.map((v) => { return arr.map((v) => {
...@@ -285,23 +263,23 @@ export default { ...@@ -285,23 +263,23 @@ export default {
page: this.leftCurrent, page: this.leftCurrent,
size: this.leftSize, size: this.leftSize,
siteId: this.siteId, siteId: this.siteId,
businessName: `%${this.serchSiteBusiness}%`,
...search, ...search,
}); });
let { code, data } = res.data; let { code, data } = res.data;
if (code === 1) { if (code === 1) {
this.leftTotal = data.pageInfo.totalResult; this.leftTotal = data.pageInfo.totalResult;
this.businessData = this.delChildren(data.data); this.businessData = this.delChildren(data.data);
console.log(this.businessData);
this.leftLoading = false; this.leftLoading = false;
} }
}, },
// 获取业务列表 // 获取一体化业务列表
async getBusinessListData() { async getBusinessListData() {
this.rightLoading = true; this.rightLoading = true;
let res = await getBusinessList({ let res = await getBusinessList({
page: this.rightCurrent, page: this.rightCurrent,
size: this.rightSize, size: this.rightSize,
name: this.serchData, name: `%${this.serchData}%`,
businessType: 0, businessType: 0,
}); });
let { code, data } = res.data; let { code, data } = res.data;
...@@ -312,11 +290,10 @@ export default { ...@@ -312,11 +290,10 @@ export default {
this.rightLoading = false; this.rightLoading = false;
} }
}, },
// 切换业务类型 onSearchLeft() {
// onChangeBusiness(val) { this.leftCurrent = 1;
// this.businessType = val.target.value; this.getSiteBusinessData();
// this.getBusinessListData(); },
// },
// 删除 // 删除
handleDel(num, data) { handleDel(num, data) {
let _this = this; let _this = this;
...@@ -466,36 +443,6 @@ export default { ...@@ -466,36 +443,6 @@ export default {
}, },
}); });
}, },
// 自定义表格展开图标
expandIcon(props) {
if (props.record.children) {
if (props.expanded) {
//有数据-展开时候图标
return (
<div
style="display: inline-block"
onClick={(e) => {
props.onExpand(props.record, e);
}}
>
<a-icon type="down" />
</div>
);
} else {
//有数据-未展开时候图标
return (
<div
style="display: inline-block"
onClick={(e) => {
props.onExpand(props.record, e);
}}
>
<a-icon type="right" />
</div>
);
}
}
},
}, },
}; };
</script> </script>
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue
View file @ 11f4238d
...@@ -192,12 +192,12 @@ ...@@ -192,12 +192,12 @@
<script> <script>
import { import {
getSiteMatterList, getSiteMatterList,
getMatterList, getMatterListSubList,
addMatterToSite, addMatterToSite,
delSiteMatter, delSiteMatter,
delMatter, delMatter,
} from "@/services/matter"; } from "@/services/matter";
import { getDeptList } from "@/services/dept"; // import { getDeptList } from "@/services/dept";
// import local from "@/utils/local"; // import local from "@/utils/local";
const leftColumns = [ const leftColumns = [
{ {
...@@ -292,18 +292,19 @@ export default { ...@@ -292,18 +292,19 @@ export default {
}; };
}, },
created() { created() {
this.getMatterListData();
// this.getMatterSiteData(); // this.getMatterSiteData();
}, },
methods: { methods: {
// 获取站点 // 获取站点
getSiteInfo(val) { getSiteInfo(siteId) {
this.siteId = val.id; Object.assign(this.$data, this.$options.data()); //获取data源对象，覆盖当前data对象状态
this.siteId = siteId;
this.getMatterSiteData();
this.getMatterListData();
}, },
getEmpty() { getEmpty() {
this.matterSiteData = []; Object.assign(this.$data, this.$options.data()); //获取data源对象，覆盖当前data对象状态
this.leftTotal = 0;
}, },
// 获取站点事项 // 获取站点事项
async getMatterSiteData(search = {}) { async getMatterSiteData(search = {}) {
...@@ -324,14 +325,14 @@ export default { ...@@ -324,14 +325,14 @@ export default {
this.matterSiteData = data; this.matterSiteData = data;
this.leftLoading = false; this.leftLoading = false;
}, },
// 获取事项列表 // 获取一体化事项列表
async getMatterListData(search = {}) { async getMatterListData(search = {}) {
this.rightLoading = true; this.rightLoading = true;
let res = await getMatterList({ let res = await getMatterListSubList({
siteId: this.siteId,
page: this.rightCurrent, page: this.rightCurrent,
size: this.rightSize, size: this.rightSize,
matterName: `%${this.searchRightVal}%`, matterName: this.searchRightVal,
source: 0,
...search, ...search,
}); });
let { pageInfo, data } = res.data.data; let { pageInfo, data } = res.data.data;
...@@ -343,12 +344,6 @@ export default { ...@@ -343,12 +344,6 @@ export default {
this.rightTotal = pageInfo.totalResult; this.rightTotal = pageInfo.totalResult;
this.rightLoading = false; this.rightLoading = false;
}, },
// 获取部门列表
async getDeptData() {
let res = await getDeptList({ siteId: this.siteId });
let { data } = res.data.data;
this.deptList = data;
},
// 左边搜索 // 左边搜索
onSearchLeft() { onSearchLeft() {
this.leftCurrent = 1; this.leftCurrent = 1;
...@@ -372,6 +367,7 @@ export default { ...@@ -372,6 +367,7 @@ export default {
if (code === 1) { if (code === 1) {
_this.$message.success(msg); _this.$message.success(msg);
_this.getMatterSiteData(); _this.getMatterSiteData();
_this.getMatterListData();
_this.deleteData = ""; _this.deleteData = "";
_this.$bus.$emit("delMatterSiteData"); _this.$bus.$emit("delMatterSiteData");
_this.$bus.$emit("delMatterSiteRelevance", row); _this.$bus.$emit("delMatterSiteRelevance", row);
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue
View file @ 11f4238d
...@@ -148,6 +148,7 @@ ...@@ -148,6 +148,7 @@
<!-- 关联 --> <!-- 关联 -->
<a-modal <a-modal
v-model="isCorrelation" v-model="isCorrelation"
:maskClosable="false"
title="关联确认" title="关联确认"
@cancel="handleclose" @cancel="handleclose"
:confirmLoading="iscConfirmLoading" :confirmLoading="iscConfirmLoading"
...@@ -191,6 +192,7 @@ ...@@ -191,6 +192,7 @@
</a-modal> </a-modal>
<!-- 解除 --> <!-- 解除 -->
<a-modal <a-modal
:maskClosable="false"
v-model="isUnbound" v-model="isUnbound"
title="解除确认" title="解除确认"
@ok="handleUnbound" @ok="handleUnbound"
...@@ -231,6 +233,7 @@ ...@@ -231,6 +233,7 @@
</a-modal> </a-modal>
<!-- 批量解除 --> <!-- 批量解除 -->
<a-modal <a-modal
:maskClosable="false"
v-model="isUnboundAll" v-model="isUnboundAll"
title="解除确认" title="解除确认"
:confirmLoading="iscConfirmLoading" :confirmLoading="iscConfirmLoading"
...@@ -401,14 +404,16 @@ export default { ...@@ -401,14 +404,16 @@ export default {
methods: { methods: {
// 获取站点 // 获取站点
getSiteInfo(val) { getSiteInfo(siteId) {
this.siteId = val.id; Object.assign(this.$data, this.$options.data()); //获取data源对象，覆盖当前data对象状态
this.siteId = siteId;
console.log(this.siteId);
this.getSiteBusinessData({ siteId });
this.getMatterSiteData({ siteId });
this.getBusinessMatterData({ siteId });
}, },
getEmpty() { getEmpty() {
this.businessMatterData = []; Object.assign(this.$data, this.$options.data()); //获取data源对象，覆盖当前data对象状态
this.SiteMatterData = [];
this.leftTotal = 0;
this.rightTotal = 0;
}, },
// 获取站点业务关联列表 // 获取站点业务关联列表
async getBusinessMatterData(search = {}) { async getBusinessMatterData(search = {}) {
......
base-manager-ui/admin/src/pages/basicset/business/group/addprofession.vue
View file @ 11f4238d
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
:visible="visibleAll" :visible="visibleAll"
:confirm-loading="confirmLoading" :confirm-loading="confirmLoading"
@cancel="handleCancel" @cancel="handleCancel"
:maskClosable="false"
> >
<a-button slot="footer" @click="handleReset">重置</a-button> <a-button slot="footer" @click="handleReset">重置</a-button>
<a-button slot="footer" type="primary" @click="handleOk">保存</a-button> <a-button slot="footer" type="primary" @click="handleOk">保存</a-button>
...@@ -69,7 +70,7 @@ ...@@ -69,7 +70,7 @@
</template> </template>
<script> <script>
import { checkEn } from "@/utils/validate"; import { checkEn, checkBusinessName } from "@/utils/validate";
// import YSwitch from "@/components/yswitch/YSwitch.vue"; // import YSwitch from "@/components/yswitch/YSwitch.vue";
import { import {
saveBusiness, saveBusiness,
...@@ -102,7 +103,9 @@ export default { ...@@ -102,7 +103,9 @@ export default {
isBusiness: [ isBusiness: [
{ required: true, message: "请选择业务等级", trigger: "change" }, { required: true, message: "请选择业务等级", trigger: "change" },
], ],
name: [{ required: true, message: "请输入业务名称", trigger: "blur" }], name: [
{ required: true, validator: checkBusinessName, trigger: "blur" },
],
englishname: [{ required: true, validator: checkEn, trigger: "blur" }], englishname: [{ required: true, validator: checkEn, trigger: "blur" }],
// flownum: [{ required: true, validator: checkFlowNum, trigger: "blur" }], // flownum: [{ required: true, validator: checkFlowNum, trigger: "blur" }],
}, },
...@@ -194,8 +197,6 @@ export default { ...@@ -194,8 +197,6 @@ export default {
this.$bus.$emit("newBusiness"); this.$bus.$emit("newBusiness");
} }
this.confirmLoading = false; this.confirmLoading = false;
} else {
this.$message.error(msg);
} }
} }
}); });
......
base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue
View file @ 11f4238d
...@@ -102,7 +102,12 @@ ...@@ -102,7 +102,12 @@
</div> --> </div> -->
</a-card> </a-card>
<!-- 新增模块 --> <!-- 新增模块 -->
<a-modal v-model="visible" :title="title" @cancel="handleClose"> <a-modal
v-model="visible"
:maskClosable="false"
:title="title"
@cancel="handleClose"
>
<template slot="footer"> <template slot="footer">
<a-button type="primary" @click="handleOk">确定</a-button> <a-button type="primary" @click="handleOk">确定</a-button>
<a-button @click="handleReset">重置</a-button> <a-button @click="handleReset">重置</a-button>
......
base-manager-ui/admin/src/pages/basicset/dept/components/adddepartment.vue
View file @ 11f4238d
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
:title="title" :title="title"
@ok="handleOk" @ok="handleOk"
:visible="Visible" :visible="Visible"
@cancel="Visible = false" @cancel="handleClose"
:maskClosable="false"
> >
<a-form-model <a-form-model
:model="form" :model="form"
...@@ -45,7 +46,10 @@ ...@@ -45,7 +46,10 @@
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="联系电话" prop="deptTelphone"> <a-form-model-item label="联系电话" prop="deptTelphone">
<a-input v-model="form.deptTelphone" placeholder="请输入联系电话" /> <a-input
v-model="form.deptTelphone"
placeholder="请输入座机电话:区号-电话号码"
/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
...@@ -101,6 +105,16 @@ import YSwitch from "@/components/yswitch/YSwitch.vue"; ...@@ -101,6 +105,16 @@ import YSwitch from "@/components/yswitch/YSwitch.vue";
export default { export default {
components: { YSwitch }, components: { YSwitch },
data() { data() {
const changeLandline = (rule, value, callback) => {
if (!value) {
callback(new Error("请输入座机号"));
callback();
} else if (!/^[0][1-9]{2,3}-[0-9]{5,10}$/.test(value)) {
callback(new Error("区号-电话号码"));
} else {
callback();
}
};
return { return {
labelCol: { span: 6 }, labelCol: { span: 6 },
wrapperCol: { span: 14 }, wrapperCol: { span: 14 },
...@@ -133,7 +147,7 @@ export default { ...@@ -133,7 +147,7 @@ export default {
{ required: true, message: "部门编号不能为空", trigger: "blur" }, { required: true, message: "部门编号不能为空", trigger: "blur" },
], ],
deptTelphone: [ deptTelphone: [
{ required: true, message: "部门电话不能为空", trigger: "blur" }, { required: true, validator: changeLandline, trigger: "blur" },
], ],
}, },
}; };
...@@ -187,13 +201,18 @@ export default { ...@@ -187,13 +201,18 @@ export default {
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$refs.formData.resetFields(); this.$refs.formData.resetFields();
this.Visible = false;
this.$message.success(msg); this.$message.success(msg);
this.$emit("addDept"); this.$emit("addDept");
this.handleClose();
} }
} }
}); });
}, },
// 关闭
handleClose() {
this.$refs.formData.resetFields();
this.Visible = false;
},
}, },
}; };
</script> </script>
...@@ -203,7 +222,9 @@ export default { ...@@ -203,7 +222,9 @@ export default {
width: 800px; width: 800px;
} }
.ant-form-item { .ant-form-item {
display: flex; margin-bottom: 15px;
align-items: center !important; }
/deep/.ant-form-explain {
position: absolute;
} }
</style> </style>
\ No newline at end of file
base-manager-ui/admin/src/pages/basicset/dept/components/addwindow.vue
View file @ 11f4238d
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
@ok="handleAdd" @ok="handleAdd"
:visible="Visible" :visible="Visible"
@cancel="handleClose" @cancel="handleClose"
:maskClosable="false"
> >
<a-form-model <a-form-model
ref="formData" ref="formData"
...@@ -186,8 +187,8 @@ export default { ...@@ -186,8 +187,8 @@ export default {
fromnum: "", // 窗口编号 fromnum: "", // 窗口编号
hongqi: "", // 红旗窗口 hongqi: "", // 红旗窗口
summary: "", // 备注 summary: "", // 备注
building: undefined, // 楼栋 building: 1, // 楼栋
level: undefined, // 楼层 level: 1, // 楼层
}, },
rules: { rules: {
siteName: [ siteName: [
......
base-manager-ui/admin/src/pages/basicset/dept/department.vue
View file @ 11f4238d
...@@ -146,28 +146,16 @@ ...@@ -146,28 +146,16 @@
</span> </span>
</a-table> </a-table>
</div> </div>
<!-- 翻页 -->
<!-- <div class="pagination" v-if="total">
<a-pagination
v-model="page"
:show-total="(total) => `共 ${total} 条`"
:total="total"
@change="onPage"
show-less-items
show-size-changer
show-quick-jumper
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div> -->
</div> </div>
<!-- 关联业务 -->
<div> <div>
<!-- 关联业务 -->
<a-modal <a-modal
title="关联业务" title="关联业务"
:visible="visibleWork" :visible="visibleWork"
@cancel="visibleWork = false" @cancel="visibleWork = false"
width="600px" width="600px"
:maskClosable="false"
> >
<template slot="footer"> <template slot="footer">
<a-button @click="handleReset">重置</a-button> <a-button @click="handleReset">重置</a-button>
...@@ -393,12 +381,7 @@ export default { ...@@ -393,12 +381,7 @@ export default {
} }
}, },
clickArea() { clickArea() {
this.department = []; Object.assign(this.$data, this.$options.data());
this.windowData = [];
this.siteId = "";
this.total = 0;
this.active = undefined;
this.deptId = "";
}, },
// 去掉空children // 去掉空children
delChildren(arr) { delChildren(arr) {
...@@ -604,8 +587,6 @@ export default { ...@@ -604,8 +587,6 @@ export default {
this.$message.success(msg); this.$message.success(msg);
this.$refs.formData.resetFields(); this.$refs.formData.resetFields();
this.visibleWork = false; this.visibleWork = false;
} else {
this.$message.error(msg);
} }
} }
}); });
...@@ -617,7 +598,6 @@ export default { ...@@ -617,7 +598,6 @@ export default {
// 新增窗口事项 // 新增窗口事项
addWindowMatter(data) { addWindowMatter(data) {
this.isShow = true; this.isShow = true;
console.log(data);
let obj = { let obj = {
windowId: data.id, windowId: data.id,
windowName: data.name, windowName: data.name,
...@@ -810,7 +790,7 @@ export default { ...@@ -810,7 +790,7 @@ export default {
} }
} }
/deep/.ant-modal-body { /deep/.ant-modal-body {
max-height: 400px; max-height: 600px;
overflow-y: auto; overflow-y: auto;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 5px; width: 5px;
......
base-manager-ui/admin/src/pages/basicset/holiday/components/addfestivals.vue
View file @ 11f4238d
<template> <template>
<a-modal <a-modal
:maskClosable="false"
:title="title" :title="title"
@ok="handleOk" @ok="handleOk"
:visible="Visible" :visible="Visible"
......
base-manager-ui/admin/src/pages/basicset/holiday/festival.vue
View file @ 11f4238d
...@@ -175,14 +175,13 @@ export default { ...@@ -175,14 +175,13 @@ export default {
methods: { methods: {
// 选择站点 // 选择站点
handleClick(val) { handleClick(val) {
Object.assign(this.$data, this.$options.data());
this.siteId = val.id; this.siteId = val.id;
this.getHolidayData(); this.getHolidayData();
}, },
// 点击区域 // 点击区域
clickArea() { clickArea() {
this.list = []; Object.assign(this.$data, this.$options.data());
this.total = 0;
this.siteId = "";
}, },
// 获取节假日列表 // 获取节假日列表
async getHolidayData() { async getHolidayData() {
......
base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue
View file @ 11f4238d
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
:title="title" :title="title"
:visible="formVisible" :visible="formVisible"
@cancel="closeModal" @cancel="closeModal"
:maskClosable="false"
:width="1200" :width="1200"
> >
<div slot="footer"> <div slot="footer">
...@@ -66,7 +67,7 @@ ...@@ -66,7 +67,7 @@
<a-input <a-input
v-model="formInfo.siteTel" v-model="formInfo.siteTel"
type="text" type="text"
placeholder="请输入中心电话" placeholder="请输入座机号码：区号-号码"
/> />
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="站点负责人" prop="leadingOfficial"> <a-form-model-item label="站点负责人" prop="leadingOfficial">
......
base-manager-ui/admin/src/pages/basicset/surface/AddSurfaceTemplate.vue
View file @ 11f4238d
...@@ -389,7 +389,6 @@ export default { ...@@ -389,7 +389,6 @@ export default {
} }
this.fieldList = data; this.fieldList = data;
this.rightTotal = pageInfo.totalResult; this.rightTotal = pageInfo.totalResult;
console.log(data);
this.rightLoading = false; this.rightLoading = false;
}, },
// 新增模板 // 新增模板
......
base-manager-ui/admin/src/pages/basicset/surface/appraiseskin/AppraiseSkin.vue
View file @ 11f4238d
...@@ -5,33 +5,23 @@ ...@@ -5,33 +5,23 @@
:id="conponentsId" :id="conponentsId"
class="call-out-skin-across" class="call-out-skin-across"
:style="{ :style="{
backgroundImage: filterImg('背景大图') background: filterItem('1', 0),
? `url(${api + filterImg('背景大图')})`
: '',
}" }"
> >
<!-- 头部 --> <!-- 头部 -->
<div class="header flex jcb"> <div class="header flex jcb">
<div class="header-title flex aic"> <div class="header-title flex aic">
<img src="../../../../assets/img/logo.png" /> <img src="../../../../assets/img/logo.png" />
<h1 :style="{ color: filterColor('标题颜色') }">政务服务中心</h1> <h1 :style="{ color: filterItem('2', 0) }">政务服务中心</h1>
</div> </div>
<div class="flex header-right jcb"> <div class="flex header-right jcb">
<p> <p>
<span :style="{ color: filterColor('数据标题') }" <span :style="{ color: filterItem('5', 0) }">今日评价次数：</span>
>今日评价次数：</span <span class="count" :style="{ color: filterItem('6', 0) }">66</span>
>
<span class="count" :style="{ color: filterColor('数据颜色') }"
>66</span
>
</p> </p>
<p> <p>
<span :style="{ color: filterColor('数据标题') }" <span :style="{ color: filterItem('5', 0) }">累计评价次数：</span>
>累计评价次数：</span <span class="count" :style="{ color: filterItem('6', 0) }">66</span>
>
<span class="count" :style="{ color: filterColor('数据颜色') }"
>66</span
>
</p> </p>
</div> </div>
</div> </div>
...@@ -40,9 +30,7 @@ ...@@ -40,9 +30,7 @@
<div <div
class="left flex flexc jca aic" class="left flex flexc jca aic"
:style="{ :style="{
backgroundImage: filterImg('信息面板') background: filterItem('10', 0),
? `url(${api + filterImg('信息面板')})`
: '',
}" }"
> >
<div class="left-info flex aic"> <div class="left-info flex aic">
...@@ -64,48 +52,48 @@ ...@@ -64,48 +52,48 @@
<div class="footer flex jcb aic"> <div class="footer flex jcb aic">
<div <div
class="footer-btn flex flexc jcc" class="footer-btn flex flexc jcc"
v-for="(v, i) in filterNav('4')"
:key="v.id"
:class="{ border: !filterItem('4', i) }"
:style="{ :style="{
backgroundImage: filterImg('办事指南') background: filterItem('4', i),
? `url(${api + filterImg('办事指南')})`
: '',
}" }"
> ></div>
<p>办事指南</p> <!-- <div
<span>Processing matters</span> class="footer-btn flex flexc jcc"
</div> :class="{ border: !filterItem('4', 1) }"
:style="{
background: filterItem('4', 1),
}"
></div>
<div <div
class="footer-btn flex flexc jcc" class="footer-btn flex flexc jcc"
:class="{ border: !filterItem('4', 2) }"
:style="{ :style="{
backgroundImage: filterImg('我要评价') background: filterItem('4', 2),
? `url(${api + filterImg('我要评价')})`
: '',
}" }"
> ></div>
<p>我要评价</p>
<span>Processing matters</span>
</div>
<div <div
class="footer-btn flex flexc jcc" class="footer-btn flex flexc jcc"
:class="{ border: !filterItem('4', 3) }"
:style="{ :style="{
backgroundImage: filterImg('投诉建议') background: filterItem('4', 3),
? `url(${api + filterImg('投诉建议')})`
: '',
}" }"
> ></div>
<p>投诉建议</p>
<span>Processing matters</span>
</div>
<div <div
class="footer-btn flex flexc jcc" class="footer-btn flex flexc jcc"
:class="{ border: !filterItem('4', 4) }"
:style="{ :style="{
backgroundImage: filterImg('廉政风险') background: filterItem('4', 4),
? `url(${api + filterImg('廉政风险')})`
: '',
}" }"
> ></div>
<p>廉政风险</p> <div
<span>Processing matters</span> class="footer-btn flex flexc jcc"
</div> :class="{ border: !filterItem('4', 5) }"
:style="{
background: filterItem('4', 5),
}"
></div> -->
</div> </div>
</div> </div>
</div> </div>
...@@ -139,32 +127,66 @@ export default { ...@@ -139,32 +127,66 @@ export default {
}, },
methods: { methods: {
// 过滤图片 // 过滤图片
filterImg(val) { // filterImg(val) {
let url = ""; // let url = "";
this.skinFieldList // this.skinFieldList
.filter((v) => { // .filter((v) => {
return v.fieldType === "2"; // return v.fieldType === "2";
}) // })
.forEach((v) => { // .forEach((v) => {
if (v.fieldName !== "" && v.fieldName === val) { // if (v.fieldName !== "" && v.fieldName === val) {
url = v.fieldValue; // url = v.fieldValue;
} // }
}); // });
return url; // return url;
// },
// // 过滤颜色
// filterColor(val) {
// let str = "";
// this.skinFieldList
// .filter((v) => {
// return v.fieldType === "1";
// })
// .forEach((v) => {
// if (v.fieldName !== "" && v.fieldName === val) {
// str = v.fieldValue;
// }
// });
// return str;
// },
// 过滤属性类型
filterItem(type, index) {
let arr = this.skinFieldList.filter((v) => {
return v.remark == type;
});
if (arr.length) {
return this.filterValueType(arr[index]);
} else {
return "";
}
}, },
// 过滤颜色 // 过滤属性值类型
filterColor(val) { filterValueType(info = {}) {
let str = ""; let value = "";
this.skinFieldList if (info.fieldType !== "" && info.fieldType === "1" && info.fieldValue) {
.filter((v) => { value = info.fieldValue;
return v.fieldType === "1"; } else if (
}) info.fieldType !== "" &&
.forEach((v) => { info.fieldType === "2" &&
if (v.fieldName !== "" && v.fieldName === val) { info.fieldValue
str = v.fieldValue; ) {
} value = `url(${this.api + info.fieldValue})`;
}); }
return str; return value;
},
// 过滤导航
filterNav(type) {
let arr = [];
arr = this.skinFieldList.filter((v) => {
return v.remark == type;
});
return arr;
}, },
}, },
}; };
...@@ -176,9 +198,9 @@ export default { ...@@ -176,9 +198,9 @@ export default {
height: 562.5px; height: 562.5px;
padding: 20px; padding: 20px;
background-image: linear-gradient(#26c5ff, #2c66ff); background-image: linear-gradient(#26c5ff, #2c66ff);
background-repeat: no-repeat; background-repeat: no-repeat !important ;
background-position: center; background-position: center !important ;
background-size: cover; background-size: cover !important ;
.header { .header {
color: #fff; color: #fff;
.header-title { .header-title {
...@@ -242,12 +264,18 @@ export default { ...@@ -242,12 +264,18 @@ export default {
margin-top: 20px; margin-top: 20px;
width: 100%; width: 100%;
.footer-btn { .footer-btn {
width: 22%; flex: 1;
margin-right: 10px;
height: 120px; height: 120px;
padding: 10px; padding: 10px;
background-color: #fff;
border-radius: 4px; border-radius: 4px;
background-size: 100% 100%; background-size: 100% 100% !important;
}
& .footer-btn:last-child {
margin-right: 0px;
}
.border {
border: 1px dashed #ececec;
} }
p { p {
margin: 0px; margin: 0px;
......
base-manager-ui/admin/src/pages/basicset/surface/calloutskin/CallOutSkin.vue
View file @ 11f4238d
...@@ -5,18 +5,19 @@ ...@@ -5,18 +5,19 @@
:id="conponentsId" :id="conponentsId"
class="call-out-skin-across" class="call-out-skin-across"
:style="{ :style="{
backgroundImage: filterImg('背景大图') background: filterItem('1', 0),
? `url(${api + filterImg('背景大图')})`
: '',
}" }"
> >
<!-- 头部 --> <!-- 头部 -->
<div class="header flex jcb"> <div class="header flex jcb">
<div class="header-title flex aic"> <div class="header-title flex aic">
<img src="../../../../assets/img/logo.png" /> <img src="../../../../assets/img/logo.png" />
<h1 :style="{ color: filterColor('标题颜色') }">政务服务中心</h1> <h1 :style="{ color: filterItem('2', 0) }">政务服务中心</h1>
</div> </div>
<div class="flex header-right jcb"> <div
class="flex header-right jcb"
:style="{ color: filterItem('3', 0) }"
>
<div class="flex flexc aic jcc"> <div class="flex flexc aic jcc">
<a-icon type="setting" /> <a-icon type="setting" />
<span>设置</span> <span>设置</span>
...@@ -33,7 +34,12 @@ ...@@ -33,7 +34,12 @@
</div> </div>
<!-- 主体 --> <!-- 主体 -->
<div class="main flex"> <div class="main flex">
<div class="left flex flexc aic jcc"> <div
class="left flex flexc aic jcc"
:style="{
background: filterItem('10', 0),
}"
>
<img src="../../../../assets/img/peopo.jpeg" /> <img src="../../../../assets/img/peopo.jpeg" />
<p>姓名：XXX</p> <p>姓名：XXX</p>
<p>部门：审批部</p> <p>部门：审批部</p>
...@@ -41,9 +47,10 @@ ...@@ -41,9 +47,10 @@
<div <div
class="left-btn" class="left-btn"
:style="{ :style="{
backgroundImage: `linear-gradient(${filterColor( backgroundImage: `linear-gradient(${filterItem(
'辅助色' '8',
)}, ${filterColor('主题色')})`, 0
)}, ${filterItem('7', 0)})`,
}" }"
> >
回归 回归
...@@ -52,50 +59,11 @@ ...@@ -52,50 +59,11 @@
<div class="right flex1 flex flexwrap jcb acb"> <div class="right flex1 flex flexwrap jcb acb">
<div <div
class="right-item" class="right-item"
v-for="(v, i) in filterNav('4')"
:key="v.id"
:class="{ border: !filterItem('4', i) }"
:style="{ :style="{
backgroundImage: filterImg('弃号') background: filterItem('4', i),
? `url(${api + filterImg('弃号')})`
: `url(${require('../../../../assets/img/qh.png')})`,
}"
></div>
<div
class="right-item"
:style="{
backgroundImage: filterImg('重新呼叫')
? `url(${api + filterImg('重新呼叫')})`
: `url(${require('../../../../assets/img/cxhj.png')})`,
}"
></div>
<div
class="right-item"
:style="{
backgroundImage: filterImg('呼叫转移')
? `url(${api + filterImg('呼叫转移')})`
: `url(${require('../../../../assets/img/hjzy.png')})`,
}"
></div>
<div
class="right-item"
:style="{
backgroundImage: filterImg('选叫')
? `url(${api + filterImg('选叫')})`
: `url(${require('../../../../assets/img/xj.png')})`,
}"
></div>
<div
class="right-item"
:style="{
backgroundImage: filterImg('评价')
? `url(${api + filterImg('评价')})`
: `url(${require('../../../../assets/img/pj.png')})`,
}"
></div>
<div
class="right-item"
:style="{
backgroundImage: filterImg('下一位')
? `url(${api + filterImg('下一位')})`
: `url(${require('../../../../assets/img/xyw.png')})`,
}" }"
></div> ></div>
</div> </div>
...@@ -103,36 +71,38 @@ ...@@ -103,36 +71,38 @@
<!-- 尾部 --> <!-- 尾部 -->
<div class="footer flex jcc aic"> <div class="footer flex jcc aic">
<div class="footer-item"> <div class="footer-item">
<p>当前窗口</p> <p :style="{ color: filterItem('5', 0) }">当前窗口</p>
<p class="footer-data" :style="{ color: filterColor('主题色') }"> <p class="footer-data" :style="{ color: filterItem('6', 0) }">
A区16号 A区16号
</p> </p>
</div> </div>
<div <div
class="line" class="line"
:style="{ :style="{
backgroundImage: `linear-gradient(to bottom,#ccc,${filterColor( backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem(
'主题色' '6',
)} 45%,${filterColor('主题色')} 65%,#ccc 100% )`, 0
)} 45%,${filterItem('6', 0)} 65%,#ccc 100% )`,
}" }"
></div> ></div>
<div class="footer-item"> <div class="footer-item">
<p>当前办理</p> <p :style="{ color: filterItem('5', 0) }">当前办理</p>
<p class="footer-data" :style="{ color: filterColor('主题色') }"> <p class="footer-data" :style="{ color: filterItem('6', 0) }">
A0012 A0012
</p> </p>
</div> </div>
<div <div
class="line" class="line"
:style="{ :style="{
backgroundImage: `linear-gradient(to bottom,#ccc,${filterColor( backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem(
'主题色' '6',
)} 45%,${filterColor('主题色')} 65%,#ccc 100% )`, 0
)} 45%,${filterItem('6', 0)} 65%,#ccc 100% )`,
}" }"
></div> ></div>
<div class="footer-item"> <div class="footer-item">
<p>等待办理</p> <p :style="{ color: filterItem('5', 0) }">等待办理</p>
<p class="footer-data" :style="{ color: filterColor('主题色') }"> <p class="footer-data" :style="{ color: filterItem('6', 0) }">
<span>160</span> <span>160</span>
<span>120</span> <span>120</span>
</p> </p>
...@@ -140,16 +110,15 @@ ...@@ -140,16 +110,15 @@
<div <div
class="line" class="line"
:style="{ :style="{
backgroundImage: `linear-gradient(to bottom,#ccc,${filterColor( backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem(
'主题色' '6',
)} 45%,${filterColor('主题色')} 65%,#ccc 100% )`, 0
)} 45%,${filterItem('6', 0)} 65%,#ccc 100% )`,
}" }"
></div> ></div>
<div class="footer-item"> <div class="footer-item">
<p>当天办理</p> <p :style="{ color: filterItem('5', 0) }">当天办理</p>
<p class="footer-data" :style="{ color: filterColor('主题色') }"> <p class="footer-data" :style="{ color: filterItem('6', 0) }">16</p>
16
</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -184,32 +153,66 @@ export default { ...@@ -184,32 +153,66 @@ export default {
}, },
methods: { methods: {
// 过滤图片 // 过滤图片
filterImg(val) { // filterImg(val) {
let url = ""; // let url = "";
this.skinFieldList // this.skinFieldList
.filter((v) => { // .filter((v) => {
return v.fieldType === "2"; // return v.fieldType === "2";
}) // })
.forEach((v) => { // .forEach((v) => {
if (v.fieldName !== "" && v.fieldName === val) { // if (v.fieldName !== "" && v.fieldName === val) {
url = v.fieldValue; // url = v.fieldValue;
} // }
}); // });
return url; // return url;
// },
// // 过滤颜色
// filterColor(val) {
// let str = "";
// this.skinFieldList
// .filter((v) => {
// return v.fieldType === "1";
// })
// .forEach((v) => {
// if (v.fieldName !== "" && v.fieldName === val) {
// str = v.fieldValue;
// }
// });
// return str;
// },
// 过滤属性类型
filterItem(type, index) {
let arr = this.skinFieldList.filter((v) => {
return v.remark == type;
});
if (arr.length) {
return this.filterValueType(arr[index]);
} else {
return "";
}
},
// 过滤属性值类型
filterValueType(info = {}) {
let value = "";
if (info.fieldType !== "" && info.fieldType === "1" && info.fieldValue) {
value = info.fieldValue;
} else if (
info.fieldType !== "" &&
info.fieldType === "2" &&
info.fieldValue
) {
value = `url(${this.api + info.fieldValue})`;
}
return value;
}, },
// 过滤颜色 // 过滤导航
filterColor(val) { filterNav(type) {
let str = ""; let arr = [];
this.skinFieldList arr = this.skinFieldList.filter((v) => {
.filter((v) => { return v.remark == type;
return v.fieldType === "1"; });
}) return arr;
.forEach((v) => {
if (v.fieldName !== "" && v.fieldName === val) {
str = v.fieldValue;
}
});
return str;
}, },
}, },
}; };
...@@ -221,9 +224,9 @@ export default { ...@@ -221,9 +224,9 @@ export default {
height: 562.5px; height: 562.5px;
padding: 20px; padding: 20px;
background-image: linear-gradient(#26c5ff, #2c66ff); background-image: linear-gradient(#26c5ff, #2c66ff);
background-repeat: no-repeat; background-repeat: no-repeat !important;
background-position: center; background-position: center !important;
background-size: cover; background-size: cover !important;
.header { .header {
.header-title { .header-title {
h1 { h1 {
...@@ -267,9 +270,12 @@ export default { ...@@ -267,9 +270,12 @@ export default {
width: 49%; width: 49%;
height: 100px; height: 100px;
border-radius: 6px; border-radius: 6px;
background-repeat: no-repeat; background-repeat: no-repeat !important;
background-position: center; background-position: center !important;
background-size: 100% 100%; background-size: 100% 100% !important;
}
.border {
border: 1px dashed #ececec;
} }
} }
} }
......
base-manager-ui/admin/src/pages/basicset/surface/centralizeskin/CentralizeSkin.vue
View file @ 11f4238d
...@@ -5,18 +5,16 @@ ...@@ -5,18 +5,16 @@
class="centralize-across" class="centralize-across"
:id="conponentsId" :id="conponentsId"
:style="{ :style="{
backgroundImage: filterImg('背景大图') background: filterItem('1', 0),
? `url(${api + filterImg('背景大图')})`
: '',
}" }"
> >
<!-- 头部 --> <!-- 头部 -->
<div class="header flex aic jcb"> <div class="header flex aic jcb">
<div class="title flex aic"> <div class="title flex aic">
<img src="../../../../assets/img/logo.png" /> <img src="../../../../assets/img/logo.png" />
<h1 :style="{ color: filterColor('标题颜色') }">政务服务中心</h1> <h1 :style="{ color: filterItem('2', 0) }">政务服务中心</h1>
</div> </div>
<div class="time" :style="{ color: filterColor('时间颜色') }"> <div class="time" :style="{ color: filterItem('3', 0) }">
2022-7-18 17:00:00 星期一 2022-7-18 17:00:00 星期一
</div> </div>
</div> </div>
...@@ -26,122 +24,104 @@ ...@@ -26,122 +24,104 @@
<img src="../../../../assets/img/Banner.png" /> <img src="../../../../assets/img/Banner.png" />
</div> </div>
<div class="call-out flex1 flex flexc jcb"> <div class="call-out flex1 flex flexc jcb">
<div <div class="call-out-item">
class="call-out-item"
:style="{ backgroundColor: filterColor('正在呼叫') }"
>
<div class="call-out-item-title">正在呼叫</div> <div class="call-out-item-title">正在呼叫</div>
<div class="call-out-item-text call-out-item-text-1"> <div class="call-out-item-text call-out-item-text-1">
请 请
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>A0004号</span >A0004号</span
> >
到 到
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>03号窗口</span >03号窗口</span
> >
</div> </div>
</div> </div>
<div <div class="call-out-item">
class="call-out-item"
:style="{ backgroundColor: filterColor('正在办理') }"
>
<div class="call-out-item-title">正在办理</div> <div class="call-out-item-title">正在办理</div>
<div class="call-out-item-text call-out-item-text-2"> <div class="call-out-item-text call-out-item-text-2">
请 请
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>A0004号</span >A0004号</span
> >
到 到
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>03号窗口</span >03号窗口</span
> >
</div> </div>
</div> </div>
<div <div class="call-out-item">
class="call-out-item"
:style="{ backgroundColor: filterColor('正在办理') }"
>
<div class="call-out-item-title">正在办理</div> <div class="call-out-item-title">正在办理</div>
<div class="call-out-item-text call-out-item-text-2"> <div class="call-out-item-text call-out-item-text-2">
请 请
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>A0004号</span >A0004号</span
> >
到 到
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>03号窗口</span >03号窗口</span
> >
</div> </div>
</div> </div>
<div <div class="call-out-item">
class="call-out-item"
:style="{ backgroundColor: filterColor('等待中') }"
>
<div class="call-out-item-title">等待中</div> <div class="call-out-item-title">等待中</div>
<div class="call-out-item-text call-out-item-text-3"> <div class="call-out-item-text call-out-item-text-3">
请 请
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>A0004号</span >A0004号</span
> >
到 到
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>--</span >--</span
> >
</div> </div>
</div> </div>
<div <div class="call-out-item">
class="call-out-item"
:style="{ backgroundColor: filterColor('等待中') }"
>
<div class="call-out-item-title">等待中</div> <div class="call-out-item-title">等待中</div>
<div class="call-out-item-text call-out-item-text-3"> <div class="call-out-item-text call-out-item-text-3">
请 请
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>A0004号</span >A0004号</span
> >
到 到
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>--</span >--</span
> >
</div> </div>
</div> </div>
<div <div class="call-out-item">
class="call-out-item"
:style="{ backgroundColor: filterColor('等待中') }"
>
<div class="call-out-item-title">等待中</div> <div class="call-out-item-title">等待中</div>
<div class="call-out-item-text call-out-item-text-3"> <div class="call-out-item-text call-out-item-text-3">
请 请
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>A0004号</span >A0004号</span
> >
到 到
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterColor('主题色') }" :style="{ color: filterItem('7', 0) }"
>--</span >--</span
> >
</div> </div>
...@@ -151,26 +131,26 @@ ...@@ -151,26 +131,26 @@
<!-- 尾部 --> <!-- 尾部 -->
<div class="footer flex aic jca"> <div class="footer flex aic jca">
<div class="footer-item flex flexc jcc aic"> <div class="footer-item flex flexc jcc aic">
<p>今日取号量</p> <p :style="{ color: filterItem('5', 0) }">今日取号量</p>
<p class="footer-count" :style="{ color: filterColor('主题色') }"> <p class="footer-count" :style="{ color: filterItem('6', 0) }">
200次 200次
</p> </p>
</div> </div>
<div class="footer-item flex flexc jcc aic"> <div class="footer-item flex flexc jcc aic">
<p>累计取号量</p> <p :style="{ color: filterItem('5', 0) }">累计取号量</p>
<p class="footer-count" :style="{ color: filterColor('主题色') }"> <p class="footer-count" :style="{ color: filterItem('6', 0) }">
200次 200次
</p> </p>
</div> </div>
<div class="footer-item flex flexc jcc aic"> <div class="footer-item flex flexc jcc aic">
<p>当前等待人数</p> <p :style="{ color: filterItem('5', 0) }">当前等待人数</p>
<p class="footer-count" :style="{ color: filterColor('主题色') }"> <p class="footer-count" :style="{ color: filterItem('6', 0) }">
200人 200人
</p> </p>
</div> </div>
<div class="footer-item flex flexc jcc aic"> <div class="footer-item flex flexc jcc aic">
<p>评价等待时间</p> <p :style="{ color: filterItem('5', 0) }">评价等待时间</p>
<p class="footer-count" :style="{ color: filterColor('主题色') }"> <p class="footer-count" :style="{ color: filterItem('6', 0) }">
12分钟 12分钟
</p> </p>
</div> </div>
...@@ -207,32 +187,58 @@ export default { ...@@ -207,32 +187,58 @@ export default {
}, },
methods: { methods: {
// 过滤图片 // 过滤图片
filterImg(val) { // filterImg(val) {
let url = ""; // let url = "";
this.skinFieldList // this.skinFieldList
.filter((v) => { // .filter((v) => {
return v.fieldType === "2"; // return v.fieldType === "2";
}) // })
.forEach((v) => { // .forEach((v) => {
if (v.fieldName !== "" && v.fieldName === val) { // if (v.fieldName !== "" && v.fieldName === val) {
url = v.fieldValue; // url = v.fieldValue;
} // }
}); // });
return url; // return url;
// },
// // 过滤颜色
// filterColor(val) {
// let str = "";
// this.skinFieldList
// .filter((v) => {
// return v.fieldType === "1";
// })
// .forEach((v) => {
// if (v.fieldName !== "" && v.fieldName === val) {
// str = v.fieldValue;
// }
// });
// return str;
// },
// 过滤属性类型
filterItem(type, index) {
let arr = this.skinFieldList.filter((v) => {
return v.remark == type;
});
if (arr.length) {
return this.filterValueType(arr[index]);
} else {
return "";
}
}, },
// 过滤颜色 // 过滤属性值类型
filterColor(val) { filterValueType(info = {}) {
let str = ""; let value = "";
this.skinFieldList if (info.fieldType !== "" && info.fieldType === "1" && info.fieldValue) {
.filter((v) => { value = info.fieldValue;
return v.fieldType === "1"; } else if (
}) info.fieldType !== "" &&
.forEach((v) => { info.fieldType === "2" &&
if (v.fieldName !== "" && v.fieldName === val) { info.fieldValue
str = v.fieldValue; ) {
} value = `url(${this.api + info.fieldValue})`;
}); }
return str; return value;
}, },
}, },
}; };
......
base-manager-ui/admin/src/pages/basicset/surface/components/ShowBox.vue
View file @ 11f4238d
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<div class="show-content" v-if="skinInfo.id"> <div class="show-content" v-if="skinInfo.id">
<div class="show-header"> <div class="show-header">
<h2 class="show-titlw">{{ skinInfo.name }}</h2> <h2 class="show-titlw">{{ skinInfo.name }}</h2>
<p> <p>
更新时间：<span style="margin-right: 20px">{{ 更新时间：<span style="margin-right: 20px">{{
skinInfo.updateTime | dateFormat skinInfo.updateTime | dateFormat
...@@ -15,6 +14,7 @@ ...@@ -15,6 +14,7 @@
</div> </div>
<div class="show-skin"> <div class="show-skin">
<component <component
conponentsId="skinInfo"
:is="component" :is="component"
:imageResolution="skinInfo.imageResolution" :imageResolution="skinInfo.imageResolution"
:skinFieldList="skinInfo.skinFieldList" :skinFieldList="skinInfo.skinFieldList"
......
base-manager-ui/admin/src/pages/basicset/surface/modal/AddField.vue
View file @ 11f4238d
...@@ -31,6 +31,13 @@ ...@@ -31,6 +31,13 @@
<a-form-model-item label="字段编码" prop="fieldCode"> <a-form-model-item label="字段编码" prop="fieldCode">
<a-input placeholder="请输入字段编码" v-model="formData.fieldCode" /> <a-input placeholder="请输入字段编码" v-model="formData.fieldCode" />
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="字段类型" prop="remark">
<a-select v-model="formData.remark" placeholder="请选择字段类型">
<a-select-option v-for="v in attrType" :key="v.key" :value="v.key">
{{ v.label }}
</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item label="数据类型" prop="fieldType"> <a-form-model-item label="数据类型" prop="fieldType">
<a-radio-group name="radioGroup" v-model="formData.fieldType"> <a-radio-group name="radioGroup" v-model="formData.fieldType">
<a-radio value="1"> 颜色 </a-radio> <a-radio value="1"> 颜色 </a-radio>
...@@ -44,14 +51,7 @@ ...@@ -44,14 +51,7 @@
</a-radio-group> </a-radio-group>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="排序号" prop="fieldOrderNo"> <a-form-model-item label="排序号" prop="fieldOrderNo">
<a-input-number v-model="formData.fieldOrderNo" :min="1" /> <a-input-number v-model="formData.fieldOrderNo" :min="0" />
</a-form-model-item>
<a-form-model-item label="备注" prop="remark">
<a-textarea
v-model="formData.remark"
placeholder="请输入备注"
allow-clear
/>
</a-form-model-item> </a-form-model-item>
</a-form-model> </a-form-model>
</a-modal> </a-modal>
...@@ -60,6 +60,18 @@ ...@@ -60,6 +60,18 @@
<script> <script>
import { fieldSave } from "@/services/surface"; import { fieldSave } from "@/services/surface";
const attrType = [
{ key: "1", label: "首页背景" },
{ key: "2", label: "标题" },
{ key: "3", label: "日期时间" },
{ key: "4", label: "导航" },
{ key: "5", label: "数据标题" },
{ key: "6", label: "数据" },
{ key: "7", label: "主题色" },
{ key: "8", label: "辅助色" },
{ key: "9", label: "备案" },
{ key: "10", label: "信息面板" },
];
export default { export default {
props: { props: {
visibleField: { visibleField: {
...@@ -81,6 +93,7 @@ export default { ...@@ -81,6 +93,7 @@ export default {
}, },
data() { data() {
return { return {
attrType, // 属性类型
formData: { formData: {
templateId: undefined, // 皮肤模板id templateId: undefined, // 皮肤模板id
templateName: "", // 模板名称 templateName: "", // 模板名称
...@@ -91,7 +104,7 @@ export default { ...@@ -91,7 +104,7 @@ export default {
fieldValue: "", // 字段值 fieldValue: "", // 字段值
fieldOrderNo: "", // 排序号 fieldOrderNo: "", // 排序号
skinId: 0, skinId: 0,
remark: "", // 备注 remark: undefined, // 字段类型
}, },
rules: { rules: {
templateId: [ templateId: [
...@@ -106,6 +119,9 @@ export default { ...@@ -106,6 +119,9 @@ export default {
fieldType: [ fieldType: [
{ required: true, message: "请选择数据类型", trigger: "change" }, { required: true, message: "请选择数据类型", trigger: "change" },
], ],
remark: [
{ required: true, message: "请选择字段类型", trigger: "change" },
],
}, },
}; };
}, },
...@@ -129,10 +145,7 @@ export default { ...@@ -129,10 +145,7 @@ export default {
this.$message.success(msg); this.$message.success(msg);
this.Visible = false; this.Visible = false;
this.$emit("addField"); this.$emit("addField");
} else {
this.$message.error(msg);
} }
console.log(res.data);
} }
}); });
}, },
......
base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue
View file @ 11f4238d
...@@ -293,6 +293,15 @@ export default { ...@@ -293,6 +293,15 @@ export default {
if (data.length) { if (data.length) {
this.skinTemplate = data; this.skinTemplate = data;
this.formData.skinFieldList = data[0].skinFieldList; this.formData.skinFieldList = data[0].skinFieldList;
this.formData.skinFieldList.forEach((v) => {
v.fieldOrderNo = Number(v.fieldOrderNo);
if (!v.fieldOrderNo) {
v.fieldOrderNo = 1000;
}
});
this.formData.skinFieldList.sort((a, b) => {
return a.fieldOrderNo - b.fieldOrderNo;
});
} }
}, },
// 上传函数 // 上传函数
...@@ -322,7 +331,6 @@ export default { ...@@ -322,7 +331,6 @@ export default {
file.type === "image/jpeg" || file.type === "image/jpeg" ||
file.type === "image/png" || file.type === "image/png" ||
file.type === "image/gif"; file.type === "image/gif";
console.log(file);
if (!isJpgOrPng) { if (!isJpgOrPng) {
this.$message.error("请上传jpeg或者png图片!"); this.$message.error("请上传jpeg或者png图片!");
} }
...@@ -375,7 +383,6 @@ export default { ...@@ -375,7 +383,6 @@ export default {
this.loading = false; this.loading = false;
this.show = false; this.show = false;
} else { } else {
this.$message.error(msg);
this.loading = false; this.loading = false;
} }
}); });
......
base-manager-ui/admin/src/pages/basicset/surface/windowskin/WindowSkin.vue
View file @ 11f4238d
...@@ -5,56 +5,46 @@ ...@@ -5,56 +5,46 @@
:id="conponentsId" :id="conponentsId"
class="window-skin-across flex jcb aic" class="window-skin-across flex jcb aic"
:style="{ :style="{
backgroundImage: filterImg('背景大图') background: filterItem('1', 0),
? `url(${api + filterImg('背景大图')})`
: '',
}" }"
> >
<div class="left flex flexc jcc aic"> <div class="left flex flexc jcc aic">
<p class="title">异地社保</p> <p class="title">异地社保</p>
<p class="code" :style="{ color: filterColor('主题色') }">A08</p> <p class="code" :style="{ color: filterItem('7', 0) }">A08</p>
<p><img width="100" src="../../../../assets/img/lvma.png" /></p> <p><img width="100" src="../../../../assets/img/lvma.png" /></p>
</div> </div>
<div class="right flex1 flex flexc aic"> <div class="right flex1 flex flexc aic">
<div class="header flex aic jcc"> <div class="header flex aic jcc">
<img src="../../../../assets/img/logo.png" /> <img src="../../../../assets/img/logo.png" />
<div> <div>
<h1 :style="{ color: filterColor('主题色') }">政务服务中心</h1> <h1 :style="{ color: filterItem('2', 0) }">政务服务中心</h1>
</div> </div>
</div> </div>
<div <div
class="call-out flex aic" class="call-out flex aic"
:style="{ backgroundColor: filterColor('辅助色') }" :style="{ background: filterItem('8', 0) }"
> >
<div class="call-out-now flex flexc aic jcb"> <div class="call-out-now flex flexc aic jcb">
<p class="call-out-title">正在办理</p> <p class="call-out-title">正在办理</p>
<p <p class="call-out-now-code" :style="{ color: filterItem('7', 0) }">
class="call-out-now-code"
:style="{ color: filterColor('主题色') }"
>
A001 A001
</p> </p>
</div> </div>
<div <div
class="line" class="line"
:style="{ :style="{
backgroundImage: `linear-gradient(to bottom,#ccc,${filterColor( backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem(
'主题色' '7',
)} 45%,${filterColor('主题色')} 65%,#ccc 100% )`, 0
)} 45%,${filterItem('7', 0)} 65%,#ccc 100% )`,
}" }"
></div> ></div>
<div class="call-out-wt flex flex1 flexc aic jcb"> <div class="call-out-wt flex flex1 flexc aic jcb">
<p class="call-out-title">等待呼叫</p> <p class="call-out-title">等待呼叫</p>
<p <p class="call-out-wt-code" :style="{ color: filterItem('7', 0) }">
class="call-out-wt-code"
:style="{ color: filterColor('主题色') }"
>
A002 A002
</p> </p>
<p <p class="call-out-wt-code" :style="{ color: filterItem('7', 0) }">
class="call-out-wt-code"
:style="{ color: filterColor('主题色') }"
>
A003 A003
</p> </p>
</div> </div>
...@@ -65,14 +55,7 @@ ...@@ -65,14 +55,7 @@
<li>退休补偿金办理</li> <li>退休补偿金办理</li>
</ul> </ul>
<!-- 底部banner --> <!-- 底部banner -->
<div <div class="footer-banner">Banner展示区</div>
class="footer-banner"
:style="{
backgroundImage: filterImg('banner图')
? `url(${api + filterImg('banner图')})`
: `url(${require('../../../../assets/img/cpbg.png')})`,
}"
></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -106,32 +89,58 @@ export default { ...@@ -106,32 +89,58 @@ export default {
}, },
methods: { methods: {
// 过滤图片 // 过滤图片
filterImg(val) { // filterImg(val) {
let url = ""; // let url = "";
this.skinFieldList // this.skinFieldList
.filter((v) => { // .filter((v) => {
return v.fieldType === "2"; // return v.fieldType === "2";
}) // })
.forEach((v) => { // .forEach((v) => {
if (v.fieldName !== "" && v.fieldName === val) { // if (v.fieldName !== "" && v.fieldName === val) {
url = v.fieldValue; // url = v.fieldValue;
} // }
}); // });
return url; // return url;
// },
// // 过滤颜色
// filterColor(val) {
// let str = "";
// this.skinFieldList
// .filter((v) => {
// return v.fieldType === "1";
// })
// .forEach((v) => {
// if (v.fieldName !== "" && v.fieldName === val) {
// str = v.fieldValue;
// }
// });
// return str;
// },
// 过滤属性类型
filterItem(type, index) {
let arr = this.skinFieldList.filter((v) => {
return v.remark == type;
});
if (arr.length) {
return this.filterValueType(arr[index]);
} else {
return "";
}
}, },
// 过滤颜色 // 过滤属性值类型
filterColor(val) { filterValueType(info = {}) {
let str = ""; let value = "";
this.skinFieldList if (info.fieldType !== "" && info.fieldType === "1" && info.fieldValue) {
.filter((v) => { value = info.fieldValue;
return v.fieldType === "1"; } else if (
}) info.fieldType !== "" &&
.forEach((v) => { info.fieldType === "2" &&
if (v.fieldName !== "" && v.fieldName === val) { info.fieldValue
str = v.fieldValue; ) {
} value = `url(${this.api + info.fieldValue})`;
}); }
return str; return value;
}, },
}, },
}; };
...@@ -143,9 +152,9 @@ export default { ...@@ -143,9 +152,9 @@ export default {
height: 562.5px; height: 562.5px;
padding: 20px; padding: 20px;
background-image: linear-gradient(#26c5ff, #2c66ff); background-image: linear-gradient(#26c5ff, #2c66ff);
background-repeat: no-repeat; background-repeat: no-repeat !important;
background-position: center; background-position: center !important;
background-size: cover; background-size: cover !important;
.left { .left {
width: 38%; width: 38%;
height: 100%; height: 100%;
...@@ -232,6 +241,10 @@ export default { ...@@ -232,6 +241,10 @@ export default {
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: 100%; background-size: 100%;
border: 1px dashed #ccc;
font-size: 20px;
text-align: center;
line-height: 100px;
} }
} }
} }
......
base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue
View file @ 11f4238d
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
cancel-text="取消" cancel-text="取消"
@ok="hideModal" @ok="hideModal"
width="820px" width="820px"
:maskClosable="false"
> >
<a-form-model <a-form-model
:model="form" :model="form"
...@@ -269,12 +270,7 @@ ...@@ -269,12 +270,7 @@
</template> </template>
<script> <script>
import { import { getWindowList, saveWorkman, uploadFile } from "@/services/dept";
getDeptList,
getWindowList,
saveWorkman,
uploadFile,
} from "@/services/dept";
import { modelList } from "@/services/basicsetFun"; import { modelList } from "@/services/basicsetFun";
import { changePhone, changeLandline } from "@/utils/validate"; import { changePhone, changeLandline } from "@/utils/validate";
export default { export default {
...@@ -297,6 +293,12 @@ export default { ...@@ -297,6 +293,12 @@ export default {
return {}; return {};
}, },
}, },
diptData: {
type: Array,
default: () => {
return [];
},
},
}, },
data() { data() {
return { return {
...@@ -357,7 +359,6 @@ export default { ...@@ -357,7 +359,6 @@ export default {
{ required: false, validator: changeLandline, trigger: "blur" }, { required: false, validator: changeLandline, trigger: "blur" },
], ],
}, },
diptData: [], // 站点部门信息
windowData: [], // 部门窗口信息 windowData: [], // 部门窗口信息
}; };
}, },
...@@ -386,17 +387,7 @@ export default { ...@@ -386,17 +387,7 @@ export default {
let res = await modelList({ page: 1, size: -1 }); let res = await modelList({ page: 1, size: -1 });
this.modelIds = res.data.data.data; this.modelIds = res.data.data.data;
}, },
// 获取部门数据
async getDeptData(obj = {}) {
let res = await getDeptList({
page: 1,
size: -1,
siteId: this.siteInfo.siteId,
...obj,
});
let { data } = res.data.data;
this.diptData = data;
},
// 部门选择 // 部门选择
async handleDeptSelect(val, node) { async handleDeptSelect(val, node) {
this.form.windowId = undefined; this.form.windowId = undefined;
...@@ -419,16 +410,12 @@ export default { ...@@ -419,16 +410,12 @@ export default {
hideModal() { hideModal() {
this.$refs.formData.validate(async (valid) => { this.$refs.formData.validate(async (valid) => {
if (valid) { if (valid) {
let res = await saveWorkman({ let res = await saveWorkman(this.form);
...this.form,
...this.siteInfo,
// modelIds: this.form.modelIds.join(","),
});
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$parent.getWorkmanData(); this.$parent.getWorkmanData();
this.Visible = false; this.handleClose();
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
...@@ -440,12 +427,12 @@ export default { ...@@ -440,12 +427,12 @@ export default {
this.form = { ...data }; this.form = { ...data };
this.form.loginName && this.$delete(this.form, "loginName"); this.form.loginName && this.$delete(this.form, "loginName");
this.form.loginPwd && this.$delete(this.form, "loginPwd"); this.form.loginPwd && this.$delete(this.form, "loginPwd");
this.editWindow(data.deptId); // this.editWindow(data.deptId);
}, },
// 关闭对话框 // 关闭对话框
handleClose() { handleClose() {
this.Visible = false;
this.$refs.formData.resetFields(); this.$refs.formData.resetFields();
this.Visible = false;
}, },
// 照片上传 // 照片上传
async uploadImg(info) { async uploadImg(info) {
......
base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue
View file @ 11f4238d
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
cancel-text="取消" cancel-text="取消"
@ok="hideModal" @ok="hideModal"
width="820px" width="820px"
:maskClosable="false"
> >
<a-form-model <a-form-model
:model="form" :model="form"
...@@ -318,12 +319,7 @@ ...@@ -318,12 +319,7 @@
<script> <script>
import { changeAccount, changePassWord } from "@/utils/validate"; import { changeAccount, changePassWord } from "@/utils/validate";
import { import { getWindowList, saveWorkman, uploadFile } from "@/services/dept";
getDeptList,
getWindowList,
saveWorkman,
uploadFile,
} from "@/services/dept";
import { modelList } from "@/services/basicsetFun"; import { modelList } from "@/services/basicsetFun";
import { changePhone, changeLandline } from "@/utils/validate"; import { changePhone, changeLandline } from "@/utils/validate";
export default { export default {
...@@ -346,6 +342,12 @@ export default { ...@@ -346,6 +342,12 @@ export default {
return {}; return {};
}, },
}, },
diptData: {
type: Array,
default: () => {
return [];
},
},
}, },
data() { data() {
return { return {
...@@ -414,7 +416,6 @@ export default { ...@@ -414,7 +416,6 @@ export default {
{ required: false, validator: changeLandline, trigger: "blur" }, { required: false, validator: changeLandline, trigger: "blur" },
], ],
}, },
diptData: [], // 站点部门信息
windowData: [], // 部门窗口信息 windowData: [], // 部门窗口信息
}; };
}, },
...@@ -442,17 +443,7 @@ export default { ...@@ -442,17 +443,7 @@ export default {
let res = await modelList({ page: 1, size: -1 }); let res = await modelList({ page: 1, size: -1 });
this.modelIds = res.data.data.data; this.modelIds = res.data.data.data;
}, },
// 获取部门数据
async getDeptData(obj = {}) {
let res = await getDeptList({
page: 1,
size: -1,
siteId: this.siteInfo.siteId,
...obj,
});
let { data } = res.data.data;
this.diptData = data;
},
// 部门选择 // 部门选择
async handleDeptSelect(val, node) { async handleDeptSelect(val, node) {
this.form.windowId = undefined; this.form.windowId = undefined;
...@@ -484,7 +475,7 @@ export default { ...@@ -484,7 +475,7 @@ export default {
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$parent.getWorkmanData(); this.$parent.getWorkmanData();
this.Visible = false; this.handleClose();
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
......
base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
View file @ 11f4238d
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
<!-- 新增工作人员 --> <!-- 新增工作人员 -->
<addpersonnel <addpersonnel
ref="addpersonnel" ref="addpersonnel"
:diptData="deptData"
:visibleAll.sync="visibleAll" :visibleAll.sync="visibleAll"
:designationDict="designationDict" :designationDict="designationDict"
:politicalDict="politicalDict" :politicalDict="politicalDict"
...@@ -167,6 +168,7 @@ ...@@ -167,6 +168,7 @@
:editVisible.sync="editVisible" :editVisible.sync="editVisible"
:designationDict="designationDict" :designationDict="designationDict"
:politicalDict="politicalDict" :politicalDict="politicalDict"
:diptData="deptData"
></EditPersonel> ></EditPersonel>
<!-- 修改密码 --> <!-- 修改密码 -->
<EditPwd ref="EditPwd" :visibleEditPwd.sync="visibleEditPwd"></EditPwd> <EditPwd ref="EditPwd" :visibleEditPwd.sync="visibleEditPwd"></EditPwd>
...@@ -290,29 +292,24 @@ export default { ...@@ -290,29 +292,24 @@ export default {
created() {}, created() {},
methods: { methods: {
handleClick(val) { handleClick(val) {
Object.assign(this.$data, this.$options.data());
this.siteId = val.id; this.siteId = val.id;
this.getDeptList({ siteId: val.id }); this.getDeptList({ siteId: val.id });
this.getWindowData({ siteId: val.id }); this.getWindowData({ siteId: val.id });
this.getWorkmanData({ siteId: val.id }); this.getWorkmanData({ siteId: val.id });
if (this.$refs.addpersonnel) { this.$refs.addpersonnel.getSiteInfo(val);
this.$refs.addpersonnel.getSiteInfo(val);
this.$refs.addpersonnel.getDeptData({ siteId: val.id });
}
if (this.$refs.EditPersonel) {
this.$refs.EditPersonel.getSiteInfo(val);
this.$refs.EditPersonel.getDeptData({ siteId: val.id });
}
}, },
clickArea() { clickArea() {
this.siteId = ""; Object.assign(this.$data, this.$options.data());
this.WorkmanData = [];
this.deptData = [];
this.windowData = [];
this.total = 0;
}, },
// 获取部门 // 获取部门
async getDeptList(obj = {}) { async getDeptList(obj = {}) {
let res = await getDeptList({ siteId: this.siteId, ...obj }); let res = await getDeptList({
page: 1,
size: -1,
siteId: this.siteId,
...obj,
});
let { data } = res.data.data; let { data } = res.data.data;
this.deptData = data; this.deptData = data;
}, },
...@@ -406,7 +403,7 @@ export default { ...@@ -406,7 +403,7 @@ export default {
async editModal(data) { async editModal(data) {
this.editVisible = true; this.editVisible = true;
this.$refs.EditPersonel.onEdit(data); this.$refs.EditPersonel.onEdit(data);
this.$refs.EditPersonel.editWindow(data.deptId); // this.$refs.EditPersonel.editWindow(data.deptId);
}, },
// 翻页 // 翻页
handlePagination(num) { handlePagination(num) {
...@@ -527,7 +524,7 @@ export default { ...@@ -527,7 +524,7 @@ export default {
padding-top: 10px; padding-top: 10px;
width: 100%; width: 100%;
color: #333; color: #333;
overflow: auto; overflow-y: auto;
padding-left: 20px; padding-left: 20px;
.person_message { .person_message {
font-weight: 600; font-weight: 600;
......
base-manager-ui/admin/src/services/basicsetApi.js
View file @ 11f4238d
...@@ -65,6 +65,7 @@ module.exports = { ...@@ -65,6 +65,7 @@ module.exports = {
delete: `${BASE_URL}/matter/delete`, delete: `${BASE_URL}/matter/delete`,
addMatterToSite: `${BASE_URL}/matter/addMatterToSite`, addMatterToSite: `${BASE_URL}/matter/addMatterToSite`,
exportExcel: `${BASE_URL}/matter/exportExcel`, exportExcel: `${BASE_URL}/matter/exportExcel`,
matterList: `${BASE_URL}/matter/sublist`,
}, },
// 事项申请材料 // 事项申请材料
matterdatum: { matterdatum: {
......
base-manager-ui/admin/src/services/matter.js
View file @ 11f4238d
import { import {
sitematter, sitematter,
matter, matter,
matterdatum, matterdatum,
matterdatumfile, matterdatumfile,
matteraccept, matteraccept,
matterquestion, matterquestion,
mattersetbase, mattersetbase,
matterintermediary, matterintermediary,
matterflowlimit, matterflowlimit,
mattercharges, mattercharges,
} from '@/services/basicsetApi' } from "@/services/basicsetApi";
import {request, METHOD} from '@/utils/request' import { request, METHOD } from "@/utils/request";
/** /**
* 站点事项 * 站点事项
*/ */
// 查询站点事项列表 // 查询站点事项列表
export async function getSiteMatterList(data) { export async function getSiteMatterList(data) {
return request(sitematter.list, METHOD.POST, data) return request(sitematter.list, METHOD.POST, data);
} }
// 新增站点事项 // 新增站点事项
export async function addSitematter(data) { export async function addSitematter(data) {
return request(sitematter.save, METHOD.POST, data) return request(sitematter.save, METHOD.POST, data);
} }
// 从站点删除事项 // 从站点删除事项
export async function delSiteMatter(data) { export async function delSiteMatter(data) {
return request(sitematter.delete, METHOD.GET, data) return request(sitematter.delete, METHOD.GET, data);
} }
/** /**
...@@ -34,77 +34,79 @@ export async function delSiteMatter(data) { ...@@ -34,77 +34,79 @@ export async function delSiteMatter(data) {
*/ */
// 获取一体化事项列表 // 获取一体化事项列表
export async function getMatterList(data) { export async function getMatterList(data) {
return request(matter.list, METHOD.POST, data) return request(matter.list, METHOD.POST, data);
} }
// 保存/更新基础事项 // 保存/更新基础事项
export async function saveAddMatter(data) { export async function saveAddMatter(data) {
return request(matter.save, METHOD.POST, data) return request(matter.save, METHOD.POST, data);
} }
// 添加基础事项到站点 // 添加基础事项到站点
export async function addMatterToSite(data) { export async function addMatterToSite(data) {
return request(matter.addMatterToSite, METHOD.POST, data) return request(matter.addMatterToSite, METHOD.POST, data);
} }
// 删除基础事项 // 删除基础事项
export async function delMatter(data) { export async function delMatter(data) {
return request(matter.delete, METHOD.GET, data) return request(matter.delete, METHOD.GET, data);
}
// 获取一体化事项列表（差集）
export async function getMatterListSubList(data) {
return request(matter.matterList, METHOD.POST, data);
} }
/** /**
* 事项申请材料 * 事项申请材料
*/ */
// 查询事项申请材料列表 // 查询事项申请材料列表
export async function getMatterDatumList(data) { export async function getMatterDatumList(data) {
return request(matterdatum.list, METHOD.POST, data) return request(matterdatum.list, METHOD.POST, data);
} }
// 保存更新事项申请材料 // 保存更新事项申请材料
export async function saveMatterDatum(data) { export async function saveMatterDatum(data) {
return request(matterdatum.save, METHOD.POST, data) return request(matterdatum.save, METHOD.POST, data);
} }
// 删除材料 // 删除材料
export async function delMatterDatum(data) { export async function delMatterDatum(data) {
return request(matterdatum.delete, METHOD.GET, data) return request(matterdatum.delete, METHOD.GET, data);
} }
// 下载附件 // 下载附件
export async function download(data,config) { export async function download(data, config) {
return request(matterdatumfile.exportExcel, METHOD.POST, data,config) return request(matterdatumfile.exportExcel, METHOD.POST, data, config);
} }
// 删除附件 // 删除附件
export async function delMatterdatumfile(data) { export async function delMatterdatumfile(data) {
return request(matterdatumfile.delete, METHOD.GET, data) return request(matterdatumfile.delete, METHOD.GET, data);
} }
/** /**
* 受理材料 * 受理材料
*/ */
// 查询事项受理条件列表 // 查询事项受理条件列表
export async function getMatteracceptList(data) { export async function getMatteracceptList(data) {
return request(matteraccept.list, METHOD.POST, data) return request(matteraccept.list, METHOD.POST, data);
} }
// 新增受理条件 // 新增受理条件
export async function addMatteraccept(data) { export async function addMatteraccept(data) {
return request(matteraccept.save, METHOD.POST, data) return request(matteraccept.save, METHOD.POST, data);
} }
// 删除受理条件 // 删除受理条件
export async function delMatteraccept(data) { export async function delMatteraccept(data) {
return request(matteraccept.delete, METHOD.GET, data) return request(matteraccept.delete, METHOD.GET, data);
} }
/** /**
* 常见问题 * 常见问题
*/ */
// 获取常见问题列表 // 获取常见问题列表
export async function getMatterquestion(data) { export async function getMatterquestion(data) {
return request(matterquestion.list, METHOD.POST, data) return request(matterquestion.list, METHOD.POST, data);
} }
// 新增问答 // 新增问答
export async function addMatterquestion(data) { export async function addMatterquestion(data) {
return request(matterquestion.save, METHOD.POST, data) return request(matterquestion.save, METHOD.POST, data);
} }
// 删除问答 // 删除问答
export async function delMatterquestion(data) { export async function delMatterquestion(data) {
return request(matterquestion.delete, METHOD.GET, data) return request(matterquestion.delete, METHOD.GET, data);
} }
/** /**
...@@ -112,15 +114,15 @@ export async function delMatterquestion(data) { ...@@ -112,15 +114,15 @@ export async function delMatterquestion(data) {
*/ */
// 获取依据列表 // 获取依据列表
export async function getMattersetbase(data) { export async function getMattersetbase(data) {
return request(mattersetbase.list, METHOD.POST, data) return request(mattersetbase.list, METHOD.POST, data);
} }
// 新增依据 // 新增依据
export async function addMattersetbase(data) { export async function addMattersetbase(data) {
return request(mattersetbase.save, METHOD.POST, data) return request(mattersetbase.save, METHOD.POST, data);
} }
// 删除依据 // 删除依据
export async function delMattersetbase(data) { export async function delMattersetbase(data) {
return request(mattersetbase.delete, METHOD.GET, data) return request(mattersetbase.delete, METHOD.GET, data);
} }
/** /**
...@@ -128,7 +130,7 @@ export async function delMattersetbase(data) { ...@@ -128,7 +130,7 @@ export async function delMattersetbase(data) {
*/ */
// 增加中介服务 // 增加中介服务
export async function addMatterintermediary(data) { export async function addMatterintermediary(data) {
return request(matterintermediary.save, METHOD.POST, data) return request(matterintermediary.save, METHOD.POST, data);
} }
/** /**
...@@ -136,7 +138,7 @@ export async function addMatterintermediary(data) { ...@@ -136,7 +138,7 @@ export async function addMatterintermediary(data) {
*/ */
// 新增办理流程 // 新增办理流程
export async function addMatterflowlimit(data) { export async function addMatterflowlimit(data) {
return request(matterflowlimit.save, METHOD.POST, data) return request(matterflowlimit.save, METHOD.POST, data);
} }
/** /**
...@@ -144,5 +146,5 @@ export async function addMatterflowlimit(data) { ...@@ -144,5 +146,5 @@ export async function addMatterflowlimit(data) {
*/ */
// 新增收费标准 // 新增收费标准
export async function addMattercharges(data) { export async function addMattercharges(data) {
return request(mattercharges.save, METHOD.POST, data) return request(mattercharges.save, METHOD.POST, data);
} }
\ No newline at end of file
base-manager-ui/admin/src/utils/validate.js
View file @ 11f4238d
// 只能为数字验证 // 只能为数字验证
export function isNumber (rule, value, callback) { export function isNumber(rule, value, callback) {
var number = /^\d+$/ var number = /^\d+$/;
if (!number.test(value)) { if (!number.test(value)) {
callback(new Error("格式有误,只能为数字")) callback(new Error("格式有误,只能为数字"));
} else { } else {
callback() callback();
} }
} }
// 验证流水编号 // 验证流水编号
export const checkFlowNum = (rule,value,callback)=>{ export const checkFlowNum = (rule, value, callback) => {
let reg = /^[A-Z][a-zA-Z0-9]{3,32}$/ let reg = /^[A-Z][a-zA-Z0-9]{3,32}$/;
if(!value){ if (!value) {
callback(new Error('请输入流水编号')) callback(new Error("请输入流水编号"));
}else if(!reg.test(value)){ } else if (!reg.test(value)) {
callback(new Error('格式为大写字母开头,4~32位')) callback(new Error("格式为大写字母开头,4~32位"));
}else{ } else {
callback() callback();
} }
} };
// 验证英文 // 验证英文
export const checkEn = (rule,value,callback)=>{ export const checkEn = (rule, value, callback) => {
let reg = /^[a-zA-Z]{2,15}$/ let reg = /^[0-9a-zA-Z\s]{2,40}$/;
if(!value){ if (!value) {
callback(new Error('请输入英文名称')) callback(new Error("请输入英文名称"));
}else if(!reg.test(value)){ } else if (!reg.test(value)) {
callback(new Error('格式为字母a-z,A-Z,2~15位')) callback(new Error("格式为a-zA-Z0-9空格,2~40位"));
}else{ } else {
callback() callback();
} }
} };
// 验证业务名称长度
export const checkBusinessName = (rule, value, callback) => {
let reg = value.length;
if (!value) {
callback(new Error("请输入业务名称"));
} else if (reg > 40) {
callback(new Error("业务名称不能超过40个字符"));
} else {
callback();
}
};
// 验证账号 // 验证账号
export const changeAccount = (rule, value, callback) => { export const changeAccount = (rule, value, callback) => {
if (!value) { if (!value) {
callback(new Error("请输入用户名")); callback(new Error("请输入用户名"));
} else if (!/^[a-zA-Z0-9_-]{2,16}$/.test(value)) { } else if (!/^[a-zA-Z0-9_-]{2,16}$/.test(value)) {
callback(new Error("2到16位(字母,数字,下划线,中横线)")); callback(new Error("2到16位(字母,数字,下划线,中横线)"));
} else { } else {
callback(); callback();
} }
}; };
// 验证密码 // 验证密码
export const changePassWord = (rule, value, callback) => { export const changePassWord = (rule, value, callback) => {
if (!value) { if (!value) {
callback(new Error("请输入密码")); callback(new Error("请输入密码"));
} else if (!/^[a-zA-Z0-9_-]{2,18}$/.test(value)) { } else if (!/^[a-zA-Z0-9_-]{2,18}$/.test(value)) {
callback(new Error("2到18位(字母,数字,下划线,中横线)")); callback(new Error("2到18位(字母,数字,下划线,中横线)"));
} else { } else {
callback(); callback();
} }
}; };
// 验证手机号码 // 验证手机号码
export const changePhone = (rule, value, callback) => { export const changePhone = (rule, value, callback) => {
if (!value) { if (!value) {
// callback(new Error("请输入手机号")); // callback(new Error("请输入手机号"));
callback(); callback();
} else if (!/^1[3-9]\d{9}$/.test(value)) { } else if (!/^1[3-9]\d{9}$/.test(value)) {
callback(new Error("手机号码格式不正确")); callback(new Error("手机号码格式不正确"));
} else { } else {
callback(); callback();
} }
}; };
// 验证座机号码 // 验证座机号码
export const changeLandline = (rule, value, callback) => { export const changeLandline = (rule, value, callback) => {
if (!value) { if (!value) {
// callback(new Error("请输入座机号")); // callback(new Error("请输入座机号"));
callback(); callback();
} else if (!/^[0][1-9]{2,3}-[0-9]{5,10}$/.test(value)) { } else if (!/^[0][1-9]{2,3}-[0-9]{5,10}$/.test(value)) {
callback(new Error("区号-电话号码")); callback(new Error("区号-电话号码"));
} else { } else {
callback(); callback();
} }
}; };
// 窗口编号验证（字母加数字 数字不能大于1000） // 窗口编号验证（字母加数字 数字不能大于1000）
export const changeWindowNumber = (rule, value, callback) => { export const changeWindowNumber = (rule, value, callback) => {
if (!value) { if (!value) {
callback(new Error("请输入窗口编号")); callback(new Error("请输入窗口编号"));
} else if (value.match(/\d+/g) && Math.max(...value.match(/\d+/g).map(Number)) > 1000) { } else if (
callback(new Error("数字不能大于1000")); value.match(/\d+/g) &&
Math.max(...value.match(/\d+/g).map(Number)) > 1000
) {
callback(new Error("数字不能大于1000"));
} else { } else {
callback(); callback();
} }
}; };
\ No newline at end of file
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