zhba/zhba_enterprises_bf.git

			@@ -33,129 +33,123 @@
			isFirstPage: false,
			fistPage: fistPage,
			//首页跳转数据
			homePage: [
			{
			homePage: [{
			userName: 'administrator',
			list: [
			{
			label: '保安员管理',
			value: '/securityGuard/index',
			imgs: 'url(/img/glba.jpg)'
			}, {
			label: '通知公告',
			value: '/desk/index',
			imgs: 'url(/img/gltz.jpg)'
			}, {
			label: '公司动态',
			value: '/desk/notification',
			imgs: 'url(/img/glgj.jpg)'
			}, {
			label: '单位信息',
			value: '/securityUnit/localCompany',
			imgs: 'url(/img/gldw.jpg)'
			}, {
			label: '智能分析',
			value: '/securityAnalysis/index',
			imgs: 'url(/img/glgz.jpg)'
			},]
			list: [{
			label: '保安员管理',
			value: '/securityGuard/index',
			imgs: 'url(/img/glba.jpg)'
			}, {
			label: '通知公告',
			value: '/desk/index',
			imgs: 'url(/img/gltz.jpg)'
			}, {
			label: '公司动态',
			value: '/desk/notification',
			imgs: 'url(/img/glgj.jpg)'
			}, {
			label: '单位信息',
			value: '/securityUnit/localCompany',
			imgs: 'url(/img/gldw.jpg)'
			}, {
			label: '智能分析',
			value: '/securityAnalysis/index',
			imgs: 'url(/img/glgz.jpg)'
			}, ]
			}, {
			userName: '保安',
			list: [
			{
			label: '保安员信息',
			value: '/securityMan/index',
			imgs: 'url(/img/yijianbaoj.jpg)'
			}, {
			label: '派遣记录',
			value: '/dispatchChildoperableSee/index',
			imgs: 'url(/img/fangyi.jpg)'
			}, {
			label: '从业记录',
			value: '/job/index',
			imgs: 'url(/img/anjian.jpg)'
			}, {
			label: '工作汇报',
			value: '/workreport/workreport',
			imgs: 'url(/img/tiwen.jpg)'
			}, {
			label: '表现记录',
			value: '/expression/index',
			imgs: 'url(/img/tongji.jpg)'
			},]
			list: [{
			label: '保安员信息',
			value: '/securityMan/index',
			imgs: 'url(/img/yijianbaoj.jpg)'
			}, {
			label: '派遣记录',
			value: '/dispatchChildoperableSee/index',
			imgs: 'url(/img/fangyi.jpg)'
			}, {
			label: '从业记录',
			value: '/job/index',
			imgs: 'url(/img/anjian.jpg)'
			}, {
			label: '工作汇报',
			value: '/workreport/workreport',
			imgs: 'url(/img/tiwen.jpg)'
			}, {
			label: '表现记录',
			value: '/expression/index',
			imgs: 'url(/img/tongji.jpg)'
			}, ]
			},
			{
			userName: '未持证保安',
			list: [
			{
			label: '保安员信息',
			value: '/securityMan/index',
			imgs: 'url(/img/yijianbaoj.jpg)'
			}, {
			label: '派遣记录',
			value: '/dispatchChildoperableSee/index',
			imgs: 'url(/img/fangyi.jpg)'
			}, {
			label: '从业记录',
			value: '/job/index',
			imgs: 'url(/img/anjian.jpg)'
			}, {
			label: '工作汇报',
			value: '/workreport/workreport',
			imgs: 'url(/img/tiwen.jpg)'
			}, {
			label: '表现记录',
			value: '/expression/index',
			imgs: 'url(/img/tongji.jpg)'
			},]
			list: [{
			label: '保安员信息',
			value: '/securityMan/index',
			imgs: 'url(/img/yijianbaoj.jpg)'
			}, {
			label: '派遣记录',
			value: '/dispatchChildoperableSee/index',
			imgs: 'url(/img/fangyi.jpg)'
			}, {
			label: '从业记录',
			value: '/job/index',
			imgs: 'url(/img/anjian.jpg)'
			}, {
			label: '工作汇报',
			value: '/workreport/workreport',
			imgs: 'url(/img/tiwen.jpg)'
			}, {
			label: '表现记录',
			value: '/expression/index',
			imgs: 'url(/img/tongji.jpg)'
			}, ]
			},
			{
			userName: '保安公司管理员',
			list: [
			{
			label: '智能分析',
			value: '/securityAnalysis/index',
			imgs: 'url(/img/glgz.jpg)'
			}, {
			label: '保安员管理',
			value: '/securityGuard/index',
			imgs: 'url(/img/glba.jpg)'
			}, {
			label: '单位信息',
			value: '/securityUnitChild/index',
			imgs: 'url(/img/gldw.jpg)'
			}, {
			label: '派遣记录',
			value: '/dispatch/dispatchChildoperable',
			imgs: 'url(/img/glgj.jpg)'
			}, {
			label: '通知公告',
			value: '/desk/index',
			imgs: 'url(/img/gltz.jpg)'
			},]
			list: [{
			label: '智能分析',
			value: '/securityAnalysis/index',
			imgs: 'url(/img/glgz.jpg)'
			}, {
			label: '保安员管理',
			value: '/securityGuard/index',
			imgs: 'url(/img/glba.jpg)'
			}, {
			label: '单位信息',
			value: '/securityUnitChild/index',
			imgs: 'url(/img/gldw.jpg)'
			}, {
			label: '派遣记录',
			value: '/dispatch/dispatchChildoperable',
			imgs: 'url(/img/glgj.jpg)'
			}, {
			label: '通知公告',
			value: '/desk/index',
			imgs: 'url(/img/gltz.jpg)'
			}, ]
			}, {
			userName: '公安管理员',
			list: [
			{
			label: '智能分析',
			value: '/securityAnalysis/index',
			imgs: 'url(/img/glgz.jpg)'
			}, {
			label: '保安员管理',
			value: '/securityGuard/index',
			imgs: 'url(/img/glba.jpg)'
			}, {
			label: '公司管理',
			value: '/securityUnit/index',
			imgs: 'url(/img/gldw.jpg)'
			}, {
			label: '通知公告',
			value: '/desk/index',
			imgs: 'url(/img/gltz.jpg)'
			}, {
			label: '工作汇报',
			value: '/workreport/workreply',
			imgs: 'url(/img/glgj.jpg)'
			}]
			list: [{
			label: '智能分析',
			value: '/securityAnalysis/index',
			imgs: 'url(/img/glgz.jpg)'
			}, {
			label: '保安员管理',
			value: '/securityGuard/index',
			imgs: 'url(/img/glba.jpg)'
			}, {
			label: '公司管理',
			value: '/securityUnit/index',
			imgs: 'url(/img/gldw.jpg)'
			}, {
			label: '通知公告',
			value: '/desk/index',
			imgs: 'url(/img/gltz.jpg)'
			}, {
			label: '工作汇报',
			value: '/workreport/workreply',
			imgs: 'url(/img/glgj.jpg)'
			}]
			}
			],

			@@ -174,6 +168,6 @@
			authUrl: 'http://localhost/blade-auth/oauth/render',
			// 流程设计器地址
			flowDesignUrl: 'http://localhost:9999',
			// 报表设计器地址(cloud端口为8108,boot端口为80)
			reportUrl: 'http://localhost:8108/ureport',
			}
			// 报表设计器地址(cloud端口为8108,boot端口为81)
			reportUrl: 'http://localhost:81/ureport',
			}

	docker-compose.yml	11 ●●●●● patch \| view \| raw \| blame \| history
	src/config/website.js	224 ●●●●● patch \| view \| raw \| blame \| history
	src/views/report/announcementReport.vue	14 ●●●●● patch \| view \| raw \| blame \| history
	src/views/report/designer.vue	14 ●●●●● patch \| view \| raw \| blame \| history

New file
			@@ -0,0 +1,11 @@
			version: '3.1'
			services:
			zhba_vue:
			image: zhba-vue:latest
			deploy:
			replicas: 1
			update_config:
			parallelism: 2
			delay: 10s
			ports:
			- "80:80"

New file
			@@ -0,0 +1,14 @@
			<template>
			<iframe src="https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-notice.ureport.xml" style="width: 100%;height: 100%" frameborder="0"></iframe>
			</template>

			<script>
			//占位路由公告报表
			export default {

			}
			</script>

			<style>

			</style>

New file
			@@ -0,0 +1,14 @@
			<template>
			<iframe src="http://localhost:81/ureport/designer" style="width: 100%;height: 100%" frameborder="0"></iframe>
			</template>

			<script>
			//占位路由报表配置
			export default {

			}
			</script>

			<style>

			</style>