From d33eacc1f85ac3a736b33ba4713a19aae466d711 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 05 八月 2022 16:42:53 +0800
Subject: [PATCH] 1.做适应平板显示的内容大小
---
src/views/jcsz/zzjg.vue | 6
src/views/zzmx/chda.vue | 22 ++-
src/views/scgl/scdd.vue | 15 +-
src/views/xtsy/index.vue | 41 ++++--
src/views/zlgl/gxjy.vue | 41 ++++++
src/views/jcsz/wldw.vue | 6
src/views/scgl/gd.vue | 16 +-
src/views/zzmx/gylx.vue | 15 +-
src/styles/global.css | 5
src/views/login/index.vue | 2
src/views/sbgl/sbqd.vue | 5
src/views/scgl/sckbg.vue | 14 +
src/views/zlgl/gxjyxm.vue | 7
src/views/jcsz/yhqd.vue | 15 +-
src/views/zzmx/jpgj.vue | 24 ++-
src/views/zlgl/qxdy.vue | 7
src/views/jcsz/jsqd.vue | 37 +++--
src/views/wlgl/ckdy.vue | 6
src/layout/components/Sidebar/index.vue | 12 +-
src/views/zzmx/gxdy.vue | 33 +++--
src/views/wlgl/kwdy.vue | 5
src/views/zlgl/gxjybz.vue | 13 +
22 files changed, 229 insertions(+), 118 deletions(-)
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index f8dfb86..a30d465 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -84,19 +84,19 @@
<style lang="scss">
$main_color: #42b983;
-.layoutLogo{
+.layoutLogo {
position: absolute;
top: 5px;
- z-index:10;
+ z-index: 10;
left: 5px;
width: 200px;
height: 90px;
- background:url("../../../assets/images/layout_logo.png") no-repeat;
+ background: url("../../../assets/images/layout_logo.png") no-repeat;
}
-.scrollbarWrapperClass{
- margin-top:90px;
- height: 85%;
+.scrollbarWrapperClass {
+ margin-top: 90px;
+ height: calc(85% - 45px) !important;
}
.el-button--text, .el-button--text.is-disabled, .el-button--text.is-disabled:focus, .el-button--text.is-disabled:hover, .el-button--text:active {
diff --git a/src/styles/global.css b/src/styles/global.css
index 3ddbd99..71fb220 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -6,6 +6,11 @@
/*min-width: 1800px;*/
/*overflow-y: hidden;*/
/*overflow-x: hidden;*/
+
+ -moz-osx-font-smoothing: grayscale;
+ -webkit-font-smoothing: antialiased;
+ text-rendering: optimizeLegibility;
+ font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index dec57fa..206278f 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -56,7 +56,7 @@
border
stripe
:height="tableHeight+'px'"
- :style="{width: 100+'%',height:tableHeight+'px'}"
+ :style="{width: 100+'%',height: tableHeight+'px'}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -134,6 +134,7 @@
<el-table-column
label="鎿嶄綔"
fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -287,10 +288,10 @@
<el-dialog
title="瑙掕壊鍏宠仈鐢ㄦ埛"
:visible.sync="userDialogVisible"
- width="1500px"
+ width="900px"
:close-on-click-modal="false"
top="15vh"
- :fullscreen="isFullscreen"
+ :fullscreen="isIpad"
class="userDialogVisible"
@closed="handleCloseUser"
@close="handleCloseUser"
@@ -305,10 +306,16 @@
<div style="display: flex;min-height: 50px">
<el-form ref="dialogFormUser" inline :model="dialogFormUser" label-width="80px">
<el-form-item label="鐢ㄦ埛缂栫爜">
- <el-input v-model="dialogFormUser.usercode" style="width: 200px" />
+ <el-input
+ v-model="dialogFormUser.usercode"
+ :style="{width:isIpad? '180px':'200px'}"
+ />
</el-form-item>
<el-form-item label="鐢ㄦ埛鍚嶇О">
- <el-input v-model="dialogFormUser.username" style="width: 200px" />
+ <el-input
+ v-model="dialogFormUser.username"
+ :style="{width:isIpad? '180px':'200px'}"
+ />
</el-form-item>
<el-form-item label="鎵�灞炵粍缁�">
<el-cascader
@@ -319,7 +326,7 @@
:append-to-body="false"
:options="StuOrgArr"
:props="defaultProps"
- style="width: 200px;"
+ :style="{width:isIpad? '180px':'200px'}"
@change="dialogCascaderChange"
/>
@@ -330,7 +337,7 @@
v-model="dialogFormUser.isrole"
filterable
:popper-append-to-body="false"
- style="width: 200px"
+ :style="{width:isIpad? '180px':'200px'}"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -362,7 +369,7 @@
:data="dialogFormUserTable"
border
highlight-current-row
- height="300"
+ height="370"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
:row-key="getRowKey"
@@ -433,7 +440,7 @@
:visible.sync="dialogVisibleRight"
width="800px"
top="15vh"
- :fullscreen="isFullscreen"
+ :fullscreen="isIpad"
:close-on-click-modal="false"
class="dialogVisibleRight"
@closed="handleCloseRight"
@@ -544,7 +551,7 @@
}
}
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -813,11 +820,13 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- console.log(window.innerHeight)
- console.log(window.innerHeight)
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 50
+ }
+
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
},
/* 璁剧疆妯″潡*/
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index d7961cd..2a88eb3 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -155,6 +155,7 @@
<el-table-column
label="鎿嶄綔"
fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -522,7 +523,10 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
},
// 瀵煎叆鎸夐挳
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index db4f7be..573a413 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -195,6 +195,7 @@
<el-table-column
label="鎿嶄綔"
fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -318,8 +319,8 @@
title="鍏宠仈瑙掕壊"
:visible.sync="dialogVisibleRoles"
width="800px"
- top="15vh"
- :fullscreen="isFullscreen"
+ :top="isIpad?'3vh':'15vh'"
+ :fullscreen="isIpad"
:close-on-click-modal="false"
class="dialogVisibleRoles"
@closed="handleCloseRoles"
@@ -550,7 +551,7 @@
}
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -845,15 +846,13 @@
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
- console.log(window.innerHeight)
- console.log(window.innerWidth)
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
- if (window.innerHeight < 800) {
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 50
}
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
},
// 鍏宠仈瑙掕壊鐐瑰嚮浜嬩欢
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index c222506..9bca1ca 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -116,6 +116,7 @@
<el-table-column
fixed="right"
label="鎿嶄綔"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -445,7 +446,10 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
}
}
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index be161d6..a136698 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -103,7 +103,7 @@
<el-button
:loading="loading"
type="primary"
- style="width:100%;margin-top:20px;"
+ style="width:100%;margin-top:20px;letter-spacing: 10px"
@click.native.prevent="handleLogin"
>鐧诲綍
</el-button>
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 0f01076..78e86d7 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -203,7 +203,7 @@
<el-table-column
label="鎿嶄綔"
fixed="right"
- width="100"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -853,9 +853,6 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- if (window.innerHeight < 800) {
- this.tableHeight = this.tableHeight - 50
- }
})
},
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index b2a5755..29cf57b 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -76,12 +76,12 @@
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
- <!-- <div v-if="!isFullscreen" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
+ <!-- <div v-if="!isIpad" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
<!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
<!-- <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>-->
<!-- <el-button type="primary" icon="el-icon-switch-button">璁㈠崟鍏抽棴</el-button>-->
<!-- </div>-->
- <!-- <div v-if="isFullscreen" style="display: flex;flex-direction: column;align-items: end">-->
+ <!-- <div v-if="isIpad" style="display: flex;flex-direction: column;align-items: end">-->
<!-- <div style="display: flex;margin: 10px 0">-->
<!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
<!-- <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>-->
@@ -230,7 +230,7 @@
/>
<el-table-column
label="鎿嶄綔"
- width="120"
+ width="140"
fixed="right"
>
<template slot-scope="{row}">
@@ -732,7 +732,7 @@
}
}
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
username: '',
@@ -1187,10 +1187,10 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
- if (this.isFullscreen) {
- this.tableHeight = this.tableHeight - 50
+ this.tableHeight = this.mainHeight - 110
+ this.isIpad = window.innerHeight < 769
+ if (this.isIpad) {
+ this.tableHeight = this.tableHeight - 30
}
})
},
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index f04d867..81ffb93 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -84,7 +84,7 @@
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
- <!-- <div v-if="!isFullscreen" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
+ <!-- <div v-if="!isIpad" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- icon="el-icon-refresh-right"-->
@@ -98,7 +98,7 @@
<!-- >鍏抽棴璁㈠崟-->
<!-- </el-button>-->
<!-- </div>-->
- <!-- <div v-if="isFullscreen" style="display: flex;flex-direction: column;align-items: end">-->
+ <!-- <div v-if="isIpad" style="display: flex;flex-direction: column;align-items: end">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- icon="el-icon-refresh-right"-->
@@ -249,6 +249,7 @@
<el-table-column
label="鎿嶄綔"
fixed="right"
+ width="80"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -388,7 +389,7 @@
}
}
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -680,10 +681,10 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
- if (this.isFullscreen) {
- this.tableHeight = this.tableHeight - 50
+ this.tableHeight = this.mainHeight - 110
+ this.isIpad = window.innerHeight < 769
+ if (this.isIpad) {
+ this.tableHeight = this.tableHeight - 30
}
})
}
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 9810c13..db79de5 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -30,7 +30,7 @@
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight+'px'"
+ :height="isIpad? (tableHeight+50):tableHeight"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
@@ -192,7 +192,7 @@
<div class="elTableDiv">
<el-table
:data="WXtableData"
- :height="tableHeight+'px'"
+ :height="isIpad? (tableHeight+50):tableHeight"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
@@ -320,7 +320,7 @@
<el-dialog
:title="dialogTitle"
:visible.sync="dialogVisible"
- width="800"
+ width="850px"
class="dialogVisible"
:top="dialogTitle==='鑷埗鎶ュ伐'?'5vh':'15vh'"
:close-on-click-modal="false"
@@ -661,6 +661,7 @@
title="棰勮"
:visible.sync="dialogVisible2"
width="1140"
+ :close-on-click-modal="false"
@close="dialogVisible2Close"
>
<!-- 瑕佹墦鍗扮殑鍖哄煙 -->
@@ -769,6 +770,7 @@
return {
mainHeight: 0,
tableHeight: 0,
+ isIpad: false,
// produceCode: '', // 宸ュ簭鐮�
// WXproduceCode: '', // 澶栧崗宸ュ簭鐮�
radioSelected: '', // 宸ュ簭閫変腑
@@ -1503,7 +1505,11 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 80
+ this.tableHeight = this.mainHeight - 50
+ this.isIpad = window.innerHeight < 769
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
}
}
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index d689952..8a52d41 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -90,6 +90,7 @@
/>
<el-table-column
label="鎿嶄綔"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -357,7 +358,10 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
}
}
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index 243167b..33deba8 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -105,6 +105,7 @@
/>
<el-table-column
label="鎿嶄綔"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -372,8 +373,8 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- if (window.innerHeight < 800) {
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 50
}
})
diff --git a/src/views/xtsy/index.vue b/src/views/xtsy/index.vue
index 506d056..684729f 100644
--- a/src/views/xtsy/index.vue
+++ b/src/views/xtsy/index.vue
@@ -81,19 +81,23 @@
<div class="center">
<div class="title" style="margin-top: 20px"><i class="el-icon-s-fold" style="margin-right: 5px" />鐢ㄦ埛姒傚喌</div>
<div class="center_content">
- <div class="content">
+ <div class="content" :style="{height: isIpad?'300px':'400px'}">
<div class="content_title">娲昏穬鏃舵</div>
<div>
- <div style="width: 100%;height: 300px;margin: 20px 0 0 10px">
- <div id="line01" style="width: 100%;height:100%" />
- </div>
+ <div
+ id="line01"
+ style="width: 100%;"
+ :style="{height:isIpad?'200px':'300px'}"
+ />
</div>
</div>
- <div class="content">
+ <div class="content" :style="{height: isIpad?'300px':'400px'}">
<div class="content_title">Top鐢ㄦ埛</div>
- <div style="width: 100%;height: 300px;margin: 20px 0 0 10px">
- <div id="bar01" style="width: 100%;height:100%" />
- </div>
+ <div
+ id="bar01"
+ style="width: 100%;"
+ :style="{height:isIpad?'200px':'300px'}"
+ />
</div>
</div>
</div>
@@ -108,23 +112,24 @@
name: 'Index',
data() {
return {
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
barTopColor01: ['42,197,137', '187,236,218'],
barTopColor02: ['248,216,76', '255,250,238'],
barTopColor03: ['42,197,137', '187,236,218'],
barTopColor04: ['232,103,103', '253,240,240']
-
}
},
created() {
- console.log(document.documentElement.clientHeight, 1)
- console.log(document.documentElement.clientWidth, 2)
+
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
- this.handleEcharts()
+ setTimeout(() => {
+ this.handleEcharts()
+ }, 10)
},
methods: {
// 鑾峰彇椤甸潰楂樺害
@@ -133,6 +138,9 @@
this.mainHeight = window.innerHeight - 120
// this.mainHeight = window.innerHeight - 200
// this.tableHeight = this.mainHeight - 100
+
+ // this.isIpad = this.mainHeight <= 768
+ this.isIpad = window.innerHeight < 769
})
},
handleEcharts() {
@@ -168,6 +176,12 @@
loadEcharts('bar01', bar01(data))
},
async getLine01() {
+ // if (this.isIpad) {
+ // document.getElementById('line01').style.height = '200px'
+ // } else {
+ // document.getElementById('line01').style.height = '300px'
+ // }
+ // console.log(document.getElementById('line01'))
const data2 = [
{ key: '2', value: 0 },
{ key: '4', value: 0.2 },
@@ -258,7 +272,8 @@
.content {
width: 49%;
- height: 400px;
+ //height: 400px;
+
background-color: #fff;
border-radius: 5px;
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index 1012919..70b27a2 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -15,7 +15,7 @@
/>
</div>
<!-- 鍏」淇℃伅 -->
- <div style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
+ <div v-if="!isIpad" style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
<div style="display: flex;">
<div style="display: flex;margin-right: 50px">
<div style="width: 90px">宸ュ崟缂栫爜锛�</div>
@@ -39,14 +39,46 @@
<div style=" display: flex;margin-left: 30px;">
<div style="display: flex;margin-right: 50px">
<div style="width: 90px">宸ュ簭缂栫爜锛�</div>
- <div>{{ form.stepcode }}</div>
+ <div style="width: 100px">{{ form.stepcode }}</div>
</div>
<div style="display: flex;">
<div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
- <div>{{ form.stepname }}</div>
+ <div style="width: 100px">{{ form.stepname }}</div>
</div>
</div>
</div>
+ <div v-if="isIpad" style="display:flex;margin-top: 10px;align-items: center;line-height: 30px; flex-direction: column">
+ <div style="display: flex; justify-content: flex-start;width: 100%">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.wo_code }}</div>
+ </div>
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">浜у搧缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.partcode }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧鍚嶇О锛�</div>
+ <div style="width: 200px">{{ form.partname }}</div>
+ </div>
+ </div>
+
+ <div style=" display: flex; justify-content: flex-start;margin-top: 10px;width: 100%">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">浜у搧瑙勬牸锛�</div>
+ <div style="width: 200px">{{ form.partspec }}</div>
+ </div>
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.stepcode }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
+ <div style="width: 200px">{{ form.stepname }}</div>
+ </div>
+ </div>
+ </div>
+
<div style="margin: 15px 0;font-size: 14px">
<i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
</div>
@@ -266,6 +298,7 @@
// },
data() {
return {
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: { // 宸ュ簭
@@ -585,6 +618,8 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+
+ this.isIpad = window.innerHeight < 769
})
}
}
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 5118d2b..9b90356 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -29,7 +29,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
@@ -107,8 +107,8 @@
<el-dialog
:title="operation==='add'?'鏂板':(operation==='edit'?'缂栬緫':'鏌ョ湅')"
:visible.sync="dialogVisible"
- width="800"
- top="15vh"
+ width="800px"
+ :top="isIpad?'5vh':'15vh'"
:close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
@@ -279,6 +279,7 @@
}
}
return {
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -460,7 +461,11 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.tableHeight = this.mainHeight - 50
+ this.isIpad = window.innerHeight < 769
+ // if (window.innerHeight < 769) {
+ // this.tableHeight = this.tableHeight - 50
+ // }
})
},
// 鑾峰彇妫�楠岄」鐩笅鎷夊垪琛�
diff --git a/src/views/zlgl/gxjyxm.vue b/src/views/zlgl/gxjyxm.vue
index 798e448..4c5e13b 100644
--- a/src/views/zlgl/gxjyxm.vue
+++ b/src/views/zlgl/gxjyxm.vue
@@ -29,7 +29,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
@@ -297,7 +297,10 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.tableHeight = this.mainHeight - 50
+ // if (window.innerHeight < 769) {
+ // this.tableHeight = this.tableHeight - 50
+ // }
})
}
}
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 0f6a717..7b5ca66 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -30,7 +30,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
@@ -297,7 +297,10 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.tableHeight = this.mainHeight - 50
+ // if (window.innerHeight < 769) {
+ // this.tableHeight = this.tableHeight - 50
+ // }
})
}
}
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index b144adf..ce61cde 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -204,6 +204,7 @@
<el-table-column
label="鎿嶄綔"
fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -463,7 +464,7 @@
:visible.sync="dialogVisibleRoute"
width="800px"
top="15vh"
- :fullscreen="isFullscreen"
+ :fullscreen="isIpad"
class="dialogVisibleRoute"
@closed="handleCloseRoute"
@close="handleCloseRoute"
@@ -520,11 +521,11 @@
<div style="margin-bottom: 10px">
<i class="el-icon-s-operation" style="color:#42b983;" /> 宸ュ簭鍒楄〃
</div>
- <div style="height: 400px;overflow-y: scroll">
+ <div style="overflow-y: scroll">
<el-table
:data="projectTableData"
border
- height="300"
+ height="280"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -598,7 +599,7 @@
}
}
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -643,9 +644,9 @@
materialname: [
{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉�', trigger: ['blur', 'change'] }
],
- materialspec: [
- { required: true, message: '璇疯緭鍏ョ墿鏂欒鏍�', trigger: ['blur', 'change'] }
- ],
+ // materialspec: [//鐗╂枡瑙勬牸鏆傛椂鏀逛负闈炲繀濉�
+ // { required: true, message: '璇疯緭鍏ョ墿鏂欒鏍�', trigger: ['blur', 'change'] }
+ // ],
uomcode: [
{ required: true, message: '璇烽�夋嫨浣跨敤鍗曚綅', trigger: ['blur', 'change'] }
],
@@ -865,6 +866,7 @@
this.dialogForm.minstockqty = row.maxqty
this.dialogForm.maxstockqty = row.minqty
})
+ await this.getuomSelect()
},
// 鍒犻櫎鎸夐挳
async del(row) {
@@ -937,11 +939,11 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
- if (window.innerHeight < 800) {
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 50
}
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
},
/* 鐐瑰嚮鍏宠仈宸ヨ壓璺嚎妯″潡*/
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index 7ab483b..33fb664 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -147,7 +147,12 @@
<template slot-scope="{row}">
<div class="operationClass">
<i v-if="row.is_eqp==='Y'" class="el-icon-share" @click="workClick(row)" />
- <i v-if="row.is_eqp==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="workClick(row)" />
+ <i
+ v-if="row.is_eqp==='N'"
+ class="el-icon-share"
+ style="color: rgb(180 ,181, 185)"
+ @click="workClick(row)"
+ />
</div>
</template>
</el-table-column>
@@ -159,13 +164,19 @@
<template slot-scope="{row}">
<div class="operationClass">
<i v-if="row.is_defect==='Y'" class="el-icon-share" @click="defectClick(row)" />
- <i v-if="row.is_defect==='N'" class="el-icon-share" style="color:rgb(180 ,181, 185);" @click="defectClick(row)" />
+ <i
+ v-if="row.is_defect==='N'"
+ class="el-icon-share"
+ style="color:rgb(180 ,181, 185);"
+ @click="defectClick(row)"
+ />
</div>
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -267,8 +278,7 @@
title="鍏宠仈宸ヤ綔绔�"
:visible.sync="workDialogVisible"
width="50%"
- top="15vh"
- :fullscreen="isFullscreen"
+ :top="isIpad?'5vh': '15vh'"
:close-on-click-modal="false"
class="workDialogVisible"
@closed="workHandleClose"
@@ -315,7 +325,7 @@
:data="workDialogForm.workTreeArr"
show-checkbox
node-key="code"
- style="height: 300px;"
+ style="height: 280px;"
default-expand-all
:props="workTreeDefaultProps"
@check="checkBoxClick"
@@ -336,8 +346,7 @@
title="宸ュ簭鍏宠仈缂洪櫡"
:visible.sync="defectDialogVisible"
width="50%"
- top="15vh"
- :fullscreen="isFullscreen"
+ :top="isIpad?'5vh':'15vh'"
:close-on-click-modal="false"
class="defectDialogVisible"
@closed="defectHandleClose"
@@ -358,7 +367,7 @@
:data="defectTree"
show-checkbox
node-key="code"
- style="height: 500px;"
+ style="height: 400px;"
default-expand-all
:props="workTreeDefaultProps"
/>
@@ -408,7 +417,7 @@
}
}
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -601,11 +610,11 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
- if (window.innerHeight < 800) {
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 50
}
+ this.isIpad = window.innerHeight < 769
})
},
/* 鍏宠仈宸ヤ綔绔欐ā鍧�*/
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 30c979c..7c61802 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -94,6 +94,7 @@
/>
<el-table-column
label="鎿嶄綔"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -121,10 +122,9 @@
<el-dialog
:title="operation==='add'?'鏂板':'棰勮'"
:visible.sync="dialogVisible"
- width="1200px"
+ width="1000px"
:close-on-click-modal="false"
- top="15vh"
- :fullscreen="isFullscreen"
+ :top="isIpad?'5vh':'15vh'"
@closed="handleClose"
@close="handleClose"
>
@@ -280,7 +280,7 @@
}
}
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -657,8 +657,11 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 50
+ }
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
}
}
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index e971ff8..ae07edf 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -144,7 +144,7 @@
prop="route_name"
label="宸ヨ壓璺嚎"
sortable="custom"
- min-width="110"
+ min-width="120"
/>
<el-table-column
prop="stepname"
@@ -186,6 +186,7 @@
<el-table-column
label="鎿嶄綔"
fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -212,9 +213,8 @@
<el-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="1200px"
- top="15vh"
- :fullscreen="isFullscreen"
+ width="1000px"
+ :top="isIpad?'5vh':'15vh'"
:close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
@@ -299,7 +299,8 @@
<el-table
:data="eqpDialogArr"
- height="400"
+ :height="tableHeight"
+ :style="{width: 100+'%',height:tableHeight-50+'px',}"
border
stripe
highlight-current-row
@@ -414,12 +415,13 @@
:page.sync="eqpTable.page"
:limit.sync="eqpTable.rows"
align="right"
- style="padding-top: 20px"
+ style="padding-top: 20px;"
layout="prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getEqpTable"
/>
</div>
+ <div v-if="eqpTableLength===0" style="width: 100px;height: 84px;" />
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -469,7 +471,7 @@
}
}
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -800,6 +802,7 @@
this.dialogForm.stand_value = ''
this.dialogForm.cavity_qty = ''
this.dialogForm.unprice = ''
+ this.eqpTableLength = 0
this.routeDialogArr = []
this.stepDialogArr = []
this.eqpDialogArr = []
@@ -836,8 +839,11 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 50
+ }
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
}
}
--
Gitblit v1.9.3