From 6466a7edc86dc195af0cd87251f7e9ca477c233f Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期一, 15 八月 2022 19:42:43 +0800
Subject: [PATCH] Default Changelist
---
src/views/safeKnowledge/sfjs/index.vue | 2
src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/reportTypeSetting/index.vue | 2
src/views/system/personShiftManage/scheduleManage/schedule/index.vue | 2
src/views/intellectInspect/intelligentLine/index.vue | 100 ++++++++++++++----------
src/views/specialWorkSystem/afterWorkManage/workTicketRecord/index.vue | 2
src/views/system/personShiftManage/scheduleManage/strategy/index.vue | 2
src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/linkSetting/index.vue | 2
src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue | 2
src/views/riskWarningSys/accidentLevel/index.vue | 2
src/views/specialWorkSystem/workBasicManage/personalProtectDevices/index.vue | 2
src/layout/navBars/breadcrumb/index.vue | 2
src/views/safeKnowledge/inner/index.vue | 2
src/views/loginPage/loginPage.vue | 30 ++++++-
src/views/specialWorkSystem/workApplyManage/myApply/index.vue | 2
src/views/riskWarningSys/educationAndTraining/index.vue | 2
src/views/specialWorkSystem/approveProcessManage/approveProcessList/index.vue | 2
src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue | 2
src/views/system/personShiftManage/personTimeManage/durationManage/index.vue | 2
src/views/intellectInspect/inspectIndex/index.vue | 2
src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue | 2
src/views/specialWorkSystem/workBasicManage/workTypeSetting/index.vue | 2
src/views/specialWorkSystem/workApplyManage/myJobApply/index.vue | 2
src/layout/navBars/breadcrumb/user.vue | 8 +-
src/views/safeKnowledge/df/index.vue | 2
src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue | 2
src/views/specialWorkSystem/afterWorkManage/workTicketCheck/index.vue | 2
src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/approveTypeSetting/index.vue | 2
src/views/system/personShiftManage/personTimeManage/timeStrategy/index.vue | 2
src/views/system/personShiftManage/personTimeManage/workingHoursSet/index.vue | 2
src/views/safeKnowledge/bmgz/index.vue | 2
src/views/riskWarningSys/emergencyDrills/index.vue | 2
src/views/specialWorkSystem/workBasicManage/certificateFilterSetting/index.vue | 2
.env.development | 7 +
src/layout/component/header.vue | 2
src/views/safeKnowledge/law/index.vue | 2
src/views/system/personShiftManage/arrangeManage/index.vue | 2
src/views/safeKnowledge/index.vue | 2
src/api/intelligentLine/index.ts | 9 ++
src/views/intellectInspect/inspectTaskManage/inspectTask/components/index.vue | 2
src/views/system/personShiftManage/personTimeManage/holidayTime/index.vue | 2
src/views/safeKnowledge/xzfg/index.vue | 2
src/views/specialWorkSystem/approveProcessManage/examineTemplate/index.vue | 2
src/views/system/personShiftManage/personArrange/index.vue | 2
src/views/system/personShiftManage/personTimeManage/holidayTimeGroup/index.vue | 2
src/views/riskWarningSys/riskLevel/index.vue | 2
src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue | 2
src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue | 2
src/views/safeKnowledge/internationalRules/index.vue | 2
48 files changed, 144 insertions(+), 96 deletions(-)
diff --git a/.env.development b/.env.development
index 3d7bbdc..e10b42b 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
# 本地环境
ENV = 'development'
-#VITE_API_URL = 'http://192.168.0.35:8008'
+VITE_API_URL = 'http://192.168.0.35:8008'
#李宇飞接口地址
#VITE_API_URL = 'http://192.168.0.29:8008'
@@ -10,7 +10,7 @@
#VITE_API_URL = 'http://192.168.0.179:8008'
#施正红接口地址
-VITE_API_URL = 'http://192.168.0.69:8008'
+#VITE_API_URL = 'http://192.168.0.69:8008'
#戚会山接口地址
#VITE_API_URL = 'http://192.168.0.52:8011/safeplatform'
@@ -24,3 +24,6 @@
#VITE_API_URL_OUT = 'http://121.239.169.27:16006/safeplatform-out'
#线上正式环境外包接口地址
+
+VITE_API_URL_SOCKET = 'http://192.168.0.29:8018'
+#黄振websocket接口地址
\ No newline at end of file
diff --git a/src/api/intelligentLine/index.ts b/src/api/intelligentLine/index.ts
index 1adb2cc..9c11ce2 100644
--- a/src/api/intelligentLine/index.ts
+++ b/src/api/intelligentLine/index.ts
@@ -10,5 +10,14 @@
data: data
});
},
+
+ // 获取Url
+ getUrl: () => {
+ // debugger
+ return request({
+ url: import.meta.env.VITE_API_URL_SOCKET + `/ws/namesrv/get/one`,
+ method: 'get'
+ });
+ }
};
}
diff --git a/src/layout/component/header.vue b/src/layout/component/header.vue
index 21c9e2d..75a9410 100644
--- a/src/layout/component/header.vue
+++ b/src/layout/component/header.vue
@@ -23,7 +23,7 @@
const setHeaderHeight = computed(() => {
let { isTagsview, layout } = themeConfig.value;
if (isTagsview && layout !== 'classic') return '84px';
- else return '50px';
+ else return '80px';
});
return {
setHeaderHeight,
diff --git a/src/layout/navBars/breadcrumb/index.vue b/src/layout/navBars/breadcrumb/index.vue
index 2810718..9ebcb7a 100644
--- a/src/layout/navBars/breadcrumb/index.vue
+++ b/src/layout/navBars/breadcrumb/index.vue
@@ -110,7 +110,7 @@
<style scoped lang="scss">
.layout-navbars-breadcrumb-index {
- height: 50px;
+ height: 80px;
display: flex;
align-items: center;
background: var(--next-bg-topBar);
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 22dcd98..beea3ff 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -2,7 +2,7 @@
<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
<div class="logo">
<img src="../../../assets/menu/companyLogo.png" />
- <span style="font-size: 22px; color: #409eff; font-weight: bolder; border-left: 2px solid #409eff; padding-left: 10px">{{ systemName }}</span>
+ <span style="font-size: 32px; color: #409eff; font-weight: bolder; border-left: 2px solid #409eff; padding-left: 10px">{{ systemName }}</span>
</div>
<div style="display: flex; align-items: center; padding-right: 5px">
<div @click="backToMenu()" class="backBtn">返回首页</div>
@@ -294,7 +294,7 @@
justify-content: space-between;
.logo {
- height: 50px;
+ height: 75%;
padding: 5px 10px;
display: flex;
align-items: center;
@@ -319,8 +319,8 @@
padding: 0 10px;
cursor: pointer;
color: var(--next-bg-topBarColor);
- height: 50px;
- line-height: 50px;
+ height: 80px;
+ line-height: 80px;
display: flex;
align-items: center;
&:hover {
diff --git a/src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue b/src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue
index 75ed2ae..e065d90 100644
--- a/src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue
+++ b/src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue
@@ -432,7 +432,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/intellectInspect/inspectIndex/index.vue b/src/views/intellectInspect/inspectIndex/index.vue
index f75adae..f80486c 100644
--- a/src/views/intellectInspect/inspectIndex/index.vue
+++ b/src/views/intellectInspect/inspectIndex/index.vue
@@ -165,7 +165,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue b/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
index 9b406f7..76c08c3 100644
--- a/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
+++ b/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
@@ -409,7 +409,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue b/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
index 008e90c..36292ce 100644
--- a/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
+++ b/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
@@ -339,7 +339,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/index.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/index.vue
index ab5a8a5..03c6499 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/index.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/index.vue
@@ -692,7 +692,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
index 3de28ea..2f8c470 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
@@ -613,7 +613,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
index b8603f1..e1f2ed4 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
@@ -435,7 +435,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index f9e56f3..542b1d6 100644
--- a/src/views/intellectInspect/intelligentLine/index.vue
+++ b/src/views/intellectInspect/intelligentLine/index.vue
@@ -10,11 +10,12 @@
<div>全屏</div>
</div>
<div class="backBtn" @click="goBack()">
- <img src="../../../assets/loginPage/back-icon.png" />
+ <img src="../../../assets/loginPage/back-icon.png"/>
<div>退出</div>
</div>
</div>
<div class="blocks">
+ <div>
<div class="star-pic">
<div class="star-bg"><img src="../../../assets/loginPage/star-bg.png" /></div>
<div class="star"><img src="../../../assets/loginPage/device-pic.png" /></div>
@@ -76,6 +77,7 @@
</div>
</div>
<div class="tip" v-else>抱歉，暂时查询不到巡检路线...</div>
+ </div>
</div>
</div>
</template>
@@ -113,7 +115,7 @@
const state = reactive<stateType>({
present: '',
isScreenfull: false,
- path: 'http://192.168.0.29:8008/ws/test/',
+ path: '',
socketData: '',
socket: null,
data: [],
@@ -126,46 +128,57 @@
}, 1000);
let curId = route.query.id
state.id = curId.toString()
- console.log(state.id)
getLine(state.id)
- init(state.id);
+ getUrl(state.id)
});
const dataList = computed(() => {
return userInfos.value.dataList;
});
- // socket获取数据
- const init = (id:string) => {
- if (typeof window.WebSocket === 'undefined') {
- alert('您的浏览器不支持socket');
- } else {
- // 实例化socket
- let uid = userInfos.value.uid.toString()
- var url = state.path + uid + '*' + id;
- console.log(url,'url')
- url = url.replace('https', 'ws').replace('http', 'ws');
- console.log(url, '获取地址');
- state.socket = new window.WebSocket(url);
- // 监听socket连接
- state.socket.onopen = () => {
- console.log('socket连接成功');
- };
- // 监听socket错误信息
- state.socket.onerror = () => {
- console.log('socket连接错误');
- };
- // 监听socket消息
- state.socket.onmessage = (msg) => {
- if (msg.data === '连接成功') return;
- userInfos.value.dataList = JSON.parse(msg.data);
- };
- }
- };
+ // 获取url
- const send = () => {
- state.socket.send(params);
- };
+ const getUrl =async (id:string)=>{
+ const res = await lineApi().getUrl();
+ if (res.data.code === '200') {
+ state.path = 'http://' + res.data.data.ip + ':' + res.data.data.port + '/ws/test/'
+ if (typeof window.WebSocket === 'undefined') {
+ alert('您的浏览器不支持socket');
+ } else {
+ // 实例化socket
+ // debugger
+ let uid = userInfos.value.uid.toString()
+ var url = state.path + uid + '*' + id;
+ console.log(url,'url',uid,'uid')
+ url = url.replace('https', 'ws').replace('http', 'ws');
+ console.log(url, '获取地址');
+ state.socket = new window.WebSocket(url);
+ // 监听socket连接
+ state.socket.onopen = () => {
+ console.log('socket连接成功');
+ };
+ // 监听socket错误信息
+ state.socket.onerror = () => {
+ console.log('socket连接错误');
+ };
+ // 监听socket消息
+ state.socket.onmessage = (msg) => {
+ if (msg.data === '连接成功') return;
+ console.log(msg.data,'data')
+ userInfos.value.dataList = JSON.parse(msg.data);
+ };
+ }
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ }
+
+ // const send = () => {
+ // state.socket.send(params);
+ // };
// 接口获取数据
const getLine = async (id:string) => {
@@ -472,14 +485,19 @@
.blocks {
width: 100%;
height: calc(100% - 90px);
- padding: 20px 40px 30px;
+ padding: 10px 40px 35px;
box-sizing: border-box;
- display: flex;
- justify-content: center;
- align-items: flex-start;
- overflow: hidden;
- overflow-x: auto;
- overflow-y: auto;
+
+ &>div{
+ width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: flex-start;
+ overflow: hidden;
+ overflow-x: auto;
+ overflow-y: auto;
+ }
.line-map {
display: flex;
diff --git a/src/views/loginPage/loginPage.vue b/src/views/loginPage/loginPage.vue
index b1a6932..fab7b59 100644
--- a/src/views/loginPage/loginPage.vue
+++ b/src/views/loginPage/loginPage.vue
@@ -78,6 +78,30 @@
</script>
<style scoped lang="scss">
+ @media screen and (min-width: 1200px){
+ .loginContent{
+ display: flex;
+ justify-content: space-around;
+ padding: 0 200px;
+ }
+ .loginContL {
+ font-size: 60px;
+ font-weight: bold;
+ margin-bottom: 100px;
+ }
+ }
+ @media screen and (min-width: 960px) and (max-width: 1200px){
+ .loginContent{
+ display: flex;
+ justify-content: space-between;
+ padding: 0 40px;
+ }
+ .loginContL {
+ font-size: 40px;
+ font-weight: bold;
+ margin-bottom: 80px;
+ }
+ }
.login-container {
width: 100%;
height: 100%;
@@ -113,18 +137,12 @@
}
.loginContent {
width: 100%;
- padding: 0 200px;
- display: flex;
flex-wrap: wrap;
align-items: center;
- justify-content: space-around;
margin-bottom: 60px;
.loginContL {
width: 100%;
- font-size: 60px;
- font-weight: bold;
- margin-bottom: 100px;
.apTitleT {
color: #fff;
diff --git a/src/views/riskWarningSys/accidentLevel/index.vue b/src/views/riskWarningSys/accidentLevel/index.vue
index 0fecae2..749e011 100644
--- a/src/views/riskWarningSys/accidentLevel/index.vue
+++ b/src/views/riskWarningSys/accidentLevel/index.vue
@@ -331,7 +331,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/riskWarningSys/educationAndTraining/index.vue b/src/views/riskWarningSys/educationAndTraining/index.vue
index 54ddaf0..8ddea74 100644
--- a/src/views/riskWarningSys/educationAndTraining/index.vue
+++ b/src/views/riskWarningSys/educationAndTraining/index.vue
@@ -267,7 +267,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/riskWarningSys/emergencyDrills/index.vue b/src/views/riskWarningSys/emergencyDrills/index.vue
index d3e372d..b7548a3 100644
--- a/src/views/riskWarningSys/emergencyDrills/index.vue
+++ b/src/views/riskWarningSys/emergencyDrills/index.vue
@@ -266,7 +266,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/riskWarningSys/riskLevel/index.vue b/src/views/riskWarningSys/riskLevel/index.vue
index a9f8673..a24b9f7 100644
--- a/src/views/riskWarningSys/riskLevel/index.vue
+++ b/src/views/riskWarningSys/riskLevel/index.vue
@@ -264,7 +264,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/safeKnowledge/bmgz/index.vue b/src/views/safeKnowledge/bmgz/index.vue
index f74c241..be13f8a 100644
--- a/src/views/safeKnowledge/bmgz/index.vue
+++ b/src/views/safeKnowledge/bmgz/index.vue
@@ -27,7 +27,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss">
.home-container{
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/safeKnowledge/df/index.vue b/src/views/safeKnowledge/df/index.vue
index 38e4824..1434ecb 100644
--- a/src/views/safeKnowledge/df/index.vue
+++ b/src/views/safeKnowledge/df/index.vue
@@ -27,7 +27,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss">
.home-container{
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/safeKnowledge/index.vue b/src/views/safeKnowledge/index.vue
index f2bc7ff..1823bc4 100644
--- a/src/views/safeKnowledge/index.vue
+++ b/src/views/safeKnowledge/index.vue
@@ -27,7 +27,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss">
.home-container{
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/safeKnowledge/inner/index.vue b/src/views/safeKnowledge/inner/index.vue
index 97b9588..0ebea9a 100644
--- a/src/views/safeKnowledge/inner/index.vue
+++ b/src/views/safeKnowledge/inner/index.vue
@@ -27,7 +27,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss">
.home-container{
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/safeKnowledge/internationalRules/index.vue b/src/views/safeKnowledge/internationalRules/index.vue
index 2c88f1e..7a96ebe 100644
--- a/src/views/safeKnowledge/internationalRules/index.vue
+++ b/src/views/safeKnowledge/internationalRules/index.vue
@@ -27,7 +27,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss">
.home-container{
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/safeKnowledge/law/index.vue b/src/views/safeKnowledge/law/index.vue
index 8f4fa8f..a3ebad6 100644
--- a/src/views/safeKnowledge/law/index.vue
+++ b/src/views/safeKnowledge/law/index.vue
@@ -27,7 +27,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss">
.home-container{
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/safeKnowledge/sfjs/index.vue b/src/views/safeKnowledge/sfjs/index.vue
index 3682dcc..84ad0a5 100644
--- a/src/views/safeKnowledge/sfjs/index.vue
+++ b/src/views/safeKnowledge/sfjs/index.vue
@@ -27,7 +27,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss">
.home-container{
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/safeKnowledge/xzfg/index.vue b/src/views/safeKnowledge/xzfg/index.vue
index a50d44c..97d134f 100644
--- a/src/views/safeKnowledge/xzfg/index.vue
+++ b/src/views/safeKnowledge/xzfg/index.vue
@@ -27,7 +27,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss">
.home-container{
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/specialWorkSystem/afterWorkManage/workTicketCheck/index.vue b/src/views/specialWorkSystem/afterWorkManage/workTicketCheck/index.vue
index 59447c5..3026179 100644
--- a/src/views/specialWorkSystem/afterWorkManage/workTicketCheck/index.vue
+++ b/src/views/specialWorkSystem/afterWorkManage/workTicketCheck/index.vue
@@ -294,7 +294,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard{
diff --git a/src/views/specialWorkSystem/afterWorkManage/workTicketRecord/index.vue b/src/views/specialWorkSystem/afterWorkManage/workTicketRecord/index.vue
index aa99570..34de123 100644
--- a/src/views/specialWorkSystem/afterWorkManage/workTicketRecord/index.vue
+++ b/src/views/specialWorkSystem/afterWorkManage/workTicketRecord/index.vue
@@ -242,7 +242,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard{
diff --git a/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/approveTypeSetting/index.vue b/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/approveTypeSetting/index.vue
index 2a146f7..9c81495 100644
--- a/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/approveTypeSetting/index.vue
+++ b/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/approveTypeSetting/index.vue
@@ -259,7 +259,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard{
diff --git a/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/linkSetting/index.vue b/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/linkSetting/index.vue
index 242b17e..3dc4b96 100644
--- a/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/linkSetting/index.vue
+++ b/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/linkSetting/index.vue
@@ -265,7 +265,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/reportTypeSetting/index.vue b/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/reportTypeSetting/index.vue
index 6eb9979..0c0edee 100644
--- a/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/reportTypeSetting/index.vue
+++ b/src/views/specialWorkSystem/approveProcessManage/approveLinkSettings/reportTypeSetting/index.vue
@@ -232,7 +232,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
diff --git a/src/views/specialWorkSystem/approveProcessManage/approveProcessList/index.vue b/src/views/specialWorkSystem/approveProcessManage/approveProcessList/index.vue
index ecc00ac..d548c7c 100644
--- a/src/views/specialWorkSystem/approveProcessManage/approveProcessList/index.vue
+++ b/src/views/specialWorkSystem/approveProcessManage/approveProcessList/index.vue
@@ -332,7 +332,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard{
diff --git a/src/views/specialWorkSystem/approveProcessManage/examineTemplate/index.vue b/src/views/specialWorkSystem/approveProcessManage/examineTemplate/index.vue
index 1591de7..2360714 100644
--- a/src/views/specialWorkSystem/approveProcessManage/examineTemplate/index.vue
+++ b/src/views/specialWorkSystem/approveProcessManage/examineTemplate/index.vue
@@ -299,7 +299,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/specialWorkSystem/workApplyManage/myApply/index.vue b/src/views/specialWorkSystem/workApplyManage/myApply/index.vue
index 44f571a..390f236 100644
--- a/src/views/specialWorkSystem/workApplyManage/myApply/index.vue
+++ b/src/views/specialWorkSystem/workApplyManage/myApply/index.vue
@@ -282,7 +282,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.demo-tabs{
diff --git a/src/views/specialWorkSystem/workApplyManage/myJobApply/index.vue b/src/views/specialWorkSystem/workApplyManage/myJobApply/index.vue
index 44f571a..390f236 100644
--- a/src/views/specialWorkSystem/workApplyManage/myJobApply/index.vue
+++ b/src/views/specialWorkSystem/workApplyManage/myJobApply/index.vue
@@ -282,7 +282,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.demo-tabs{
diff --git a/src/views/specialWorkSystem/workBasicManage/certificateFilterSetting/index.vue b/src/views/specialWorkSystem/workBasicManage/certificateFilterSetting/index.vue
index 91a85f7..5506079 100644
--- a/src/views/specialWorkSystem/workBasicManage/certificateFilterSetting/index.vue
+++ b/src/views/specialWorkSystem/workBasicManage/certificateFilterSetting/index.vue
@@ -229,7 +229,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard{
diff --git a/src/views/specialWorkSystem/workBasicManage/personalProtectDevices/index.vue b/src/views/specialWorkSystem/workBasicManage/personalProtectDevices/index.vue
index f5eba70..f8bd4c3 100644
--- a/src/views/specialWorkSystem/workBasicManage/personalProtectDevices/index.vue
+++ b/src/views/specialWorkSystem/workBasicManage/personalProtectDevices/index.vue
@@ -209,7 +209,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard{
diff --git a/src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue b/src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue
index 27c6a17..4964f20 100644
--- a/src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue
+++ b/src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue
@@ -338,7 +338,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard{
diff --git a/src/views/specialWorkSystem/workBasicManage/workTypeSetting/index.vue b/src/views/specialWorkSystem/workBasicManage/workTypeSetting/index.vue
index 3224075..6d97c46 100644
--- a/src/views/specialWorkSystem/workBasicManage/workTypeSetting/index.vue
+++ b/src/views/specialWorkSystem/workBasicManage/workTypeSetting/index.vue
@@ -280,7 +280,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard{
diff --git a/src/views/system/personShiftManage/arrangeManage/index.vue b/src/views/system/personShiftManage/arrangeManage/index.vue
index 4d5b471..e723428 100644
--- a/src/views/system/personShiftManage/arrangeManage/index.vue
+++ b/src/views/system/personShiftManage/arrangeManage/index.vue
@@ -413,7 +413,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard{
diff --git a/src/views/system/personShiftManage/personArrange/index.vue b/src/views/system/personShiftManage/personArrange/index.vue
index 9ed7d58..47d2c51 100644
--- a/src/views/system/personShiftManage/personArrange/index.vue
+++ b/src/views/system/personShiftManage/personArrange/index.vue
@@ -272,7 +272,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard{
diff --git a/src/views/system/personShiftManage/personTimeManage/durationManage/index.vue b/src/views/system/personShiftManage/personTimeManage/durationManage/index.vue
index eb9e387..2be202a 100644
--- a/src/views/system/personShiftManage/personTimeManage/durationManage/index.vue
+++ b/src/views/system/personShiftManage/personTimeManage/durationManage/index.vue
@@ -484,7 +484,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/system/personShiftManage/personTimeManage/holidayTime/index.vue b/src/views/system/personShiftManage/personTimeManage/holidayTime/index.vue
index 64702cf..64387a5 100644
--- a/src/views/system/personShiftManage/personTimeManage/holidayTime/index.vue
+++ b/src/views/system/personShiftManage/personTimeManage/holidayTime/index.vue
@@ -585,7 +585,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/system/personShiftManage/personTimeManage/holidayTimeGroup/index.vue b/src/views/system/personShiftManage/personTimeManage/holidayTimeGroup/index.vue
index 43195dc..6f7c35b 100644
--- a/src/views/system/personShiftManage/personTimeManage/holidayTimeGroup/index.vue
+++ b/src/views/system/personShiftManage/personTimeManage/holidayTimeGroup/index.vue
@@ -483,7 +483,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/system/personShiftManage/personTimeManage/timeStrategy/index.vue b/src/views/system/personShiftManage/personTimeManage/timeStrategy/index.vue
index c789039..809fdcb 100644
--- a/src/views/system/personShiftManage/personTimeManage/timeStrategy/index.vue
+++ b/src/views/system/personShiftManage/personTimeManage/timeStrategy/index.vue
@@ -510,7 +510,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/system/personShiftManage/personTimeManage/workingHoursSet/index.vue b/src/views/system/personShiftManage/personTimeManage/workingHoursSet/index.vue
index d9e62c5..5083c09 100644
--- a/src/views/system/personShiftManage/personTimeManage/workingHoursSet/index.vue
+++ b/src/views/system/personShiftManage/personTimeManage/workingHoursSet/index.vue
@@ -486,7 +486,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/system/personShiftManage/scheduleManage/schedule/index.vue b/src/views/system/personShiftManage/scheduleManage/schedule/index.vue
index 0d693ed..71f7d52 100644
--- a/src/views/system/personShiftManage/scheduleManage/schedule/index.vue
+++ b/src/views/system/personShiftManage/scheduleManage/schedule/index.vue
@@ -499,7 +499,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
diff --git a/src/views/system/personShiftManage/scheduleManage/strategy/index.vue b/src/views/system/personShiftManage/scheduleManage/strategy/index.vue
index 95e396f..c7b209c 100644
--- a/src/views/system/personShiftManage/scheduleManage/strategy/index.vue
+++ b/src/views/system/personShiftManage/scheduleManage/strategy/index.vue
@@ -596,7 +596,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
--
Gitblit v1.9.2