From 0e11714f01de9fe1756d6896f67bcd07ff50a148 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 10 八月 2022 18:34:52 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/safeKnowledgeSys/internationalRules/index.vue | 40 +++
src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/reportTypeSetting/index.vue | 0
src/layout/component/aside.vue | 3
src/views/safeKnowledgeSys/index.vue | 1
src/assets/menu/companyLogo.png | 0
src/views/specialWorkSystem/afterWorkManage/workTicketRecord/index.vue | 0
src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/linkSetting/index.vue | 0
src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue | 92 +++---
src/views/specialWorkSystem/workApplyManage/workApplyForm/components/cutLineForm.vue | 0
src/views/specialWorkSystem/workBasicManage/personalProtectDevices/index.vue | 0
src/views/specialWorkSystem/workApplyManage/workApplyForm/components/dirtWorkForm.vue | 0
src/views/safeKnowledgeSys/xzfg/index.vue | 39 +++
src/views/specialWorkSystem/approveProcessManage/approveProcessSetting/index.vue | 0
src/assets/menu/bg_home.jpg | 0
src/views/system/menu/index.vue | 2
src/views/loginPage/loginPage.vue | 23 +
src/views/specialWorkSystem/workProcessManage/gasCheckAnalyze/index.vue | 5
src/views/specialWorkSystem/workApplyManage/myApply/index.vue | 0
src/views/specialWorkSystem/workApplyManage/workApplyForm/components/hangLoadForm.vue | 0
src/views/safeKnowledgeSys/df/index.vue | 40 +++
src/views/loginPage/component/accountLogin.vue | 1
src/assets/menu/companyLogo.jpg | 0
src/views/specialWorkSystem/approveProcessManage/approveProcessList/index.vue | 0
src/views/specialWorkSystem/workApplyManage/workApplyForm/components/highWorkForm.vue | 0
src/views/specialWorkSystem/workBasicManage/workTypeSetting/index.vue | 97 +++---
src/views/specialWorkSystem/workProcessManage/workCheckRecord/index.vue | 0
src/layout/navBars/breadcrumb/user.vue | 86 +++++-
src/views/specialWorkSystem/workApplyManage/workApplyForm/components/limitedSpaceForm.vue | 0
src/layout/navMenu/vertical.vue | 2
src/views/layoutPage/index.vue | 2
src/views/intellectInspect/intelligentMap/index.vue | 79 ++++-
src/views/safeKnowledgeSys/inner/index.vue | 40 +++
src/views/safeKnowledgeSys/law/index.vue | 40 +++
src/views/safeKnowledgeSys/sfjs/index.vue | 40 +++
src/views/specialWorkSystem/afterWorkManage/workTicketCheck/index.vue | 0
src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/approveTypeSetting/index.vue | 0
src/views/specialWorkSystem/workApplyManage/workApplyForm/components/tempElectForm.vue | 0
src/views/specialWorkSystem/workApplyManage/workApplyForm/components/blindPanelForm.vue | 0
src/views/specialWorkSystem/workApplyManage/workApplyForm/components/fireWorkForm.vue | 0
src/views/specialWorkSystem/workBasicManage/certificateFilterSetting/index.vue | 0
src/views/home/index.vue | 2
src/views/specialWorkSystem/workApplyManage/workApplyForm/index.vue | 45 +-
src/views/homeMenu/homeMenu.vue | 42 ++
src/views/safeKnowledgeSys/bmgz/index.vue | 40 +++
44 files changed, 584 insertions(+), 177 deletions(-)
diff --git a/src/assets/menu/bg_home.jpg b/src/assets/menu/bg_home.jpg
new file mode 100644
index 0000000..c8b3afd
--- /dev/null
+++ b/src/assets/menu/bg_home.jpg
Binary files differ
diff --git a/src/assets/menu/companyLogo.jpg b/src/assets/menu/companyLogo.jpg
new file mode 100644
index 0000000..2ab18b0
--- /dev/null
+++ b/src/assets/menu/companyLogo.jpg
Binary files differ
diff --git a/src/assets/menu/companyLogo.png b/src/assets/menu/companyLogo.png
new file mode 100644
index 0000000..7150a8d
--- /dev/null
+++ b/src/assets/menu/companyLogo.png
Binary files differ
diff --git a/src/layout/component/aside.vue b/src/layout/component/aside.vue
index d4ee363..139364e 100644
--- a/src/layout/component/aside.vue
+++ b/src/layout/component/aside.vue
@@ -1,10 +1,11 @@
<template>
<div class="h100" v-show="!isTagsViewCurrenFull">
<el-aside class="layout-aside" :class="setCollapseStyle">
- <Logo v-if="setShowLogo" />
+<!-- <Logo v-if="setShowLogo" />-->
<el-scrollbar class="flex-auto" ref="layoutAsideScrollbarRef" @mouseenter="onAsideEnterLeave(true)" @mouseleave="onAsideEnterLeave(false)">
<Vertical :menuList="menuList" />
</el-scrollbar>
+ <div style="font-size: 9px;color: rgba(255,255,255,.4);padding: 10px 20px">技术支持：<br/>苏州国科鸿宇智能科技有限公司</div>
</el-aside>
</div>
</template>
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 415e04e..bad2b59 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -1,5 +1,10 @@
<template>
<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
+ <div class="logo">
+ <img src="src/assets/menu/companyLogo.jpg">
+ <span style="font-size: 16px;color: #333;font-weight: bolder"> | {{systemName}}</span>
+ </div>
+ <div style="display: flex;padding-right: 5px">
<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
<div class="layout-navbars-breadcrumb-user-icon">
<i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
@@ -12,23 +17,23 @@
</el-dropdown-menu>
</template>
</el-dropdown>
- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
- <div class="layout-navbars-breadcrumb-user-icon">
- <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>
- </div>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>
- <el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>
- <el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
- <el-icon :title="$t('message.user.title2')">
- <ele-Search />
- </el-icon>
- </div>
+<!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">-->
+<!-- <div class="layout-navbars-breadcrumb-user-icon">-->
+<!-- <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>-->
+<!-- </div>-->
+<!-- <template #dropdown>-->
+<!-- <el-dropdown-menu>-->
+<!-- <el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>-->
+<!-- <el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>-->
+<!-- <el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>-->
+<!-- </el-dropdown-menu>-->
+<!-- </template>-->
+<!-- </el-dropdown>-->
+<!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">-->
+<!-- <el-icon :title="$t('message.user.title2')">-->
+<!-- <ele-Search />-->
+<!-- </el-icon>-->
+<!-- </div>-->
<!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">-->
<!-- <i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>-->
<!-- </div>-->
@@ -61,7 +66,7 @@
<el-dropdown-menu>
<el-dropdown-item command="/homeMenu">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
<!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
+<!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->
<!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
<!-- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->
<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
@@ -69,6 +74,7 @@
</template>
</el-dropdown>
<Search ref="searchRef" />
+ </div>
</div>
</template>
@@ -86,6 +92,20 @@
import UserNews from '/@/layout/navBars/breadcrumb/userNews.vue';
import Search from '/@/layout/navBars/breadcrumb/search.vue';
import { useLoginApi } from '/@/api/login';
+import { Session } from '/@/utils/storage';
+import { useMenuApi } from '/@/api/systemManage/menu/index';
+import { ElMessage } from 'element-plus';
+
+const menuApi = useMenuApi();
+import {
+ backEndComponent,
+ getBackEndControlRoutes,
+ initBackEndControlRoutes,
+ setAddRoute, setFilterMenuAndCacheTagsViewRoutes
+} from '../../../router/backEnd';
+import {NextLoading} from "/@/utils/loading";
+import {useRequestOldRoutes} from "/@/stores/requestOldRoutes";
+import {dynamicRoutes} from "/@/router/route";
export default defineComponent({
name: 'layoutBreadcrumbUser',
@@ -102,7 +122,8 @@
const state = reactive({
isScreenfull: false,
disabledI18n: 'zh-cn',
- disabledSize: 'large'
+ disabledSize: 'large',
+ systemName: ''
});
// 设置分割样式
const layoutUserFlexNum = computed(() => {
@@ -232,12 +253,25 @@
break;
}
};
+
+ const getSysName = async()=>{
+ if (window.nextLoading === undefined) NextLoading.start();
+ if (!Session.get('token')) return false;
+ const res = await menuApi.getMenuAdmin(Session.get('projectId') === null ? '' : Session.get('projectId'));
+ if(res.data.code === '200'){
+ state.systemName = res.data.data[1].project.projectName;
+ console.log(state.systemName)
+ }else{
+ console.log('有问题')
+ }
+ }
// 页面加载时
onMounted(() => {
if (Local.get('themeConfig')) {
initI18n();
initComponentSize();
}
+ getSysName()
});
return {
userInfos,
@@ -259,7 +293,19 @@
.layout-navbars-breadcrumb-user {
display: flex;
align-items: center;
- justify-content: flex-end;
+ justify-content: space-between;
+
+ .logo{
+ height: 50px;
+ padding: 5px 10px;
+ display: flex;
+ align-items: center;
+ overflow: hidden;
+ box-sizing: border-box;
+ img{
+ height: 100%;
+ }
+ }
&-link {
height: 100%;
display: flex;
diff --git a/src/layout/navMenu/vertical.vue b/src/layout/navMenu/vertical.vue
index 1bfa825..bfd7d2d 100644
--- a/src/layout/navMenu/vertical.vue
+++ b/src/layout/navMenu/vertical.vue
@@ -4,7 +4,7 @@
:default-active="defaultActive"
background-color="transparent"
:collapse="isCollapse"
- :unique-opened="getThemeConfig.isUniqueOpened"
+ :unique-opened="true"
:collapse-transition="false"
>
<template v-for="val in menuLists">
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 4a6a8fd..7e986cd 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -77,7 +77,7 @@
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
homeOne: [
- { id: 1, name: '基础数据权限管理系统' },
+ { id: 1, name: '安全基础信息系统' },
{ id: 2, name: '双重预防系统' },
{ id: 3, name: '系统2' },
{ id: 4, name: '系统3' },
diff --git a/src/views/homeMenu/homeMenu.vue b/src/views/homeMenu/homeMenu.vue
index 04087b8..4c3a9a0 100644
--- a/src/views/homeMenu/homeMenu.vue
+++ b/src/views/homeMenu/homeMenu.vue
@@ -8,6 +8,9 @@
<div>安全风险预警监测系统</div>
</div>
<div class="userInfo">
+ <div @click="onScreenfullClick" style="margin-right: 15px;cursor: pointer">
+ <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
+ </div>
<div class="avator">
<img src="../../assets/menu/admin.png" />
<div>admin</div>
@@ -37,7 +40,7 @@
<img class="iconImg" src="../../assets/menu/icon8.png" /><img class="bgImg" src="../../assets/menu/card8.png" /></div
></el-col>
<el-col :span="6">
- <div class="grid-content" v-throttle @click="render('5')">
+ <div class="grid-content" v-throttle @click="toRiskPlatform">
<div class="itemTit">安全风险综合 <br />预警预报平台</div>
<img class="iconImg" src="../../assets/menu/icon1.png" />
<img class="bgImg" src="../../assets/menu/card1.png" />
@@ -79,7 +82,7 @@
></el-col>
<el-col :span="9"
><div class="grid-content grid-content-3" @click="render('1')">
- <div class="itemTit">基础数据权限管理系统</div>
+ <div class="itemTit">安全基础信息系统</div>
<img class="iconImg" src="../../assets/menu/icon11.png" /><img class="bgImg" src="../../assets/menu/card11.png" /></div
></el-col>
</el-row>
@@ -106,6 +109,8 @@
import { ElMessageBox } from 'element-plus/es';
import { useLoginApi } from '/@/api/login';
import { useI18n } from 'vue-i18n';
+import screenfull from 'screenfull';
+import router from '../../router'
// 定义接口来定义对象的类型
interface LoginState {
@@ -133,7 +138,8 @@
isScan: false,
count: 0,
projectId: '1',
- once: 0
+ once: 0,
+ isScreenfull: false
});
// 获取布局配置信息
const getThemeConfig = computed(() => {
@@ -185,7 +191,24 @@
state.projectId = value;
renderMenu();
};
-
+ // 全屏点击时
+ const onScreenfullClick = () => {
+ if (!screenfull.isEnabled) {
+ ElMessage.warning('暂不不支持全屏');
+ return false;
+ }
+ screenfull.toggle();
+ screenfull.on('change', () => {
+ if (screenfull.isFullscreen) state.isScreenfull = true;
+ else state.isScreenfull = false;
+ });
+ };
+ // 去风险大屏
+ const toRiskPlatform = ()=>{
+ router.push({
+ name: "bigDataScreen"
+ });
+ }
const throttle = (renderMenu: any, delay: number) => {
let flag = true;
let count = 0;
@@ -247,6 +270,8 @@
render,
logoMini,
onLoginOut,
+ toRiskPlatform,
+ onScreenfullClick,
loginIconTwo,
getThemeConfig,
...toRefs(state)
@@ -260,7 +285,7 @@
width: 100%;
height: 100%;
position: relative;
- background: url('../../assets/menu/bg_home1.jpg') no-repeat center;
+ background: url('../../assets/menu/bg_home.jpg') no-repeat center;
.topPanel {
position: absolute;
width: 100%;
@@ -366,10 +391,10 @@
.grid-content {
border-radius: 10px;
- height: 234px;
+ height: calc((100vh - 240px) / 3);
padding: 32px;
position: relative;
- background-image: linear-gradient(135deg, #00c0f5, #44b1ff);
+ background: #007BE5;
overflow: hidden;
cursor: pointer;
transition: 0.3s;
@@ -384,7 +409,8 @@
line-height: 36px;
height: 40%;
font-family: 'PingFang SC';
- font-weight: lighter;
+ font-weight: bolder;
+ letter-spacing: 1px;
color: #fff;
margin-bottom: 25px;
}
diff --git a/src/views/intellectInspect/intelligentMap/index.vue b/src/views/intellectInspect/intelligentMap/index.vue
index b8f7172..b11ed9f 100644
--- a/src/views/intellectInspect/intelligentMap/index.vue
+++ b/src/views/intellectInspect/intelligentMap/index.vue
@@ -2,9 +2,17 @@
<div class="container">
<div class="big-title" @click="goBack()"><span></span>国泰新华智能巡检系统<span></span></div>
<div style="font-size: 14px;color: #00ffff">{{present}}</div>
+ <div class="btns">
+ <div class="fullbtn" @click="onScreenfullClick">
+ <div class="toFull">
+ <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
+ </div>
+ <div>全屏</div>
+ </div>
<div class="backBtn" @click="goBack()">
<img src="../../../assets/loginPage/back-icon.png">
<div>退出</div>
+ </div>
</div>
<div class="blocks">
<div class="current-task">
@@ -167,12 +175,12 @@
</div>
</div>
<div class="pic-tit water">
- <img src="../../../assets/loginPage/equipment.JPG">
+ <img src="../../../assets/loginPage/equipment.jpg">
<p>实验室装置区</p>
</div>
<div></div>
<div class="pic-tit">
- <img src="../../../assets/loginPage/wind.JPG">
+ <img src="../../../assets/loginPage/wind.jpg">
<p>实验室风机系统</p>
</div>
<div class="item item-l warning">
@@ -204,7 +212,7 @@
<div></div>
<div></div>
<div class="pic-tit water">
- <img src="../../../assets/loginPage/watersys.JPG">
+ <img src="../../../assets/loginPage/watersys.jpg">
<p>实验室循环水系统</p>
</div>
<div class="item item-t">
@@ -272,6 +280,10 @@
</template>
<script>
+import { ElMessage } from 'element-plus';
+import { ElMessageBox } from 'element-plus/es';
+import screenfull from 'screenfull';
+
export default {
name: 'NewForm',
props: {
@@ -279,7 +291,8 @@
},
data(){
return{
- present: ''
+ present: '',
+ isScreenfull: false
}
},
created() {
@@ -290,6 +303,23 @@
methods:{
goBack(){
window.history.go(-1)
+ },
+ // 全屏点击时
+ onScreenfullClick(){
+ const t = this
+ if (!screenfull.isEnabled) {
+ ElMessage.warning('暂不不支持全屏');
+ return false;
+ }
+ screenfull.toggle();
+ screenfull.on('change', () => {
+ if (screenfull.isFullscreen) {
+ t.isScreenfull = true
+ }
+ else{
+ t.isScreenfull = false
+ }
+ });
}
}
}
@@ -399,23 +429,42 @@
margin: 0 20px;
}
}
- .backBtn{
+ .btns{
position: absolute;
z-index: 99999;
- right: 150px;
+ right: 60px;
top: 40px;
display: flex;
align-items: center;
- cursor: pointer;
-
- img{
- width: 18px;
- height: 18px;
- margin-right: 10px;
+ .fullbtn{
+ cursor: pointer;
+ display: flex;
+ align-items: center;
+ margin-right: 20px;
+ .toFull{
+ font-weight: bolder;
+ color: #00FFFF;
+ margin-right: 10px;
+ }
+ div{
+ font-size: 16px;
+ color: #00FFFF;
+ }
}
- div{
- font-size: 16px;
- color: #00FFFF;
+
+ .backBtn{
+ cursor: pointer;
+ display: flex;
+ align-items: center;
+ img{
+ width: 14px;
+ height: 14px;
+ margin-right: 10px;
+ }
+ div{
+ font-size: 16px;
+ color: #00FFFF;
+ }
}
}
.blocks{
diff --git a/src/views/layoutPage/index.vue b/src/views/layoutPage/index.vue
index fc2ab10..549c2a3 100644
--- a/src/views/layoutPage/index.vue
+++ b/src/views/layoutPage/index.vue
@@ -75,7 +75,7 @@
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
- homeOne:[{id:1,name:'基础数据权限管理系统'},{id:2,name:'双重预防系统'},{id:3,name:'系统2'},{id:4,name:'系统3'},{id:5,name:'系统4'}],
+ homeOne:[{id:1,name:'安全基础信息系统'},{id:2,name:'双重预防系统'},{id:3,name:'系统2'},{id:4,name:'系统3'},{id:5,name:'系统4'}],
});
// 折线图
const renderMenu = async (value: string) => {
diff --git a/src/views/loginPage/component/accountLogin.vue b/src/views/loginPage/component/accountLogin.vue
index 3385ed5..9284f51 100644
--- a/src/views/loginPage/component/accountLogin.vue
+++ b/src/views/loginPage/component/accountLogin.vue
@@ -189,7 +189,6 @@
.login-content-password {
width: 100%;
display: inline-block;
- width: 20px;
cursor: pointer;
&:hover {
color: #909399;
diff --git a/src/views/loginPage/loginPage.vue b/src/views/loginPage/loginPage.vue
index ab061f4..9b976a0 100644
--- a/src/views/loginPage/loginPage.vue
+++ b/src/views/loginPage/loginPage.vue
@@ -4,14 +4,14 @@
<canvas class="particles-js-canvas-el" style="width: 100%; height: 100%;" width="472" height="625"></canvas>
</div>
<el-row class="loginContent">
- <el-col :sm="24" :md="12">
+ <el-col :md="12">
<div class="loginContL">
<div class="apTitleT">新疆国泰新华</div>
<div class="apTitleB">安全风险预警监测系统</div>
<span></span>
</div>
</el-col>
- <el-col :sm="24" :md="12">
+ <el-col :md="12" style="display: flex;justify-content: flex-end">
<div class="loginPanel">
<div class="welc">WELCOME！</div>
<div class="welcc">欢迎登录</div>
@@ -26,7 +26,7 @@
</div>
</el-col>
</el-row>
-
+ <div class="rights">技术支持：苏州国科鸿宇智能科技有限公司</div>
</div>
</template>
@@ -84,6 +84,7 @@
position: relative;
z-index: 999;
display: flex;
+ flex-direction: column;
align-items: center;
justify-content: center;
background: url("../../assets/loginPage/login-bg.jpg") no-repeat center;
@@ -97,27 +98,29 @@
#particles-js {
width: 100%;
height: 100%;
-
background-size: cover;
background-position: 50% 50%;
background-repeat: no-repeat;
- width: 100%;
- height: 100%;
position: absolute;
top: 0;
left: 0;
}
-
+ .rights{
+ font-size: 14px;
+ color: #fff;
+ }
.loginContent{
width: 100%;
- padding: 0 150px;
+ padding: 0 200px;
display: flex;
+ flex-wrap: wrap;
align-items: center;
justify-content: space-around;
+ margin-bottom: 40px;
.loginContL{
width: 100%;
- font-size: 48px;
+ font-size: 60px;
font-weight: bold;
margin-bottom: 100px;
@@ -139,7 +142,7 @@
}
}
.loginPanel{
- width: 80%;
+ width: 65%;
padding: 85px 70px;
background: #fff;
min-width: 450px;
diff --git a/src/views/safeKnowledgeSys/bmgz/index.vue b/src/views/safeKnowledgeSys/bmgz/index.vue
new file mode 100644
index 0000000..f74c241
--- /dev/null
+++ b/src/views/safeKnowledgeSys/bmgz/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/bmgz"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledgeSys/df/index.vue b/src/views/safeKnowledgeSys/df/index.vue
new file mode 100644
index 0000000..38e4824
--- /dev/null
+++ b/src/views/safeKnowledgeSys/df/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/df"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledgeSys/index.vue b/src/views/safeKnowledgeSys/index.vue
index 354a082..f2bc7ff 100644
--- a/src/views/safeKnowledgeSys/index.vue
+++ b/src/views/safeKnowledgeSys/index.vue
@@ -34,6 +34,7 @@
iframe{
width: 100%;
height: 100%;
+ border: none;
}
}
</style>
diff --git a/src/views/safeKnowledgeSys/inner/index.vue b/src/views/safeKnowledgeSys/inner/index.vue
new file mode 100644
index 0000000..97b9588
--- /dev/null
+++ b/src/views/safeKnowledgeSys/inner/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/inner"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledgeSys/internationalRules/index.vue b/src/views/safeKnowledgeSys/internationalRules/index.vue
new file mode 100644
index 0000000..2c88f1e
--- /dev/null
+++ b/src/views/safeKnowledgeSys/internationalRules/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/law"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledgeSys/law/index.vue b/src/views/safeKnowledgeSys/law/index.vue
new file mode 100644
index 0000000..8f4fa8f
--- /dev/null
+++ b/src/views/safeKnowledgeSys/law/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/gong"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledgeSys/sfjs/index.vue b/src/views/safeKnowledgeSys/sfjs/index.vue
new file mode 100644
index 0000000..3682dcc
--- /dev/null
+++ b/src/views/safeKnowledgeSys/sfjs/index.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/laws"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+ }
+</style>
diff --git a/src/views/safeKnowledgeSys/xzfg/index.vue b/src/views/safeKnowledgeSys/xzfg/index.vue
new file mode 100644
index 0000000..a50d44c
--- /dev/null
+++ b/src/views/safeKnowledgeSys/xzfg/index.vue
@@ -0,0 +1,39 @@
+<template>
+ <div class="home-container">
+ <iframe src="http://39.104.85.193/xzfg"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'safeKnowledgeSys',
+ props: {
+
+ },
+ data(){
+ return{
+
+ }
+ },
+ created() {
+
+ },
+ methods:{
+
+ }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+ .home-container{
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
+ overflow: hidden;
+
+ iframe{
+ width: 100%;
+ height: 100%;
+ }
+ }
+</style>
diff --git a/src/views/specialWorkSystem/afterWorkManagement/workTicketCheck/index.vue b/src/views/specialWorkSystem/afterWorkManage/workTicketCheck/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/afterWorkManagement/workTicketCheck/index.vue
rename to src/views/specialWorkSystem/afterWorkManage/workTicketCheck/index.vue
diff --git a/src/views/specialWorkSystem/afterWorkManagement/workTicketRecord/index.vue b/src/views/specialWorkSystem/afterWorkManage/workTicketRecord/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/afterWorkManagement/workTicketRecord/index.vue
rename to src/views/specialWorkSystem/afterWorkManage/workTicketRecord/index.vue
diff --git a/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveTypeSetting/index.vue b/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/approveTypeSetting/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveTypeSetting/index.vue
rename to src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/approveTypeSetting/index.vue
diff --git a/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveLinkSetting/index.vue b/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/linkSetting/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveLinkSetting/index.vue
rename to src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/linkSetting/index.vue
diff --git a/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue b/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/reportTypeSetting/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue
rename to src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/reportTypeSetting/index.vue
diff --git a/src/views/specialWorkSystem/approveProcessManagement/approveProcessList/index.vue b/src/views/specialWorkSystem/approveProcessManage/approveProcessList/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/approveProcessManagement/approveProcessList/index.vue
rename to src/views/specialWorkSystem/approveProcessManage/approveProcessList/index.vue
diff --git a/src/views/specialWorkSystem/approveProcessManagement/approveProcessSetting/index.vue b/src/views/specialWorkSystem/approveProcessManage/approveProcessSetting/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/approveProcessManagement/approveProcessSetting/index.vue
rename to src/views/specialWorkSystem/approveProcessManage/approveProcessSetting/index.vue
diff --git a/src/views/specialWorkSystem/workApplyManagement/myApply/index.vue b/src/views/specialWorkSystem/workApplyManage/myApply/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/workApplyManagement/myApply/index.vue
rename to src/views/specialWorkSystem/workApplyManage/myApply/index.vue
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/blindPanelForm.vue b/src/views/specialWorkSystem/workApplyManage/workApplyForm/components/blindPanelForm.vue
similarity index 100%
rename from src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/blindPanelForm.vue
rename to src/views/specialWorkSystem/workApplyManage/workApplyForm/components/blindPanelForm.vue
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/cutLineForm.vue b/src/views/specialWorkSystem/workApplyManage/workApplyForm/components/cutLineForm.vue
similarity index 100%
rename from src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/cutLineForm.vue
rename to src/views/specialWorkSystem/workApplyManage/workApplyForm/components/cutLineForm.vue
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/dirtWorkForm.vue b/src/views/specialWorkSystem/workApplyManage/workApplyForm/components/dirtWorkForm.vue
similarity index 100%
rename from src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/dirtWorkForm.vue
rename to src/views/specialWorkSystem/workApplyManage/workApplyForm/components/dirtWorkForm.vue
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/fireWorkForm.vue b/src/views/specialWorkSystem/workApplyManage/workApplyForm/components/fireWorkForm.vue
similarity index 100%
rename from src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/fireWorkForm.vue
rename to src/views/specialWorkSystem/workApplyManage/workApplyForm/components/fireWorkForm.vue
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/hangLoadForm.vue b/src/views/specialWorkSystem/workApplyManage/workApplyForm/components/hangLoadForm.vue
similarity index 100%
rename from src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/hangLoadForm.vue
rename to src/views/specialWorkSystem/workApplyManage/workApplyForm/components/hangLoadForm.vue
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/highWorkForm.vue b/src/views/specialWorkSystem/workApplyManage/workApplyForm/components/highWorkForm.vue
similarity index 100%
rename from src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/highWorkForm.vue
rename to src/views/specialWorkSystem/workApplyManage/workApplyForm/components/highWorkForm.vue
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/limitedSpaceForm.vue b/src/views/specialWorkSystem/workApplyManage/workApplyForm/components/limitedSpaceForm.vue
similarity index 100%
rename from src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/limitedSpaceForm.vue
rename to src/views/specialWorkSystem/workApplyManage/workApplyForm/components/limitedSpaceForm.vue
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/tempElectForm.vue b/src/views/specialWorkSystem/workApplyManage/workApplyForm/components/tempElectForm.vue
similarity index 100%
rename from src/views/specialWorkSystem/workApplyManagement/workApplyForm/components/tempElectForm.vue
rename to src/views/specialWorkSystem/workApplyManage/workApplyForm/components/tempElectForm.vue
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue b/src/views/specialWorkSystem/workApplyManage/workApplyForm/index.vue
similarity index 93%
rename from src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue
rename to src/views/specialWorkSystem/workApplyManage/workApplyForm/index.vue
index 272e899..466fa00 100644
--- a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue
+++ b/src/views/specialWorkSystem/workApplyManage/workApplyForm/index.vue
@@ -1,11 +1,11 @@
<template>
<div class="home-container">
- <el-scrollbar height="100%">
+ <div style="height: 100%">
<el-form :model="form" label-width="150px" :rules="applyRules" ref="ruleFormRef2">
- <blind-panel-form :bpForm="form.addForm" ref="additionalForm"></blind-panel-form>
+<!-- <blind-panel-form :bpForm="form.addForm" ref="additionalForm"></blind-panel-form>-->
<!-- <cut-line-form :clForm="form.addForm" ref="additionalForm"></cut-line-form>-->
<!-- <dirt-work-form :dwForm="form.addForm" ref="additionalForm"></dirt-work-form>-->
-<!-- <fire-work-form :fwForm="form.addForm" ref="additionalForm"></fire-work-form>-->
+ <fire-work-form :fwForm="form.addForm" ref="additionalForm"></fire-work-form>
<!-- <hang-load-form :hlForm="form.addForm" ref="additionalForm"></hang-load-form>-->
<!-- <high-work-form :hwForm="form.addForm" ref="additionalForm"></high-work-form>-->
<!-- <limited-space-form :lsForm="form.addForm" ref="additionalForm"></limited-space-form>-->
@@ -85,7 +85,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="作业负责人" prop="responsor">
<el-input
v-model="form.responsor"
@@ -98,7 +98,7 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="监护人" prop="monitor">
<el-input
v-model="form.monitor"
@@ -111,7 +111,7 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="监护人岗位" prop="monitorStation">
<el-input
v-model="form.monitorStation"
@@ -217,14 +217,12 @@
</el-row>
</div>
</div>
- <div class="applyBtn">
- <el-row>
- <el-col :span="24" class="submitBtn">
- <el-button type="primary" size="large" plain @click="handleApply(ruleFormRef2)">发起申请</el-button>
- </el-col>
- </el-row>
- </div>
</el-form>
+ <div class="applyBtn">
+ <el-col :span="24" class="submitBtn">
+ <el-button type="primary" size="large" plain @click="handleApply(ruleFormRef2)">发起申请</el-button>
+ </el-col>
+ </div>
<el-dialog v-model="dialogAddWorker" title="添加作业人">
<el-form :model="addWorkerForm" label-width="120px" :rules="addWorkerRules" ref='ruleFormRef3'>
<el-form-item label="作业人" prop="worker">
@@ -341,7 +339,7 @@
</el-form-item>
</el-form>
</el-dialog>
- </el-scrollbar>
+ </div>
</div>
</template>
@@ -370,20 +368,20 @@
export default defineComponent({
name: 'workApplyForm',
components: {
- fireWorkForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/fireWorkForm.vue')),
- limitedSpaceForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/limitedSpaceForm.vue')),
- hangLoadForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/hangLoadForm.vue')),
- dirtWorkForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/dirtWorkForm.vue')),
- cutLineForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/cutLineForm.vue')),
- highWorkForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/highWorkForm.vue')),
- tempElectForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/tempElectForm.vue')),
- blindPanelForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/components/blindPanelForm.vue'))
+ fireWorkForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/fireWorkForm.vue')),
+ limitedSpaceForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/limitedSpaceForm.vue')),
+ hangLoadForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/hangLoadForm.vue')),
+ dirtWorkForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/dirtWorkForm.vue')),
+ cutLineForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/cutLineForm.vue')),
+ highWorkForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/highWorkForm.vue')),
+ tempElectForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/tempElectForm.vue')),
+ blindPanelForm: defineAsyncComponent(()=> import('/@/views/specialWorkSystem/workApplyManage/workApplyForm/components/blindPanelForm.vue'))
},
setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
- homeOne:[{id:1,name:'基础数据权限管理系统'},{id:2,name:'双重预防系统'},{id:3,name:'系统2'},{id:4,name:'系统3'},{id:5,name:'系统4'}],
+ homeOne:[{id:1,name:'安全基础信息系统'},{id:2,name:'双重预防系统'},{id:3,name:'系统2'},{id:4,name:'系统3'},{id:5,name:'系统4'}],
});
const form = reactive({
addForm: {},
@@ -622,7 +620,6 @@
.home-container {
height: 100%;
overflow: hidden;
- padding: 20px;
position: relative;
.homeCard{
width: 100%;
diff --git a/src/views/specialWorkSystem/workBasicManagementSetting/certificateFilterSetting/index.vue b/src/views/specialWorkSystem/workBasicManage/certificateFilterSetting/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/workBasicManagementSetting/certificateFilterSetting/index.vue
rename to src/views/specialWorkSystem/workBasicManage/certificateFilterSetting/index.vue
diff --git a/src/views/specialWorkSystem/workBasicManagementSetting/personalProtectDevices/index.vue b/src/views/specialWorkSystem/workBasicManage/personalProtectDevices/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/workBasicManagementSetting/personalProtectDevices/index.vue
rename to src/views/specialWorkSystem/workBasicManage/personalProtectDevices/index.vue
diff --git a/src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue b/src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue
similarity index 91%
rename from src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue
rename to src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue
index ae00ade..27c6a17 100644
--- a/src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue
+++ b/src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="home-container">
- <el-scrollbar height="100%">
+ <div style="height: 100%">
<el-row class="homeCard">
<el-col :span="16">
<div class="grid-content topInfo">
@@ -15,7 +15,6 @@
<el-input v-model="searchWord" placeholder="输入检查内容"></el-input>
<el-button type="primary">查询</el-button>
<el-button plain>重置</el-button>
- <el-button plain :icon="Upload"></el-button>
</div>
</el-col>
</el-row>
@@ -33,6 +32,7 @@
ref="multipleTableRef"
:data="tableData"
style="width: 100%"
+ height="calc(100% - 100px)"
:header-cell-style="{background: '#fafafa'}"
@selection-change="handleSelectionChange"
>
@@ -54,22 +54,22 @@
</template>
</el-table-column>
</el-table>
- </div>
- <div class="pageBtn">
- <el-pagination
- v-model:currentPage="currentPage"
- v-model:page-size="pageSize"
- :page-sizes="[10, 15]"
- small=false
- background
- layout="total, sizes, prev, pager, next, jumper"
- :total="100"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ <div class="pageBtn">
+ <el-pagination
+ v-model:currentPage="currentPage"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 15]"
+ small=false
+ background
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="100"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
</div>
</div>
- </el-scrollbar>
+ </div>
<el-dialog v-model="dialogDetails" title="安全措施">
<el-form :model="details" label-width="120px">
<el-form-item label="作业类型">
@@ -338,14 +338,45 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: 100%;
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
overflow: hidden;
- padding: 20px;
.homeCard{
width: 100%;
padding: 20px;
+ box-sizing: border-box;
background: #fff;
border-radius: 4px;
+
+ .main-card{
+ width: 100%;
+ height: 100%;
+ .cardTop{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .mainCardBtn{
+ margin: 0;
+ }
+ }
+ .pageBtn{
+ height: 60px;
+ display: flex;
+ align-items: center;
+ justify-content: right;
+
+ .demo-pagination-block + .demo-pagination-block {
+ margin-top: 10px;
+ }
+ .demo-pagination-block .demonstration {
+ margin-bottom: 16px;
+ }
+ }
+ }
+ &:last-of-type{
+ height: calc(100% - 100px);
+ }
}
.el-row{
display: flex;
@@ -369,31 +400,6 @@
white-space: nowrap;
margin-right: 20px;
}
- }
- }
- .main-card{
- width: 100%;
- .cardTop{
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: 20px;
- .mainCardBtn{
- margin: 0;
- }
- }
- }
- .pageBtn{
- display: flex;
- align-items: center;
- justify-content: right;
- margin-top: 20px;
-
- .demo-pagination-block + .demo-pagination-block {
- margin-top: 10px;
- }
- .demo-pagination-block .demonstration {
- margin-bottom: 16px;
}
}
}
diff --git a/src/views/specialWorkSystem/workBasicManagementSetting/workTypeSetting/index.vue b/src/views/specialWorkSystem/workBasicManage/workTypeSetting/index.vue
similarity index 89%
rename from src/views/specialWorkSystem/workBasicManagementSetting/workTypeSetting/index.vue
rename to src/views/specialWorkSystem/workBasicManage/workTypeSetting/index.vue
index 7e9af1a..3224075 100644
--- a/src/views/specialWorkSystem/workBasicManagementSetting/workTypeSetting/index.vue
+++ b/src/views/specialWorkSystem/workBasicManage/workTypeSetting/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="home-container">
- <el-scrollbar height="100%">
+ <div style="height: 100%">
<el-row class="homeCard">
<el-col :span="16">
<div class="grid-content topInfo">
@@ -29,6 +29,7 @@
ref="multipleTableRef"
:data="tableData"
style="width: 100%"
+ height="calc(100% - 100px)"
:header-cell-style="{background: '#fafafa'}"
@selection-change="handleSelectionChange"
>
@@ -44,22 +45,22 @@
</template>
</el-table-column>
</el-table>
- </div>
- <div class="pageBtn">
- <el-pagination
- v-model:currentPage="currentPage"
- v-model:page-size="pageSize"
- :page-sizes="[10, 15]"
- small=false
- background
- layout="total, sizes, prev, pager, next, jumper"
- :total="100"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ <div class="pageBtn">
+ <el-pagination
+ v-model:currentPage="currentPage"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 15]"
+ small=false
+ background
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="100"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
</div>
</div>
- </el-scrollbar>
+ </div>
<el-dialog v-model="dialogDetails" title="作业工种">
<el-form :model="details" label-width="120px">
<el-form-item label="作业类型">
@@ -279,14 +280,45 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: 100%;
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
overflow: hidden;
- padding: 20px;
.homeCard{
width: 100%;
padding: 20px;
+ box-sizing: border-box;
background: #fff;
border-radius: 4px;
+
+ .main-card{
+ width: 100%;
+ height: 100%;
+ .cardTop{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .mainCardBtn{
+ margin: 0;
+ }
+ }
+ .pageBtn{
+ height: 60px;
+ display: flex;
+ align-items: center;
+ justify-content: right;
+
+ .demo-pagination-block + .demo-pagination-block {
+ margin-top: 10px;
+ }
+ .demo-pagination-block .demonstration {
+ margin-bottom: 16px;
+ }
+ }
+ }
+ &:last-of-type{
+ height: calc(100% - 100px);
+ }
}
.el-row{
display: flex;
@@ -310,37 +342,6 @@
white-space: nowrap;
margin-right: 20px;
}
- }
- }
- .mainPages{
- height: 100%;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- }
- .main-card{
- width: 100%;
- .cardTop{
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: 20px;
- .mainCardBtn{
- margin: 0;
- }
- }
- }
- .pageBtn{
- display: flex;
- align-items: center;
- justify-content: right;
- margin-top: 20px;
-
- .demo-pagination-block + .demo-pagination-block {
- margin-top: 10px;
- }
- .demo-pagination-block .demonstration {
- margin-bottom: 16px;
}
}
}
diff --git a/src/views/specialWorkSystem/workProcessManagement/gasCheckAnalyze/index.vue b/src/views/specialWorkSystem/workProcessManage/gasCheckAnalyze/index.vue
similarity index 97%
rename from src/views/specialWorkSystem/workProcessManagement/gasCheckAnalyze/index.vue
rename to src/views/specialWorkSystem/workProcessManage/gasCheckAnalyze/index.vue
index b019d19..14b6c74 100644
--- a/src/views/specialWorkSystem/workProcessManagement/gasCheckAnalyze/index.vue
+++ b/src/views/specialWorkSystem/workProcessManage/gasCheckAnalyze/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="home-container">
- <el-scrollbar height="100%">
+ <div height="100%">
<el-row class="homeCard">
<el-col :span="8">
<div class="grid-content topInfo">
@@ -15,7 +15,6 @@
<el-row class="cardTop">
<el-col :span="12" class="mainCardBtn">
<el-button type="primary" :icon="Plus" size="default">新建</el-button>
- <el-button type="warning" :icon="Edit" size="default" plain>修改</el-button>
<el-button type="danger" :icon="Delete" size="default" plain>删除</el-button>
</el-col>
<el-button type="primary" :icon="Refresh" size="default"/>
@@ -84,7 +83,7 @@
</el-form-item>
</el-form>
</el-dialog>
- </el-scrollbar>
+ </div>
</div>
</template>
diff --git a/src/views/specialWorkSystem/workProcessManagement/workCheckinRecord/index.vue b/src/views/specialWorkSystem/workProcessManage/workCheckRecord/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/workProcessManagement/workCheckinRecord/index.vue
rename to src/views/specialWorkSystem/workProcessManage/workCheckRecord/index.vue
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index b177040..7b5cd4b 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -91,7 +91,7 @@
roleList: [],
menuTableData: [],
projectList: [
- { id: '1', name: '基础数据权限管理系统', key: 0 },
+ { id: '1', name: '安全基础信息系统', key: 0 },
{ id: '2', name: '双重预防系统', key: 1 },
{ id: '3', name: '特殊作业系统', key: 2 },
{ id: '4', name: '智能巡检系统', key: 3 },
--
Gitblit v1.9.2