suzhou-jichuang-lanhai
/
Gyyq-Upstairs
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

标签和bug修改

Browse Source
xuhongjie
严飞永 3 weeks ago
parent b600c2f76c
commit 17082e1bf3
13 changed files with 134 additions and 85 deletions
Show Stats Download Patch File Download Diff File

2
src/api/ManageApi/index.js
Unescape View File

@ -689,7 +689,7 @@ export function xmlist(){
//企业统计 //企业统计
//整体项目情况 //整体项目情况
export function allproject(){ export function allinformationtwo(){
return request({ return request({
url:'/gysl/qyStats/allProject', url:'/gysl/qyStats/allProject',
method:'get' method:'get'

BIN
src/assets/images/标签管理.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

5
src/views/components/ProjectDetails/Buildings.vue
Unescape View File

@ -14,7 +14,7 @@
新增 新增
</el-button> </el-button>
<el-button type="primary" size="medium" plain <el-button type="primary" size="medium" plain
v-if="buildings.length !== 0 && (action === 'fill' || !action)" v-if="buildings.length !== 0"
style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;"
@click="handleEdit(selectedBuilding)"> @click="handleEdit(selectedBuilding)">
<img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="编辑" <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
@ -44,7 +44,8 @@
:class="[getTagItemClass(building), { 'active-tag': selectedBuilding && selectedBuilding.id === building.id }]"> :class="[getTagItemClass(building), { 'active-tag': selectedBuilding && selectedBuilding.id === building.id }]">
<img src="@/assets/images/detailsicon/icon-楼栋@2x.png" alt=""> <img src="@/assets/images/detailsicon/icon-楼栋@2x.png" alt="">
<span>{{ building.name }}</span> <span>{{ building.name }}</span>
<img src="@/assets/images/detailsicon/icon-gb@2x.png" v-if="action === 'fill' || !action" alt="" <img src="@/assets/images/detailsicon/icon-gb@2x.png" v-if="action === 'fill' || !action || action === 'okay'"
alt=""
@click.stop="handleDelete(building.id)"> @click.stop="handleDelete(building.id)">
</div> </div>
</div> </div>

25
src/views/components/ProjectDetails/Projectpicture.vue
Unescape View File

@ -40,13 +40,23 @@
</div> </div>
</div> </div>
</div> </div>
<div class="descriptionsdivtwo">
<div class="tablehead">
<img src="@/assets/images/标签管理.png" alt="">
<span style="margin-top: -0.3rem;">标签管理：</span>
<!-- <span style="margin-top: .3rem;"></span> -->
</div>
<div class="tablebody">
<div>123</div>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import { getpicture, getpicturelist } from '@/api/ManageApi/index'; // 确保路径正确 import { getpicture, getpicturelist } from '@/api/ManageApi/index';
export default { export default {
props: { props: {
@ -264,7 +274,7 @@ export default {
.topleft span { .topleft span {
width: auto; width: auto;
height: 0.88rem; height: 0.88rem;
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; font-family: aliregular;
font-weight: 500; font-weight: 500;
font-size: 0.88rem; font-size: 0.88rem;
color: #3D424C; color: #3D424C;
@ -280,17 +290,22 @@ export default {
} }
.descriptionsdiv { .descriptionsdiv {
width: 52rem; width: 20rem;
margin-left: 10rem; margin-left: 10rem;
height: 25.31rem; height: 25.31rem;
} }
.descriptionsdivtwo {
width: 20rem;
margin-left: 3rem;
height: 25.31rem;
}
.two-row-item { .two-row-item {
height: 20rem; height: 20rem;
} }
.tablebody { .tablebody {
margin-top: 2rem; margin-top: 1rem;
} }
.table-container { .table-container {
@ -306,7 +321,7 @@ export default {
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
background-color: #F2F4F7; background-color: #F2F4F7;
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; font-family: aliregular;
font-weight: 600; font-weight: 600;
font-size: 0.88rem; font-size: 0.88rem;
color: #3D3D3D; color: #3D3D3D;

8
src/views/components/analysis/all.vue
Unescape View File

@ -86,7 +86,7 @@
<img src="@/assets/images/icon-yjsl@2x.png" alt=""> <img src="@/assets/images/icon-yjsl@2x.png" alt="">
<div class="itemleft"> <div class="itemleft">
<div class="lefttitle">拟建数量(个)</div> <div class="lefttitle">拟建数量(个)</div>
<div class="number">{{ currentYearData.currentBuilding2 }}</div> <div class="number">{{ currentYearData.currentBuilding3 }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -112,7 +112,8 @@ export default {
currentYearProject: 0, //总数 currentYearProject: 0, //总数
currentYearGrossArea: 0, //面积 currentYearGrossArea: 0, //面积
currentYearBuilding1: 0, // 已建 currentYearBuilding1: 0, // 已建
currentBuilding2: 0 // 在建 currentBuilding2: 0, // 在建
currentBuilding3: 0
}, },
loading: false, loading: false,
error: null error: null
@ -160,7 +161,8 @@ export default {
currentYearProject: response.data.currentYearProject || 0, currentYearProject: response.data.currentYearProject || 0,
currentYearGrossArea: response.data.currentYearGrossArea || 0, currentYearGrossArea: response.data.currentYearGrossArea || 0,
currentYearBuilding1: response.data.currentYearBuilding1 || 0, currentYearBuilding1: response.data.currentYearBuilding1 || 0,
currentBuilding2: response.data.currentBuilding2 || 0 currentBuilding2: response.data.currentBuilding2 || 0 ,
currentBuilding3: response.data.currentBuilding3 || 0
}; };
} catch (error) { } catch (error) {
console.error("获取数据失败:", error); console.error("获取数据失败:", error);

16
src/views/components/analysis/allcompany.vue
Unescape View File

@ -4,9 +4,9 @@
<div class="top"> <div class="top">
<div class="title">整体项目情况</div> <div class="title">整体项目情况</div>
<div class="importdiv"> <div class="importdiv">
<el-date-picker v-model="selectedYear" type="year" placeholder="选择年份" format="yyyy" <!-- <el-date-picker v-model="selectedYear" type="year" placeholder="选择年份" format="yyyy"
value-format="yyyy" @change="handleYearChange"> value-format="yyyy" @change="handleYearChange">
</el-date-picker> </el-date-picker> -->
<!-- <el-button icon="el-icon-upload2" style="background-color: #2B62F1; color: #FFFFFF;" <!-- <el-button icon="el-icon-upload2" style="background-color: #2B62F1; color: #FFFFFF;"
@click="handleExport"> @click="handleExport">
报告导出 报告导出
@ -86,7 +86,7 @@
<img src="@/assets/images/icon-yjsl@2x.png" alt=""> <img src="@/assets/images/icon-yjsl@2x.png" alt="">
<div class="itemleft"> <div class="itemleft">
<div class="lefttitle">拟建数量(个)</div> <div class="lefttitle">拟建数量(个)</div>
<div class="number">{{ currentYearData.currentBuilding2 }}</div> <div class="number">{{ currentYearData.currentBuilding3 }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -95,7 +95,7 @@
</template> </template>
<script> <script>
import { allproject } from '@/api/ManageApi'; import { allinformationtwo } from '@/api/ManageApi';
export default { export default {
data() { data() {
@ -112,7 +112,8 @@ export default {
currentYearProject: 0, //总数 currentYearProject: 0, //总数
currentYearGrossArea: 0, //面积 currentYearGrossArea: 0, //面积
currentYearBuilding1: 0, // 已建 currentYearBuilding1: 0, // 已建
currentBuilding2: 0 // 在建 currentBuilding2: 0 , // 在建
currentBuilding3: 0 // 在建
}, },
loading: false, loading: false,
error: null error: null
@ -145,7 +146,7 @@ export default {
this.loading = true; this.loading = true;
try { try {
// 调用 API 时传入 years 参数 // 调用 API 时传入 years 参数
const response = await allproject({ const response = await allinformationtwo({
years: this.selectedYear, years: this.selectedYear,
_t: Date.now() // 添加时间戳防止缓存 _t: Date.now() // 添加时间戳防止缓存
}); });
@ -160,7 +161,8 @@ export default {
currentYearProject: response.data.currentYearProject || 0, currentYearProject: response.data.currentYearProject || 0,
currentYearGrossArea: response.data.currentYearGrossArea || 0, currentYearGrossArea: response.data.currentYearGrossArea || 0,
currentYearBuilding1: response.data.currentYearBuilding1 || 0, currentYearBuilding1: response.data.currentYearBuilding1 || 0,
currentBuilding2: response.data.currentBuilding2 || 0 currentBuilding2: response.data.currentBuilding2 || 0,
currentBuilding3: response.data.currentBuilding3 || 0,
}; };
} catch (error) { } catch (error) {
console.error("获取数据失败:", error); console.error("获取数据失败:", error);

10
src/views/components/analysis/map.vue
Unescape View File

@ -18,7 +18,8 @@
</div> </div>
<div class="rightdiv"> <div class="rightdiv">
<el-input v-model="searchBox" placeholder="请输入地点名称" class="search-input" @input="handleSearchInput" clearable> <el-input v-model="searchBox" placeholder="请输入项目名称" class="search-input" @input="handleSearchInput"
@clear="handleClear" clearable>
<el-button slot="append" icon="el-icon-search" @click="toSearch"></el-button> <el-button slot="append" icon="el-icon-search" @click="toSearch"></el-button>
</el-input> </el-input>
</div> </div>
@ -126,6 +127,11 @@ export default {
this.debouncedSearch = debounce(this.toSearch, 300); this.debouncedSearch = debounce(this.toSearch, 300);
}, },
methods: { methods: {
handleClear() {
this.showLocationIcon = false;
this.searchList = [];
this.hasSearched = false;
},
toggleCollapse() { toggleCollapse() {
this.isCollapsed = !this.isCollapsed; this.isCollapsed = !this.isCollapsed;
}, },
@ -133,6 +139,7 @@ export default {
if (this.searchBox.trim() === '') { if (this.searchBox.trim() === '') {
this.searchList = []; this.searchList = [];
this.hasSearched = false; this.hasSearched = false;
this.showLocationIcon = false;
return; return;
} }
this.debouncedSearch(); this.debouncedSearch();
@ -401,6 +408,7 @@ export default {
font-family: aliregular; font-family: aliregular;
width: 3rem; width: 3rem;
} }
.value { .value {
color: #3D424C; color: #3D424C;
font-family: aliregular; font-family: aliregular;

10
src/views/components/analysis/message.vue
Unescape View File

@ -14,8 +14,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="date" width="100"> <el-table-column prop="date" width="100">
<template slot-scope="scope">
{{ scope.row.date }}
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-if="tableData.length === 0" class="no-data">
暂无数据
</div>
<!-- 详情弹窗 --> <!-- 详情弹窗 -->
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%"> <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
@ -30,6 +36,7 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getAllMessages } from '@/api/ManageApi/index'; import { getAllMessages } from '@/api/ManageApi/index';
import { markSmartReminderAsRead } from '@/api/ManageApi/index'; import { markSmartReminderAsRead } from '@/api/ManageApi/index';
@ -117,4 +124,7 @@ export default {
width: 30rem; width: 30rem;
height: 14.5rem; height: 14.5rem;
} }
.no-data{
color: gray;
}
</style> </style>

11
src/views/components/analysis/messagecompany.vue
Unescape View File

@ -14,8 +14,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="date" width="100"> <el-table-column prop="date" width="100">
<template slot-scope="scope">
{{ scope.row.date }}
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-if="tableData.length === 0" class="no-data">
暂无数据
</div>
<!-- 详情弹窗 --> <!-- 详情弹窗 -->
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%"> <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
@ -30,6 +36,8 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getAllMessagestwo } from '@/api/ManageApi/index'; import { getAllMessagestwo } from '@/api/ManageApi/index';
import { markSmartReminderAsRead } from '@/api/ManageApi/index'; import { markSmartReminderAsRead } from '@/api/ManageApi/index';
@ -117,4 +125,7 @@ export default {
width: 30rem; width: 30rem;
height: 14.5rem; height: 14.5rem;
} }
.no-data{
color: gray;
}
</style> </style>

4
src/views/components/qiyexinxi/qiyexinxi.vue
Unescape View File

@ -37,9 +37,7 @@
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
</el-row> <el-col :span="5">
<el-row>
<el-col :span="8">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" <el-button type="primary" icon="el-icon-search" size="mini"
@click="handleQuery">查询</el-button> @click="handleQuery">查询</el-button>

20
src/views/evalute/evalist/index.vue
Unescape View File

@ -10,18 +10,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="建设起止时间">
<el-date-picker v-model="queryParams.begainTime"
type="date" placeholder="开始日期" value-format="yyyy-MM-dd"
style="width: 11rem;" :clearable="true">
</el-date-picker>
~
<el-date-picker v-model="queryParams.endTime"
type="date" placeholder="结束日期"
value-format="yyyy-MM-dd"
style="width: 10.5rem;" :clearable="true">
</el-date-picker>
</el-form-item> -->
<el-form-item label="建设起止时间"> <el-form-item label="建设起止时间">
<el-date-picker v-model="queryParams.begainTime" type="month" placeholder="开始月份" value-format="yyyy-MM" <el-date-picker v-model="queryParams.begainTime" type="month" placeholder="开始月份" value-format="yyyy-MM"
style="width: 9rem;" :clearable="true"> style="width: 9rem;" :clearable="true">
@ -114,7 +102,13 @@
</el-form-item> </el-form-item>
<el-form-item label="评价等级"> <el-form-item label="评价等级">
<el-select v-model="infoForm.pjdj" placeholder="请选择评价等级" clearable> <el-select v-model="infoForm.pjdj" placeholder="请选择评价等级" clearable>
<el-option v-for="dict in dict.type.pjdj" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option label="全部" :value="0" />
<el-option label="总投资额" :value="1" />
<el-option label="层数" :value="2" />
<el-option label="首层层高" :value="3" />
<el-option label="2层及以上层高" :value="4" />
<el-option label="首层地面荷载" :value="5" />
<el-option label="二层及以上楼面荷载" :value="6" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目法人单位"> <el-form-item label="项目法人单位">

30
src/views/manage-info/index.vue
Unescape View File

@ -352,22 +352,22 @@ export default {
// 如果所有校验通过，则准备数据并提交 // 如果所有校验通过，则准备数据并提交
// const submitData = this.prepareSubmitData(); const submitData = this.prepareSubmitData();
// console.log('准备提交的完整数据:', JSON.stringify(submitData, null, 2)); // 打印完整数据 console.log('准备提交的完整数据:', JSON.stringify(submitData, null, 2)); // 打印完整数据
// fillBasicInformation(submitData) fillBasicInformation(submitData)
// .then(response => { .then(response => {
// this.$message.success('提交成功'); this.$message.success('提交成功');
// this.isSubmitted = true; this.isSubmitted = true;
// this.$router.push('/manage'); this.$router.push('/manage');
// }) })
// .catch(error => { .catch(error => {
// this.$message.error('提交失败'); this.$message.error('提交失败');
// console.error('提交错误:', error); console.error('提交错误:', error);
// }) })
// .finally(() => { .finally(() => {
// this.loading = false; this.loading = false;
// }); });
}, },
// 审核通过的提交数据 // 审核通过的提交数据

8
src/views/tongjifenxi/index.vue
Unescape View File

@ -21,6 +21,7 @@
<span>关联项目</span> <span>关联项目</span>
</div> </div>
<div class="mainarea" style="height: 22rem; overflow: auto;"> <div class="mainarea" style="height: 22rem; overflow: auto;">
<div v-if="postList.length > 0">
<div class="mainareaitem" v-for="(item, index) in postList" :key="index"> <div class="mainareaitem" v-for="(item, index) in postList" :key="index">
<div class="itemleft"> <div class="itemleft">
<div class="xmmctitle" @click="getInfo(item, 'detail')">{{ item.name }}</div> <div class="xmmctitle" @click="getInfo(item, 'detail')">{{ item.name }}</div>
@ -36,6 +37,10 @@
</div> </div>
</div> </div>
</div> </div>
<div v-else class="no-data">
暂无数据
</div>
</div>
</div> </div>
<div class="grid-item item-2"> <div class="grid-item item-2">
<!-- 我的待办 --> <!-- 我的待办 -->
@ -249,4 +254,7 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.no-data{
color: gray;
}
</style> </style>
Write Preview
Loading…
Cancel
Save