Skip to content

P
pdczt_qd
Commit d6cfbc3d by cat
Options

zd

parent 962762e4
Showing with 183 additions and 90 deletions
src/api/ztxx.js 0 → 100644
import request from '@/utils/request'
// 查询钻头基础信息列表
export function listZtxxJcxx(query) {
return request({
url: '/system/ztxxJcxx/list',
method: 'get',
params: query
})
}
// 查询钻头基础信息详细
export function getZtxxJcxx(id) {
return request({
url: '/system/ztxxJcxx/' + id,
method: 'get'
})
}
// 新增钻头基础信息
export function addZtxxJcxx(data) {
return request({
url: '/system/ztxxJcxx',
method: 'post',
data: data
})
}
// 修改钻头基础信息
export function updateZtxxJcxx(data) {
return request({
url: '/system/ztxxJcxx',
method: 'put',
data: data
})
}
// 删除钻头基础信息
export function delZtxxJcxx(id) {
return request({
url: '/system/ztxxJcxx/' + id,
method: 'delete'
})
}
src/views/engineeringData/gjcXsj/index.vue
......@@ -13,10 +13,10 @@
<el-input v-model="queryParams.jh" placeholder="请输入井号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="完井日期">
<el-date-picker v-model="queryParams.wjrqks" type="year" value-format="yyyy" placeholder="完井开始年份">
<el-date-picker v-model="queryParams.wjrqks" type="date" value-format="yyyy-MM-dd"placeholder="完井开始年份">
</el-date-picker>
-
<el-date-picker v-model="queryParams.wjrqjs" type="year" value-format="yyyy" placeholder="完井结束年份">
<el-date-picker v-model="queryParams.wjrqjs" type="date" value-format="yyyy-MM-dd" placeholder="完井结束年份">
</el-date-picker>
</el-form-item>
<el-form-item>
......@@ -50,8 +50,8 @@
<el-table border v-loading="loading" :data="jskdList" @selection-change="handleSelectionChange"
height="calc(100vh - 200px)" class="table-container">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="井号" align="center" prop="jh" />
<el-table-column label="序号" align="center" prop="xh" />
<el-table-column label="井号" align="center" prop="jh" />
<el-table-column label="斜井深" align="center" prop="xjs" />
<el-table-column label="段长" align="center" prop="dc" />
<el-table-column label="井斜" align="center" prop="jx" />
......@@ -84,135 +84,125 @@
class="pagination-fixed" />
<!-- 添加或修改定向井测斜数据计算数据对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="井号" prop="jh">
<el-input v-model="form.jh" placeholder="请输入井号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="序号" prop="xh">
<el-input v-model="form.xh" placeholder="请输入序号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="斜井深" prop="xjs">
<el-input v-model="form.xjs" placeholder="请输入斜井深" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="段长" prop="dc">
<el-input v-model="form.dc" placeholder="请输入段长" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="井斜" prop="jx">
<el-input v-model="form.jx" placeholder="请输入井斜" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="平均井斜" prop="pjjx">
<el-input v-model="form.pjjx" placeholder="请输入平均井斜" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="方位" prop="fw">
<el-input v-model="form.fw" placeholder="请输入方位" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="平均方位" prop="pjfw">
<el-input v-model="form.pjfw" placeholder="请输入平均方位" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="全角变化率" prop="qjbhl">
<el-input v-model="form.qjbhl" placeholder="请输入全角变化率" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="垂直段长" prop="czdc">
<el-input v-model="form.czdc" placeholder="请输入垂直段长" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="累计垂直井深" prop="ljczjs">
<el-input v-model="form.ljczjs" placeholder="请输入累计垂直井深" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="分段水平位移" prop="fdspwy">
<el-input v-model="form.fdspwy" placeholder="请输入分段水平位移" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="井底横坐标1" prop="jdhzb1">
<el-input v-model="form.jdhzb1" placeholder="请输入井底横坐标1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="井底横坐标2" prop="jdhzb2">
<el-input v-model="form.jdhzb2" placeholder="请输入井底横坐标2" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="井底纵坐标1" prop="jdzzb1">
<el-input v-model="form.jdzzb1" placeholder="请输入井底纵坐标1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="井底纵坐标2" prop="jdzzb2">
<el-input v-model="form.jdzzb2" placeholder="请输入井底纵坐标2" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="闭合方位" prop="bhfw">
<el-input v-model="form.bhfw" placeholder="请输入闭合方位" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="闭合位移" prop="bhwy">
<el-input v-model="form.bhwy" placeholder="请输入闭合位移" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="位移投影度" prop="wytyjd">
<el-input v-model="form.wytyjd" placeholder="请输入位移在设计方位线上投影度" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="位移投影米" prop="wytyc">
<el-input v-model="form.wytyc" placeholder="请输入位移在设计方位线上投影米" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="测斜方式" prop="cxfs">
<el-input v-model="form.cxfs" placeholder="请输入测斜方式" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="备注" prop="bz">
<el-input v-model="form.bz" placeholder="请输入备注" />
</el-form-item>
......@@ -446,4 +436,9 @@ export default {
padding: 5px !important;
margin: 0;
}
::v-deep .el-form-item{
margin-bottom: 10px !important;
}
</style>
\ No newline at end of file
src/views/engineeringData/jsbb/index.vue
......@@ -79,42 +79,76 @@
@pagination="getList" :page-sizes="[20, 50, 100]" />
<!-- 添加或修改地质简介地层及岩性描述数据对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="井号" prop="jh">
<el-input v-model="form.jh" placeholder="请输入井号" />
</el-form-item>
<el-form-item label="地质时代名称" prop="dzsdmc">
<el-input v-model="form.dzsdmc" placeholder="请输入地质时代名称" />
</el-form-item>
<el-form-item label="层位" prop="cw">
<el-input v-model="form.cw" placeholder="请输入层位" />
</el-form-item>
<el-form-item label="设计底界深度" prop="sjdjsd">
<el-input v-model="form.sjdjsd" placeholder="请输入设计底界深度" @input="handleDecimalInput(form.sjdjsd, 'sjdjsd')" />
</el-form-item>
<el-form-item label="实际底界深度" prop="sjdjsd2">
<el-input v-model="form.sjdjsd2" placeholder="请输入实际底界深度"
@input="handleDecimalInput(form.sjdjsd2, 'sjdjsd2')" />
</el-form-item>
<el-form-item label="设计厚度" prop="sjhd">
<el-input v-model="form.sjhd" placeholder="请输入设计厚度" @input="handleDecimalInput(form.sjhd, 'sjhd')" />
</el-form-item>
<el-form-item label="实际厚度" prop="sjhd2">
<el-input v-model="form.sjhd2" placeholder="请输入实际厚度" @input="handleDecimalInput(form.sjhd2, 'sjhd2')" />
</el-form-item>
<el-form-item label="主要岩性描述" prop="zyyxms">
<el-input v-model="form.zyyxms" placeholder="请输入主要岩性描述" />
</el-form-item>
<el-form-item label="地层走向" prop="dczx">
<el-input v-model="form.dczx" placeholder="请输入地层走向" />
</el-form-item>
<el-form-item label="地层倾角" prop="dcqj">
<el-input v-model="form.dcqj" placeholder="请输入地层倾角" />
</el-form-item>
<el-form-item label="备注" prop="bz">
<el-input v-model="form.bz" placeholder="请输入备注" />
</el-form-item>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="井号" prop="jh">
<el-input v-model="form.jh" placeholder="请输入井号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="地质时代名称" prop="dzsdmc">
<el-input v-model="form.dzsdmc" placeholder="请输入地质时代名称" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="层位" prop="cw">
<el-input v-model="form.cw" placeholder="请输入层位" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设计底界深度" prop="sjdjsd">
<el-input v-model="form.sjdjsd" placeholder="请输入设计底界深度" @input="handleDecimalInput(form.sjdjsd, 'sjdjsd')" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="实际底界深度" prop="sjdjsd2">
<el-input v-model="form.sjdjsd2" placeholder="请输入实际底界深度"
@input="handleDecimalInput(form.sjdjsd2, 'sjdjsd2')" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设计厚度" prop="sjhd">
<el-input v-model="form.sjhd" placeholder="请输入设计厚度" @input="handleDecimalInput(form.sjhd, 'sjhd')" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="实际厚度" prop="sjhd2">
<el-input v-model="form.sjhd2" placeholder="请输入实际厚度" @input="handleDecimalInput(form.sjhd2, 'sjhd2')" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="地层走向" prop="dczx">
<el-input v-model="form.dczx" placeholder="请输入地层走向" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="地层倾角" prop="dcqj">
<el-input v-model="form.dcqj" placeholder="请输入地层倾角" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主要岩性描述" prop="zyyxms">
<el-input v-model="form.zyyxms" placeholder="请输入主要岩性描述" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="bz">
<el-input v-model="form.bz" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -168,14 +202,14 @@ export default {
form: {},
// 表单校验
rules: {
sjdjsd: [
{ required: true, message: "设计底界深度不能为空", trigger: "blur" }
sjdjsd2: [
{ required: true, message: "实际底界深度不能为空", trigger: "blur" }
],
jh: [
{ required: true, message: "井号不能为空", trigger: "blur" }
],
sjhd: [
{ required: true, message: "设计厚度不能为空", trigger: "blur" }
sjhd2: [
{ required: true, message: "实际厚度不能为空", trigger: "blur" }
],
dzsdmc: [
{ required: true, message: "地质时代名称不能为空", trigger: "blur" }
......
src/views/engineeringData/loggingData/index.vue
<!-- 测井数据 -->
<template>
<div class="app-container">
<el-tabs v-model="activeTab" v-loading="loading">
<el-tab-pane label="测井数据" name="loggingData">
<!-- <el-tabs v-model="activeTab" v-loading="loading"> -->
<!-- <el-tab-pane label="测井数据" name="loggingData"> -->
<el-form :model="cjqueryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="100px">
<el-form-item label="井号" prop="jh">
......@@ -17,7 +17,7 @@
</el-form-item>
</el-form>
<div style="background-color: #fff;">
<el-form style="background-color: #fff" ref="queryForm" size="small" :inline="true"
<!-- <el-form style="background-color: #fff" ref="queryForm" size="small" :inline="true"
v-show="showSearch" label-width="68px">
<el-form-item style="margin: 5px 0 5px 10px;">
<el-button type="primary" @click="handleImport2">导入las文件</el-button>
......@@ -27,7 +27,7 @@
<el-button type="primary" @click="jscs">计算参数</el-button>
<el-button type="primary" @click="js">计算</el-button>
</el-form-item>
</el-form>
</el-form> -->
<el-table border :height="TableHeight()" style="background-color: #fff;margin-top: 5px"
:data="cjsjLasList" :header-cell-style="{
padding: '1px 0',
......@@ -43,11 +43,11 @@
<pagination v-show="total > 0" :total="total" :page.sync="cjqueryParams.pageNum"
:limit.sync="cjqueryParams.pageSize" @pagination="handleCjData" />
</div>
</el-tab-pane>
<!-- </el-tab-pane>
<el-tab-pane label="钻头优选" name="drillBitSelection">
<cjqx></cjqx>
</el-tab-pane>
</el-tabs>
</el-tab-pane> -->
<!-- </el-tabs> -->
<!-- 弹窗组件 -->
<el-dialog title="变量取值范围" :visible.sync="open" width="700px" append-to-body>
......
src/views/optimization/singleWellcon/components/rigConfigurations.vue
......@@ -1790,7 +1790,7 @@ export default {
.button-container {
display: flex;
justify-content: end;
justify-content: flex-end;
margin: 0 50px;
/* justify-content: space-around; */
font-size: 20px;
......
src/views/system/ztxxTzsj/index.vue
......@@ -59,11 +59,27 @@
<el-input v-model="form.tzdm" placeholder="请输入特征代码" />
</el-form-item>
<el-form-item label="示例图" prop="slt">
<el-upload class="avatar-uploader" :action="uploadUrl" :headers="headers" :show-file-list="false"
:on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload" :limit="1" :on-exceed="handleExceed">
<el-upload
ref="uploadRef"
class="avatar-uploader"
:action="uploadUrl"
:headers="headers"
:show-file-list="false"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"
:limit="1"
:on-exceed="handleExceed"
>
<img v-if="form.slt" :src="form.slt" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<el-button
v-if="form.slt"
size="mini"
type="danger"
style="margin-top: 10px;"
@click="handleRemoveImage"
>删除图片</el-button>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -238,6 +254,7 @@ export default {
handleAvatarSuccess(res, file) {
if (res.code === 200) {
this.form.slt = res.url;
this.$refs.uploadRef.clearFiles(); // 关键：上传成功后清空文件列表
this.$modal.msgSuccess("上传成功");
} else {
this.$modal.msgError("上传失败");
......@@ -261,12 +278,14 @@ export default {
this.$message.error('上传图片大小不能超过 2MB!');
return false;
}
// 如果已经有图片，阻止上传
if (this.form.slt) {
this.$message.warning("只能上传一张图片，如需更换请先删除当前图片");
return false;
}
// 不再做“只能上传一张图片”的判断，交给 handleAvatarSuccess 统一清理
return true;
},
/** 删除图片按钮操作 */
handleRemoveImage() {
this.$refs.uploadRef.clearFiles();
this.form.slt = null;
this.$message.success('图片已删除');
}
}
};
......
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