0017
/
smart-power-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(大屏): 调整长城、谷云项目名称，iconfont更换为cdn，调整项目、设备相关页面，开启线路websocket

This commit is contained in:
fhysy 2024-09-19 16:42:45 +08:00
parent a2d3270c36
commit 01c7b6b7f7
10 changed files with 91 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.cc
View File

@ -19,7 +19,7 @@ VUE_APP_YDXCX_URL = 'images/cc/ydxcx.jpg'
# 备案号 # 备案号
VUE_APP_RECORD_NUMBER = '沪ICP备2021036275号-1' VUE_APP_RECORD_NUMBER = '沪ICP备2021036275号-1'
# 系统名 # 系统名
VUE_APP_SYSTEM_NAME = '数字用电管理系统' VUE_APP_SYSTEM_NAME = '数字能源一体化平台'
# 系统登录页 login-green、login-blue-black、login-blue-white # 系统登录页 login-green、login-blue-black、login-blue-white
#VUE_APP_LOGIN_PAGE = 'login-green' #VUE_APP_LOGIN_PAGE = 'login-green'
#VUE_APP_LOGIN_PAGE = 'login-blue-black' #VUE_APP_LOGIN_PAGE = 'login-blue-black'

2
.env.ccprod
View File

@ -20,7 +20,7 @@ VUE_APP_YDXCX_URL = 'images/cc/ydxcx.jpg'
# 备案号 # 备案号
VUE_APP_RECORD_NUMBER = '沪ICP备2021036275号-1' VUE_APP_RECORD_NUMBER = '沪ICP备2021036275号-1'
# 系统名 # 系统名
VUE_APP_SYSTEM_NAME = '数字用电管理系统' VUE_APP_SYSTEM_NAME = '数字能源一体化平台'
# 系统登录页 login-green、login-blue-black、login-blue-white # 系统登录页 login-green、login-blue-black、login-blue-white
#VUE_APP_LOGIN_PAGE = 'login-green' #VUE_APP_LOGIN_PAGE = 'login-green'
#VUE_APP_LOGIN_PAGE = 'login-blue-black' #VUE_APP_LOGIN_PAGE = 'login-blue-black'

2
.env.drgy
View File

@ -19,7 +19,7 @@ VUE_APP_YDXCX_URL = 'images/drgy/ydxcx.jpg'
# 备案号 # 备案号
VUE_APP_RECORD_NUMBER = '沪ICP备2024070570号-1' VUE_APP_RECORD_NUMBER = '沪ICP备2024070570号-1'
# 系统名称 # 系统名称
VUE_APP_SYSTEM_NAME = '数字用电管理系统' VUE_APP_SYSTEM_NAME = '数字一体化管理系统'
# 系统登录页 login-green、login-blue-black、login-blue-white # 系统登录页 login-green、login-blue-black、login-blue-white
#VUE_APP_LOGIN_PAGE = 'login-green' #VUE_APP_LOGIN_PAGE = 'login-green'
#VUE_APP_LOGIN_PAGE = 'login-blue-black' #VUE_APP_LOGIN_PAGE = 'login-blue-black'

2
.env.drgyprod
View File

@ -20,7 +20,7 @@ VUE_APP_YDXCX_URL = 'images/drgy/ydxcx.jpg'
# 备案号 # 备案号
VUE_APP_RECORD_NUMBER = '沪ICP备2024070570号-1' VUE_APP_RECORD_NUMBER = '沪ICP备2024070570号-1'
# 系统名称 # 系统名称
VUE_APP_SYSTEM_NAME = '数字用电管理系统' VUE_APP_SYSTEM_NAME = '数字一体化管理系统'
# 系统登录页 login-green、login-blue-black、login-blue-white # 系统登录页 login-green、login-blue-black、login-blue-white
VUE_APP_LOGIN_PAGE = 'login-green' VUE_APP_LOGIN_PAGE = 'login-green'
#VUE_APP_LOGIN_PAGE = 'login-blue-black' #VUE_APP_LOGIN_PAGE = 'login-blue-black'

4
public/index.html
View File

