Commit 8f3aeeb7 authored by xinzhedeai's avatar xinzhedeai

add:环境监测-历史数据;巷道表面位移-历史数据;选择日期导出功能添加

parent 700509ec
......@@ -51,8 +51,14 @@
icon="el-icon-setting"
@click="resetTable"
>重置</el-button>
<el-button
type="goon"
icon="el-icon-download"
@click="exportDialogVisible=true"
>导出</el-button>
</el-form-item>
</el-form>
<el-table :data="dmList"
height="535"
border
......@@ -78,6 +84,19 @@
</div>
<!-- 日期选择弹窗 -->
<el-dialog title="选择导出日期" :visible.sync="exportDialogVisible" width="30%">
<el-date-picker
v-model="exportDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
></el-date-picker>
<span slot="footer">
<el-button @click="exportDialogVisible = false">取消</el-button>
<el-button type="primary" @click="handleExport">确定</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -91,6 +110,9 @@ export default {
dicts: ['microseismequipment'],
data() {
return {
exportDialogVisible: false,
exportDate: "",
// 总条数
total: 0,
dmList: [],
......@@ -110,6 +132,22 @@ export default {
this.searchEqu();
},
methods: {
/** 导出按钮操作 */
handleExport() {
if (!this.exportDate) {
this.$message.warning('请选择日期')
return
}
this.download(
"business/tun/data/exportData",
{
day: this.exportDate,
...this.queryParams,
},
`xdData_${new Date().getTime()}.xlsx`
);
this.exportDialogVisible = false
},
searchEqu() {
var param ={
pageNum:1,
......
......@@ -126,7 +126,7 @@
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
@click="exportDialogVisible=true"
v-hasPermi="['business:szData:export']"
>导出</el-button>
</el-col>
......@@ -230,6 +230,19 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 日期选择弹窗 -->
<el-dialog title="选择导出日期" :visible.sync="exportDialogVisible" width="30%">
<el-date-picker
v-model="exportDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
></el-date-picker>
<span slot="footer">
<el-button @click="exportDialogVisible = false">取消</el-button>
<el-button type="primary" @click="handleExport">确定</el-button>
</span>
</el-dialog>
</div>
</div>
</template>
......@@ -241,6 +254,9 @@
name: "SzData",
data() {
return {
exportDialogVisible: false,
exportDate: "",
// 根路径
baseURL: process.env.VUE_APP_BASE_API,
// 遮罩层
......@@ -410,9 +426,19 @@
},
/** 导出按钮操作 */
handleExport() {
this.download('business/szData/export', {
...this.queryParams
}, `szData_${new Date().getTime()}.xlsx`)
if (!this.exportDate) {
this.$message.warning('请选择日期')
return
}
this.download(
"business/szData/exportData",
{
day: this.exportDate,
...this.queryParams,
},
`szData_${new Date().getTime()}.xlsx`
);
this.exportDialogVisible = false
}
}
};
......
......@@ -35,9 +35,9 @@ module.exports = {
proxy: {
[process.env.VUE_APP_BASE_API]: {
target: `http://192.168.113.100:8001/lswz`, // 青海线上内网
// target: `http://192.168.113.100:8001/lswz`, // 青海线上内网
// target: `http://192.168.0.103:8085/lswz`, // 线上内网
// target: `http://192.168.2.18:8085/lswz`, // 毕广建
target: `http://192.168.2.18:8085/lswz`, // 毕广建
// target: `http://192.168.3.188:8085/lswz`,
//target: `http://192.168.3.37:8085/lswz`,
// target: `http://10.50.70.100:8085/lswz`,
......
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