Commit c0fac7cc authored by sxl's avatar sxl 💬

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

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