diff --git a/.drone.yml b/.drone.yml index 4e3e755..67245dc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ steps: - export NODE_MODULES_PATH=`pwd`/node_modules # - npm config set registry https://registry.npm.taobao.org - set NODE_OPTIONS=--openssl-legacy-provider -# - npm install + - npm install - npm run build - echo $NODE_MODULES_PATH - cp -r dist /app/build/$DRONE_REPO_NAME diff --git a/package.json b/package.json index 6ee804c..9d118c2 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,10 @@ "@element-plus/icons-vue": "^2.3.1", "autofit.js": "^3.0.4", "axios": "^1.4.0", + "csv-exportor": "^1.0.2", "echarts": "^5.4.2", "element-plus": "^2.3.5", + "element-resize-detector": "^1.2.4", "js-cookie": "^3.0.5", "nprogress": "^0.2.0", "pinia": "^2.0.35", diff --git a/src/assets/images/fanInfo/shrink.png b/src/assets/images/fanInfo/shrink.png new file mode 100644 index 0000000..7d653d9 Binary files /dev/null and b/src/assets/images/fanInfo/shrink.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 3bc876d..d43bdef 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -18,13 +18,15 @@ body { background-color: #f5f5f5; } -.allLoading.el-loading-mask.is-fullscreen{ - .el-loading-spinner{ - .circular{ + +.allLoading.el-loading-mask.is-fullscreen { + .el-loading-spinner { + .circular { width: 75px; height: 75px; } - .el-loading-text{ + + .el-loading-text { font-size: 26px; letter-spacing: 2px; } @@ -312,51 +314,30 @@ body, } } -//弹窗样式 -.digital-tunnel { - .chat-dialog { - display: flex; +.shrink-screen-dialog { + width: 2175px !important; + //width: 100% !important; + //height: 100% !important; + height: 1300px !important; + margin: 520px auto 0 auto !important; + background: rgba(6, 34, 71, 0.8) !important; +} - #container { - flex: 1; - height: 1200px; - //width: 1300px; - } +.alarm-tunnel { + .el-tag { + font-size: 36px; + height: 60px; + padding: 0 20px; + border-radius: 10px; + } - #containerFan { - flex: 1; - height: 1200px; - //width: 1300px; - } + .detail { + font-size: 50px; + color: #FFFFFF; - #containerBad { - flex: 1; - height: 1200px; - //width: 1300px; - } - - #containerWind { - flex: 1; - height: 1200px; - //width: 1300px; - } - - #containerWindDirection { - flex: 1; - height: 1160px; - //width: 1300px; - } - - #containerEle { - flex: 1; - height: 1010px; - //width: 2180px; - } - - #containerAir { - flex: 1; - height: 1150px; - //width: 2180px; + > div { + color: #f5f5f5; + margin-bottom: 10px; } } @@ -364,9 +345,9 @@ body, position: relative; display: flex; flex-direction: column; - height: 1300px; + height: 1400px; border: 2px solid #0f82af; - background: rgba(6, 34, 71, 0.78); + background: rgba(6, 34, 71, 0.8); border-radius: 20px; padding: 47px 30px; box-sizing: border-box; @@ -473,6 +454,212 @@ body, transform: rotate(180deg); } +} + +.shrink-icon { + margin: -36px -20px 0 30px; + cursor: pointer; + width: 65px; + height: 65px; + background-image: url("@/assets/images/fanInfo/shrink.png"); +} + +.full-icon { + cursor: pointer; + margin: -36px -20px 0 30px; +} + +//弹窗样式 +.digital-tunnel { + .chat-dialog { + display: flex; + + #container { + flex: 1; + height: 1200px; + //width: 1300px; + } + + #containerFan { + //width: 100%; + //height: 100%; + flex: 1; + //height: calc(100vh - 100px); + //height: 100vh; + height: 1200px; + //width: 1300px; + } + + #containerBad { + flex: 1; + height: 1200px; + //width: 1300px; + } + + #containerWind { + flex: 1; + height: 1200px; + //width: 1300px; + } + + #containerWindDirection { + flex: 1; + height: 1160px; + //width: 1300px; + } + + #containerEle { + flex: 1; + height: 1010px; + //width: 2180px; + } + + #containerAir { + flex: 1; + height: 1150px; + //width: 2180px; + } + } + + .el-dialog { + position: relative; + display: flex; + flex-direction: column; + width: 99.9%; + height: 99.9%; + //height: 1300px; + border: 2px solid #0f82af; + //background: rgba(6, 34, 71, 0.78); + background: rgba(6, 34, 71, 0.95); + border-radius: 20px; + padding: 47px 30px; + box-sizing: border-box; + //margin: 520px auto 0 auto; + margin: 0; + + .el-dialog__header { + padding: 0 0 28px 0; + //display: none; + .el-dialog__title { + font-size: 50px; + font-weight: bold; + color: #d6f1fa; + } + + .el-dialog__headerbtn { + right: 22px; + + .el-dialog__close { + color: #05feff; + font-size: 73px; + } + } + + } + + .el-dialog__body { + padding: 0; + } + } + + .left-top-icon { + position: absolute; + top: -3px; + left: -3px; + width: 41px; + height: 41px; + background-image: url(@/assets/images/badGasInfo/sp_jz.png); + } + + .right-top-icon { + position: absolute; + top: -3px; + right: -3px; + width: 41px; + height: 41px; + background-image: url(@/assets/images/badGasInfo/sp_jz.png); + transform: rotate(90deg); + } + + .export-btn { + cursor: pointer; + //padding-left: 53px; + width: 178px; + height: 92px; + line-height: 92px; + border-radius: 11px; + border: 2px solid #08B7B8; + background: #264A78; + //border-radius: 11px; + color: #FFFFFF; + font-size: 48px; + text-align: center; + margin-right: 30px; + } + + .change-screen { + position: absolute; + right: 126px; + top: 50px; + } + + .time-select { + position: absolute; + top: 20px; + right: 200px; + display: flex; + + .choose-day { + margin-right: 40px; + + .el-date-editor { + width: 370px; + height: 92px; + } + + .el-input__wrapper { + height: 92px; + background-color: transparent; + border-radius: 10px; + border: 2px solid #0F82AF; + box-shadow: none; + //padding: 18px 24px; + .el-input__prefix, .el-input__suffix { + .el-icon { + font-size: 40px; + color: #FFFFFF; + } + } + + .el-input__inner { + height: 80px; + font-size: 40px; + color: #FFFFFF; + } + } + } + } + + .left-bottom-icon { + position: absolute; + bottom: -3px; + left: -3px; + width: 41px; + height: 41px; + background-image: url(@/assets/images/badGasInfo/sp_jz.png); + transform: rotate(-90deg); + } + + .right-bottom-icon { + position: absolute; + bottom: -3px; + right: -3px; + width: 41px; + height: 41px; + background-image: url(@/assets/images/badGasInfo/sp_jz.png); + transform: rotate(180deg); + } + //用电量 .top-tag { position: absolute; diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue index 735d14a..b21f283 100644 --- a/src/components/content/airInfo/AirInfo.vue +++ b/src/components/content/airInfo/AirInfo.vue @@ -5,11 +5,11 @@