Skip to content

P
pdczt_qd
Commit df563069 by zhaopanyu
Options

zpy

parent 9142da4f
Showing with 589 additions and 110 deletions
src/views/efficiencyAnalysis/djxx/detail/components/HistogramGraph.vue
...@@ -308,17 +308,21 @@ export default { ...@@ -308,17 +308,21 @@ export default {
if (chartDom) { if (chartDom) {
this.setChartDimensions(chartDom); this.setChartDimensions(chartDom);
} }
this.myChart.resize(); this.$nextTick(() => {
if (this.lastStackedAreas && this.lastChartConfig && this.lastXAxisLabels) { if (this.myChart) {
this.drawStratumLabels(this.lastStackedAreas, this.lastChartConfig, this.lastXAxisLabels); this.myChart.resize();
} if (this.lastStackedAreas && this.lastChartConfig && this.lastXAxisLabels) {
if (this.lastDepthIntervals && this.lastXAxisLabels && this.lastChartConfig) { this.drawStratumLabels(this.lastStackedAreas, this.lastChartConfig, this.lastXAxisLabels);
this.drawJhSeparators(this.lastDepthIntervals, this.lastXAxisLabels, this.lastChartConfig); }
} if (this.lastDepthIntervals && this.lastXAxisLabels && this.lastChartConfig) {
if (this.lastXAxisLabels && this.lastChartConfig) { this.drawJhSeparators(this.lastDepthIntervals, this.lastXAxisLabels, this.lastChartConfig);
this.drawCategoryEdgeLines(this.lastXAxisLabels, this.lastChartConfig); }
this.drawTopBandSvg(this.lastXAxisLabels, this.lastChartConfig, this.lastStackedAreas); if (this.lastXAxisLabels && this.lastChartConfig) {
} this.drawCategoryEdgeLines(this.lastXAxisLabels, this.lastChartConfig);
this.drawTopBandSvg(this.lastXAxisLabels, this.lastChartConfig, this.lastStackedAreas);
}
}
});
} }
}, },
...@@ -347,19 +351,46 @@ export default { ...@@ -347,19 +351,46 @@ export default {
this.setChartDimensions(chartDom); this.setChartDimensions(chartDom);
} }
this.myChart.setOption(option, true); this.myChart.setOption(option, true);
// 确保图表完全渲染后再resize // 确保图表完全渲染后再resize和绘制
this.$nextTick(() => { this.$nextTick(() => {
// 先resize确保图表尺寸正确
this.myChart.resize(); this.myChart.resize();
this.lastStackedAreas = wellData.stackedAreas; // 使用 requestAnimationFrame 确保浏览器完成渲染后再绘制
this.lastChartConfig = mockData.chartConfig; requestAnimationFrame(() => {
this.lastXAxisLabels = xAxisLabels; requestAnimationFrame(() => {
this.drawStratumLabels(this.lastStackedAreas, this.lastChartConfig, this.lastXAxisLabels); // 再次确认尺寸，确保图表已完全渲染
this.lastDepthIntervals = wellData.depthIntervals || []; const chartDom = this.$refs.chartRef;
this.drawJhSeparators(this.lastDepthIntervals, this.lastXAxisLabels, this.lastChartConfig); if (chartDom && chartDom.offsetWidth > 0 && chartDom.offsetHeight > 0) {
// 在顶部为每个类目绘制左右两条短竖线 // 再次resize确保尺寸准确
this.drawCategoryEdgeLines(this.lastXAxisLabels, this.lastChartConfig); this.myChart.resize();
// 顶部段内根据 x 和 y2 渲染 SVG 纹理 // 保存数据用于后续resize时重新绘制
this.drawTopBandSvg(this.lastXAxisLabels, this.lastChartConfig, this.lastStackedAreas); this.lastStackedAreas = wellData.stackedAreas;
this.lastChartConfig = mockData.chartConfig;
this.lastXAxisLabels = xAxisLabels;
this.lastDepthIntervals = wellData.depthIntervals || [];
// 绘制所有图形元素
this.drawStratumLabels(this.lastStackedAreas, this.lastChartConfig, this.lastXAxisLabels);
this.drawJhSeparators(this.lastDepthIntervals, this.lastXAxisLabels, this.lastChartConfig);
this.drawCategoryEdgeLines(this.lastXAxisLabels, this.lastChartConfig);
this.drawTopBandSvg(this.lastXAxisLabels, this.lastChartConfig, this.lastStackedAreas);
} else {
// 如果尺寸还未确定，延迟重试
setTimeout(() => {
if (this.myChart) {
this.myChart.resize();
this.lastStackedAreas = wellData.stackedAreas;
this.lastChartConfig = mockData.chartConfig;
this.lastXAxisLabels = xAxisLabels;
this.lastDepthIntervals = wellData.depthIntervals || [];
this.drawStratumLabels(this.lastStackedAreas, this.lastChartConfig, this.lastXAxisLabels);
this.drawJhSeparators(this.lastDepthIntervals, this.lastXAxisLabels, this.lastChartConfig);
this.drawCategoryEdgeLines(this.lastXAxisLabels, this.lastChartConfig);
this.drawTopBandSvg(this.lastXAxisLabels, this.lastChartConfig, this.lastStackedAreas);
}
}, 150);
}
});
});
}); });
} catch (error) { } catch (error) {
console.error("渲染数据失败:", error); console.error("渲染数据失败:", error);
...@@ -965,7 +996,11 @@ export default { ...@@ -965,7 +996,11 @@ export default {
? this.currentGraphicElements.filter(el => !el.__stratumLabel) ? this.currentGraphicElements.filter(el => !el.__stratumLabel)
: []; : [];
this.currentGraphicElements = elements; this.currentGraphicElements = elements;
this.myChart.setOption({ graphic: { elements } }); this.$nextTick(() => {
if (this.myChart) {
this.myChart.setOption({ graphic: { elements } }, { replaceMerge: ['graphic'] });
}
});
}, },
// 根据 depthIntervals 的顺序按 jh 分段，绘制虚线与顶部井号 // 根据 depthIntervals 的顺序按 jh 分段，绘制虚线与顶部井号
...@@ -1004,11 +1039,17 @@ export default { ...@@ -1004,11 +1039,17 @@ export default {
} }
const graphics = []; const graphics = [];
// 确保图表已完全渲染，检查容器尺寸
const chartDom = this.$refs.chartRef;
if (!chartDom || chartDom.offsetWidth === 0 || chartDom.offsetHeight === 0) {
console.warn('图表容器尺寸无效，跳过绘制井号分隔符');
return;
}
// 垂直范围（像素）——考虑 y 轴 inverse，取像素最小为顶部、最大为底部 // 垂直范围（像素）——考虑 y 轴 inverse，取像素最小为顶部、最大为底部
const yMinPx = this.myChart.convertToPixel({ yAxisIndex: 0 }, chartConfig.yAxis.min); const yMinPx = this.myChart.convertToPixel({ yAxisIndex: 0 }, chartConfig.yAxis.min);
const yMaxPx = this.myChart.convertToPixel({ yAxisIndex: 0 }, chartConfig.yAxis.max); const yMaxPx = this.myChart.convertToPixel({ yAxisIndex: 0 }, chartConfig.yAxis.max);
if (yMinPx === null || yMaxPx === null) { if (yMinPx === null || yMaxPx === null || isNaN(yMinPx) || isNaN(yMaxPx)) {
console.warn('convertToPixel 返回 null 值，跳过绘制井号分隔符'); console.warn('convertToPixel 返回无效值，跳过绘制井号分隔符');
return; return;
} }
const yTopPx = Math.min(yMinPx, yMaxPx); const yTopPx = Math.min(yMinPx, yMaxPx);
...@@ -1118,16 +1159,30 @@ export default { ...@@ -1118,16 +1159,30 @@ export default {
const prevElements = Array.isArray(this.currentGraphicElements) ? this.currentGraphicElements : []; const prevElements = Array.isArray(this.currentGraphicElements) ? this.currentGraphicElements : [];
const merged = prevElements.concat(graphics); const merged = prevElements.concat(graphics);
this.currentGraphicElements = merged; this.currentGraphicElements = merged;
this.myChart.setOption({ graphic: { elements: merged } }); this.$nextTick(() => {
if (this.myChart) {
this.myChart.setOption({ graphic: { elements: merged } }, { replaceMerge: ['graphic'] });
}
});
}, },
// 为每个 x 类目在左右各画一条黑色竖线（仅顶部短竖线） // 为每个 x 类目在左右各画一条黑色竖线（仅顶部短竖线）
drawCategoryEdgeLines(xAxisLabels, chartConfig) { drawCategoryEdgeLines(xAxisLabels, chartConfig) {
if (!this.myChart || !Array.isArray(xAxisLabels) || xAxisLabels.length === 0) return; if (!this.myChart || !Array.isArray(xAxisLabels) || xAxisLabels.length === 0) return;
// 确保图表已完全渲染，检查容器尺寸
const chartDom = this.$refs.chartRef;
if (!chartDom || chartDom.offsetWidth === 0 || chartDom.offsetHeight === 0) {
console.warn('图表容器尺寸无效，跳过绘制类目边界线');
return;
}
const yMinPx = this.myChart.convertToPixel({ yAxisIndex: 0 }, chartConfig.yAxis.min); const yMinPx = this.myChart.convertToPixel({ yAxisIndex: 0 }, chartConfig.yAxis.min);
const yMaxPx = this.myChart.convertToPixel({ yAxisIndex: 0 }, chartConfig.yAxis.max); const yMaxPx = this.myChart.convertToPixel({ yAxisIndex: 0 }, chartConfig.yAxis.max);
if (yMinPx === null || yMaxPx === null) return; if (yMinPx === null || yMaxPx === null || isNaN(yMinPx) || isNaN(yMaxPx)) {
console.warn('convertToPixel 返回无效值，跳过绘制类目边界线');
return;
}
const yTopPx = Math.min(yMinPx, yMaxPx); const yTopPx = Math.min(yMinPx, yMaxPx);
const yBottomPx = Math.max(yMinPx, yMaxPx); const yBottomPx = Math.max(yMinPx, yMaxPx);
// 只在上方画短竖线：长度占绘图区高度的 12%，并限制在 30-120 像素 // 只在上方画短竖线：长度占绘图区高度的 12%，并限制在 30-120 像素
...@@ -1227,13 +1282,24 @@ export default { ...@@ -1227,13 +1282,24 @@ export default {
const prev = Array.isArray(this.currentGraphicElements) ? this.currentGraphicElements : []; const prev = Array.isArray(this.currentGraphicElements) ? this.currentGraphicElements : [];
const merged = prev.concat(graphics); const merged = prev.concat(graphics);
this.currentGraphicElements = merged; this.currentGraphicElements = merged;
this.myChart.setOption({ graphic: { elements: merged } }); this.$nextTick(() => {
if (this.myChart) {
this.myChart.setOption({ graphic: { elements: merged } }, { replaceMerge: ['graphic'] });
}
});
}, },
// 图内根据 x 和 y2 渲染 SVG 纹理（每段使用该 x 在 stackedAreas 中最浅层 y2 对应的 svg），从顶部填充到 y2 深度 // 图内根据 x 和 y2 渲染 SVG 纹理（每段使用该 x 在 stackedAreas 中最浅层 y2 对应的 svg），从顶部填充到 y2 深度
async drawTopBandSvg(xAxisLabels, chartConfig, stackedAreas) { async drawTopBandSvg(xAxisLabels, chartConfig, stackedAreas) {
if (!this.myChart || !Array.isArray(xAxisLabels) || !stackedAreas) return; if (!this.myChart || !Array.isArray(xAxisLabels) || !stackedAreas) return;
// 确保图表已完全渲染，检查容器尺寸
const chartDom = this.$refs.chartRef;
if (!chartDom || chartDom.offsetWidth === 0 || chartDom.offsetHeight === 0) {
console.warn('图表容器尺寸无效，跳过绘制顶部SVG纹理');
return;
}
// 计算每个类目的像素中心 // 计算每个类目的像素中心
const centers = []; const centers = [];
for (let i = 0; i < xAxisLabels.length; i++) { for (let i = 0; i < xAxisLabels.length; i++) {
...@@ -1340,7 +1406,11 @@ export default { ...@@ -1340,7 +1406,11 @@ export default {
const kept = prev.filter(el => !el.__band); const kept = prev.filter(el => !el.__band);
const merged = kept.concat(graphics); const merged = kept.concat(graphics);
this.currentGraphicElements = merged; this.currentGraphicElements = merged;
this.myChart.setOption({ graphic: { elements: merged } }); this.$nextTick(() => {
if (this.myChart) {
this.myChart.setOption({ graphic: { elements: merged } }, { replaceMerge: ['graphic'] });
}
});
} }
}, },
}; };
...@@ -1420,6 +1490,7 @@ export default { ...@@ -1420,6 +1490,7 @@ export default {
border-radius: 6px; border-radius: 6px;
border: 1px solid rgba(15, 23, 42, 0.15); border: 1px solid rgba(15, 23, 42, 0.15);
background-color: #d1d5db; background-color: #d1d5db;
background-size: cover !important;
} }
.legend-label { .legend-label {
......
src/views/efficiencyAnalysis/jcxx/components/HistogramGraph.vue
...@@ -944,6 +944,7 @@ export default { ...@@ -944,6 +944,7 @@ export default {
border-radius: 6px; border-radius: 6px;
border: 1px solid rgba(15, 23, 42, 0.15); border: 1px solid rgba(15, 23, 42, 0.15);
background-color: #d1d5db; background-color: #d1d5db;
background-size: cover !important;
} }
.legend-label { .legend-label {
......
src/views/efficiencyAnalysis/jcxx/components/LoggingData.vue
...@@ -55,43 +55,151 @@ ...@@ -55,43 +55,151 @@
}" :header-cell-class-name="'table-header'" :cell-style="{ }" :header-cell-class-name="'table-header'" :cell-style="{
padding: '1px 0' padding: '1px 0'
}" :tooltip-effect="'dark'" header-overflow-tooltip v-loading="loading"> }" :tooltip-effect="'dark'" header-overflow-tooltip v-loading="loading">
<el-table-column v-if="isColumnVisible('dept')" label="井深" prop="dept" min-width="90" align="center" <el-table-column v-if="isColumnVisible('dept')" prop="dept" min-width="90" align="center"
show-overflow-tooltip :render-header="renderTableHeader" /> show-overflow-tooltip>
<el-table-column v-if="isColumnVisible('tvd')" label="垂深" prop="tvd" min-width="90" align="center" <template slot="header">
show-overflow-tooltip :render-header="renderTableHeader" /> <el-tooltip content="井深" placement="top" effect="dark">
<span>井深</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('tvd')" prop="tvd" min-width="90" align="center"
show-overflow-tooltip>
<template slot="header">
<el-tooltip content="垂深" placement="top" effect="dark">
<span>垂深</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('vdl')" label="声波变密度(微秒/μs)" min-width="100" prop="vdl" <el-table-column v-if="isColumnVisible('vdl')" label="声波变密度(微秒/μs)" min-width="100" prop="vdl"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="声波变密度(微秒/μs)" placement="top" effect="dark">
<span>声波变密度(微秒/μs)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('sp')" label="自然电位(毫伏/mv)" min-width="100" prop="sp" <el-table-column v-if="isColumnVisible('sp')" label="自然电位(毫伏/mv)" min-width="100" prop="sp"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="自然电位(毫伏/mv)" placement="top" effect="dark">
<span>自然电位(毫伏/mv)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('gr')" label="自然伽马(自然伽马单位/API)" min-width="130" prop="gr" <el-table-column v-if="isColumnVisible('gr')" label="自然伽马(自然伽马单位/API)" min-width="130" prop="gr"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="自然伽马(自然伽马单位/API)" placement="top" effect="dark">
<span>自然伽马(自然伽马单位/API)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('rd')" label="深侧向电阻率" prop="rd" min-width="100" align="center" <el-table-column v-if="isColumnVisible('rd')" label="深侧向电阻率" prop="rd" min-width="100" align="center"
show-overflow-tooltip :render-header="renderTableHeader" /> show-overflow-tooltip>
<template slot="header">
<el-tooltip content="深侧向电阻率" placement="top" effect="dark">
<span>深侧向电阻率</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('rs')" label="浅侧向电阻率" prop="rs" min-width="100" align="center" <el-table-column v-if="isColumnVisible('rs')" label="浅侧向电阻率" prop="rs" min-width="100" align="center"
show-overflow-tooltip :render-header="renderTableHeader" /> show-overflow-tooltip>
<template slot="header">
<el-tooltip content="浅侧向电阻率" placement="top" effect="dark">
<span>浅侧向电阻率</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('cnl')" label="补偿中子(百分数/%)" min-width="100" prop="cnl" <el-table-column v-if="isColumnVisible('cnl')" label="补偿中子(百分数/%)" min-width="100" prop="cnl"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="补偿中子(百分数/%)" placement="top" effect="dark">
<span>补偿中子(百分数/%)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('den')" label="体积密度(克每立方厘米/g/cm3)" min-width="100" prop="den" <el-table-column v-if="isColumnVisible('den')" label="体积密度(克每立方厘米/g/cm3)" min-width="100" prop="den"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="体积密度(克每立方厘米/g/cm3)" placement="top" effect="dark">
<span>体积密度(克每立方厘米/g/cm3)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('ac')" label="声波时差(微秒每英尺/μs/ft)" min-width="120" prop="ac" <el-table-column v-if="isColumnVisible('ac')" label="声波时差(微秒每英尺/μs/ft)" min-width="120" prop="ac"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="声波时差(微秒每英尺/μs/ft)" placement="top" effect="dark">
<span>声波时差(微秒每英尺/μs/ft)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('dzky')" label="单轴抗压强度" prop="dzky" min-width="100" <el-table-column v-if="isColumnVisible('dzky')" label="单轴抗压强度" prop="dzky" min-width="100"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="单轴抗压强度" placement="top" effect="dark">
<span>单轴抗压强度</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="固定规则" align="center"> <el-table-column label="固定规则" align="center">
<el-table-column v-if="isColumnVisible('vsh')" label="泥质含量" prop="vsh" align="center" <el-table-column v-if="isColumnVisible('vsh')" label="泥质含量" prop="vsh" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="泥质含量" placement="top" effect="dark">
<span>泥质含量</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('kjqd')" label="抗剪强度" prop="kjqd" align="center" <el-table-column v-if="isColumnVisible('kjqd')" label="抗剪强度" prop="kjqd" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="抗剪强度" placement="top" effect="dark">
<span>抗剪强度</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('yskzxjz')" label="岩石可钻性级值" prop="yskzxjz" align="center" <el-table-column v-if="isColumnVisible('yskzxjz')" label="岩石可钻性级值" prop="yskzxjz" align="center"
min-width="120" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="120" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="岩石可钻性级值" placement="top" effect="dark">
<span>岩石可钻性级值</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('ymzs')" label="研磨性系数" prop="ymzs" align="center" <el-table-column v-if="isColumnVisible('ymzs')" label="研磨性系数" prop="ymzs" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="研磨性系数" placement="top" effect="dark">
<span>研磨性系数</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('nmcj')" label="内摩擦角" prop="nmcj" align="center" <el-table-column v-if="isColumnVisible('nmcj')" label="内摩擦角" prop="nmcj" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="内摩擦角" placement="top" effect="dark">
<span>内摩擦角</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('cjzs')" label="均质性系数" prop="cjzs" align="center" <el-table-column v-if="isColumnVisible('cjzs')" label="均质性系数" prop="cjzs" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="均质性系数" placement="top" effect="dark">
<span>均质性系数</span>
</el-tooltip>
</template>
</el-table-column>
<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>
<template slot="header">
<el-tooltip content="钻头选型指数" placement="top" effect="dark">
<span>钻头选型指数</span>
</el-tooltip>
</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="140" align="center"> <el-table-column label="操作" fixed="right" width="140" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/engineeringData/loggingData/index.vue
...@@ -51,43 +51,151 @@ ...@@ -51,43 +51,151 @@
}" :header-cell-class-name="'table-header'" :cell-style="{ }" :header-cell-class-name="'table-header'" :cell-style="{
padding: '1px 0' padding: '1px 0'
}" :tooltip-effect="'dark'" header-overflow-tooltip v-loading="loading"> }" :tooltip-effect="'dark'" header-overflow-tooltip v-loading="loading">
<el-table-column v-if="isColumnVisible('dept')" label="井深" prop="dept" min-width="90" align="center" <el-table-column v-if="isColumnVisible('dept')" prop="dept" min-width="90" align="center"
show-overflow-tooltip :render-header="renderTableHeader" /> show-overflow-tooltip>
<el-table-column v-if="isColumnVisible('tvd')" label="垂深" prop="tvd" min-width="90" align="center" <template slot="header">
show-overflow-tooltip :render-header="renderTableHeader" /> <el-tooltip content="井深" placement="top" effect="dark">
<span>井深</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('tvd')" prop="tvd" min-width="90" align="center"
show-overflow-tooltip>
<template slot="header">
<el-tooltip content="垂深" placement="top" effect="dark">
<span>垂深</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('vdl')" label="声波变密度(微秒/μs)" min-width="100" prop="vdl" <el-table-column v-if="isColumnVisible('vdl')" label="声波变密度(微秒/μs)" min-width="100" prop="vdl"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="声波变密度(微秒/μs)" placement="top" effect="dark">
<span>声波变密度(微秒/μs)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('sp')" label="自然电位(毫伏/mv)" min-width="100" prop="sp" <el-table-column v-if="isColumnVisible('sp')" label="自然电位(毫伏/mv)" min-width="100" prop="sp"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="自然电位(毫伏/mv)" placement="top" effect="dark">
<span>自然电位(毫伏/mv)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('gr')" label="自然伽马(自然伽马单位/API)" min-width="130" prop="gr" <el-table-column v-if="isColumnVisible('gr')" label="自然伽马(自然伽马单位/API)" min-width="130" prop="gr"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="自然伽马(自然伽马单位/API)" placement="top" effect="dark">
<span>自然伽马(自然伽马单位/API)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('rd')" label="深侧向电阻率" prop="rd" min-width="100" align="center" <el-table-column v-if="isColumnVisible('rd')" label="深侧向电阻率" prop="rd" min-width="100" align="center"
show-overflow-tooltip :render-header="renderTableHeader" /> show-overflow-tooltip>
<template slot="header">
<el-tooltip content="深侧向电阻率" placement="top" effect="dark">
<span>深侧向电阻率</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('rs')" label="浅侧向电阻率" prop="rs" min-width="100" align="center" <el-table-column v-if="isColumnVisible('rs')" label="浅侧向电阻率" prop="rs" min-width="100" align="center"
show-overflow-tooltip :render-header="renderTableHeader" /> show-overflow-tooltip>
<template slot="header">
<el-tooltip content="浅侧向电阻率" placement="top" effect="dark">
<span>浅侧向电阻率</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('cnl')" label="补偿中子(百分数/%)" min-width="100" prop="cnl" <el-table-column v-if="isColumnVisible('cnl')" label="补偿中子(百分数/%)" min-width="100" prop="cnl"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="补偿中子(百分数/%)" placement="top" effect="dark">
<span>补偿中子(百分数/%)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('den')" label="体积密度(克每立方厘米/g/cm3)" min-width="100" prop="den" <el-table-column v-if="isColumnVisible('den')" label="体积密度(克每立方厘米/g/cm3)" min-width="100" prop="den"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="体积密度(克每立方厘米/g/cm3)" placement="top" effect="dark">
<span>体积密度(克每立方厘米/g/cm3)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('ac')" label="声波时差(微秒每英尺/μs/ft)" min-width="120" prop="ac" <el-table-column v-if="isColumnVisible('ac')" label="声波时差(微秒每英尺/μs/ft)" min-width="120" prop="ac"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="声波时差(微秒每英尺/μs/ft)" placement="top" effect="dark">
<span>声波时差(微秒每英尺/μs/ft)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('dzky')" label="单轴抗压强度" prop="dzky" min-width="100" <el-table-column v-if="isColumnVisible('dzky')" label="单轴抗压强度" prop="dzky" min-width="100"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="单轴抗压强度" placement="top" effect="dark">
<span>单轴抗压强度</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="固定规则" align="center"> <el-table-column label="固定规则" align="center">
<el-table-column v-if="isColumnVisible('vsh')" label="泥质含量" prop="vsh" align="center" <el-table-column v-if="isColumnVisible('vsh')" label="泥质含量" prop="vsh" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="泥质含量" placement="top" effect="dark">
<span>泥质含量</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('kjqd')" label="抗剪强度" prop="kjqd" align="center" <el-table-column v-if="isColumnVisible('kjqd')" label="抗剪强度" prop="kjqd" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="抗剪强度" placement="top" effect="dark">
<span>抗剪强度</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('yskzxjz')" label="岩石可钻性级值" prop="yskzxjz" align="center" <el-table-column v-if="isColumnVisible('yskzxjz')" label="岩石可钻性级值" prop="yskzxjz" align="center"
min-width="120" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="120" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="岩石可钻性级值" placement="top" effect="dark">
<span>岩石可钻性级值</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('ymzs')" label="研磨性系数" prop="ymzs" align="center" <el-table-column v-if="isColumnVisible('ymzs')" label="研磨性系数" prop="ymzs" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="研磨性系数" placement="top" effect="dark">
<span>研磨性系数</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('nmcj')" label="内摩擦角" prop="nmcj" align="center" <el-table-column v-if="isColumnVisible('nmcj')" label="内摩擦角" prop="nmcj" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="内摩擦角" placement="top" effect="dark">
<span>内摩擦角</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('cjzs')" label="均质性系数" prop="cjzs" align="center" <el-table-column v-if="isColumnVisible('cjzs')" label="均质性系数" prop="cjzs" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="均质性系数" placement="top" effect="dark">
<span>均质性系数</span>
</el-tooltip>
</template>
</el-table-column>
<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>
<template slot="header">
<el-tooltip content="钻头选型指数" placement="top" effect="dark">
<span>钻头选型指数</span>
</el-tooltip>
</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="80" align="center"> <el-table-column label="操作" fixed="right" width="80" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/system/basicInformationOfDrillBit/index.vue
...@@ -295,11 +295,86 @@ ...@@ -295,11 +295,86 @@
<!-- 现代化特征代码卡片区 --> <!-- 现代化特征代码卡片区 -->
<div class="feature-code-cards"> <div class="feature-code-cards">
<div class="code-card" v-for="(item, i) in featureMap" :key="i"> <div class="code-card" v-for="(item, i) in featureMap" :key="i">
<div class="code-title">T{{ String(i + 1).padStart(2, '0') }}</div> <div class="code-title">{{ item.tzdl }}</div>
<div class="code-value">{{ detailData[item.codeField + '_tzdm'] || '--' }}</div> <div class="code-value">{{ detailData[item.codeField + '_tzdm'] || '--' }}</div>
<!-- <div class="code-value">{{ detailData[item.codeField + '_value'] || (detailData[item.codeField] || '--') }}</div> --> <!-- <div class="code-value">{{ detailData[item.codeField + '_value'] || (detailData[item.codeField] || '--') }}</div> -->
</div> </div>
</div> </div>
<!-- 设计详细参数 -->
<div class="design-detail-params">
<el-divider class="divider-strong">设计详细参数</el-divider>
<el-form :model="detailData" label-width="120px">
<el-row :gutter="20" class="geometry-row">
<el-col :span="8">
<el-form-item label="冠部轮廓">
<el-input :value="detailData.gblk || '--'" readonly />
</el-form-item>
</el-col>
<el-col v-if="['双圆弧', '单圆弧'].includes(detailData.gblk)" :span="8">
<el-form-item label="R1(mm)">
<el-input :value="detailData.r1 || '--'" readonly />
</el-form-item>
</el-col>
<el-col v-if="detailData.gblk === '双圆弧'" :span="8">
<el-form-item label="R2(mm)">
<el-input :value="detailData.r2 || '--'" readonly />
</el-form-item>
</el-col>
<el-col v-if="detailData.gblk === '其他'" :span="8">
<el-form-item label="其他">
<el-input :value="detailData.qt || '--'" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="内锥角(°)">
<el-input :value="detailData.nzj || '--'" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="冠部高度(mm)">
<el-input :value="detailData.gbgd || '--'" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="冠顶直径(mm)">
<el-input :value="detailData.gdzj || '--'" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="内锥高度(mm)">
<el-input :value="detailData.nzgd || '--'" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="后倾角心部(°)">
<el-input :value="detailData.hqjxb || '--'" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="后倾角冠部(°)">
<el-input :value="detailData.hqjgb || '--'" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="后倾角保径(°)">
<el-input :value="detailData.hqjbj || '--'" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="后倾角其他(°)">
<el-input :value="detailData.hqjqt || '--'" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="后排齿后倾角(°)">
<el-input :value="detailData.hpchqj || '--'" readonly />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 特征参数 --> <!-- 特征参数 -->
<div class="feature-params"> <div class="feature-params">
<div class="params-header"> <div class="params-header">
...@@ -317,13 +392,10 @@ ...@@ -317,13 +392,10 @@
</div> </div>
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="detailVisible = false">关闭</el-button> <el-button @click="detailVisible = false">关闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="imgPreviewVisible" width="80%" append-to-body class="img-preview-dialog" <el-dialog :visible.sync="imgPreviewVisible" width="80%" append-to-body class="img-preview-dialog"
:show-close="true" center> :show-close="true" center>
<img :src="imgPreviewUrl" style="max-width:80vw;max-height:80vh;border-radius:18px;" /> <img :src="imgPreviewUrl" style="max-width:80vw;max-height:80vh;border-radius:18px;" />
...@@ -350,7 +422,6 @@ ...@@ -350,7 +422,6 @@
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -1300,6 +1371,17 @@ export default { ...@@ -1300,6 +1371,17 @@ export default {
letter-spacing: 2px; letter-spacing: 2px;
} }
.design-detail-params {
background: #f8faff;
border-radius: 12px;
padding: 24px 18px;
box-shadow: 0 2px 8px rgba(64, 158, 255, 0.06);
}
.design-detail-params .geometry-row {
margin-top: 20px;
}
.collapse-area { .collapse-area {
background: #fafdff; background: #fafdff;
border-radius: 12px; border-radius: 12px;
......
src/views/wellDesign/components/AdjacentWell.vue
...@@ -54,43 +54,151 @@ ...@@ -54,43 +54,151 @@
padding: '1px 0' padding: '1px 0'
}" :tooltip-effect="'dark'" header-overflow-tooltip v-loading="loading" }" :tooltip-effect="'dark'" header-overflow-tooltip v-loading="loading"
element-loading-text="计算时间较长,请耐心等待..."> element-loading-text="计算时间较长,请耐心等待...">
<el-table-column v-if="isColumnVisible('dept')" label="井深" prop="dept" min-width="90" align="center" <el-table-column v-if="isColumnVisible('dept')" prop="dept" min-width="90" align="center"
show-overflow-tooltip :render-header="renderTableHeader" /> show-overflow-tooltip>
<el-table-column v-if="isColumnVisible('tvd')" label="垂深" prop="tvd" min-width="90" align="center" <template slot="header">
show-overflow-tooltip :render-header="renderTableHeader" /> <el-tooltip content="井深" placement="top" effect="dark">
<span>井深</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('tvd')" prop="tvd" min-width="90" align="center"
show-overflow-tooltip>
<template slot="header">
<el-tooltip content="垂深" placement="top" effect="dark">
<span>垂深</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('vdl')" label="声波变密度(微秒/μs)" min-width="100" prop="vdl" <el-table-column v-if="isColumnVisible('vdl')" label="声波变密度(微秒/μs)" min-width="100" prop="vdl"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="声波变密度(微秒/μs)" placement="top" effect="dark">
<span>声波变密度(微秒/μs)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('sp')" label="自然电位(毫伏/mv)" min-width="100" prop="sp" <el-table-column v-if="isColumnVisible('sp')" label="自然电位(毫伏/mv)" min-width="100" prop="sp"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="自然电位(毫伏/mv)" placement="top" effect="dark">
<span>自然电位(毫伏/mv)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('gr')" label="自然伽马(自然伽马单位/API)" min-width="130" prop="gr" <el-table-column v-if="isColumnVisible('gr')" label="自然伽马(自然伽马单位/API)" min-width="130" prop="gr"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="自然伽马(自然伽马单位/API)" placement="top" effect="dark">
<span>自然伽马(自然伽马单位/API)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('rd')" label="深侧向电阻率" prop="rd" min-width="100" align="center" <el-table-column v-if="isColumnVisible('rd')" label="深侧向电阻率" prop="rd" min-width="100" align="center"
show-overflow-tooltip :render-header="renderTableHeader" /> show-overflow-tooltip>
<template slot="header">
<el-tooltip content="深侧向电阻率" placement="top" effect="dark">
<span>深侧向电阻率</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('rs')" label="浅侧向电阻率" prop="rs" min-width="100" align="center" <el-table-column v-if="isColumnVisible('rs')" label="浅侧向电阻率" prop="rs" min-width="100" align="center"
show-overflow-tooltip :render-header="renderTableHeader" /> show-overflow-tooltip>
<template slot="header">
<el-tooltip content="浅侧向电阻率" placement="top" effect="dark">
<span>浅侧向电阻率</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('cnl')" label="补偿中子(百分数/%)" min-width="100" prop="cnl" <el-table-column v-if="isColumnVisible('cnl')" label="补偿中子(百分数/%)" min-width="100" prop="cnl"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="补偿中子(百分数/%)" placement="top" effect="dark">
<span>补偿中子(百分数/%)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('den')" label="体积密度(克每立方厘米/g/cm3)" min-width="100" prop="den" <el-table-column v-if="isColumnVisible('den')" label="体积密度(克每立方厘米/g/cm3)" min-width="100" prop="den"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="体积密度(克每立方厘米/g/cm3)" placement="top" effect="dark">
<span>体积密度(克每立方厘米/g/cm3)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('ac')" label="声波时差(微秒每英尺/μs/ft)" min-width="120" prop="ac" <el-table-column v-if="isColumnVisible('ac')" label="声波时差(微秒每英尺/μs/ft)" min-width="120" prop="ac"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="声波时差(微秒每英尺/μs/ft)" placement="top" effect="dark">
<span>声波时差(微秒每英尺/μs/ft)</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('dzky')" label="单轴抗压强度" prop="dzky" min-width="100" <el-table-column v-if="isColumnVisible('dzky')" label="单轴抗压强度" prop="dzky" min-width="100"
align="center" show-overflow-tooltip :render-header="renderTableHeader" /> align="center" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="单轴抗压强度" placement="top" effect="dark">
<span>单轴抗压强度</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="固定规则" align="center"> <el-table-column label="固定规则" align="center">
<el-table-column v-if="isColumnVisible('vsh')" label="泥质含量" prop="vsh" align="center" <el-table-column v-if="isColumnVisible('vsh')" label="泥质含量" prop="vsh" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="泥质含量" placement="top" effect="dark">
<span>泥质含量</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('kjqd')" label="抗剪强度" prop="kjqd" align="center" <el-table-column v-if="isColumnVisible('kjqd')" label="抗剪强度" prop="kjqd" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="抗剪强度" placement="top" effect="dark">
<span>抗剪强度</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('yskzxjz')" label="岩石可钻性级值" prop="yskzxjz" align="center" <el-table-column v-if="isColumnVisible('yskzxjz')" label="岩石可钻性级值" prop="yskzxjz" align="center"
min-width="120" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="120" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="岩石可钻性级值" placement="top" effect="dark">
<span>岩石可钻性级值</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('ymzs')" label="研磨性系数" prop="ymzs" align="center" <el-table-column v-if="isColumnVisible('ymzs')" label="研磨性系数" prop="ymzs" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="研磨性系数" placement="top" effect="dark">
<span>研磨性系数</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('nmcj')" label="内摩擦角" prop="nmcj" align="center" <el-table-column v-if="isColumnVisible('nmcj')" label="内摩擦角" prop="nmcj" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="内摩擦角" placement="top" effect="dark">
<span>内摩擦角</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('cjzs')" label="均质性系数" prop="cjzs" align="center" <el-table-column v-if="isColumnVisible('cjzs')" label="均质性系数" prop="cjzs" align="center"
min-width="100" show-overflow-tooltip :render-header="renderTableHeader" /> min-width="100" show-overflow-tooltip>
<template slot="header">
<el-tooltip content="均质性系数" placement="top" effect="dark">
<span>均质性系数</span>
</el-tooltip>
</template>
</el-table-column>
<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>
<template slot="header">
<el-tooltip content="钻头选型指数" placement="top" effect="dark">
<span>钻头选型指数</span>
</el-tooltip>
</template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="140" align="center" fixed="right"> <el-table-column label="操作" width="140" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/wellDesign/components/WellStructure.vue
...@@ -461,9 +461,9 @@ export default { ...@@ -461,9 +461,9 @@ export default {
.attr("transform", "translate(10,0)") .attr("transform", "translate(10,0)")
.call(yAxis); .call(yAxis);
svg2.selectAll(".tick text").style("fill", "#fff"); svg2.selectAll(".tick text").style("fill", "#000");
svg2.selectAll(".tick line").style("stroke", "#fff"); svg2.selectAll(".tick line").style("stroke", "#000");
svg2.selectAll(".domain").style("stroke", "#fff"); svg2.selectAll(".domain").style("stroke", "#000");
const gradient = svg2.append("defs") const gradient = svg2.append("defs")
.append("linearGradient") .append("linearGradient")
...@@ -532,14 +532,14 @@ export default { ...@@ -532,14 +532,14 @@ export default {
svg2.append("path") svg2.append("path")
.attr("transform", `translate(0,0)`) .attr("transform", `translate(0,0)`)
.attr("fill", "none") .attr("fill", "none")
.attr("stroke", "#fff") .attr("stroke", "#000")
.attr("stroke-width", 2) .attr("stroke-width", 2)
.attr("d", line(seg.leftLine)); .attr("d", line(seg.leftLine));
if (seg.leftLine[1]) { if (seg.leftLine[1]) {
svg2.append("path") svg2.append("path")
.datum(seg.leftLine[1]) .datum(seg.leftLine[1])
.attr("class", "triangle-point") .attr("class", "triangle-point")
.attr("fill", "rgb(255,255,255)") .attr("fill", "rgb(0,0,0)")
.attr("d", this.drawTriangle(triangleLeft)) .attr("d", this.drawTriangle(triangleLeft))
.attr("transform", d => `translate(${x(d.value)},${y(d.depth)})`); .attr("transform", d => `translate(${x(d.value)},${y(d.depth)})`);
} }
...@@ -553,14 +553,14 @@ export default { ...@@ -553,14 +553,14 @@ export default {
svg2.append("path") svg2.append("path")
.attr("transform", `translate(0,0)`) .attr("transform", `translate(0,0)`)
.attr("fill", "none") .attr("fill", "none")
.attr("stroke", "#fff") .attr("stroke", "#000")
.attr("stroke-width", 2) .attr("stroke-width", 2)
.attr("d", line(seg.rightLine)); .attr("d", line(seg.rightLine));
if (seg.rightLine[1]) { if (seg.rightLine[1]) {
svg2.append("path") svg2.append("path")
.datum(seg.rightLine[1]) .datum(seg.rightLine[1])
.attr("class", "triangle-point") .attr("class", "triangle-point")
.attr("fill", "rgb(255,255,255)") .attr("fill", "rgb(0,0,0)")
.attr("d", this.drawTriangle(triangleRight)) .attr("d", this.drawTriangle(triangleRight))
.attr("transform", d => `translate(${x(d.value)},${y(d.depth)})`); .attr("transform", d => `translate(${x(d.value)},${y(d.depth)})`);
} }
...@@ -582,7 +582,7 @@ export default { ...@@ -582,7 +582,7 @@ export default {
// 箭头线 // 箭头线
svg2.append("path") svg2.append("path")
.attr("d", arrowLine(item.point)) .attr("d", arrowLine(item.point))
.attr("stroke", "#ffffff") .attr("stroke", "#000")
.attr("fill", "none") .attr("fill", "none")
.attr("stroke-width", 1) .attr("stroke-width", 1)
.attr("stroke-linecap", "round"); .attr("stroke-linecap", "round");
...@@ -594,7 +594,7 @@ export default { ...@@ -594,7 +594,7 @@ export default {
.attr("cx", circleX) .attr("cx", circleX)
.attr("cy", circleY) .attr("cy", circleY)
.attr("r", 3) .attr("r", 3)
.attr("fill", "#ffffff") .attr("fill", "#000")
.attr("stroke", "none"); .attr("stroke", "none");
// 文本位置在箭头起点右侧稍上 // 文本位置在箭头起点右侧稍上
...@@ -605,7 +605,7 @@ export default { ...@@ -605,7 +605,7 @@ export default {
const text = group.append("text") const text = group.append("text")
.attr("x", textX + 10) .attr("x", textX + 10)
.attr("y", textY) .attr("y", textY)
.attr("fill", "#ffffff") .attr("fill", "#000")
.attr("font-size", "12px"); .attr("font-size", "12px");
if (item.describe1) { if (item.describe1) {
...@@ -640,7 +640,7 @@ export default { ...@@ -640,7 +640,7 @@ export default {
svg2.append("path") svg2.append("path")
.attr("d", arrowLine(item.point)) .attr("d", arrowLine(item.point))
.attr("stroke", "#ffffff") .attr("stroke", "#000")
.attr("fill", "none") .attr("fill", "none")
.attr("stroke-width", 1) .attr("stroke-width", 1)
.attr("stroke-linecap", "round"); .attr("stroke-linecap", "round");
...@@ -651,7 +651,7 @@ export default { ...@@ -651,7 +651,7 @@ export default {
.attr("cx", circleX) .attr("cx", circleX)
.attr("cy", circleY) .attr("cy", circleY)
.attr("r", 3) .attr("r", 3)
.attr("fill", "#ffffff") .attr("fill", "#000")
.attr("stroke", "none"); .attr("stroke", "none");
const textX = x(item.point[0][0] + 20); const textX = x(item.point[0][0] + 20);
...@@ -661,7 +661,7 @@ export default { ...@@ -661,7 +661,7 @@ export default {
const text = group.append("text") const text = group.append("text")
.attr("x", textX + 10) .attr("x", textX + 10)
.attr("y", textY) .attr("y", textY)
.attr("fill", "#ffffff") .attr("fill", "#000")
.attr("font-size", "12px"); .attr("font-size", "12px");
if (item.describe1) { if (item.describe1) {
...@@ -823,7 +823,7 @@ export default { ...@@ -823,7 +823,7 @@ export default {
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #262a32; background-color: #fff;
overflow: hidden; overflow: hidden;
} }
...@@ -831,8 +831,9 @@ export default { ...@@ -831,8 +831,9 @@ export default {
padding: 6px 12px; padding: 6px 12px;
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
color: #ffffff; color: #333;
border-bottom: 1px solid #3c3f45; border-bottom: 1px solid #e4e7ed;
background-color: #f5f7fa;
} }
.jsjgt-body { .jsjgt-body {
......
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