Commit 3e6eac57 by zhaopanyu

zpy

parent afa861e0
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -49,6 +49,7 @@
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
"html2canvas": "^1.4.1",
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
"jsencrypt": "3.0.0-rc.1",
......@@ -78,6 +79,7 @@
"connect": "3.6.6",
"eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0",
"file-loader": "^6.2.0",
"lint-staged": "10.5.3",
"runjs": "4.4.2",
"sass": "1.32.13",
......
import request from '@/utils/request'
// 查询基础数据列表
export function listJsaa(query) {
return request({
url: '/system/jsaa/list',
method: 'get',
params: query
})
}
// 查询基础数据详细
export function getJsaa(jh) {
return request({
url: '/system/jsaa/' + jh,
method: 'get'
})
}
// 新增基础数据
export function addJsaa(data) {
return request({
url: '/system/jsaa',
method: 'post',
data: data
})
}
// 修改基础数据
export function updateJsaa(data) {
return request({
url: '/system/jsaa',
method: 'put',
data: data
})
}
// 删除基础数据
export function delJsaa(jh) {
return request({
url: '/system/jsaa/' + jh,
method: 'delete'
})
}
//区块
export function getBlockName(query) {
return request({
url: '/system/jsaa/qklist',
method: 'get',
params: query
})
}
//区块下拉框
export function getQkxl(query) {
return request({
url: '/system/qkxx/list',
method: 'get',
params: query
})
}
import request from '@/utils/request'
// 查询地质简介基本数据列表
export function listJsba(query) {
return request({
url: '/system/jsba/list',
method: 'get',
params: query
})
}
// 查询地质简介基本数据详细
export function getJsba(jh) {
return request({
url: '/system/jsba/' + jh,
method: 'get'
})
}
// 新增地质简介基本数据
export function addJsba(data) {
return request({
url: '/system/jsba',
method: 'post',
data: data
})
}
// 修改地质简介基本数据
export function updateJsba(data) {
return request({
url: '/system/jsba',
method: 'put',
data: data
})
}
// 删除地质简介基本数据
export function delJsba(jh) {
return request({
url: '/system/jsba/' + jh,
method: 'delete'
})
}
import request from '@/utils/request'
// 查询地质简介地层及岩性描述数据列表
export function listJsbb(query) {
return request({
url: '/system/jsbb/list',
method: 'get',
params: query
})
}
// 查询地质简介地层及岩性描述数据详细
export function getJsbb(jh) {
return request({
url: '/system/jsbb/' + jh,
method: 'get'
})
}
// 新增地质简介地层及岩性描述数据
export function addJsbb(data) {
return request({
url: '/system/jsbb',
method: 'post',
data: data
})
}
// 修改地质简介地层及岩性描述数据
export function updateJsbb(data) {
return request({
url: '/system/jsbb',
method: 'put',
data: data
})
}
// 删除地质简介地层及岩性描述数据
export function delJsbb(jh) {
return request({
url: '/system/jsbb/' + jh,
method: 'delete'
})
}
import request from '@/utils/request'
// 查询井身结构示意图列表
export function listJsda(query) {
return request({
url: '/system/jsda/list',
method: 'get',
params: query
})
}
// 查询井身结构示意图详细
export function getJsda(jh) {
return request({
url: '/system/jsda/' + jh,
method: 'get'
})
}
// 新增井身结构示意图
export function addJsda(data) {
return request({
url: '/system/jsda',
method: 'post',
data: data
})
}
// 修改井身结构示意图
export function updateJsda(data) {
return request({
url: '/system/jsda',
method: 'put',
data: data
})
}
// 删除井身结构示意图
export function delJsda(jh) {
return request({
url: '/system/jsda/' + jh,
method: 'delete'
})
}
import request from '@/utils/request'
// 查询井身结构数据列表
export function listJsdb(query) {
return request({
url: '/system/jsdb/list',
method: 'get',
params: query
})
}
// 查询井身结构数据详细
export function getJsdb(jh) {
return request({
url: '/system/jsdb/' + jh,
method: 'get'
})
}
// 新增井身结构数据
export function addJsdb(data) {
return request({
url: '/system/jsdb',
method: 'post',
data: data
})
}
// 修改井身结构数据
export function updateJsdb(data) {
return request({
url: '/system/jsdb',
method: 'put',
data: data
})
}
// 删除井身结构数据
export function delJsdb(jh) {
return request({
url: '/system/jsdb/' + jh,
method: 'delete'
})
}
import request from '@/utils/request'
// 查询钻头数据列表
export function listJsha(query) {
return request({
url: '/system/jsha/list',
method: 'get',
params: query
})
}
// 查询钻头数据详细
export function getJsha(jh) {
return request({
url: '/system/jsha/' + jh,
method: 'get'
})
}
// 新增钻头数据
export function addJsha(data) {
return request({
url: '/system/jsha',
method: 'post',
data: data
})
}
// 修改钻头数据
export function updateJsha(data) {
return request({
url: '/system/jsha',
method: 'put',
data: data
})
}
// 删除钻头数据
export function delJsha(jh) {
return request({
url: '/system/jsha/' + jh,
method: 'delete'
})
}
import request from '@/utils/request'
// 查询定向井测斜数据计算数据列表
export function listJskd(query) {
return request({
url: '/system/jskd/list',
method: 'get',
params: query
})
}
// 查询定向井测斜数据计算数据详细
export function getJskd(jh) {
return request({
url: '/system/jskd/' + jh,
method: 'get'
})
}
// 新增定向井测斜数据计算数据
export function addJskd(data) {
return request({
url: '/system/jskd',
method: 'post',
data: data
})
}
// 修改定向井测斜数据计算数据
export function updateJskd(data) {
return request({
url: '/system/jskd',
method: 'put',
data: data
})
}
// 删除定向井测斜数据计算数据
export function delJskd(jh) {
return request({
url: '/system/jskd/' + jh,
method: 'delete'
})
}
......@@ -46,16 +46,16 @@ export const constantRoutes = [
component: () => import("@/views/login"),
hidden: true,
},
{
path: "/",
component: () => import("@/views/home"),
hidden: true,
},
{
path: "/home",
component: () => import("@/views/home"),
hidden: true,
},
// {
// path: "/",
// component: () => import("@/views/home"),
// hidden: true,
// },
// {
// path: "/home",
// component: () => import("@/views/home"),
// hidden: true,
// },
{
path: "/register",
component: () => import("@/views/register"),
......@@ -71,19 +71,19 @@ export const constantRoutes = [
component: () => import("@/views/error/401"),
hidden: true,
},
// {
// path: "",
// component: Layout,
// redirect: "index",
// children: [
// {
// path: "index",
// component: () => import("@/views/index"),
// name: "Index",
// meta: { title: "首页", icon: "dashboard", affix: true },
// },
// ],
// },
{
path: "",
component: Layout,
redirect: "index",
children: [
{
path: "index",
component: () => import("@/views/index"),
name: "Index",
meta: { title: "首页", icon: "dashboard", affix: true },
},
],
},
{
path: "/user",
component: Layout,
......@@ -106,7 +106,8 @@ export const constantRoutes = [
children: [
{
path: "schemeOptimization",
component: () => import("@/views/scientificDrill/schemeOptimization/index"),
component: () =>
import("@/views/scientificDrill/schemeOptimization/index"),
name: "schemeOptimization",
meta: { title: "方案设计", icon: "" },
},
......@@ -120,7 +121,8 @@ export const constantRoutes = [
children: [
{
path: "taleData",
component: () => import("@/views/scientificDrill/designScheme/tableData/index"),
component: () =>
import("@/views/scientificDrill/designScheme/tableData/index"),
name: "schemeOptimization",
meta: { title: "钻工设计", icon: "" },
},
......@@ -134,7 +136,8 @@ export const constantRoutes = [
children: [
{
path: "tableDatatg",
component: () => import("@/views/scientificDrill/designScheme/tableDatatg/index"),
component: () =>
import("@/views/scientificDrill/designScheme/tableDatatg/index"),
name: "schemeOptimization",
meta: { title: "钻具组合-套管", icon: "" },
},
......@@ -162,7 +165,8 @@ export const constantRoutes = [
children: [
{
path: "initialization",
component: () => import("@/views/optimization/components/initialization/index"),
component: () =>
import("@/views/optimization/components/initialization/index"),
name: "dataInitialization",
meta: { title: "钻井优化", icon: "" },
},
......@@ -190,7 +194,8 @@ export const constantRoutes = [
children: [
{
path: "workingConditions/tableData",
component: () => import("@/views/optimization/workingConditions/tableData"),
component: () =>
import("@/views/optimization/workingConditions/tableData"),
name: "dataInitialization",
meta: { title: "计算图版", icon: "" },
},
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="区块名称" prop="qk">
<el-select v-model="queryParams.qk" placeholder="请选择区块名称" clearable filterable>
<el-option v-for="item in blockOptions" :key="item.qk" :label="item.qk" :value="item.qk"
v-if="item && item.qk" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="success" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" border :data="blockList">
<el-table-column label="区块名称" align="center" prop="qk" />
<el-table-column label="井数量" align="center">
<template slot-scope="scope">
<el-button type="text" @click="goToJsaaPage(scope.row)">{{ scope.row.jsl }}</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
:page-sizes="[10, 20, 30, 50, 100]" @pagination="getList" />
</div>
</template>
<script>
import { getBlockName, getQkxl } from "@/api/system/jsaa";
export default {
name: "BlockManagement",
data() {
return {
// 遮罩层
loading: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 区块列表数据
blockList: [],
// 区块下拉选项
blockOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
qk: null
}
};
},
created() {
this.getList();
this.getBlockOptions();
},
methods: {
/** 查询区块列表 */
getList() {
this.loading = true;
getBlockName(this.queryParams).then(response => {
this.blockList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 获取区块下拉选项 */
getBlockOptions() {
getQkxl().then(response => {
// 过滤掉无效的选项
this.blockOptions = response.data.filter(item => item && item.qk);
});
},
/** 跳转到jsaa页面 */
goToJsaaPage(row) {
this.$router.push({
path: '/engineeringData/jsaa',
query: {
qk: row.qk
}
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 导出按钮操作 */
handleExport() {
this.download('/system/jsaa/exportQk', {
...this.queryParams
}, `区块管理${new Date().getTime()}.xlsx`)
}
}
};
</script>
<style lang="scss" scoped>
::v-deep .el-table__cell>.cell {
// font-size: 13px;
font-weight: normal;
}
::v-deep .el-table--medium .el-table__cell {
padding: 5px 0 !important;
}
.pagination-container {
position: relative;
height: 49px;
margin-bottom: 10px;
margin-top: 1px;
padding: 20px 5px !important;
}
</style>
\ No newline at end of file
......@@ -135,9 +135,7 @@ export default {
this.$store
.dispatch('Login', this.loginForm)
.then(() => {
// this.$router.push({ path: this.redirect || "/" }).catch(() => { });
// this.$router.push({ path: '/schemeOptimization' }).catch(() => { })
this.$router.push({ path: '/home' }).catch(() => { });
this.$router.push({ path: '/index' }).catch(() => { });
})
.catch(() => {
this.loading = false
......
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