@ -8,10 +8,10 @@
<link href="<%= BASE_URL %>images/<%= process.env.VUE_APP_ICO_URL %>" rel="icon"> <link href="<%= BASE_URL %>images/<%= process.env.VUE_APP_ICO_URL %>" rel="icon">
<link href="<%= BASE_URL %>cdn/iconfont/1.0.0/index.css" rel="stylesheet"> <link href="<%= BASE_URL %>cdn/iconfont/1.0.0/index.css" rel="stylesheet">
<link href="<%= BASE_URL %>cdn/iconfont/1.0.0/iconfont.css" rel="stylesheet"> <link href="<%= BASE_URL %>cdn/iconfont/1.0.0/iconfont.css" rel="stylesheet">
<link href="//at.alicdn.com/t/font_2506643_9w119og75cs.css" rel="stylesheet"> <link href="http://static.drgyen.com/pc/smart-power-ui/font_2506643_9w119og75cs.css" rel="stylesheet">
<link href="//at.alicdn.com/t/c/font_2506643_51mhr4b9ys6.css" rel="stylesheet"> <link href="http://static.drgyen.com/pc/smart-power-ui/font_2506643_51mhr4b9ys6.css" rel="stylesheet">
<script src="https://webapi.amap.com/maps?v=1.4.15&key=4b483d227a9c7dd12e46faae5a8c8af8" type="text/javascript"></script> <script src="https://webapi.amap.com/maps?v=1.4.15&key=4b483d227a9c7dd12e46faae5a8c8af8" type="text/javascript"></script>
<script src="<%= BASE_URL %>js/config.js"></script> <script src="<%= BASE_URL %>js/config.js"></script>

63
src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue
View File

