Skip to content

P
pdczt_qd
Commit a930ca57 by zhaopanyu
Options

zpy

parent c5c4155e
Showing with 243 additions and 33 deletions
src/api/system/cjsjLas.js
...@@ -102,7 +102,12 @@ export function ppZtxx(query) { ...@@ -102,7 +102,12 @@ export function ppZtxx(query) {
params: query, params: query,
}); });
} }
export function ppZtxxx(query) {
return request({
url: "/system/ztxxJcxx/tjxq",
params: query,
});
}
// 查询 // 查询
export function getZtxxck(id) { export function getZtxxck(id) {
return request({ return request({
......
src/api/system/sjJsdb copy.js 0 → 100644
import request from "@/utils/request";
// 查询设计-井身结构数据列表
export function listSjJsdb(query) {
return request({
url: "/system/sjJsdb/list",
method: "get",
params: query,
});
}
// 查询设计-井身结构数据详细
export function getSjJsdb(id) {
return request({
url: "/system/sjJsdb/" + id,
method: "get",
});
}
// 新增设计-井身结构数据
export function addSjJsdb(data) {
return request({
url: "/system/sjJsdb",
method: "post",
data: data,
});
}
// 修改设计-井身结构数据
export function updateSjJsdb(data) {
return request({
url: "/system/sjJsdb",
method: "put",
data: data,
});
}
// 删除设计-井身结构数据
export function delSjJsdb(id) {
return request({
url: "/system/sjJsdb/" + id,
method: "delete",
});
}
// 井身结构图（设计模块）
export function getSjJsjgt(params) {
return request({
url: "/system/sjJsdb/jsjgt",
method: "get",
params,
});
}
src/api/system/sjJsdb.js
import request from '@/utils/request' import request from "@/utils/request";
// 查询设计-井身结构数据列表 // 查询设计-井身结构数据列表
export function listSjJsdb(query) { export function listSjJsdb(query) {
return request({ return request({
url: '/system/sjJsdb/list', url: "/system/sjJsdb/list",
method: 'get', method: "get",
params: query params: query,
}) });
} }
// 查询设计-井身结构数据详细 // 查询设计-井身结构数据详细
export function getSjJsdb(id) { export function getSjJsdb(id) {
return request({ return request({
url: '/system/sjJsdb/' + id, url: "/system/sjJsdb/" + id,
method: 'get' method: "get",
}) });
} }
// 新增设计-井身结构数据 // 新增设计-井身结构数据
export function addSjJsdb(data) { export function addSjJsdb(data) {
return request({ return request({
url: '/system/sjJsdb', url: "/system/sjJsdb",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 修改设计-井身结构数据 // 修改设计-井身结构数据
export function updateSjJsdb(data) { export function updateSjJsdb(data) {
return request({ return request({
url: '/system/sjJsdb', url: "/system/sjJsdb",
method: 'put', method: "put",
data: data data: data,
}) });
} }
// 删除设计-井身结构数据 // 删除设计-井身结构数据
export function delSjJsdb(id) { export function delSjJsdb(id) {
return request({ return request({
url: '/system/sjJsdb/' + id, url: "/system/sjJsdb/" + id,
method: 'delete' method: "delete",
}) });
}
// 井身结构图（设计模块）
export function getSjJsjgt(params) {
return request({
url: "/system/sjJsdb/jsjgt",
method: "get",
params,
});
} }
src/assets/.DS_Store
No preview for this file type
src/assets/images/btbj1.png
src/assets/images/btbj1.png

13.6 KB | W: | H:

src/assets/images/btbj1.png

13.2 KB | W: | H:

src/assets/images/btbj1.png
src/assets/images/btbj1.png
src/assets/images/btbj1.png
src/assets/images/btbj1.png
  • 2-up
  • Swipe
  • Onion skin
src/views/efficiencyAnalysis/jcxx/components/LoggingData.vue
...@@ -93,9 +93,10 @@ ...@@ -93,9 +93,10 @@
<el-table-column v-if="isColumnVisible('fbit')" label="钻头选型指数" prop="fbit" align="center" <el-table-column v-if="isColumnVisible('fbit')" label="钻头选型指数" prop="fbit" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip :render-header="renderTableHeader" />
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="80" align="center"> <el-table-column label="操作" fixed="right" width="140" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" @click="handleView(scope.row)">查看</el-button> <el-button type="text" size="mini" @click="handleView(scope.row)">查看</el-button>
<el-button type="text" size="mini" @click="handleEdit(scope.row)">修改</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -300,6 +301,28 @@ ...@@ -300,6 +301,28 @@
<el-button type="primary" @click="viewOpen = false">关 闭</el-button> <el-button type="primary" @click="viewOpen = false">关 闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 修改弹窗 -->
<el-dialog title="修改" :visible.sync="editOpen" width="600px" append-to-body>
<el-form ref="editForm" :model="editForm" :rules="editRules" label-width="220px">
<el-form-item label="井号">
<el-input v-model="editForm.jh" disabled />
</el-form-item>
<el-form-item label="井深">
<el-input v-model="editForm.dept" disabled />
</el-form-item>
<el-form-item label="自然伽马(自然伽马单位/API)" prop="gr">
<el-input v-model="editForm.gr" placeholder="请输入自然伽马" />
</el-form-item>
<el-form-item label="声波时差(微秒每英尺/μs/ft)" prop="ac">
<el-input v-model="editForm.ac" placeholder="请输入声波时差" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitEditForm">保 存</el-button>
<el-button @click="editOpen = false">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -372,6 +395,16 @@ export default { ...@@ -372,6 +395,16 @@ export default {
fileUploadComplete: false, // 文件上传是否完成 fileUploadComplete: false, // 文件上传是否完成
viewOpen: false, viewOpen: false,
viewForm: {}, viewForm: {},
editOpen: false,
editForm: {},
editRules: {
gr: [
{ required: false, message: "请输入自然伽马", trigger: "blur" }
],
ac: [
{ required: false, message: "请输入声波时差", trigger: "blur" }
]
},
rules: { rules: {
jh: [{ required: true, message: "井号不能为空", trigger: "blur" }], jh: [{ required: true, message: "井号不能为空", trigger: "blur" }],
jhdm: [ jhdm: [
...@@ -670,10 +703,9 @@ export default { ...@@ -670,10 +703,9 @@ export default {
handleCjData() { handleCjData() {
this.loading = true; this.loading = true;
const params = { const params = {
pageNum: 1, pageNum: this.cjqueryParams.pageNum || 1,
pageSize: 20, pageSize: this.cjqueryParams.pageSize || 20,
jhe: this.jh || this.$route.query.jh jh: this.cjqueryParams.jh || this.jh || this.$route.query.jh
} }
listCjsjLas(params).then(response => { listCjsjLas(params).then(response => {
this.cjsjLasList = response.rows; this.cjsjLasList = response.rows;
...@@ -944,6 +976,50 @@ export default { ...@@ -944,6 +976,50 @@ export default {
} else { } else {
this.viewForm = row || {}; this.viewForm = row || {};
} }
},
handleEdit(row) {
const id = row && (row.id || row.cjsjLasId || row.cid);
this.editForm = {};
this.editOpen = true;
if (id) {
this.loading = true;
getCjsjLas(id).then(res => {
this.editForm = res && res.data ? res.data : row;
}).finally(() => {
this.loading = false;
});
} else {
this.editForm = { ...row } || {};
}
},
submitEditForm() {
this.$refs.editForm.validate(valid => {
if (valid) {
this.loading = true;
// 构建更新数据，包含ID和可编辑的字段
const updateData = {};
// 保留ID字段（可能是 id、cjsjLasId 或 cid）
if (this.editForm.id) updateData.id = this.editForm.id;
if (this.editForm.cjsjLasId) updateData.cjsjLasId = this.editForm.cjsjLasId;
if (this.editForm.cid) updateData.cid = this.editForm.cid;
// 只更新可编辑的字段
updateData.gr = this.editForm.gr;
updateData.ac = this.editForm.ac;
// 保留井号等必要字段
if (this.editForm.jh) updateData.jh = this.editForm.jh;
updateCjsjLas(updateData).then(response => {
this.$modal.msgSuccess("修改成功");
this.editOpen = false;
this.handleCjData();
}).catch(error => {
console.error('修改失败:', error);
this.$modal.msgError("修改失败");
}).finally(() => {
this.loading = false;
});
}
});
} }
} }
}; };
......
src/views/system/ztxxTzsj/index.vue
...@@ -241,7 +241,7 @@ export default { ...@@ -241,7 +241,7 @@ export default {
/** 图片上传成功处理 */ /** 图片上传成功处理 */
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
if (res.code === 200) { if (res.code === 200) {
this.form.slt = res.url; this.form.slt = 'https://10.68.249.114:8088/pdc-api' + res.fileName;
this.$refs.uploadRef.clearFiles(); // 关键：上传成功后清空文件列表 this.$refs.uploadRef.clearFiles(); // 关键：上传成功后清空文件列表
this.$modal.msgSuccess("上传成功"); this.$modal.msgSuccess("上传成功");
} else { } else {
......
src/views/wellDesign/components/AdjacentWell.vue
...@@ -92,9 +92,10 @@ ...@@ -92,9 +92,10 @@
<el-table-column v-if="isColumnVisible('fbit')" label="钻头选型指数" prop="fbit" align="center" <el-table-column v-if="isColumnVisible('fbit')" label="钻头选型指数" prop="fbit" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip :render-header="renderTableHeader" />
</el-table-column> </el-table-column>
<el-table-column label="操作" width="80" align="center" fixed="right"> <el-table-column label="操作" width="140" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" @click="handleView(scope.row)">查看</el-button> <el-button type="text" size="mini" @click="handleView(scope.row)">查看</el-button>
<el-button type="text" size="mini" @click="handleEdit(scope.row)">修改</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -300,6 +301,28 @@ ...@@ -300,6 +301,28 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 修改弹窗 -->
<el-dialog title="修改" :visible.sync="editOpen" width="600px" append-to-body>
<el-form ref="editForm" :model="editForm" :rules="editRules" label-width="220px">
<el-form-item label="井号">
<el-input v-model="editForm.jh" disabled />
</el-form-item>
<el-form-item label="井深">
<el-input v-model="editForm.dept" disabled />
</el-form-item>
<el-form-item label="自然伽马(自然伽马单位/API)" prop="gr">
<el-input v-model="editForm.gr" placeholder="请输入自然伽马" />
</el-form-item>
<el-form-item label="声波时差(微秒每英尺/μs/ft)" prop="ac">
<el-input v-model="editForm.ac" placeholder="请输入声波时差" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitEditForm">保 存</el-button>
<el-button @click="editOpen = false">取 消</el-button>
</div>
</el-dialog>
<!-- 选择邻井弹窗 --> <!-- 选择邻井弹窗 -->
<el-dialog title="选择邻井" :visible.sync="wellDialogVisible" width="80%" :close-on-click-modal="false" <el-dialog title="选择邻井" :visible.sync="wellDialogVisible" width="80%" :close-on-click-modal="false"
class="well-dialog" :z-index="2000" @open="handleWellDialogOpen"> class="well-dialog" :z-index="2000" @open="handleWellDialogOpen">
...@@ -556,7 +579,17 @@ export default { ...@@ -556,7 +579,17 @@ export default {
// 查看详情相关 // 查看详情相关
viewDialogVisible: false, viewDialogVisible: false,
viewRowData: null, viewRowData: null,
viewForm: {} viewForm: {},
editOpen: false,
editForm: {},
editRules: {
gr: [
{ required: false, message: "请输入自然伽马", trigger: "blur" }
],
ac: [
{ required: false, message: "请输入声波时差", trigger: "blur" }
]
}
}; };
}, },
computed: { computed: {
...@@ -1165,6 +1198,33 @@ export default { ...@@ -1165,6 +1198,33 @@ export default {
this.viewForm = { ...row }; this.viewForm = { ...row };
this.viewDialogVisible = true; this.viewDialogVisible = true;
}, },
handleEdit(row) {
this.editForm = { ...row };
this.editOpen = true;
},
submitEditForm() {
this.$refs.editForm.validate(valid => {
if (valid) {
this.loading = true;
// 传递完整的对象数据，但只更新 gr 和 ac 字段
const updateData = { ...this.editForm };
// 确保只更新可编辑的字段
updateData.gr = this.editForm.gr;
updateData.ac = this.editForm.ac;
updateSjCjsjLas(updateData).then(response => {
this.$modal.msgSuccess("修改成功");
this.editOpen = false;
this.handleCjData();
}).catch(error => {
console.error('修改失败:', error);
this.$modal.msgError("修改失败");
}).finally(() => {
this.loading = false;
});
}
});
},
// 判断列是否可见 // 判断列是否可见
isColumnVisible(prop) { isColumnVisible(prop) {
// 根据表格字段配置控制列的显示/隐藏 // 根据表格字段配置控制列的显示/隐藏
......
src/views/wellDesign/components/BitDesign.vue
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
短抛物线</div> 短抛物线</div>
<div <div
style="position: absolute; top: 50px; left: 1100px; font-size: 10px; writing-mode: vertical-rl; font-weight: bold;"> style="position: absolute; top: 50px; left: 1100px; font-size: 10px; writing-mode: vertical-rl; font-weight: bold;">
圆形</div> 鱼尾型</div>
<div <div
style="position: absolute; top: 50px; left: 1135px; font-size: 10px; writing-mode: vertical-rl; font-weight: bold;"> style="position: absolute; top: 50px; left: 1135px; font-size: 10px; writing-mode: vertical-rl; font-weight: bold;">
13</div> 13</div>
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
<!-- 开次信息显示区域 --> <!-- 开次信息显示区域 -->
<div ref="kcListContainer" <div ref="kcListContainer"
style="position: absolute; top: 90px; left: 1425px; width: 80px; height: 610px; overflow: visible; z-index: 10; border: 1px solid #000000; border-top: 0;"> style="position: absolute; top: 90px; left: 1425px; width: 80px; height: 560px; overflow: visible; z-index: 10; border: 1px solid #000000; border-top: 0;">
</div> </div>
</div> </div>
<div id="tooltip-container" style="display: none;position: absolute"></div> <div id="tooltip-container" style="display: none;position: absolute"></div>
......
src/views/wellDesign/components/BitMatching.vue
<template> <template>
<div class="bit-matching"> <div class="bit-matching" v-loading="loading">
<div class="page-header"> <div class="page-header">
<h2>钻头匹配</h2> <h2>钻头匹配</h2>
</div> </div>
...@@ -116,7 +116,8 @@ export default { ...@@ -116,7 +116,8 @@ export default {
// 弹窗相关 // 弹窗相关
dialogVisible: false, dialogVisible: false,
selectedBitId: null, selectedBitId: null,
selectedBitData: null selectedBitData: null,
loading: false // 加载状态
} }
}, },
mounted() { mounted() {
...@@ -149,6 +150,9 @@ export default { ...@@ -149,6 +150,9 @@ export default {
fetchBitMatchingData() { fetchBitMatchingData() {
console.log('调用ppZtxx接口'); console.log('调用ppZtxx接口');
// 开始加载
this.loading = true;
// 构建接口参数 // 构建接口参数
const params = { const params = {
jh: this.queryParams.jh, jh: this.queryParams.jh,
...@@ -176,6 +180,9 @@ export default { ...@@ -176,6 +180,9 @@ export default {
}).catch(error => { }).catch(error => {
console.error('调用ppZtxx接口失败:', error); console.error('调用ppZtxx接口失败:', error);
this.$message.error('获取钻头匹配数据失败，请重试'); this.$message.error('获取钻头匹配数据失败，请重试');
}).finally(() => {
// 结束加载
this.loading = false;
}); });
}, },
......
vue.config.js
...@@ -37,7 +37,7 @@ module.exports = { ...@@ -37,7 +37,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://192.168.31.108:8091`, target: `http://192.168.31.108:8091`,
// target: `http://192.168.31.190:8091`, // target: `http://192.168.31.26:8091`,
// target: `http://192.168.31.12:8091`, // target: `http://192.168.31.12:8091`,
// target: `http://192.168.110.69:8091`, // target: `http://192.168.110.69:8091`,
// target: `http://192.168.31.109:8080`, // target: `http://192.168.31.109: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