Yangwl
/
lanju-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Yangwl:ca30d2ac03c9c9012659a7c6f47dc149cd9800f4
Branches Tags
Yangwl:master
..
compare: Yangwl:90c27d2bc1d02ea60c5cfae334e1a0ecc16e4b03
Branches Tags
Yangwl:master

No commits in common. 'ca30d2ac03c9c9012659a7c6f47dc149cd9800f4' and '90c27d2bc1d02ea60c5cfae334e1a0ecc16e4b03' have entirely different histories.
ca30d2ac03 ... 90c27d2bc1

3 changed files with 85 additions and 165 deletions
Show Stats

4
package.json
Unescape Escape View File

@ -61,7 +61,7 @@
"sortablejs": "1.10.2",
"swiper": "^5.4.5",
"v-scale-screen": "^1.0.2",
"vue": "^2.6.14",
"vue": "2.6.12",
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.5",
"vue-meta": "2.4.0",
@ -89,7 +89,7 @@
"sass-loader": "10.1.1",
"script-ext-html-webpack-plugin": "2.1.5",
"svg-sprite-loader": "5.1.1",
"vue-template-compiler": "^2.6.14"
"vue-template-compiler": "2.6.12"
},
"engines": {
"node": ">=8.9",

142
src/views/energy/WaterManagement/dianMeasurement/index.vue
Unescape Escape View File

@ -71,12 +71,10 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索
</el-button
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置
</el-button
>重置</el-button
>
</el-form-item>
</el-form>
@ -90,8 +88,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['energy:ShuiMeasurement:add']"
>新增
</el-button
>新增</el-button
>
</el-col>
<el-col :span="1.5">
@ -101,8 +98,7 @@
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll"
>展开/折叠
</el-button
>展开/折叠</el-button
>
</el-col>
<el-col :span="1.5">
@ -113,11 +109,10 @@
size="mini"
@click="handleExport"
v-hasPermi="['energy:ShuiMeasurement:export']"
>导出
</el-button>
>导出</el-button>
</el-col>
<el-col :span="1.5">
共{{ list.length }}条
共{{list.length}}条
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@ -141,8 +136,8 @@
prop="monitorId"
min-width="150"
/>
<el-table-column label="计量设备名称" align="center" prop="monitorName"/>
<el-table-column label="计量设备位置" align="center" prop="monitorAddr"/>
<el-table-column label="计量设备名称" align="center" prop="monitorName" />
<el-table-column label="计量设备位置" align="center" prop="monitorAddr" />
<el-table-column label="计量设备类型" align="center" prop="monitorType">
<template slot-scope="scope">
<dict-tag
@ -151,9 +146,9 @@
/>
</template>
</el-table-column>
<el-table-column label="CBS房间编号" align="center" key="roomCode" prop="roomCode"/>
<el-table-column label="CBS房间名称" align="center" key="roomName" prop="roomName"/>
<el-table-column label="CBS物理编号" align="center" key="physicalCode" prop="physicalCode"/>
<el-table-column label="CBS房间编号" align="center" key="roomCode" prop="roomCode" />
<el-table-column label="CBS房间名称" align="center" key="roomName" prop="roomName" />
<el-table-column label="CBS物理编号" align="center" key="physicalCode" prop="physicalCode" />
<el-table-column label="计量设备状态" align="center" prop="monitorStatus">
<template slot-scope="scope">
<dict-tag
@ -210,8 +205,7 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['energy:ShuiMeasurement:edit']"
>修改
</el-button
>修改</el-button
>
<el-button
size="mini"
@ -219,8 +213,7 @@
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['energy:ShuiMeasurement:add']"
>新增
</el-button
>新增</el-button
>
<el-button
size="mini"
@ -228,8 +221,7 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['energy:ShuiMeasurement:remove']"
>删除
</el-button
>删除</el-button
>
</template>
</el-table-column>
@ -248,8 +240,7 @@
</el-col>
<el-col :span="12">
<el-button type="primary" @click="selectDevice"
>选择采集设备
</el-button
>选择采集设备</el-button
>
</el-col>
</el-row>
@ -263,7 +254,7 @@
/>
</el-form-item>
<el-form-item label="计量设备编号" prop="monitorId">
<el-input v-model="form.monitorId" placeholder="请输入计量设备名称"/>
<el-input v-model="form.monitorId" placeholder="请输入计量设备名称" />
</el-form-item>
<el-form-item label="计量设备名称" prop="monitorName">
<el-input
@ -278,25 +269,24 @@
/>
</el-form-item>
<el-form-item label="类型" prop="monitorType" v-if="false">
<el-input v-model="form.monitorType"/>
<el-input v-model="form.monitorType" />
</el-form-item>
<el-form-item label="CBS房间编号" prop="roomCode">
<el-input v-model="form.roomCode" placeholder="请输入CBS房间编号"/>
<el-input v-model="form.roomCode" placeholder="请输入CBS房间编号" />
</el-form-item>
<el-form-item label="CBS房间名称" prop="roomName">
<el-input v-model="form.roomName" placeholder="请输入房间名称"/>
<el-input v-model="form.roomName" placeholder="请输入房间名称" />
</el-form-item>
<el-form-item label="CBS物理编号" prop="physicalCode">
<el-input v-model="form.physicalCode" placeholder="physicalCode"/>
<el-input v-model="form.physicalCode" placeholder="physicalCode" />
</el-form-item>
<el-form-item label="通讯地址" prop="addressCode">
<el-input v-model="form.addressCode" placeholder="请填写通讯地址"/>
<el-input v-model="form.addressCode" placeholder="请填写通讯地址" />
</el-form-item>
<el-form-item label="电表类型" prop="electricityMeterType">
<el-select v-model="form.electricityMeterType" clearable placeholder="请选择电表类型" style="width: 100%">
<el-option
v-for="item in dict.type.electricity_type" :value="item.value+''" :key="item.value+''"
:label="item.label">
v-for="item in dict.type.electricity_type" :value="item.value+''" :key="item.value+''" :label="item.label" >
</el-option>
</el-select>
</el-form-item>
@ -306,8 +296,7 @@
v-for="dict in dict.type.monitorStatus"
:key="dict.value"
:label="parseInt(dict.value)"
>{{ dict.label }}
</el-radio
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
@ -336,15 +325,13 @@
<el-tree
class="tree-border"
:data="subentryOptions"
accordion
show-checkbox
:check-strictly="true"
:default-expanded-keys="[...subentryExpandedKeys]"
:default-expanded-keys="twoKeys"
ref="subentry"
node-key="id"
empty-text="加载中，请稍候"
:props="defaultProps"
@check="handleCheckSubentryOptions"
></el-tree>
</el-form-item>
<el-form-item label="业态类型" prop="businessId">
@ -361,19 +348,19 @@
></el-tree>
</el-form-item>
<el-form-item label="传感器仪表" prop="meterTypeId">
<el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表"/>
<el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表" />
</el-form-item>
<el-form-item label="测量器具" prop="meterId">
<el-input v-model="form.meterId" placeholder="请输入测量器具"/>
<el-input v-model="form.meterId" placeholder="请输入测量器具" />
</el-form-item>
<el-form-item label="修正值" prop="correctValue">
<el-input v-model="form.correctValue" placeholder="请输入修正值"/>
<el-input v-model="form.correctValue" placeholder="请输入修正值" />
</el-form-item>
<el-form-item label="PT值" prop="pt">
<el-input v-model="form.pt" placeholder="请输入PT值"/>
<el-input v-model="form.pt" placeholder="请输入PT值" />
</el-form-item>
<el-form-item label="CT值" prop="ct">
<el-input v-model="form.ct" placeholder="请输入CT值"/>
<el-input v-model="form.ct" placeholder="请输入CT值" />
</el-form-item>
<el-form-item label="是否虚拟" label-width="100px" prop="isAmmeter">
<el-radio v-model="form.isAmmeter" label="true">是</el-radio>
@ -385,8 +372,7 @@
v-for="dict in dict.type.public_share_type"
:key="dict.value"
:label="parseInt(dict.value)"
>{{ dict.label }}
</el-radio
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
@ -460,12 +446,10 @@
icon="el-icon-search"
size="mini"
@click="handleQuery1"
>搜索
</el-button
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery1"
>重置
</el-button
>重置</el-button
>
</el-form-item>
</el-form>
@ -474,7 +458,7 @@
:data="typeList"
@selection-change="handleSelectionChange1"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="设备编号"
align="center"
@ -485,7 +469,7 @@
align="center"
prop="collectDeviceName"
/>
<el-table-column label="生产厂家" align="center" prop="manufacturer"/>
<el-table-column label="生产厂家" align="center" prop="manufacturer" />
<el-table-column label="能源类型" align="center" prop="energyType">
<template slot-scope="scope">
<dict-tag
@ -522,13 +506,13 @@ import {
businessTreeSelect,
treeselect,
} from "@/api/energy/energy/waterManagement/shuiMeasurement";
import {listInfo} from "@/api/energy/energy/base/info";
import { listInfo } from "@/api/energy/energy/base/info";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "ShuiMeasurement",
dicts: ["isAmmeter", "monitorStatus", "energy_type", "public_share_type", 'monitor_hierarchy', 'electricity_type'],
dicts: ["isAmmeter", "monitorStatus", "energy_type", "public_share_type",'monitor_hierarchy','electricity_type'],
components: {
Treeselect,
},
@ -583,8 +567,8 @@ export default {
form: {},
// 表单校验
rules: {
electricityMeterType: [
{required: true, message: "电表类型不能为空", trigger: "blur"}
electricityMeterType:[
{ required: true, message: "电表类型不能为空", trigger: "blur" }
],
},
// 选中数组
@ -618,7 +602,6 @@ export default {
businessOptions: [],
// 二级展示节点
twoKeys: [],
subentryExpandedKeys: [],
};
},
created() {
@ -662,6 +645,16 @@ export default {
children: node.children,
};
},
/** 查询计量设备信息下拉树结构 */
getTreeselect() {
this.queryParams.monitorType = 2;
listShuiMeasurement(this.queryParams).then((response) => {
this.ShuiMeasurementOptions = [];
const data = { objid: 0, monitorName: "顶级节点", children: [] };
data.children = this.handleTree(response.data, "objid", "parentId");
this.ShuiMeasurementOptions.push(data);
});
},
// 取消按钮
cancel() {
this.open = false;
@ -809,8 +802,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {
});
.catch(() => {});
},
// 取消按钮-------------------------------------------
/** 选择采集设备操作 */
@ -871,32 +863,9 @@ export default {
/** 查询部门类型树结构 */
getSubentrySelect() {
subentryTreeSelect().then((response) => {
this.setSubentryOptions(response.data, 0);
this.subentryOptions = response.data;
});
},
setSubentryOptions(data, level) {
data.forEach(item => {
if (item.children && item.children.length > 0) {
this.$set(item, 'disabled', true);
}
if (item.children) {
this.setSubentryOptions(item.children, level + 1);
}
});
if (level != 0) return
this.subentryOptions = data
this.subentryExpandedKeys =[].concat([this.form.subentryId])
},
handleCheckSubentryOptions(data, checkedStatus) {
const isParent = data.children && data.children.length > 0
if (isParent) {
this.$refs.subentry.setChecked(data.id, false)
return
}
if (checkedStatus.checkedKeys.includes(data.id)) {
this.$refs.subentry.setCheckedKeys([data.id])
}
},
/** 查询业态类型树结构 */
getBusinessSelect() {
businessTreeSelect().then((response) => {
@ -938,7 +907,7 @@ export default {
this.queryParams.monitorType = 2;
listShuiMeasurement(this.queryParams).then((response) => {
this.ShuiMeasurementOptions = [];
const data = {objid: 0, monitorName: "顶级节点", children: []};
const data = { objid: 0, monitorName: "顶级节点", children: [] };
data.children = this.handleTree(response.data, "objid", "parentId");
this.ShuiMeasurementOptions.push(data);
});
@ -947,8 +916,8 @@ export default {
getAllTree(objid) {
return treeselect(objid).then((response) => {
this.buildOptions = response.builds;
this.subentryOptions = response.subentrys;
this.businessOptions = response.business;
this.setSubentryOptions(response.subentrys, 0);
return response;
});
},
@ -961,10 +930,3 @@ export default {
},
};
</script>
<style scoped>
/* 隐藏带 is-disabled 类名的复选框 */
/deep/ .el-checkbox__input.is-disabled .el-checkbox__inner {
display: none !important;
}
</style>

104
src/views/energy/powerUse/Energystatistics/index.vue
Unescape Escape View File

@ -162,20 +162,6 @@
prop="address"
v-if="columns[2].visible"
/>
<el-table-column
label="表具类型"
align="center"
key="publicShareType"
prop="publicShareType"
v-if="columns[3].visible"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.public_share_type"
:value="scope.row.publicShareType"
/>
</template>
</el-table-column>
<el-table-column
label="表具层级"
align="center"
@ -197,37 +183,6 @@
prop="owningUser"
v-if="columns[3].visible"
/>
<el-table-column
label="所属部门"
align="center"
key="subentryName"
prop="subentryName"
v-if="columns[3].visible"
/>
<el-table-column
label="尖电量(kW·h)"
align="center"
key="kwh1"
prop="kwh1"
/>
<el-table-column
label="峰电量(kW·h)"
align="center"
key="kwh2"
prop="kwh2"
/>
<el-table-column
label="平电量(kW·h)"
align="center"
key="kwh3"
prop="kwh3"
/>
<el-table-column
label="谷电量(kW·h)"
align="center"
key="kwh4"
prop="kwh4"
/>
<el-table-column
label="用电量(kW·h)"
align="center"
@ -300,7 +255,7 @@
highlight-current
@check-change="handleCheckChange"
/>
</div>http://192.168.58.226:81/ems/powerUse/Energystatistics
</div>
</el-col>
</el-form>
<div slot="footer" class="dialog-footer">
@ -501,34 +456,34 @@ export default {
},
},
created() {
this.initDateRange();
this.dateRangeone = new Date(new Date().setHours(0, 0, 0, 0));
var d = new Date(this.dateRangeone);
let m = ("0" + (d.getMonth() + 1)).slice(-2);
let tian = ("0" + d.getDate()).slice(-2);
let h = ("0" + d.getHours()).slice(-2);
let M = ("0" + d.getMinutes()).slice(-2);
let s = ("0" + d.getSeconds()).slice(-2);
console.log("d", d);
this.dateRangeone = d.getFullYear() + "-" + m + "-" + tian;
this.dateRangetwo = new Date(
new Date().setHours(0, 0, 0, 0) + 24 * 60 * 60 * 1000 - 1
);
var d1 = new Date(this.dateRangetwo);
let m1 = ("0" + (d1.getMonth() + 1)).slice(-2);
let tian1 = ("0" + d1.getDate()).slice(-2);
let h1 = ("0" + d1.getHours()).slice(-2);
let M1 = ("0" + d1.getMinutes()).slice(-2);
let s1 = ("0" + d1.getSeconds()).slice(-2);
console.log("tian1.length", tian1);
this.dateRangetwo = d1.getFullYear() + "-" + m1 + "-" + tian1;
//this.dateRangetwo = d1.getFullYear()+ '-'+m1+ '-'+tian1+ ' '+ h1+ ':'+M1+':'+s1;
this.getList();
//this.getDeptTree();
},
mounted() {},
methods: {
initDateRange(){
this.dateRangeone = new Date(new Date().setHours(0, 0, 0, 0));
var d = new Date(this.dateRangeone);
let m = ("0" + (d.getMonth() + 1)).slice(-2);
let tian = ("0" + d.getDate()).slice(-2);
let h = ("0" + d.getHours()).slice(-2);
let M = ("0" + d.getMinutes()).slice(-2);
let s = ("0" + d.getSeconds()).slice(-2);
console.log("d", d);
this.dateRangeone = d.getFullYear() + "-" + m + "-" + tian;
this.dateRangetwo = new Date(
new Date().setHours(0, 0, 0, 0) + 24 * 60 * 60 * 1000 - 1
);
var d1 = new Date(this.dateRangetwo);
let m1 = ("0" + (d1.getMonth() + 1)).slice(-2);
let tian1 = ("0" + d1.getDate()).slice(-2);
let h1 = ("0" + d1.getHours()).slice(-2);
let M1 = ("0" + d1.getMinutes()).slice(-2);
let s1 = ("0" + d1.getSeconds()).slice(-2);
console.log("tian1.length", tian1);
this.dateRangetwo = d1.getFullYear() + "-" + m1 + "-" + tian1;
},
/** 查询用户列表 */
getList() {
this.loading = true;
@ -686,9 +641,12 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.initDateRange()
this.queryParams.publicShareType=null
this.queryParams.monitorHierarchy=null
//this.dateRange = [];
this.dateRangeone = "";
this.dateRangetwo = "";
//this.resetForm("queryForm");
//this.queryParams.deptId = undefined;
//this.$refs.tree.setCurrentKey(null);
this.handleQuery();
},
// 多选框选中数据

Write Preview
Loading…
Cancel
Save