|
@@ -78,6 +78,17 @@
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
+ type="info"
|
|
|
+ plain
|
|
|
+ icon="el-icon-upload2"
|
|
|
+ size="mini"
|
|
|
+ @click="handleImport"
|
|
|
+ v-hasPermi="['system:user:import']"
|
|
|
+ >导入
|
|
|
+ </el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
type="warning"
|
|
|
plain
|
|
|
icon="el-icon-download"
|
|
@@ -103,6 +114,19 @@
|
|
|
<el-table-column label="经度" align="center" prop="longitude" />
|
|
|
<el-table-column label="纬度" align="center" prop="latitude" />
|
|
|
<el-table-column label="控制区域" align="center" prop="remark" />
|
|
|
+ <el-table-column label="行政区" align="center" prop="district" >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag :options="dict.type.district" :value="scope.row.district"/>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="队伍" align="center" prop="team" />
|
|
|
+ <el-table-column label="阀头形状" align="center" prop="valveHeadShape" />
|
|
|
+ <el-table-column label="阀井深度(米)" align="center" prop="valveWellDepth" />
|
|
|
+ <el-table-column label="井盖代别" align="center" prop="manholeCoverInstead" />
|
|
|
+ <el-table-column label="积水情况" align="center" prop="waterCondition" />
|
|
|
+ <el-table-column label="压力等级" align="center" prop="pressureRating" />
|
|
|
+ <el-table-column label="是否需要下井才能开关阀门" align="center" prop="isXyxjcnkg" />
|
|
|
+ <el-table-column label="备注" align="center" prop="remarks" />
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -123,6 +147,46 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
+ <!-- 用户导入对话框 -->
|
|
|
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
|
|
+ <el-upload
|
|
|
+ ref="upload"
|
|
|
+ :limit="1"
|
|
|
+ accept=".xlsx, .xls"
|
|
|
+ :headers="upload.headers"
|
|
|
+ :action="upload.url + '?updateSupport=' + upload.updateSupport"
|
|
|
+ :disabled="upload.isUploading"
|
|
|
+ :on-progress="handleFileUploadProgress"
|
|
|
+ :on-success="handleFileSuccess"
|
|
|
+ :auto-upload="false"
|
|
|
+ drag
|
|
|
+ >
|
|
|
+ <i class="el-icon-upload"></i>
|
|
|
+ <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
|
|
+ <div class="el-upload__tip text-center" slot="tip">
|
|
|
+ <!--<div class="el-upload__tip" slot="tip">-->
|
|
|
+ <!--<el-checkbox v-model="upload.updateSupport"/>-->
|
|
|
+ <!--是否更新已经存在的用户数据-->
|
|
|
+ <!--</div>-->
|
|
|
+ <span>仅允许导入xls、xlsx格式文件。</span>
|
|
|
+ <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
|
|
|
+ @click="importTemplate"
|
|
|
+ >下载模板
|
|
|
+ </el-link>
|
|
|
+ </div>
|
|
|
+ </el-upload>
|
|
|
+ <div style="padding-top: 15px;line-height: 25px;font-size: 14px;">
|
|
|
+ 完成度:{{ bfb }}%
|
|
|
+ <progress max="100" :value="bfb" style="width: 200px;height: 18px;"></progress>
|
|
|
+ <br>
|
|
|
+ 导入结果:{{ jdtMsg }}
|
|
|
+ </div>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" @click="submitFileForm">确 定</el-button>
|
|
|
+ <el-button @click="upload.open = false;bfb='0';jdtMsg=''">取 消</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
<pagination
|
|
|
v-show="total>0"
|
|
|
:total="total"
|
|
@@ -132,8 +196,8 @@
|
|
|
/>
|
|
|
|
|
|
<!-- 添加或修改阀井位置对话框 -->
|
|
|
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
+ <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body>
|
|
|
+ <el-form ref="form" :model="form" :rules="rules" label-width="180px" :inline="true">
|
|
|
<el-form-item label="阀井名称" prop="valveWellName">
|
|
|
<el-input v-model="form.valveWellName" placeholder="请输入阀井名称" />
|
|
|
</el-form-item>
|
|
@@ -147,7 +211,48 @@
|
|
|
<el-input v-model="form.latitude" placeholder="请输入纬度" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="控制区域" prop="remark">
|
|
|
- <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
|
|
+ <el-input v-model="form.remark" placeholder="请输入内容" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="行政区" prop="district">
|
|
|
+ <el-select v-model="form.district" placeholder="请选择行政区" style="width: 100%">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.district"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="队伍" prop="team">
|
|
|
+ <el-select v-model="form.team" clearable placeholder="请选择队伍">
|
|
|
+ <el-option
|
|
|
+ v-for="item in postOptions"
|
|
|
+ :key="item.postName"
|
|
|
+ :label="item.postName"
|
|
|
+ :value="item.postName"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="阀头形状" prop="valveHeadShape">
|
|
|
+ <el-input v-model="form.valveHeadShape" placeholder="请输入内容" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="阀井深度(米)" prop="valveWellDepth">
|
|
|
+ <el-input v-model="form.valveWellDepth" placeholder="请输入内容" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="井盖代别" prop="manholeCoverInstead">
|
|
|
+ <el-input v-model="form.manholeCoverInstead" placeholder="请输入内容" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="积水情况" prop="waterCondition">
|
|
|
+ <el-input v-model="form.waterCondition" placeholder="请输入内容" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="压力等级" prop="pressureRating">
|
|
|
+ <el-input v-model="form.pressureRating" placeholder="请输入内容" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="是否需要下井才能开关阀门" prop="isXyxjcnkg">
|
|
|
+ <el-input v-model="form.isXyxjcnkg" placeholder="请输入内容" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="备注" prop="remarks">
|
|
|
+ <el-input v-model="form.remarks" placeholder="请输入内容" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -160,17 +265,27 @@
|
|
|
|
|
|
<script>
|
|
|
import { listValveWellPosition, getValveWellPosition, delValveWellPosition, addValveWellPosition, updateValveWellPosition } from "@/api/gas/valveWellPosition";
|
|
|
+import {listPostAll} from "@/api/system/post";
|
|
|
+import {getToken} from "@/utils/auth";
|
|
|
+import {clearFlushProgress, clearFlushProgressA, flushProgress, flushProgressA} from "@/api/gas/area";
|
|
|
|
|
|
export default {
|
|
|
name: "ValveWellPosition",
|
|
|
+ dicts: ['district'],
|
|
|
data() {
|
|
|
return {
|
|
|
+ //进度条
|
|
|
+ timeInterval: null,
|
|
|
+ bfb: '0',
|
|
|
+ jdtMsg: '',
|
|
|
// 按钮loading
|
|
|
buttonLoading: false,
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
// 导出遮罩层
|
|
|
exportLoading: false,
|
|
|
+ // 岗位选项
|
|
|
+ postOptions: [],
|
|
|
// 选中数组
|
|
|
ids: [],
|
|
|
// 非单个禁用
|
|
@@ -198,6 +313,21 @@ export default {
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
+ // 用户导入参数
|
|
|
+ upload: {
|
|
|
+ // 是否显示弹出层(用户导入)
|
|
|
+ open: false,
|
|
|
+ // 弹出层标题(用户导入)
|
|
|
+ title: '',
|
|
|
+ // 是否禁用上传
|
|
|
+ isUploading: false,
|
|
|
+ // 是否更新已经存在的用户数据
|
|
|
+ updateSupport: 0,
|
|
|
+ // 设置上传的请求头部
|
|
|
+ headers: { Authorization: 'Bearer ' + getToken() },
|
|
|
+ // 上传的地址
|
|
|
+ url: process.env.VUE_APP_BASE_API + '/gas/valveWellPosition/importData'
|
|
|
+ },
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
id: [
|
|
@@ -219,9 +349,54 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
+ this.getPostList();
|
|
|
this.getList();
|
|
|
},
|
|
|
methods: {
|
|
|
+ /** 下载模板操作 */
|
|
|
+ importTemplate() {
|
|
|
+ this.$download.excel('/gas/valveWellPosition/importTemplate')
|
|
|
+ },
|
|
|
+ // 提交上传文件
|
|
|
+ submitFileForm() {
|
|
|
+ const ther = this
|
|
|
+ this.timeInterval = setInterval(function() {
|
|
|
+ ther.flushProgress()
|
|
|
+ }, 1500)
|
|
|
+ this.$refs.upload.submit()
|
|
|
+ },
|
|
|
+ // 提交上传文件
|
|
|
+ flushProgress() {
|
|
|
+ flushProgressA().then(response => {
|
|
|
+ this.bfb = parseInt(response.data.bfb) >= 100 ? 100 : response.data.bfb
|
|
|
+ this.jdtMsg = response.data.message
|
|
|
+ if (response.data.message != null && response.data.message != '') {
|
|
|
+ clearFlushProgressA().then(response => {
|
|
|
+ })
|
|
|
+ clearInterval(this.timeInterval)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 文件上传中处理
|
|
|
+ handleFileUploadProgress(event, file, fileList) {
|
|
|
+ this.upload.isUploading = true
|
|
|
+ },
|
|
|
+ // 文件上传成功处理
|
|
|
+ handleFileSuccess(response, file, fileList) {
|
|
|
+ this.upload.isUploading = false
|
|
|
+ this.$refs.upload.clearFiles()
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
+ /** 导入按钮操作 */
|
|
|
+ handleImport() {
|
|
|
+ this.upload.title = '导入'
|
|
|
+ this.upload.open = true
|
|
|
+ },
|
|
|
+ getPostList(){
|
|
|
+ listPostAll({remark:'ranks'}).then(response => {
|
|
|
+ this.postOptions = response.data;
|
|
|
+ });
|
|
|
+ },
|
|
|
/** 查询阀井位置列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|