|
@@ -3,19 +3,19 @@
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
<el-form-item label="桩点编号" prop="holeNum">
|
|
|
<el-input
|
|
|
- v-model="queryParams.holeNum"
|
|
|
- placeholder="请输入桩点编号"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
+ v-model="queryParams.holeNum"
|
|
|
+ placeholder="请输入桩点编号"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="施工状态" prop="consStatus">
|
|
|
<el-select v-model="queryParams.consStatus" placeholder="请选择施工状态" clearable>
|
|
|
<el-option
|
|
|
- v-for="dict in dict.type.pile_hole_status"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
+ v-for="dict in dict.type.pile_hole_status"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
@@ -28,58 +28,49 @@
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="primary"
|
|
|
- plain
|
|
|
- icon="el-icon-plus"
|
|
|
- size="mini"
|
|
|
- @click="handleAdd"
|
|
|
- v-hasPermi="['cons:pileHoleInfo:add']"
|
|
|
- >新增</el-button>
|
|
|
- </el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- plain
|
|
|
- icon="el-icon-edit"
|
|
|
- size="mini"
|
|
|
- :disabled="single"
|
|
|
- @click="handleUpdate"
|
|
|
- v-hasPermi="['cons:pileHoleInfo:edit']"
|
|
|
- >修改</el-button>
|
|
|
+ type="info"
|
|
|
+ plain
|
|
|
+ icon="el-icon-upload2"
|
|
|
+ size="mini"
|
|
|
+ @click="handleImport"
|
|
|
+ v-hasPermi="['cons:pileHoleInfo:add']"
|
|
|
+ >{{ $t("common.import") }}
|
|
|
+ </el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="danger"
|
|
|
- plain
|
|
|
- icon="el-icon-delete"
|
|
|
- size="mini"
|
|
|
- :disabled="multiple"
|
|
|
- @click="handleDelete"
|
|
|
- v-hasPermi="['cons:pileHoleInfo:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ type="primary"
|
|
|
+ plain
|
|
|
+ icon="el-icon-plus"
|
|
|
+ size="mini"
|
|
|
+ @click="handleAdd"
|
|
|
+ v-hasPermi="['cons:pileHoleInfo:add']"
|
|
|
+ >{{ $t("common.add") }}
|
|
|
+ </el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="warning"
|
|
|
- plain
|
|
|
- icon="el-icon-download"
|
|
|
- size="mini"
|
|
|
- @click="handleExport"
|
|
|
- v-hasPermi="['cons:pileHoleInfo:export']"
|
|
|
- >导出</el-button>
|
|
|
+ type="warning"
|
|
|
+ plain
|
|
|
+ icon="el-icon-download"
|
|
|
+ size="mini"
|
|
|
+ @click="handleExport"
|
|
|
+ v-hasPermi="['cons:pileHoleInfo:export']"
|
|
|
+ >{{ $t("common.export") }}
|
|
|
+ </el-button>
|
|
|
</el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
<el-table v-loading="loading" :data="pileHoleInfoList" @selection-change="handleSelectionChange">
|
|
|
- <el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="编号" align="center" prop="id" />
|
|
|
- <el-table-column label="桩点编号" align="center" prop="holeNum" />
|
|
|
- <el-table-column label="dx" align="center" prop="deltaX" />
|
|
|
- <el-table-column label="dy" align="center" prop="deltaY" />
|
|
|
- <el-table-column label="经度" align="center" prop="lng" />
|
|
|
- <el-table-column label="纬度" align="center" prop="lat" />
|
|
|
- <el-table-column label="施工状态" align="center" prop="consStatus">
|
|
|
+ <el-table-column type="selection" width="55" align="center"/>
|
|
|
+ <el-table-column :label="$t('cons.index')" align="center" prop="id"/>
|
|
|
+ <el-table-column label="桩点编号" align="center" prop="holeNum"/>
|
|
|
+ <el-table-column label="dx" align="center" prop="deltaX"/>
|
|
|
+ <el-table-column label="dy" align="center" prop="deltaY"/>
|
|
|
+ <el-table-column label="经度" align="center" prop="lng"/>
|
|
|
+ <el-table-column label="纬度" align="center" prop="lat"/>
|
|
|
+ <el-table-column label="施工状态" align="center" width="120" prop="consStatus">
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag :options="dict.type.pile_hole_status" :value="scope.row.consStatus"/>
|
|
|
</template>
|
|
@@ -94,8 +85,8 @@
|
|
|
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="设计深度" align="center" prop="desDept" />
|
|
|
- <el-table-column label="桩径" align="center" prop="diameter" />
|
|
|
+ <el-table-column label="设计深度" align="center" prop="desDept"/>
|
|
|
+ <el-table-column label="桩径" align="center" prop="diameter"/>
|
|
|
<el-table-column label="修改时间" align="center" prop="updateTime" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
|
|
@@ -109,79 +100,82 @@
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-edit"
|
|
|
- @click="handleUpdate(scope.row)"
|
|
|
- v-hasPermi="['cons:pileHoleInfo:edit']"
|
|
|
- >修改</el-button>
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-edit"
|
|
|
+ @click="handleUpdate(scope.row)"
|
|
|
+ v-hasPermi="['cons:pileHoleInfo:edit']"
|
|
|
+ >修改
|
|
|
+ </el-button>
|
|
|
<el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-delete"
|
|
|
- @click="handleDelete(scope.row)"
|
|
|
- v-hasPermi="['cons:pileHoleInfo:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ @click="handleDelete(scope.row)"
|
|
|
+ v-hasPermi="['cons:pileHoleInfo:remove']"
|
|
|
+ >删除
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
-
|
|
|
+
|
|
|
<pagination
|
|
|
- v-show="total>0"
|
|
|
- :total="total"
|
|
|
- :page.sync="queryParams.pageNum"
|
|
|
- :limit.sync="queryParams.pageSize"
|
|
|
- @pagination="getList"
|
|
|
+ v-show="total>0"
|
|
|
+ :total="total"
|
|
|
+ :page.sync="queryParams.pageNum"
|
|
|
+ :limit.sync="queryParams.pageSize"
|
|
|
+ @pagination="getList"
|
|
|
/>
|
|
|
|
|
|
<!-- 添加或修改施工桩点信息对话框 -->
|
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
<el-form-item label="桩点编号" prop="holeNum">
|
|
|
- <el-input v-model="form.holeNum" placeholder="请输入桩点编号" />
|
|
|
+ <el-input v-model="form.holeNum" placeholder="请输入桩点编号"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="dx" prop="deltaX">
|
|
|
- <el-input v-model="form.deltaX" placeholder="请输入dx" />
|
|
|
+ <el-input v-model="form.deltaX" placeholder="请输入dx"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="dy" prop="deltaY">
|
|
|
- <el-input v-model="form.deltaY" placeholder="请输入dy" />
|
|
|
+ <el-input v-model="form.deltaY" placeholder="请输入dy"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="经度" prop="lng">
|
|
|
- <el-input v-model="form.lng" placeholder="请输入经度" />
|
|
|
+ <el-input v-model="form.lng" placeholder="请输入经度"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="纬度" prop="lat">
|
|
|
- <el-input v-model="form.lat" placeholder="请输入纬度" />
|
|
|
+ <el-input v-model="form.lat" placeholder="请输入纬度"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="施工状态" prop="consStatus">
|
|
|
<el-radio-group v-model="form.consStatus">
|
|
|
<el-radio
|
|
|
- v-for="dict in dict.type.pile_hole_status"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.value"
|
|
|
- >{{dict.label}}</el-radio>
|
|
|
+ v-for="dict in dict.type.pile_hole_status"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.value"
|
|
|
+ >{{ dict.label }}
|
|
|
+ </el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="开始时间" prop="startTime">
|
|
|
<el-date-picker clearable
|
|
|
- v-model="form.startTime"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="请选择开始时间">
|
|
|
+ v-model="form.startTime"
|
|
|
+ type="date"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="请选择开始时间">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="结束时间" prop="endTime">
|
|
|
<el-date-picker clearable
|
|
|
- v-model="form.endTime"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="请选择结束时间">
|
|
|
+ v-model="form.endTime"
|
|
|
+ type="date"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="请选择结束时间">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="设计深度" prop="desDept">
|
|
|
- <el-input v-model="form.desDept" placeholder="请输入设计深度" />
|
|
|
+ <el-input v-model="form.desDept" placeholder="请输入设计深度"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="桩径" prop="diameter">
|
|
|
- <el-input v-model="form.diameter" placeholder="请输入桩径" />
|
|
|
+ <el-input v-model="form.diameter" placeholder="请输入桩径"/>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -189,11 +183,47 @@
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <!-- 用户导入对话框 -->
|
|
|
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
|
|
+ <el-upload
|
|
|
+ ref="upload"
|
|
|
+ :limit="1"
|
|
|
+ accept=".dwg"
|
|
|
+ :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">{{ $t("common.importModeMsg")}}</div>
|
|
|
+ <div class="el-upload__tip text-center" slot="tip">
|
|
|
+ <div class="el-upload__tip" slot="tip">
|
|
|
+ <el-checkbox v-model="upload.updateSupport"/>
|
|
|
+ {{ $t("common.importMessage")}}
|
|
|
+ </div>
|
|
|
+ <span>{{ $t("common.importFileType", {fileType: 'DWG'})}}</span>
|
|
|
+ </div>
|
|
|
+ </el-upload>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" @click="submitFileForm">确 定</el-button>
|
|
|
+ <el-button @click="upload.open = false">取 消</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listPileHoleInfo, getPileHoleInfo, delPileHoleInfo, addPileHoleInfo, updatePileHoleInfo } from "@/api/cons/pileHoleInfo";
|
|
|
+import {
|
|
|
+ addPileHoleInfo,
|
|
|
+ delPileHoleInfo,
|
|
|
+ getPileHoleInfo,
|
|
|
+ listPileHoleInfo,
|
|
|
+ updatePileHoleInfo
|
|
|
+} from "@/api/cons/pileHoleInfo";
|
|
|
+import {getToken} from "@/utils/auth";
|
|
|
|
|
|
export default {
|
|
|
name: "PileHoleInfo",
|
|
@@ -230,20 +260,32 @@ export default {
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
holeNum: [
|
|
|
- { required: true, message: "桩点编号不能为空", trigger: "blur" }
|
|
|
+ {required: true, message: "桩点编号不能为空", trigger: "blur"}
|
|
|
],
|
|
|
deltaX: [
|
|
|
- { required: true, message: "dx不能为空", trigger: "blur" }
|
|
|
+ {required: true, message: "dx不能为空", trigger: "blur"}
|
|
|
],
|
|
|
deltaY: [
|
|
|
- { required: true, message: "dy不能为空", trigger: "blur" }
|
|
|
+ {required: true, message: "dy不能为空", trigger: "blur"}
|
|
|
],
|
|
|
lng: [
|
|
|
- { required: true, message: "经度不能为空", trigger: "blur" }
|
|
|
+ {required: true, message: "经度不能为空", trigger: "blur"}
|
|
|
],
|
|
|
lat: [
|
|
|
- { required: true, message: "纬度不能为空", trigger: "blur" }
|
|
|
+ {required: true, message: "纬度不能为空", trigger: "blur"}
|
|
|
],
|
|
|
+ },
|
|
|
+ upload: {
|
|
|
+ title: this.$t("cons.pileHoleImportTitle"),
|
|
|
+ open: false,
|
|
|
+ // 是否禁用上传
|
|
|
+ isUploading: false,
|
|
|
+ // 是否更新已经存在的用户数据
|
|
|
+ updateSupport: 0,
|
|
|
+ // 设置上传的请求头部
|
|
|
+ headers: {Authorization: "Bearer " + getToken()},
|
|
|
+ // 上传的地址
|
|
|
+ url: process.env.VUE_APP_BASE_API + "/system/user/importData"
|
|
|
}
|
|
|
};
|
|
|
},
|
|
@@ -251,6 +293,21 @@ export default {
|
|
|
this.getList();
|
|
|
},
|
|
|
methods: {
|
|
|
+ handleImport(){
|
|
|
+ this.upload.open = true;
|
|
|
+ },
|
|
|
+ // 文件上传中处理
|
|
|
+ handleFileUploadProgress(event, file, fileList) {
|
|
|
+ this.upload.isUploading = true;
|
|
|
+ },
|
|
|
+ // 文件上传成功处理
|
|
|
+ handleFileSuccess(response, file, fileList) {
|
|
|
+ this.upload.open = false;
|
|
|
+ this.upload.isUploading = false;
|
|
|
+ this.$refs.upload.clearFiles();
|
|
|
+ this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
|
|
|
+ this.getList();
|
|
|
+ },
|
|
|
/** 查询施工桩点信息列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
@@ -299,7 +356,7 @@ export default {
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
this.ids = selection.map(item => item.id)
|
|
|
- this.single = selection.length!==1
|
|
|
+ this.single = selection.length !== 1
|
|
|
this.multiple = !selection.length
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
@@ -341,12 +398,13 @@ export default {
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const ids = row.id || this.ids;
|
|
|
- this.$modal.confirm('是否确认删除施工桩点信息编号为"' + ids + '"的数据项?').then(function() {
|
|
|
+ this.$modal.confirm('是否确认删除施工桩点信息编号为"' + ids + '"的数据项?').then(function () {
|
|
|
return delPileHoleInfo(ids);
|
|
|
}).then(() => {
|
|
|
this.getList();
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
- }).catch(() => {});
|
|
|
+ }).catch(() => {
|
|
|
+ });
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|