@ -2,14 +2,14 @@
<div class="e-object-device-children-table"> <div class="e-object-device-children-table">
<div class="device-children-header"> <div class="device-children-header">
<div class="left-link-home" @click="handleLinkToHome"> <div class="left-link-home" @click="handleLinkToHome">
<icon class="iconfont iconfanhui_1"></icon> <i class="iconfont iconfanhui_1"></i>
<span class="link-bt-title">返回</span> <span class="link-bt-title">返回</span>
</div> </div>
<div class="lift-gateway-info"> <div class="lift-gateway-info">
<span class="gateway-label">位置：</span> <!-- <span class="gateway-label">位置：</span>-->
<span class="gateway-adders">{{ <!-- <span class="gateway-adders">{{-->
gatewayDevice.deviceAddress || "--" <!-- gatewayDevice.deviceAddress || "&#45;&#45;"-->
}}</span> <!-- }}</span>-->
<span class="gateway-label">设备号：</span> <span class="gateway-label">设备号：</span>
<span class="gateway-did">{{ gatewayDevice.deviceId || "--" }}</span> <span class="gateway-did">{{ gatewayDevice.deviceId || "--" }}</span>
<span class="gateway-label">在线状态：</span> <span class="gateway-label">在线状态：</span>
@ -55,23 +55,32 @@
> >
查找设备 查找设备
</div> </div>
<el-select <!-- <el-select-->
v-model="queryParams.prodKey" <!-- v-model="queryParams.prodKey"-->
placeholder="请选择项目类型" <!-- placeholder="请选择项目类型"-->
size="small" <!-- size="small"-->
style="margin-left: 5xp; width: 130px" <!-- style="margin-left: 5xp; width: 130px"-->
@change="getTableFilterList" <!-- @change="getTableFilterList"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="dict in projectModelList" <!-- v-for="dict in projectModelList"-->
:key="dict.prodKey" <!-- :key="dict.prodKey"-->
:label="dict.modelName" <!-- :label="dict.modelName"-->
:value="dict.prodKey" <!-- :value="dict.prodKey"-->
></el-option> <!-- ></el-option>-->
</el-select> <!-- </el-select>-->
</div> </div>
</div> </div>
<div class="device-tabs">
<el-tabs v-model="queryParams.prodKey" type="card" @tab-click="getTableFilterList">
<el-tab-pane v-for="dict in projectModelList"
:key="dict.prodKey"
:label="dict.modelName"
:name="dict.prodKey"
></el-tab-pane>
</el-tabs>
</div>
<div class="device-children-center"> <div class="device-children-center">
<e-dynamic-table <e-dynamic-table
:border="true" :border="true"
@ -92,7 +101,7 @@
@handleQuery="handleQuery" @handleQuery="handleQuery"
@tableSelectionChange="handleTableChange" @tableSelectionChange="handleTableChange"
> >
<template v-slot:operate="scope"> <template v-slot:operate="scope" >
<div class="children-device-operate"> <div class="children-device-operate">
<span <span
:class=" :class="
@ -202,6 +211,7 @@ export default {
width: "200px", width: "200px",
slot: true, slot: true,
slotName: "operate", slotName: "operate",
fixed:"right"
}, },
projectModelList: [], projectModelList: [],
tableSelectList: [], tableSelectList: [],
@ -277,10 +287,10 @@ export default {
).then((res) => { ).then((res) => {
this.tableList = res.rows; this.tableList = res.rows;
this.deviceTotal = res.total; this.deviceTotal = res.total;
// if (this.stompClient) { if (this.stompClient) {
// this.closeSocket(); this.closeSocket();
// } }
// this.connection(); this.connection();
}); });
}, },
// 动态表格 返回的 勾选数据 // 动态表格 返回的 勾选数据
@ -384,7 +394,7 @@ export default {
handleDeviceInfo(param) { handleDeviceInfo(param) {
if (this.tableList && this.tableList.length > 0) { if (this.tableList && this.tableList.length > 0) {
this.tableList = this.tableList.map((v) => { this.tableList = this.tableList.map((v) => {
if (v["deviceKey"] === param["deviceKey"]) { if (v["deviceKey"] === param["deviceId"]) {
return Object.assign(v, param); return Object.assign(v, param);
} else { } else {
return v; return v;
@ -412,7 +422,8 @@ export default {
}, },
socket_message(data) { socket_message(data) {
console.log("socket-message:", data); console.log("socket-message:", data);
this.handleDeviceInfo(data); const messagedata = JSON.parse(data.data);
this.handleDeviceInfo(messagedata);
this.$forceUpdate(); this.$forceUpdate();
}, },
socket_onclose(e) { socket_onclose(e) {

10
src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
View File

@ -95,11 +95,11 @@
: 'card-left off-line' : 'card-left off-line'
" "
> >
<icon <i
v-if="devItem['deviceState'] == 'ONLINE'" v-if="devItem['deviceState'] == 'ONLINE'"
class="iconfont iconSYS_STA_1" class="iconfont iconSYS_STA_1"
/> />
<icon v-else class="iconfont iconlixian" /> <i v-else class="iconfont iconlixian" />
<span style="margin-left: 8px">{{ <span style="margin-left: 8px">{{
devItem["deviceState"] == "ONLINE" ? "在线" : "离线" devItem["deviceState"] == "ONLINE" ? "在线" : "离线"
}}</span> }}</span>
@ -109,7 +109,7 @@
<span class="c-number">{{ devItem.routeCount || 0 }}</span> <span class="c-number">{{ devItem.routeCount || 0 }}</span>
<el-dropdown> <el-dropdown>
<icon class="el-icon-s-operation card-opt-i" /> <i class="el-icon-menu card-opt-i" />
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="handleChildrenDevice(devItem)" <el-dropdown-item @click.native="handleChildrenDevice(devItem)"
>查看线路列表</el-dropdown-item >查看线路列表</el-dropdown-item
@ -153,7 +153,7 @@
: 'card-footer dev-error' : 'card-footer dev-error'
" "
> >
<icon class="iconfont icontongzhi"></icon> <i class="iconfont icontongzhi"></i>
<span class="footer-title" stle="margin-left: 10px;">{{ <span class="footer-title" stle="margin-left: 10px;">{{
devItem.alarmProcessStatus == 1 devItem.alarmProcessStatus == 1
? "正常" ? "正常"
@ -301,7 +301,7 @@ export default {
item.deviceStatus == 0 ? "card-footer" : "card-footer dev-error" item.deviceStatus == 0 ? "card-footer" : "card-footer dev-error"
} }
> >
<icon class="iconfont icontongzhi"></icon> <i class="iconfont icontongzhi"></i>
<span> <span>
{item.deviceStatus == 0 ? "正常" : "card-footer dev-error"} {item.deviceStatus == 0 ? "正常" : "card-footer dev-error"}
</span> </span>

34
src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue
View File

@ -3,25 +3,21 @@
<el-table <el-table
ref="multipleTable" ref="multipleTable"
v-loading="loading" v-loading="loading"
:height="tableHeight" :border="border"
:data="tableList" :data="tableList"
:row-key="rowKey" :row-key="rowKey"
:border="border"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column <el-table-column
type="selection"
v-if="isSelect" v-if="isSelect"
width="50"
align="center"
:reserve-selection="true" :reserve-selection="true"
align="center"
type="selection"
width="50"
/> />
<el-table-column <el-table-column
v-if="isIndex" v-if="isIndex"
type="index"
label="序号"
align="center"
:index=" :index="
(val) => { (val) => {
return ( return (
@ -29,16 +25,20 @@
); );
} }
" "
align="center"
label="序号"
type="index"
width="80px" width="80px"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:label="tableItem.label || ''"
:align="tableItem.align || 'left'"
:prop="tableItem.prop || ''"
:width="tableItem.width || ''"
v-for="(tableItem, idx) in filterList" v-for="(tableItem, idx) in filterList"
:key="idx" :key="idx"
:align="tableItem.align || 'left'"
:fixed="tableItem.fixed || false"
:label="tableItem.label || ''"
:prop="tableItem.prop || ''"
:width="tableItem.width || ''"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<slot <slot
@ -48,8 +48,8 @@
></slot> ></slot>
<span <span
v-else v-else
class="lay-table-textarea"
:title="scope.row[tableItem.prop || '']" :title="scope.row[tableItem.prop || '']"
class="lay-table-textarea"
> >
{{ scope.row[tableItem.prop || ""] }} {{ scope.row[tableItem.prop || ""] }}
</span> </span>
@ -57,11 +57,11 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
style="margin-top: 5px; height: 35px"
v-show="tableTotal > 0" v-show="tableTotal > 0"
:total="tableTotal"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="tableTotal"
style="margin-top: 5px; height: 35px"
@pagination="handleQuery2" @pagination="handleQuery2"
/> />
</div> </div>
@ -72,7 +72,7 @@ export default {
props: { props: {
tableHeight: { tableHeight: {
type: [Number, String], type: [Number, String],
default: "", default: "450px",
}, },
border: { border: {
type: Boolean, type: Boolean,

4
src/views/iot/project/profileV2/EObjectContainer.vue
View File

@ -5,11 +5,11 @@
<e-object-info v-if="activeName === 'info'" :infoData="projectInfo || {}" :projectTypeOptions="projectTypeOptions"></e-object-info> <e-object-info v-if="activeName === 'info'" :infoData="projectInfo || {}" :projectTypeOptions="projectTypeOptions"></e-object-info>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="用户" name="tenant" v-if="isShowUserTable"> <el-tab-pane v-if="isShowUserTable" label="成员" name="tenant">
<e-object-tenant v-if="activeName === 'tenant'" :infoData="projectInfo || {}"/> <e-object-tenant v-if="activeName === 'tenant'" :infoData="projectInfo || {}"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="项目人员" name="user" v-if="!isShowUserTable"> <el-tab-pane v-if="!isShowUserTable" label="项目人员" name="user">
<e-tenant-user v-if="activeName === 'user'" :projectId="projectInfo.projectId"></e-tenant-user> <e-tenant-user v-if="activeName === 'user'" :projectId="projectInfo.projectId"></e-tenant-user>
</el-tab-pane> </el-tab-pane>

44
src/views/iot/project/profileV2/details.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div <div
class="project-detail-v2"
id="project-detail-v2-id" id="project-detail-v2-id"
ref="project-detail-v2-id" ref="project-detail-v2-id"
class="project-detail-v2"
> >
<!-- <!--
比例缩放效果01 比例缩放效果01
@ -16,10 +16,10 @@
<div :class="isFoldRight ? 'block-lift block-right-fold' : 'block-lift'"> <div :class="isFoldRight ? 'block-lift block-right-fold' : 'block-lift'">
<div class="container-title"> <div class="container-title">
<div <div
class="title-left"
v-for="(item, idx) in projectList" v-for="(item, idx) in projectList"
:key="idx"
v-show="item.projectId === infoData.projectId" v-show="item.projectId === infoData.projectId"
:key="idx"
class="title-left"
> >
<span>{{ item.projectName }}</span> <span>{{ item.projectName }}</span>
<i <i
@ -70,7 +70,7 @@
padding-left: 20px; padding-left: 20px;
" "
> >
<el-descriptions class="margin-top" title="" :column="2"> <el-descriptions :column="2" class="margin-top" title="">
<el-descriptions-item label="行业类型：">{{ <el-descriptions-item label="行业类型：">{{
statusFormat(infoData) statusFormat(infoData)
}}</el-descriptions-item> }}</el-descriptions-item>
@ -86,8 +86,8 @@
<el-descriptions-item label="项目地址："> <el-descriptions-item label="项目地址：">
<div class="e-descriptions-address"> <div class="e-descriptions-address">
<span <span
class="e-address-span"
:title="infoData.projectAddress" :title="infoData.projectAddress"
class="e-address-span"
> >
{{ infoData.projectAddress }} {{ infoData.projectAddress }}
</span> </span>
@ -96,12 +96,12 @@
@click="mapClick" @click="mapClick"
></i> ></i>
<el-popover <el-popover
placement="bottom"
title="项目地址坐标"
width="1080"
trigger="manual"
v-model="visible" v-model="visible"
placement="bottom"
style="top: 30px; left: -85%; position: relative" style="top: 30px; left: -85%; position: relative"
title="项目地址坐标"
trigger="manual"
width="1080"
> >
<slot> <slot>
<el-row> <el-row>
@ -115,11 +115,11 @@
<shop-location <shop-location
v-if="visible === true" v-if="visible === true"
style="height: 450px; margin-top: 10px"
:mapCenter="mapCenter"
:draggable="false" :draggable="false"
@mapEvent="mapEvent" :mapCenter="mapCenter"
:zoom="zoom" :zoom="zoom"
style="height: 450px; margin-top: 10px"
@mapEvent="mapEvent"
/> />
<div <div
@ -133,8 +133,8 @@
" "
> >
<el-button <el-button
type="primary"
size="mini" size="mini"
type="primary"
@click="visible = false" @click="visible = false"
>确 定</el-button >确 定</el-button
> >
@ -168,24 +168,24 @@
</div> </div>
<div class="container-main"> <div class="container-main">
<div <div
class="main-block"
:style="isShrink ? 'width: 100%;' : 'width: calc(100% - 150px);'" :style="isShrink ? 'width: 100%;' : 'width: calc(100% - 150px);'"
class="main-block"
> >
<component <component
:is="activeName" :is="activeName"
:isFoldRight="isFoldRight"
:isShrink="isShrink"
:projectInfo="infoData" :projectInfo="infoData"
:projectTypeOptions="projectTypeOptions" :projectTypeOptions="projectTypeOptions"
:sourceId="stateSourceId" :sourceId="stateSourceId"
:tempType="activeType"
:isShrink="isShrink"
:isFoldRight="isFoldRight"
:tabs="selectNavChildren" :tabs="selectNavChildren"
:tempType="activeType"
></component> ></component>
</div> </div>
</div> </div>
</div> </div>
<div class="block-right" v-if="!isFoldRight"> <div v-if="!isFoldRight" class="block-right">
<e-simple-card title="最近2 天警情同比" class="today-ratio-card"> <e-simple-card class="today-ratio-card" title="最近2 天警情同比">
<template slot="cardBody"> <template slot="cardBody">
<e-today-ratio <e-today-ratio
v-if="!isFoldRight" v-if="!isFoldRight"
@ -194,7 +194,7 @@
</template> </template>
</e-simple-card> </e-simple-card>
<e-simple-card title="类型分布统计" class="type-census-card"> <e-simple-card class="type-census-card" title="类型分布统计">
<template slot="cardBody"> <template slot="cardBody">
<e-type-census <e-type-census
v-if="!isFoldRight" v-if="!isFoldRight"
@ -203,7 +203,7 @@
</template> </template>
</e-simple-card> </e-simple-card>
<e-simple-card title="报警预警趋势" class="trend-census-card"> <e-simple-card class="trend-census-card" title="报警预警趋势">
<template slot="cardBody"> <template slot="cardBody">
<e-trend-census <e-trend-census
v-if="!isFoldRight" v-if="!isFoldRight"
@ -401,7 +401,7 @@ export default {
], ],
}, },
{ {
label: "综合管理", label: "场景联动",
key: "synthesizeManage", key: "synthesizeManage",
icon: "iconfont icontasks", icon: "iconfont icontasks",
template: "ENavLayout", template: "ENavLayout",