Commit 1398be55 authored by xinzhedeai's avatar xinzhedeai

导出-模态框同步调整、列表和模态框布局优化处理

parent 5c143c92
# 页面标题 # 页面标题
VUE_APP_TITLE = 青海多金属矿山井下监测项目 VUE_APP_TITLE = 青海多金属矿山井下监测系统
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
# 青海多金属矿山井下监测项目 # 青海多金属矿山井下监测系统
# /开发环境 # /开发环境
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
# VUE_APP_BASE_API = '/prod-api' # VUE_APP_BASE_API = '/prod-api'
......
# 页面标题 # 页面标题
VUE_APP_TITLE = 青海多金属矿山井下监测项目 VUE_APP_TITLE = 青海多金属矿山井下监测系统
# 生产环境配置 # 生产环境配置
......
# 页面标题 # 页面标题
VUE_APP_TITLE = 青海多金属矿山井下监测项目 VUE_APP_TITLE = 青海多金属矿山井下监测系统
NODE_ENV = production NODE_ENV = production
......
# 青海多金属矿山井下监测项目 # 青海多金属矿山井下监测系统
#### Description #### Description
......
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
}, },
data() { data() {
return { return {
title: "青海多金属矿山井下监测项目", title: "青海多金属矿山井下监测系统",
}; };
}, },
}; };
......
...@@ -433,7 +433,7 @@ Highcharts3D(Highcharts); ...@@ -433,7 +433,7 @@ Highcharts3D(Highcharts);
export default { export default {
data() { data() {
return { return {
screenTitle: "青海多金属矿山井下监测项目", screenTitle: "青海多金属矿山井下监测系统",
nowDate: "2023-01-01", nowDate: "2023-01-01",
nowTime: "23:59:59", nowTime: "23:59:59",
jxlEquipno: 19, jxlEquipno: 19,
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
v-loading="loading" v-loading="loading"
:data="drybeachequipinforList" :data="drybeachequipinforList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
height="535" height="550"
border border
header-cell-style="background-color: #08267d; color: #96dcdf;border:1px solid #409EFF;" header-cell-style="background-color: #08267d; color: #96dcdf;border:1px solid #409EFF;"
> >
...@@ -127,11 +127,10 @@ ...@@ -127,11 +127,10 @@
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
prop="createTime"
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createtime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -460,14 +459,23 @@ ...@@ -460,14 +459,23 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="库水位设备编号" prop=""> <el-form-item label="库水位设备编号" prop="">
<el-input <el-input
v-model="form.kswequipno" v-model="form.kswequipno"
placeholder="请输入干滩所属库水位的设备编号" placeholder="请输入干滩所属库水位的设备编号"
/> />
</el-form-item> </el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="所属尾矿库编码" prop="">
<el-input
v-model="form.tailingid"
placeholder="请输入所属尾矿库编码"
/>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="干滩安全超高" prop=""> <el-form-item label="干滩安全超高" prop="">
<el-input <el-input
...@@ -560,7 +568,7 @@ ...@@ -560,7 +568,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设备在用状态" prop=""> <el-form-item label="设备在用状态" prop="">
<el-select <el-select
v-model="form.isUse" v-model="form.isUsed"
placeholder="请选择设备在用状态" placeholder="请选择设备在用状态"
> >
<el-option label="在用" :value="1"></el-option> <el-option label="在用" :value="1"></el-option>
...@@ -624,7 +632,7 @@ ...@@ -624,7 +632,7 @@
</el-col> </el-col>
</el-row> --> </el-row> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer modalBtn">
<el-button class="savebtn" @click="submitForm">确 定</el-button> <el-button class="savebtn" @click="submitForm">确 定</el-button>
<!-- <el-button @click="cancel">取 消</el-button> --> <!-- <el-button @click="cancel">取 消</el-button> -->
</div> </div>
...@@ -1179,9 +1187,9 @@ export default { ...@@ -1179,9 +1187,9 @@ export default {
</script> </script>
<style rel="stylesheet/scss" lang="scss" scope> <style rel="stylesheet/scss" lang="scss" scope>
::v-deep .el-dialog__footer { .modalBtn{
padding-bottom: 50px; height: 58px;
// padding-right: 50px; margin-top: -20px;
} }
.app-container { .app-container {
display: flex; display: flex;
...@@ -1345,4 +1353,7 @@ export default { ...@@ -1345,4 +1353,7 @@ export default {
.el-table--border { .el-table--border {
border: 1px solid #00dff1 !important; border: 1px solid #00dff1 !important;
} }
</style> </style>
\ No newline at end of file
<template> <template>
<div class="login" :style="'background-image:url(' + Background + ');'"> <div class="login" :style="'background-image:url(' + Background + ');'">
<div class="headder"> <div class="headder">
<h2>青海多金属矿山井下监测项目</h2> <h2>青海多金属矿山井下监测系统</h2>
</div> </div>
<div class="logo-place"> <div class="logo-place">
<div class="logo-title">登录窗口</div> <div class="logo-title">登录窗口</div>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
:rules="registerRules" :rules="registerRules"
class="register-form" class="register-form"
> >
<h3 class="title">青海多金属矿山井下监测项目</h3> <h3 class="title">青海多金属矿山井下监测系统</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
v-model="registerForm.username" v-model="registerForm.username"
......
...@@ -7,7 +7,7 @@ function resolve(dir) { ...@@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin') const CompressionPlugin = require('compression-webpack-plugin')
const name = '青海多金属矿山井下监测项目' // 网页标题 const name = '青海多金属矿山井下监测系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 8080 // 端口 const port = process.env.port || process.env.npm_config_port || 8080 // 端口
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment