jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xd
lijun 2024-12-11 00:21:00 +08:00
parent 300608c53e
commit 13c655fa1c
10 changed files with 295 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonData.java
View File

@ -48,8 +48,17 @@ public class GreenCarbonData extends BaseEntity
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private Long isDel; private Long isDel;
private Long factorType;
private Date dataDate; private Date dataDate;
public Long getFactorType() {
return factorType;
}
public void setFactorType(Long factorType) {
this.factorType = factorType;
}
public Date getDataDate() { public Date getDataDate() {
return dataDate; return dataDate;
} }

5
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/GreenCarbonDataMapper.java
View File

@ -58,4 +58,9 @@ public interface GreenCarbonDataMapper
* @return 结果 * @return 结果
*/ */
public int deleteGreenCarbonDataByIds(Long[] ids); public int deleteGreenCarbonDataByIds(Long[] ids);
/**
* 按类型分组统计
*/
List<GreenCarbonData> groupByFactorType(GreenCarbonData greenCarbonData);
} }

13
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/GreenCarbonDataMapper.xml
View File

@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="compName" column="comp_name"/> <result property="compName" column="comp_name"/>
<result property="projectName" column="project_name"/> <result property="projectName" column="project_name"/>
<result property="factorType" column="factor_type"/>
<association property="greenCarbonItem" javaType="GreenCarbonItem"> <association property="greenCarbonItem" javaType="GreenCarbonItem">
<id property="id" column="gid"></id> <id property="id" column="gid"></id>
<result property="carbonFactorType" column="carbon_factor_type" /> <result property="carbonFactorType" column="carbon_factor_type" />
@ -49,10 +50,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="estimateValue != null "> and gd.estimate_value = #{estimateValue}</if> <if test="estimateValue != null "> and gd.estimate_value = #{estimateValue}</if>
<if test="practicalValue != null "> and gd.practical_value = #{practicalValue}</if> <if test="practicalValue != null "> and gd.practical_value = #{practicalValue}</if>
<if test="state != null "> and gd.state = #{state}</if> <if test="state != null "> and gd.state = #{state}</if>
<if test="dataDate != null "> and date(gd.data_date) = date(#{dataDate})</if>
<if test="factorType != null "> and g.carbon_factor_type = #{factorType}</if>
<if test="isDel != null "> and gd.is_del = #{isDel}</if> <if test="isDel != null "> and gd.is_del = #{isDel}</if>
</where> </where>
</select> </select>
<select id="groupByFactorType" parameterType="GreenCarbonData" resultMap="GreenCarbonDataResult">
SELECT g.carbon_factor_type factor_type,count(1) id
from green_carbon_data gd
JOIN green_carbon_item g on g.id=gd.item_id
<where>
<if test="comId != null "> and gd.com_id = #{comId}</if>
<if test="projectId != null "> and gd.project_id = #{projectId}</if>
</where>
GROUP BY g.carbon_factor_type
</select>
<select id="selectGreenCarbonDataById" parameterType="Long" resultMap="GreenCarbonDataResult"> <select id="selectGreenCarbonDataById" parameterType="Long" resultMap="GreenCarbonDataResult">
<include refid="selectGreenCarbonDataVo"/> <include refid="selectGreenCarbonDataVo"/>
where gd.id = #{id} where gd.id = #{id}

32
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonDataController.java
View File

@ -12,6 +12,7 @@ import com.yanzhu.common.log.annotation.Log;
import com.yanzhu.common.log.enums.BusinessType; import com.yanzhu.common.log.enums.BusinessType;
import com.yanzhu.common.security.annotation.RequiresPermissions; import com.yanzhu.common.security.annotation.RequiresPermissions;
import com.yanzhu.manage.domain.GreenCarbonData; import com.yanzhu.manage.domain.GreenCarbonData;
import com.yanzhu.manage.domain.GreenCarbonItem;
import com.yanzhu.manage.service.IGreenCarbonDataService; import com.yanzhu.manage.service.IGreenCarbonDataService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -48,7 +49,14 @@ public class GreenCarbonDataController extends BaseController
List<GreenCarbonData> list = greenCarbonDataService.selectGreenCarbonDataList(greenCarbonData); List<GreenCarbonData> list = greenCarbonDataService.selectGreenCarbonDataList(greenCarbonData);
return getDataTable(list); return getDataTable(list);
} }
/**
* 按类型分组统计
*/
@RequiresPermissions("manage:greenCarbonData:list")
@GetMapping("/groupByFactorType")
public AjaxResult groupByFactorType(GreenCarbonData greenCarbonData){
return AjaxResult.success(greenCarbonDataService.groupByFactorType(greenCarbonData));
}
/** /**
* 导出建碳管理列表 * 导出建碳管理列表
*/ */
@ -80,6 +88,15 @@ public class GreenCarbonDataController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody GreenCarbonData greenCarbonData) public AjaxResult add(@RequestBody GreenCarbonData greenCarbonData)
{ {
GreenCarbonData where =new GreenCarbonData();
where.setComId(greenCarbonData.getComId());
where.setProjectId(greenCarbonData.getProjectId());
where.setDataDate(greenCarbonData.getDataDate());
where.setItemId(greenCarbonData.getItemId());
List<GreenCarbonData> list=greenCarbonDataService.selectGreenCarbonDataList(where);
if(list.size()>0){
return AjaxResult.error("同一天已经存在相同的数据!");
}
return toAjax(greenCarbonDataService.insertGreenCarbonData(greenCarbonData)); return toAjax(greenCarbonDataService.insertGreenCarbonData(greenCarbonData));
} }
@ -91,6 +108,19 @@ public class GreenCarbonDataController extends BaseController
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody GreenCarbonData greenCarbonData) public AjaxResult edit(@RequestBody GreenCarbonData greenCarbonData)
{ {
GreenCarbonData where =new GreenCarbonData();
where.setComId(greenCarbonData.getComId());
where.setProjectId(greenCarbonData.getProjectId());
where.setDataDate(greenCarbonData.getDataDate());
where.setItemId(greenCarbonData.getItemId());
List<GreenCarbonData> list=greenCarbonDataService.selectGreenCarbonDataList(where);
if(list.size()>0){
for(GreenCarbonData it : list){
if(!it.getId().equals(greenCarbonData.getId())){
return AjaxResult.error("同一天已经存在相同的数据!");
}
}
}
return toAjax(greenCarbonDataService.updateGreenCarbonData(greenCarbonData)); return toAjax(greenCarbonDataService.updateGreenCarbonData(greenCarbonData));
} }

4
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IGreenCarbonDataService.java
View File

@ -58,4 +58,8 @@ public interface IGreenCarbonDataService
* @return 结果 * @return 结果
*/ */
public int deleteGreenCarbonDataById(Long id); public int deleteGreenCarbonDataById(Long id);
/**
* 按类型分组统计
*/
List<GreenCarbonData> groupByFactorType(GreenCarbonData greenCarbonData);
} }

7
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/GreenCarbonDataServiceImpl.java
View File

@ -97,4 +97,11 @@ public class GreenCarbonDataServiceImpl implements IGreenCarbonDataService
{ {
return greenCarbonDataMapper.deleteGreenCarbonDataById(id); return greenCarbonDataMapper.deleteGreenCarbonDataById(id);
} }
/**
* 按类型分组统计
*/
@Override
public List<GreenCarbonData> groupByFactorType(GreenCarbonData greenCarbonData) {
return greenCarbonDataMapper.groupByFactorType(greenCarbonData);
}
} }

9
yanzhu-ui-vue3/src/api/manage/greenCarbonData.js
View File

@ -42,3 +42,12 @@ export function delGreenCarbonData(id) {
method: 'delete' method: 'delete'
}) })
} }
export function groupByFactorType(query){
return request({
url: '/manage/greenCarbonData/groupByFactorType',
method: 'get',
params: query
})
}

288
yanzhu-ui-vue3/src/views/manage/greenCarbonData/index.vue
View File

@ -1,79 +1,117 @@
<template> <template>
<div class="app-container green-carbon-data"> <div class="app-container green-carbon-data">
<el-tabs v-model="data.selTab" type="card" class="main-tab"> <el-tabs v-model="data.selTab" type="card" class="main-tab" @click="doTabClick">
<el-tab-pane v-for="(it, idx) in data.types" :key="idx" :name="it.value" :label="it.text"></el-tab-pane> <el-tab-pane v-for="(it, idx) in data.types" :key="idx" :name="it.value"
:label="it.text + '(' + it.count + ')'"></el-tab-pane>
</el-tabs> </el-tabs>
<template v-if="data.currentProId">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['manage:greenCarbonData:add']">新增</el-button>
</el-col>
<el-row :gutter="10" class="mb8"> <el-col :span="1.5">
<el-col :span="1.5"> <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['manage:greenCarbonData:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['manage:greenCarbonData:remove']">删除</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="greenCarbonDataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="公司主键" align="center" prop="comId" />
<el-table-column label="分包单位" align="center" prop="projectId" />
<el-table-column label="因子ID-外键" align="center" prop="itemId" />
<el-table-column label="预估使用数量" align="center" prop="estimateValue" />
<el-table-column label=" 实际使用量" align="center" prop="practicalValue" />
<el-table-column label="状态" align="center" prop="state" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="${comment}" align="center" prop="isDel" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:greenCarbonData:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:greenCarbonData:remove']">删除</el-button> v-hasPermi="['manage:greenCarbonData:remove']">删除</el-button>
</template> </el-col>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" </el-row>
v-model:limit="queryParams.pageSize" @pagination="getList" />
<el-table v-loading="loading" :data="greenCarbonDataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="日期" align="center" prop="dataDate">
<template #default="scope">{{ parseTime(scope.row.dataDate, '{y}-{m}-{d}') }}</template>
</el-table-column>
<el-table-column label="材料名称" align="center">
<template #default="scope">{{ scope.row.greenCarbonItem?.carbonName || '' }}</template>
</el-table-column>
<el-table-column label="碳排放因子" align="center">
<template #default="scope">{{ scope.row.greenCarbonItem?.carbonFactor || '' }} kg
CO2/{{ scope.row.greenCarbonItem?.unit || '' }}</template>
</el-table-column>
<el-table-column label="预估使用数量" align="center" prop="estimateValue" />
<el-table-column label="预估排放量(KG)" align="center">
<template #default="scope">{{ (scope.row.greenCarbonItem?.carbonFactor || 0) * scope.row.estimateValue }}</template>
</el-table-column>
<el-table-column label="实际使用量" align="center" prop="practicalValue" />
<el-table-column label="实际排放量(KG)" align="center">
<template
#default="scope">{{ (scope.row.greenCarbonItem?.carbonFactor || 0) * scope.row.practicalValue }}</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:greenCarbonData:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:greenCarbonData:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
</template>
<div v-else style="margin-top:50px;text-align: center;color: #999;">
<el-icon color="#999">
<WarningFilled />
</el-icon> 请选择项目！
</div>
<!-- 添加或修改建碳管理对话框 --> <!-- 添加或修改建碳管理对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" width="800px" append-to-body>
<el-form ref="greenCarbonDataRef" :model="form" :rules="rules" label-width="80px"> <el-form ref="greenCarbonDataRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="公司主键" prop="comId"> <el-form-item label="时间" prop="dataDate">
<el-input v-model="form.comId" placeholder="请输入公司主键" /> <el-date-picker clearable v-model="form.dataDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="分包单位" prop="projectId"> <el-form-item prop="itemId">
<el-input v-model="form.projectId" placeholder="请输入分包单位" /> <template v-slot:label>
<span v-if="data.selTab == 1">材料名称</span>
<span v-if="data.selTab == 2">耗能名称</span>
<span v-if="data.selTab == 3">油料名称</span>
</template>
<el-select v-model="form.itemId" clearable placeholder="请选择名称" @change="doItemChange">
<el-option v-for="it in data.itemList" :key="it.id" :label="it.carbonName" :value="it.id" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="因子ID-外键" prop="itemId"> <el-form-item label="碳排放因子">
<el-input v-model="form.itemId" placeholder="请输入因子ID-外键" /> <el-input v-model="form.itemData" readonly />
</el-form-item>
<el-form-item label="预估使用数量" prop="estimateValue">
<el-input v-model="form.estimateValue" placeholder="请输入预估使用数量" />
</el-form-item>
<el-form-item label=" 实际使用量" prop="practicalValue">
<el-input v-model="form.practicalValue" placeholder="请输入 实际使用量" />
</el-form-item>
<el-form-item label="状态" prop="state">
<el-input v-model="form.state" placeholder="请输入状态" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="${comment}" prop="isDel">
<el-input v-model="form.isDel" placeholder="请输入${comment}" />
</el-form-item> </el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="预估使用量" prop="estimateValue">
<el-input v-model="form.estimateValue" placeholder="请输入预估使用量" @change="calcDataValue">
<template #append v-if="data.selItem">{{ data.selItem.unit }}</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预估排放量">
<el-input v-model="form.estimateValueData" readonly />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="实际使用量" prop="practicalValue">
<el-input v-model="form.practicalValue" placeholder="请输入实际使用量" @change="calcDataValue">
<template #append v-if="data.selItem">{{ data.selItem.unit }}</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实际排放量">
<el-input v-model="form.practicalValueData" readonly />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
@ -83,9 +121,13 @@
</template> </template>
<script setup name="GreenCarbonData"> <script setup name="GreenCarbonData">
import { listGreenCarbonData, getGreenCarbonData, delGreenCarbonData, addGreenCarbonData, updateGreenCarbonData } from "@/api/manage/greenCarbonData"; import { listGreenCarbonData, groupByFactorType, getGreenCarbonData, delGreenCarbonData, addGreenCarbonData, updateGreenCarbonData } from "@/api/manage/greenCarbonData";
import { listGreenCarbonItem } from "@/api/manage/greenCarbonItem";
import greenCarbonData, { getGreenCarbon } from "../greenCarbonItem/greenCarbonData"; import greenCarbonData, { getGreenCarbon } from "../greenCarbonItem/greenCarbonData";
import useUserStore from '@/store/modules/user'
import { onMounted } from "vue";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const userStore = useUserStore()
const greenCarbonDataList = ref([]); const greenCarbonDataList = ref([]);
const open = ref(false); const open = ref(false);
@ -104,6 +146,7 @@ const data = reactive({
pageSize: 10, pageSize: 10,
comId: null, comId: null,
projectId: null, projectId: null,
factorType: 1,
itemId: null, itemId: null,
estimateValue: null, estimateValue: null,
practicalValue: null, practicalValue: null,
@ -111,13 +154,37 @@ const data = reactive({
isDel: null, isDel: null,
}, },
rules: { rules: {
dataDate: [
{ required: true, message: '请选择日期', trigger: 'change' },
],
itemId: [
{ required: true, message: '请选择名称', trigger: 'blur' },
],
estimateValue: [
{ required: true, message: '请输入预估使用量', trigger: 'blur' },
],
practicalValue: [
{ required: true, message: '请输入实际使用量', trigger: 'blur' },
],
}, },
types: greenCarbonData.types, currentProId: '',
selTab: 1 types: greenCarbonData.types.map(it => {
it.count = 0;
return it;
}),
selTab: 1,
itemList: [],
selItem: null,
delDatas: [],
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
function doTabClick() {
queryParams.value.pageNum = 1;
queryParams.value.factorType = data.selTab;
getList();
}
/** 查询建碳管理列表 */ /** 查询建碳管理列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
@ -128,6 +195,15 @@ function getList() {
}); });
} }
function getCounts() {
groupByFactorType(queryParams.value).then(d => {
let datas = d.data || [];
data.types.forEach(it => {
let objs = datas.filter(item => item.factorType == it.value);
it.count = objs.length > 0 ? objs[0].id : 0;
});
})
}
// 取消按钮 // 取消按钮
function cancel() { function cancel() {
open.value = false; open.value = false;
@ -169,25 +245,77 @@ function resetQuery() {
// 多选框选中数据 // 多选框选中数据
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id); ids.value = selection.map(item => item.id);
data.delDatas = selection.map(item => proxy.parseTime(item.dataDate, '{y}-{m}-{d}') + ' - ' + item.greenCarbonItem?.carbonName || '')
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} }
function doItemChange() {
let tmps = data.itemList.filter(d => d.id == form.value.itemId);
data.selItem = tmps.length > 0 ? tmps[0] : null;
form.value.itemData = tmps.length > 0 ? tmps[0].carbonFactor + ' kg CO2/' + tmps[0].unit : '';
calcDataValue();
}
function calcDataValue() {
form.value.estimateValueData = "";
form.value.practicalValueData = "";
if (data.selItem) {
if (form.value.estimateValue) {
let v1 = form.value.estimateValue * data.selItem.carbonFactor;
if (!isNaN(v1)) {
form.value.estimateValueData = v1 + ' kg';
}
}
if (form.value.practicalValue) {
let v1 = form.value.practicalValue * data.selItem.carbonFactor;
if (!isNaN(v1)) {
form.value.practicalValueData = v1 + ' kg';
}
}
}
}
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
if (!userStore.currentProId) {
proxy.$modal.msgWarning("请切换到项目数据！！！");
return false;
}
reset(); reset();
listGreenCarbonItem({
pageNum: 1,
pageSize: 100,
projectId: userStore.currentProId,
comIdL: userStore.currentComId,
carbonFactorType: data.selTab
}).then(d => {
data.itemList = d.rows || [];
});
form.value.projectId = userStore.currentProId;
form.value.projectName = userStore.currentProName;
open.value = true; open.value = true;
title.value = "添加建碳管理"; title.value = "建碳管理 - " + getGreenCarbon(data.selTab).text + ' - 新增';
} }
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); reset();
const _id = row.id || ids.value const _id = row.id || ids.value
getGreenCarbonData(_id).then(response => { listGreenCarbonItem({
form.value = response.data; pageNum: 1,
open.value = true; pageSize: 100,
title.value = "修改建碳管理"; projectId: userStore.currentProId,
comIdL: userStore.currentComId,
carbonFactorType: data.selTab
}).then(d => {
data.itemList = d.rows || [];
getGreenCarbonData(_id).then(response => {
form.value = response.data;
open.value = true;
title.value = "建碳管理 - " + getGreenCarbon(data.selTab).text + ' - 修改';
doItemChange();
});
}); });
} }
@ -195,6 +323,7 @@ function handleUpdate(row) {
function submitForm() { function submitForm() {
proxy.$refs["greenCarbonDataRef"].validate(valid => { proxy.$refs["greenCarbonDataRef"].validate(valid => {
if (valid) { if (valid) {
form.value.comId = userStore.currentComId;
if (form.value.id != null) { if (form.value.id != null) {
updateGreenCarbonData(form.value).then(response => { updateGreenCarbonData(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功"); proxy.$modal.msgSuccess("修改成功");
@ -206,6 +335,7 @@ function submitForm() {
proxy.$modal.msgSuccess("新增成功"); proxy.$modal.msgSuccess("新增成功");
open.value = false; open.value = false;
getList(); getList();
getCounts();
}); });
} }
} }
@ -214,8 +344,8 @@ function submitForm() {
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const _ids = row.id || ids.value; const _ids = row && row.id ? proxy.parseTime(row.dataDate, '{y}-{m}-{d}') + ' - ' + row.greenCarbonItem?.carbonName || '' : data.delDatas.join(",");
proxy.$modal.confirm('是否确认删除建碳管理编号为"' + _ids + '"的数据项？').then(function () { proxy.$modal.confirm('是否确认删除建碳管理编号为【' + _ids + '】的数据项？').then(function () {
return delGreenCarbonData(_ids); return delGreenCarbonData(_ids);
}).then(() => { }).then(() => {
getList(); getList();
@ -230,13 +360,19 @@ function handleExport() {
}, `greenCarbonData_${new Date().getTime()}.xlsx`) }, `greenCarbonData_${new Date().getTime()}.xlsx`)
} }
getList(); onMounted(() => {
queryParams.value.projectId = userStore.currentProId;
queryParams.value.comId = userStore.currentComId;
data.currentProId = userStore.currentProId;
getList();
getCounts();
})
</script> </script>
<style lang="scss"> <style lang="scss">
.green-carbon-data{ .green-carbon-data {
.main-tab{ .main-tab {
.el-tabs__item{ .el-tabs__item {
&.is-active{ &.is-active {
background-color: rgb(64, 158, 255); background-color: rgb(64, 158, 255);
color: #fff; color: #fff;
} }

2
yanzhu-ui-vue3/src/views/manage/greenCarbonItem/greenCarbonData.js
View File

@ -1,7 +1,7 @@
const types=[ const types=[
{value:1,text:'建筑材料'}, {value:1,text:'建筑材料'},
{value:2,text:'油料'}, {value:2,text:'油料'},
{value:3,text:'电'} {value:3,text:'电力'}
] ]
export function getGreenCarbon(id){ export function getGreenCarbon(id){

5
yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue
View File

@ -112,7 +112,7 @@
</template> </template>
</el-dialog> </el-dialog>
<el-dialog title="导入结果" v-model="open" width="800px" append-to-body class="green-import-result-dialog"> <el-dialog title="导入结果" v-model="data.openImport" width="800px" append-to-body class="green-import-result-dialog">
<el-table :data="data.importData" height="50vh"> <el-table :data="data.importData" height="50vh">
<el-table-column label="公司" align="center" prop="compName" v-if="!data.currentProId"/> <el-table-column label="公司" align="center" prop="compName" v-if="!data.currentProId"/>
<el-table-column label="分包单位" align="center" prop="projectName" v-if="!data.currentProId"/> <el-table-column label="分包单位" align="center" prop="projectName" v-if="!data.currentProId"/>
@ -205,6 +205,7 @@ const data = reactive({
types:greenCarbonData.types, types:greenCarbonData.types,
delDatas:[], delDatas:[],
importData:[], importData:[],
openImport:false,
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
@ -350,7 +351,7 @@ const handleFileSuccess = (response, file, fileList) => {
if(response.code==200){ if(response.code==200){
proxy.$modal.msgSuccess("导入成功!"); proxy.$modal.msgSuccess("导入成功!");
data.importData=response.data||[]; data.importData=response.data||[];
open.value=true; data.openImport=true;
}else{ }else{
proxy.$modal.msgError("导入失败!"); proxy.$modal.msgError("导入失败!");
} }