Skip to content

M
mancheng_code
Commit 771542ce by heshihao
Options

feat: 界面字段展示修改

parent a11bd2b1
Showing with 135 additions and 95 deletions
src/views/assess/assess.vue
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
{ {
img: "icon-sjtb.png", img: "icon-sjtb.png",
img_select: "icon-sjtb-select.png", img_select: "icon-sjtb-select.png",
title: "数据填报", title: "资源管理",
name: "fill", name: "fill",
}, },
], ],
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
list.push({ list.push({
img: "icon-sjtb.png", img: "icon-sjtb.png",
img_select: "icon-sjtb-select.png", img_select: "icon-sjtb-select.png",
title: "数据填报", title: "资源管理",
name: "fill", name: "fill",
}); });
this.activeRouter === "" ? (this.activeRouter = "fill") : ""; this.activeRouter === "" ? (this.activeRouter = "fill") : "";
......
src/views/assess/pages/ass.vue
...@@ -1366,56 +1366,56 @@ export default { ...@@ -1366,56 +1366,56 @@ export default {
*ipad 1024 * 768 *ipad 1024 * 768
*/ */
/*分辨率低于1680，采用下面的样式*/ /*分辨率低于1680，采用下面的样式*/
@media screen and (max-device-width: 1680px) { // @media screen and (max-device-width: 1680px) {
.list.height-248 { // .list.height-248 {
height: 248px; // height: 248px;
overflow-y: scroll; // overflow-y: scroll;
} // }
/deep/ .el-checkbox .el-checkbox__label { // /deep/ .el-checkbox .el-checkbox__label {
font-size: 14px; // font-size: 14px;
} // }
/deep/ .el-checkbox__label { // /deep/ .el-checkbox__label {
padding-left: 2px; // padding-left: 2px;
font-size: 14px; // font-size: 14px;
} // }
.list.height-248 { // .list.height-248 {
height: 220px; // height: 220px;
overflow-y: scroll; // overflow-y: scroll;
} // }
} // }
// /*分辨率低于1536，采用下面的样式*/ // /*分辨率低于1536，采用下面的样式*/
// @media screen and (max-device-width: 1512px) { // @media screen and (max-device-width: 1512px) {
// } // }
/*分辨率低于1440，采用下面的样式*/ /*分辨率低于1440，采用下面的样式*/
@media screen and (max-device-width: 1440px) { // @media screen and (max-device-width: 1440px) {
.list { // .list {
height: 285px; // height: 285px;
overflow-y: scroll; // overflow-y: scroll;
} // }
.list.height-248 { // .list.height-248 {
height: 182px; // height: 182px;
overflow-y: scroll; // overflow-y: scroll;
} // }
.option label { // .option label {
display: inline-block; // display: inline-block;
flex: 0 0 56px; // flex: 0 0 56px;
font-size: 12px; // font-size: 12px;
} // }
.option > div > div { // .option > div > div {
flex: 0 0 calc(100% - 66px) !important; // flex: 0 0 calc(100% - 66px) !important;
} // }
.select .op li div .company { // .select .op li div .company {
right: 14px; // right: 14px;
} // }
/deep/ .el-checkbox .el-checkbox__label { // /deep/ .el-checkbox .el-checkbox__label {
padding-left: 2px; // padding-left: 2px;
font-size: 12px; // font-size: 12px;
} // }
/deep/ .el-pagination { // /deep/ .el-pagination {
text-align: center; // text-align: center;
margin-top: 6px; // margin-top: 6px;
} // }
} // }
/*分辨率低于1366，采用下面的样式*/ /*分辨率低于1366，采用下面的样式*/
@media screen and (max-device-width: 1366px) { @media screen and (max-device-width: 1366px) {
} }
......
src/views/assess/pages/fill.vue
...@@ -2,28 +2,16 @@ ...@@ -2,28 +2,16 @@
<div class="assess_main"> <div class="assess_main">
<div class="assess_body"> <div class="assess_body">
<div class="top-head-nav"> <div class="top-head-nav">
<span <span :class="[activeName == 1 ? 'active' : '']" @click="activeName = 1">
:class="[activeName == 1 ? 'active' : '']" 土地信息
@click="activeName = 1"
>
土地数据填报
</span> </span>
<span <span :class="[activeName == 2 ? 'active' : '']" @click="activeName = 2">
:class="[activeName == 2 ? 'active' : '']" 标准厂房信息
@click="activeName = 2"
>
标准厂房数据填报
</span> </span>
<span <span :class="[activeName == 3 ? 'active' : '']" @click="activeName = 3">
:class="[activeName == 3 ? 'active' : '']" 商业楼宇信息
@click="activeName = 3"
>
商业楼宇数据填报
</span> </span>
<span <span :class="[activeName == 4 ? 'active' : '']" @click="activeName = 4">
:class="[activeName == 4 ? 'active' : '']"
@click="activeName = 4"
>
操作日志 操作日志
</span> </span>
</div> </div>
...@@ -118,8 +106,7 @@ export default { ...@@ -118,8 +106,7 @@ export default {
} }
} }
.assess_main .assess_body {
.assess_main .assess_body{
overflow: hidden auto; overflow: hidden auto;
} }
</style> </style>
src/views/assess/pages/land.vue
...@@ -747,19 +747,19 @@ export default { ...@@ -747,19 +747,19 @@ export default {
], ],
district_options: [ district_options: [
{ label: "城区", value: "城区" }, // { label: "城区", value: "城区" },
{ label: "泽州县", value: "泽州县" }, // { label: "泽州县", value: "泽州县" },
{ label: "高平市", value: "高平市" }, // { label: "高平市", value: "高平市" },
{ label: "阳城县", value: "阳城县" }, // { label: "阳城县", value: "阳城县" },
{ label: "陵川县", value: "陵川县" }, // { label: "陵川县", value: "陵川县" },
{ label: "沁水县", value: "沁水县" }, // { label: "沁水县", value: "沁水县" },
], ],
kf_district_options: [ kf_district_options: [
{ label: "晋城市经济技术开发区", value: "晋城市经济技术开发区" }, // { label: "晋城市经济技术开发区", value: "晋城市经济技术开发区" },
{ label: "高平市经济技术开发区", value: "高平市经济技术开发区" }, // { label: "高平市经济技术开发区", value: "高平市经济技术开发区" },
{ label: "阳城县经济技术开发区", value: "阳城县经济技术开发区" }, // { label: "阳城县经济技术开发区", value: "阳城县经济技术开发区" },
{ label: "陵川县经济技术开发区", value: "陵川县经济技术开发区" }, // { label: "陵川县经济技术开发区", value: "陵川县经济技术开发区" },
{ label: "沁水县经济技术开发区", value: "沁水县经济技术开发区" }, // { label: "沁水县经济技术开发区", value: "沁水县经济技术开发区" },
], ],
total: 0, total: 0,
listInfo: [], listInfo: [],
......
src/views/index/index_copy.vue
...@@ -66,13 +66,14 @@ ...@@ -66,13 +66,14 @@
/> />
<div class="text"> <div class="text">
<p style="margin-right: 20px;" :class="[activeCard == 1 ? 'active' : '']" @click="changeACard(1)"> <p style="margin-right: 20px;" :class="[activeCard == 1 ? 'active' : '']" @click="changeACard(1)">
<span class="title">经济指标</span> <span class="title">满城区经济指标</span>
</p>
<p :class="[activeCard == 2 ? 'active' : '']" @click="changeACard(2)">
<span class="title">开发区经济指标</span>
</p> </p>
<!-- <p :class="[activeCard == 2 ? 'active' : '']" @click="changeACard(2)">
<span class="title">企业统计</span>
</p> -->
</div> </div>
</div> </div>
<el-carousel <el-carousel
height="210px" height="210px"
:interval="5000" :interval="5000"
...@@ -130,13 +131,71 @@ ...@@ -130,13 +131,71 @@
</ul> </ul>
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
<div v-if="activeCard == 2" class="enterprise">
<el-carousel
height="210px"
:interval="5000"
:loop="true"
indicator-position="none"
ref="carousel1"
v-if="activeCard == 2"
>
<el-carousel-item v-for="item in 2" :key="item">
<ul class="list-num " v-if="item == 1">
<p class="title">
<span class="san-left" @click="prev1"></span>
<span>2022年</span>
<span class="san-right" @click="next1"></span>
</p>
<li class="bg-100">
<span>地区生产总值:150.19亿元</span>
<span>固定资产投资:-亿元</span>
</li>
<li class="bg-100">
<span>规模以上工业增加值:3.7%</span>
<span>社会消费品零售总额:29.85亿元</span>
</li>
<li class="bg-100">
<span>限额以上消费品零售额:3.76亿元</span>
<span>城镇居民人均可支配收入:40769元</span>
</li>
<li class="bg-100">
<span>农村居民人均可支配收入:24660元 </span>
<span>公共财政预算收入:7.79亿元</span>
</li>
</ul>
<ul class="list-num" v-if="item == 2">
<p class="title">
<span class="san-left" @click="prev1"></span>
<span>2023年1-11月(*为季度指标)</span>
<span class="san-right" @click="next1"></span>
</p>
<li class="bg-100">
<span>*地区生产总值:114.5亿元</span>
<span>固定资产投资:-亿元</span>
</li>
<li class="bg-100">
<span>规模以上工业增加值:4.1%</span>
<span>*社会消费品零售总额:23.6亿元</span>
</li>
<li class="bg-100">
<span>限额以上消费品零售额:3.47亿元</span>
<span>*城镇居民人均可支配收入:32206元</span>
</li>
<li class="bg-100">
<span>*农村居民人均可支配收入:20350元 </span>
<span>公共财政预算收入:-亿元</span>
</li>
</ul>
</el-carousel-item>
</el-carousel>
<!-- <div v-if="activeCard == 2" class="enterprise">
<ul class="list-num1"> <ul class="list-num1">
<li> <li>
<span @click="goEpList(1)">上市企业：{{ table_dic.ssqy }}家</span> <span @click="goEpList(1)">上市企业：{{ table_dic.ssqy }}家</span>
<span @click="goEpList(2)"> <span @click="goEpList(2)">
规模以上企业：354家 规模以上企业：354家
<!-- {{ table_dic.gmys }} -->
</span> </span>
</li> </li>
<li> <li>
...@@ -146,16 +205,9 @@ ...@@ -146,16 +205,9 @@
<li> <li>
<span @click="goEpList(5)"> 科技型中小企业：{{ table_dic.kjzx }}家 </span> <span @click="goEpList(5)"> 科技型中小企业：{{ table_dic.kjzx }}家 </span>
专精特新示范企业 专精特新示范企业
<!-- <span @click="goEpList(6)"> 省级民营科技企业：{{ table_dic.tbe_sjmy }}家 </span> -->
</li> </li>
<!-- <li>
<span @click="goEpList(7)"> 国家级专精特新小巨人企业：{{ table_dic.zjtg_gjjxjr }}家 </span>
</li>
<li>
<span @click="goEpList(8)"> 省级专精特新小巨人企业：{{ table_dic.zjtg_sjxjr }}家 </span>
</li> -->
</ul> </ul>
</div> </div> -->
</div> </div>
<div class="left-three"> <div class="left-three">
......
src/views/login/login.vue
...@@ -648,6 +648,7 @@ export default { ...@@ -648,6 +648,7 @@ export default {
*/ */
let res = await API.LoginByPwd({ param }); let res = await API.LoginByPwd({ param });
console.log(res, "数据信息");
// let res = await API.LoginByPwd({ mobile, password }); // let res = await API.LoginByPwd({ mobile, password });
if (res.token) { if (res.token) {
......
src/views/systemgl/systemgljueseadd.vue
...@@ -146,7 +146,7 @@ export default { ...@@ -146,7 +146,7 @@ export default {
option2: [ option2: [
{ id: 6, name: "产业地图" }, { id: 6, name: "产业地图" },
{ id: 7, name: "项目选址" }, { id: 7, name: "项目选址" },
{ id: 8, name: "数据填报" }, { id: 8, name: "资源管理" },
], ],
option3: [ option3: [
{ id: 9, name: "项目总览" }, { id: 9, name: "项目总览" },
......
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