wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
chenchenzai 2022-11-22 18:27:13 +08:00
parent 3aed6a86ac d844e709db
commit 5a98693b05
2 changed files with 66 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
back/src/views/modules/assetReport/index.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.guoyue * @Author: hisense.guoyue
* @LastEditors: hisense.guoyue * @LastEditors: hisense.guoyue
* @LastEditTime: 2022-09-27 14:23:29 * @LastEditTime: 2022-09-27 14:23:29
* @Description: 设备审批 * @Description: 资金报表
--> -->
<template> <template>
<el-card shadow="never" class="aui-card--fill" style="position: relative"> <el-card shadow="never" class="aui-card--fill" style="position: relative">
@ -10,9 +10,10 @@
<div <div
style=" style="
text-align: center; text-align: center;
font-size: 26px; font-size: 24px;
font-weight: bold; font-weight: bold;
margin-bottom: 14px; margin-bottom: 14px;
color:#0058e1;
" "
> >
累计节省财政资金约{{ saveMoney }}万元 累计节省财政资金约{{ saveMoney }}万元
@ -20,8 +21,8 @@
<div <div
style=" style="
text-align: center; text-align: center;
font-size: 14px; font-size: 12px;
font-weight: bold;
margin-bottom: 14px; margin-bottom: 14px;
" "
> >
@ -32,7 +33,7 @@
<el-form-item> <el-form-item>
<span>日期：</span> <span>日期：</span>
<el-date-picker <el-date-picker
v-model="dataList" v-model="dateList"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
@ -43,11 +44,11 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!--提供部门--> <!--提供部门 传id-->
<el-form-item> <el-form-item>
<span>提供部门：</span> <span>提供部门：</span>
<el-select <el-select
v-model="dataForm.offerDepartment" v-model="dataForm.provideDept"
placeholder="请选择提供部门" placeholder="请选择提供部门"
filterable filterable
clearable clearable
@ -55,19 +56,19 @@
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option <el-option
v-for="item in offerDepartSelects" v-for="item in offerDepartSelects"
:key="item.label" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
v-bind="item" v-bind="item"全部
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--申请部门--> <!--申请部门 传汉字-->
<el-form-item> <el-form-item>
<span>申请部门：</span> <span>申请部门：</span>
<el-select <el-select
v-model="dataForm.applyDepartment" v-model="dataForm.applyDept"
placeholder="请选择申请部门" placeholder="请选择申请部门"
filterable filterable
clearable clearable
@ -88,8 +89,8 @@
<span>类型：</span> <span>类型：</span>
<el-select <el-select
@change="changeIiem" @change="changeIiem"
v-model="dataForm.type" v-model="dataForm.resourceType"
placeholder="请选择类型" placeholder="请选择资源类型"
clearable clearable
> >
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -108,7 +109,7 @@
<span>名称：</span> <span>名称：</span>
<el-input <el-input
style="width: 80%" style="width: 80%"
v-model="dataForm.name" v-model="dataForm.resourceName"
placeholder="请输入资源名称" placeholder="请输入资源名称"
clearable clearable
></el-input> ></el-input>
@ -127,14 +128,12 @@
$t("reset") $t("reset")
}}</el-button> }}</el-button>
</el-form-item> </el-form-item>
<!-- 导出 -->
<a <a
class="export" class="export"
:href=" :href="
exportExcel + exportExcel +
exportExcelType +
'?' + '?' +
exportExcelCondition + dataForm +
'&token=' + '&token=' +
token token
" "
@ -144,60 +143,54 @@
<div class="mod-activiti__process"> <div class="mod-activiti__process">
<el-table <el-table
:data="dataList" :data="tableData"
:header-cell-style="{ textAlign: 'center', height: '40px' }" :header-cell-style="{ textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
style="width: 100%" style="width: 100%"
> >
<el-table-column width="80px" label="序号" align="center">
<template slot-scope="scop">
{{scop.$index+1}}
</template>
</el-table-column>
<el-table-column <el-table-column
prop="title" prop="resourceName"
label="序号"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="name"
label="资源名称" label="资源名称"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="createDate" prop="resourceType"
label="类型" label="资源类型"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="auditTime" prop="provideDept"
label="提供部门" label="提供部门"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="auditTime" prop="applyDept"
label="提供部门"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="auditTime"
label="申请部门" label="申请部门"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="auditTime" prop="applyDate"
label="申请时间" label="申请时间"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="auditTime" prop="applyPrice"
label="参考价格(元)" label="参考价格(元)"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
</el-table> </el-table>
<div class="block" >
<el-pagination <el-pagination
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="total, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
@ -207,6 +200,7 @@
> >
</el-pagination> </el-pagination>
</div> </div>
</div>
</el-card> </el-card>
</template> </template>
@ -220,8 +214,9 @@ export default {
return { return {
token: Cookies.get('ucsToken'), token: Cookies.get('ucsToken'),
//导出全部 //导出全部
exportExcelCondition: '', exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/processForm/tabilityapplication/exportFundStatementTable',
exportExcelType: '',
saveMoney: 3243, saveMoney: 3243,
offerDepartSelects: [], offerDepartSelects: [],
applyDepartSelects: [], applyDepartSelects: [],
@ -231,38 +226,48 @@ export default {
{ name: "开发组件", value: 3 }, { name: "开发组件", value: 3 },
{ name: "业务组件", value: 4 }, { name: "业务组件", value: 4 },
{ name: "应用资源", value: 5 }, { name: "应用资源", value: 5 },
{ name: "会客厅", value: 5 },
], // 类型备选列表 ], // 类型备选列表
dataList: [], tableData: [],
dateList: [],//时间
dataForm: { dataForm: {
// date: '', // date: '',
startDate: "", startDate: "",
endDate: "", endDate: "",
offerDepartment: "", provideDept: "",
applyDepartment: "", applyDept: "",
type: "", resourceType: "",
name: "", resourceName: "",
pageNum:1,
pageSize:10,
}, },
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
total: null, total: 0,
}; };
}, },
methods: { methods: {
init() { init() {
if (this.value1 && this.value1.length > 0) { if (this.dateList && this.dateList.length > 0) {
this.dataForm.startDate = this.value1[0]; this.dataForm.startDate = this.dateList[0];
this.dataForm.endDate = this.value1[1]; this.dataForm.endDate = this.dateList[1];
} else { } else {
this.dataForm.startDate = ""; this.dataForm.startDate = "";
this.dataForm.endDate = ""; this.dataForm.endDate = "";
} }
this.dataForm.pageNum=this.currentPage
let params = this.dataForm; let params = this.dataForm;
this.$http this.$http
.get("/census/center/v3/treeList/", { .get("/processForm/tabilityapplication/getFundStatement/", {
params, params,
}) })
.then((res) => { .then((res) => {
this.tableData = res.data.data; this.tableData = res.data.data.list;
let price=Number(res.data.data.totalPrice);
price=Math.round(price / 10000);
this.saveMoney=price.toFixed(1)
this.total=Number(res.data.data.total);
}); });
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
@ -270,13 +275,13 @@ export default {
this.init(); this.init();
}, },
resetDataList() { resetDataList() {
this.dataList = []; this.dateList = [];
this.dataForm.startDate = ""; this.dataForm.startDate = "";
this.dataForm.endDate = ""; this.dataForm.endDate = "";
this.dataForm.type = ""; this.dataForm.resourceType = "";
this.dataForm.name = ""; this.dataForm.resourceName = "";
this.dataForm.applyDepartment = ""; this.dataForm.applyDept = "";
this.dataForm.offerDepartment = ""; this.dataForm.provideDept = "";
this.currentPage = 1; this.currentPage = 1;
this.init(); this.init();
}, },
@ -289,7 +294,7 @@ export default {
this.applyDepartSelects = []; this.applyDepartSelects = [];
this.offerDepartSelects = []; this.offerDepartSelects = [];
res.data.data.map((val) => { res.data.data.map((val) => {
this.applyDepartSelects.push({ label: val.name, value: val.id }); this.applyDepartSelects.push({ label: val.name, value: val.name });
this.offerDepartSelects.push({ label: val.name, value: val.id }); this.offerDepartSelects.push({ label: val.name, value: val.id });
}); });
}); });

3
front/src/views/home/videoSurveillance/index.vue
View File

@ -315,6 +315,9 @@ import { ElMessage } from 'element-plus'
lng: item.location.x, lng: item.location.x,
} }
this.hiMapFun.mapFlyTo(latLng) this.hiMapFun.mapFlyTo(latLng)
if(this.addressType=='2'){
mybus.emit('openOperationPopup', [item]);
}
}, },
//框选 //框选
areaSelectResource(){ areaSelectResource(){