Skip to content

C
chifengweb2.0
Commit c0fac7cc authored by sxl's avatar sxl 💬
Browse files
Options

fix:[bug]:重点矿业权 接口优化

parent 86da5d17
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2004 additions and 3566 deletions
pages/Transaction/detail/_id copy.vue
View file @ c0fac7cc
......@@ -2,11 +2,7 @@
<div>
<BackToTopButton />
<Header :activeIndex="2" />
<CommonDialog
:show="dialogVisible"
@close-dialog="handleCloseDialog"
:omDemandName="omDemandName"
/>
<CommonDialog :show="dialogVisible" @close-dialog="handleCloseDialog" :omDemandName="omDemandName" />
<div class="wrapper">
<article>
<div class="part part6">
......@@ -16,42 +12,20 @@
<div class="mt20"></div>
<div class="top-zd">
<ul class="suggestype">
<li
:class="{ active: currentIndex4overview === index }"
v-for="(item, index) in commonCode4mineRightType"
:key="index"
@click="changeSuggest(index, item)"
>
<li :class="{ active: currentIndex4overview === index }" v-for="(item, index) in commonCode4mineRightType"
:key="index" @click="changeSuggest(index, item)">
{{ item.dictLabel }}
</li>
</ul>
<el-select
v-model="searchForm.minType"
placeholder="请选择矿种类型"
@change="handleChange"
>
<el-option
v-for="dict in minTypeList"
:key="dict.name"
:label="dict.name"
:value="dict.name"
/>
<el-select v-model="searchForm.minType" placeholder="请选择矿种类型" @change="handleChange">
<el-option v-for="dict in minTypeList" :key="dict.name" :label="dict.name" :value="dict.name" />
</el-select>
</div>
<div class="tableWrapper" v-show="currentIndex4overview === 0">
<div
class="item"
v-for="(item, index1) in suggestList1"
:key="index1"
@click="clickVolume(item.id)"
>
<div class="item" v-for="(item, index1) in suggestList1" :key="index1" @click="clickVolume(item.id)">
<div class="img-box">
<img
v-show="item.websiteMiningImage"
:src="`${baseApi}${item.websiteMiningImage[0]}`"
alt=""
class="left-img"
/>
<img v-show="item.websiteMiningImage" :src="`${baseApi}${item.websiteMiningImage[0]}`" alt=""
class="left-img" />
</div>
<div class="center">
<p class="tit" :title="item.websiteMiningTitle">
......@@ -80,19 +54,13 @@
}}
</p>
<p>资源储量：{{ item.reservesScale || "-" }}</p>
<img
class="mining-tag"
:src="
baseApi +
<img class="mining-tag" :src="baseApi +
getValueByIdAndField(
KqTagList,
Number(item.miningLable[0]),
'picUrl'
)
"
alt=""
v-if="item.miningLable && item.miningLable.length > 0"
/>
" alt="" v-if="item.miningLable && item.miningLable.length > 0" />
</div>
<!-- <p>整体转让</p> -->
<!-- <div class="item-right">
......@@ -103,18 +71,9 @@
</div>
</div>
<div class="tableWrapper" v-show="currentIndex4overview === 1">
<div
class="item"
v-for="(item, index1) in suggestList2"
:key="index1"
@click="clickVolume(item.id)"
>
<div class="item" v-for="(item, index1) in suggestList2" :key="index1" @click="clickVolume(item.id)">
<div class="img-box">
<img
v-show="item.websiteMiningImage"
:src="`${baseApi}${item.websiteMiningImage[0]}`"
alt=""
/>
<img v-show="item.websiteMiningImage" :src="`${baseApi}${item.websiteMiningImage[0]}`" alt="" />
</div>
<div class="center">
<p class="tit" :title="item.websiteMiningTitle">
......@@ -143,19 +102,13 @@
}}
</p>
<p>资源储量：{{ item.reservesScale || "-" }}</p>
<img
class="mining-tag"
:src="
baseApi +
<img class="mining-tag" :src="baseApi +
getValueByIdAndField(
KqTagList,
Number(item.miningLable[0]),
'picUrl'
)
"
alt=""
v-if="item.miningLable && item.miningLable.length > 0"
/>
" alt="" v-if="item.miningLable && item.miningLable.length > 0" />
</div>
<!-- <p>整体转让</p> -->
<!-- <div class="item-right">
......@@ -169,13 +122,8 @@
</article>
</div>
<div class="inner">
<el-pagination
layout="prev, pager, next"
:current-page="page.pageNum"
@current-change="changePage"
:page-size="page.pageSize"
:total="total"
>
<el-pagination layout="prev, pager, next" :current-page="page.pageNum" @current-change="changePage"
:page-size="page.pageSize" :total="total">
</el-pagination>
</div>
......@@ -413,6 +361,7 @@ $border-color: #f1f1f1;
overflow: hidden;
box-sizing: border-box;
margin-bottom: 20px;
.block {
width: 100%;
}
......@@ -424,6 +373,7 @@ $border-color: #f1f1f1;
height: 40px;
position: relative;
width: 240px;
li {
position: absolute;
width: 120px;
......@@ -438,6 +388,7 @@ $border-color: #f1f1f1;
color: #fff;
background: url(~/static/images/newHome/def-icon.png) no-repeat center;
background-size: 100%;
// &:first-child {
// border-right: none;
// }
......@@ -450,23 +401,28 @@ $border-color: #f1f1f1;
background-size: 100%;
}
}
li:first-child {
left: 10px;
top: 0;
z-index: 4;
}
li:last-child {
left: 115px;
top: 0;
z-index: 3;
}
}
overflow: hidden;
.kq {
display: flex;
justify-content: space-around;
flex-wrap: wrap;
margin: 40px 0;
li {
width: 48%;
display: flex;
......@@ -475,9 +431,11 @@ $border-color: #f1f1f1;
align-items: center;
transition: all 0.5s ease;
cursor: pointer;
.item-left {
width: 166px;
height: 160px;
img {
width: 100%;
height: 100%;
......@@ -485,6 +443,7 @@ $border-color: #f1f1f1;
display: block;
}
}
.item-mid {
text-align: left;
display: flex;
......@@ -493,6 +452,7 @@ $border-color: #f1f1f1;
line-height: 26px;
margin: 0 20px;
width: calc(75% - 166px);
p:first-child {
font-size: 16px;
font-weight: bold;
......@@ -500,15 +460,19 @@ $border-color: #f1f1f1;
text-overflow: ellipsis;
white-space: nowrap;
}
// align-items: center;
}
.item-right {
text-align: center;
p {
font-size: 18px;
color: #eb5757;
line-height: 36px;
}
div {
font-size: 14px;
background-color: #218496;
......@@ -520,6 +484,7 @@ $border-color: #f1f1f1;
cursor: pointer;
}
}
&:hover {
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
}
......@@ -541,6 +506,7 @@ body {
margin: 0 auto;
background-color: #fff;
}
body {
background: #eeeeee;
}
......@@ -548,6 +514,7 @@ body {
.headerTitle {
text-align: center;
margin: 20px 0px 40px 0px;
h1 {
font-size: 25px;
text-indent: 0px;
......@@ -555,7 +522,8 @@ body {
font-weight: 500;
letter-spacing: 7px;
}
> p {
>p {
font-size: 14px;
color: #b1b1b1;
margin-top: 6px;
......@@ -567,8 +535,10 @@ body {
background-color: #fff;
margin-top: 40px;
padding-bottom: 40px;
.navWrapper {
position: relative;
a {
position: absolute;
right: 12px;
......@@ -579,6 +549,7 @@ body {
.suggestype {
overflow: hidden;
margin-bottom: 20px;
li {
width: 120px;
height: 40px;
......@@ -590,9 +561,11 @@ body {
cursor: pointer;
transition: color 0.5s linear;
color: #9d9d9d;
&:first-child {
border-right: none;
}
&.active {
border-bottom: 1px solid #fff;
font-size: 14px;
......@@ -601,6 +574,7 @@ body {
}
}
}
.tableWrapper {
width: 100%;
overflow: hidden;
......
pages/Transaction/detail/_id.vue
View file @ c0fac7cc
......@@ -2,11 +2,7 @@
<div>
<BackToTopButton />
<Header :activeIndex="2" />
<CommonDialog
:show="dialogVisible"
@close-dialog="handleCloseDialog"
:omDemandName="omDemandName"
/>
<CommonDialog :show="dialogVisible" @close-dialog="handleCloseDialog" :omDemandName="omDemandName" />
<div class="wrapper">
<article>
<div class="part part6">
......@@ -16,42 +12,20 @@
<div class="mt20"></div>
<div class="top-zd">
<ul class="suggestype">
<li
:class="{ active: currentIndex4overview === index }"
v-for="(item, index) in commonCode4mineRightType"
:key="index"
@click="changeSuggest(index, item)"
>
<li :class="{ active: currentIndex4overview === index }" v-for="(item, index) in commonCode4mineRightType"
:key="index" @click="changeSuggest(index, item)">
{{ item.dictLabel }}
</li>
</ul>
<el-select
v-model="searchForm.minType"
placeholder="请选择矿种类型"
@change="handleChange"
>
<el-option
v-for="dict in minTypeList"
:key="dict.name"
:label="dict.name"
:value="dict.name"
/>
<el-select v-model="searchForm.minType" placeholder="请选择矿种类型" @change="handleChange">
<el-option v-for="dict in minTypeList" :key="dict.name" :label="dict.name" :value="dict.name" />
</el-select>
</div>
<div class="tableWrapper">
<div
class="item"
v-for="(item, index1) in suggestList"
:key="index1"
@click="clickVolume(item.id)"
>
<div class="item" v-for="(item, index1) in suggestList" :key="index1" @click="clickVolume(item.id)">
<div class="img-box">
<img
v-show="item.websiteMiningImage"
:src="`${baseApi}${item.websiteMiningImage[0]}`"
alt=""
class="left-img"
/>
<img v-show="item.websiteMiningImage" :src="`${baseApi}${item.websiteMiningImage[0]}`" alt=""
class="left-img" />
</div>
<div class="center">
<p class="tit" :title="item.websiteMiningTitle">
......@@ -80,19 +54,13 @@
}}
</p>
<p>资源储量：{{ item.reservesScale || "-" }}</p>
<img
class="mining-tag"
:src="
baseApi +
<img class="mining-tag" :src="baseApi +
getValueByIdAndField(
KqTagList,
Number(item.miningLable[0]),
'picUrl'
)
"
alt=""
v-if="item.miningLable && item.miningLable.length > 0"
/>
" alt="" v-if="item.miningLable && item.miningLable.length > 0" />
</div>
<!-- <p>整体转让</p> -->
<!-- <div class="item-right">
......@@ -163,13 +131,8 @@
</article>
</div>
<div class="inner">
<el-pagination
layout="prev, pager, next"
:current-page="searchForm.pageNum"
@current-change="changePage"
:page-size="searchForm.pageSize"
:total="total"
>
<el-pagination layout="prev, pager, next" :current-page="searchForm.pageNum" @current-change="changePage"
:page-size="searchForm.pageSize" :total="total">
</el-pagination>
</div>
......@@ -250,9 +213,15 @@ export default {
this.searchForm.pageNum = pageNum;
this.getSuggestList();
},
clickVolume(id, index) {
async clickVolume(id, index) {
const result = await sendRequest("business/screening/trackMine", "get", {
id,
});
if (result.code === 200) {
const url = `/Transaction/minDet?id=${id}`;
window.open(url, "_blank"); // '_blank' 表示在新标签页中打开
}
},
openDia(val) {
this.dialogVisible = true;
......@@ -326,6 +295,7 @@ $border-color: #f1f1f1;
overflow: hidden;
box-sizing: border-box;
margin-bottom: 20px;
.block {
width: 100%;
}
......@@ -337,6 +307,7 @@ $border-color: #f1f1f1;
height: 40px;
position: relative;
width: 240px;
li {
position: absolute;
width: 120px;
......@@ -351,6 +322,7 @@ $border-color: #f1f1f1;
color: #fff;
background: url(~/static/images/newHome/def-icon.png) no-repeat center;
background-size: 100%;
// &:first-child {
// border-right: none;
// }
......@@ -363,23 +335,28 @@ $border-color: #f1f1f1;
background-size: 100%;
}
}
li:first-child {
left: 10px;
top: 0;
z-index: 4;
}
li:last-child {
left: 115px;
top: 0;
z-index: 3;
}
}
overflow: hidden;
.kq {
display: flex;
justify-content: space-around;
flex-wrap: wrap;
margin: 40px 0;
li {
width: 48%;
display: flex;
......@@ -388,9 +365,11 @@ $border-color: #f1f1f1;
align-items: center;
transition: all 0.5s ease;
cursor: pointer;
.item-left {
width: 166px;
height: 160px;
img {
width: 100%;
height: 100%;
......@@ -398,6 +377,7 @@ $border-color: #f1f1f1;
display: block;
}
}
.item-mid {
text-align: left;
display: flex;
......@@ -406,6 +386,7 @@ $border-color: #f1f1f1;
line-height: 26px;
margin: 0 20px;
width: calc(75% - 166px);
p:first-child {
font-size: 16px;
font-weight: bold;
......@@ -413,15 +394,19 @@ $border-color: #f1f1f1;
text-overflow: ellipsis;
white-space: nowrap;
}
// align-items: center;
}
.item-right {
text-align: center;
p {
font-size: 18px;
color: #eb5757;
line-height: 36px;
}
div {
font-size: 14px;
background-color: #218496;
......@@ -433,6 +418,7 @@ $border-color: #f1f1f1;
cursor: pointer;
}
}
&:hover {
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
}
......@@ -454,6 +440,7 @@ body {
margin: 0 auto;
background-color: #fff;
}
body {
background: #eeeeee;
}
......@@ -461,6 +448,7 @@ body {
.headerTitle {
text-align: center;
margin: 20px 0px 40px 0px;
h1 {
font-size: 25px;
text-indent: 0px;
......@@ -468,7 +456,8 @@ body {
font-weight: 500;
letter-spacing: 7px;
}
> p {
>p {
font-size: 14px;
color: #b1b1b1;
margin-top: 6px;
......@@ -480,8 +469,10 @@ body {
background-color: #fff;
margin-top: 40px;
padding-bottom: 40px;
.navWrapper {
position: relative;
a {
position: absolute;
right: 12px;
......@@ -492,6 +483,7 @@ body {
.suggestype {
overflow: hidden;
margin-bottom: 20px;
li {
width: 120px;
height: 40px;
......@@ -503,9 +495,11 @@ body {
cursor: pointer;
transition: color 0.5s linear;
color: #9d9d9d;
&:first-child {
border-right: none;
}
&.active {
border-bottom: 1px solid #fff;
font-size: 14px;
......@@ -514,6 +508,7 @@ body {
}
}
}
.tableWrapper {
width: 100%;
overflow: hidden;
......
pages/Transaction/minDet/_id.vue
View file @ c0fac7cc
This diff is collapsed.
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