Skip to content

D
dsk-cr20g
Commit d3d79069 authored by huangjie's avatar huangjie
Browse files
Options

Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

parents c70ded0c 36fcd023
Expand all Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 1219 deletions
dsk-operate-ui/src/assets/styles/public.css deleted 100644 → 0
View file @ c70ded0c
This diff is collapsed.
dsk-operate-ui/src/assets/styles/public.scss
View file @ d3d79069
......@@ -323,9 +323,13 @@ select {
}
.el-dropdown-land .el-icon-caret-bottom {
color: #666666;
color: rgba(35,35,32,0.4);
margin-left: 2px;
}
.el-icon-caret-bottom:before{
color: rgba(35,35,32,0.4);
}
.land_date_picker {
position: absolute !important;
......
dsk-operate-ui/src/views/index.vue
View file @ d3d79069
......@@ -24,7 +24,7 @@
<div class="flex-box query-box">
<div class="flex-box query-params">
<span class="common-title">集团中标统计</span>
<div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工内土地交易项目，未公开的不含在内</div>
<div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工类项目，未公开的不含在内。</div>
</div>
<div class="flex-box">
<div class="search">
......@@ -86,7 +86,7 @@
<div class="flex-box query-box">
<div class="flex-box query-params">
<span class="common-title">大项目中标排行榜</span>
<div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工内土地交易项目，未公开的不含在内</div>
<div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工类项目，未公开的不含在内。</div>
</div>
<div class="flex-box">
<div class="search">
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/BI.vue
View file @ d3d79069
......@@ -40,7 +40,7 @@
.el-tabs__header{
margin: 0;
position: sticky;
top: 104px;
top: 102px;
z-index: 999;
background: #fff;
.el-tabs__item{
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @ d3d79069
......@@ -422,13 +422,13 @@
overflow:visible;
.el-table__header-wrapper{
position: sticky;
top:104px;
top:102px;
z-index: 9;
}
.el-table__fixed-header-wrapper{
position: sticky;
z-index: 9;
top: 104px;
top: 102px;
}
.el-table__fixed{
overflow-x: clip;
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue
View file @ d3d79069
......@@ -30,16 +30,16 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="type" label="项目类型" :formatter="formatStatus" width="100"/>
<el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable width="130">
<el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column>
<el-table-column prop="countRate" label="数量占比" align="right" :formatter="formatStatus" sortable width="140">
<el-table-column prop="countRate" label="数量占比" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.countRate }}%</template>
</el-table-column>
<el-table-column prop="money" label="中标总金额" align="right" :formatter="formatStatus" sortable width="190">
<el-table-column prop="money" label="中标总金额" align="right" :formatter="formatStatus" sortable min-width="180">
<template slot-scope="scope">{{ scope.row.money }}万元</template>
</el-table-column>
<el-table-column prop="moneyRate" label="金额占比" align="right" :formatter="formatStatus" sortable width="120">
<el-table-column prop="moneyRate" label="金额占比" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.moneyRate }}%</template>
</el-table-column>
</el-table>
......@@ -78,16 +78,16 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="province" label="地区" :formatter="formatStatus" width="100"/>
<el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable width="130">
<el-table-column prop="count" label="中标数量" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column>
<el-table-column prop="countRate" label="数量占比" align="right" :formatter="formatStatus" sortable width="140">
<el-table-column prop="countRate" label="数量占比" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.countRate }}%</template>
</el-table-column>
<el-table-column prop="sumMoney" label="中标总金额" align="right" :formatter="formatStatus" sortable width="190">
<el-table-column prop="sumMoney" label="中标总金额" align="right" :formatter="formatStatus" sortable min-width="180">
<template slot-scope="scope">{{ scope.row.sumMoney }}万元</template>
</el-table-column>
<el-table-column prop="moneyRate" label="金额占比" align="right" :formatter="formatStatus" sortable width="120">
<el-table-column prop="moneyRate" label="金额占比" align="right" :formatter="formatStatus" sortable width="110">
<template slot-scope="scope">{{ scope.row.moneyRate }}%</template>
</el-table-column>
</el-table>
......
dsk-operate-ui/src/views/macro/nationalEconomies/index.vue
View file @ d3d79069
......@@ -81,7 +81,7 @@ export default {
border-radius: 4px;
color: #232323;
position: sticky;
top: 56px;
top: 54px;
z-index: 999;
::v-deep .el-tabs{
height: 48px;
......
dsk-operate-ui/src/views/market/index.vue
View file @ d3d79069
......@@ -21,7 +21,8 @@
iframeHight: window.innerHeight, // iframe高度-当前页控制
navigation: {isFixed: true, fixedHeight: 56, totalHeight: 68}, // iframe之外页面顶部对象，ifFixed:是否浮动；fixedHeight：浮动对象高度；totalHeight：顶部整体高度
src: '', //iframe嵌套页面地址
domain: 'https://plug.jiansheku.com', // 插件地址
// domain: 'https://plug.jiansheku.com', // 插件地址
domain: 'https://pre-plug.jiansheku.com', // 插件地址测试
// domain: 'http://192.168.60.19:3400',
// domain: 'http://192.168.60.30:3300',
ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912', // 需要携带的sdkId
......
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