Skip to content

P
pdczt_qd
Commit df563069 by zhaopanyu
Options

zpy

parent 9142da4f
Showing with 105 additions and 21 deletions
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/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/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