Commit f992d683 authored by liubinyu's avatar liubinyu

调整样式,最终版

parent 71345daf
// 常量 // 常量
// const server_ip = '8.130.25.40'; // 测试服务器 // const server_ip = '8.130.25.40'; // 测试服务器
const server_ip = '22.57.64.22:8256'; // 线上内网ip const server_ip = '22.57.64.22:8256'; // 线上内网ip
// const server_ip = '192.168.43.122:8258'; // const server_ip = '192.168.43.25:8258';
export const CONFIG = { export const CONFIG = {
SERVER_IP: server_ip, SERVER_IP: server_ip,
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</div> </div>
<div v-else class="down"> <div v-else class="down">
<num :number="relNumber" /> <num :number="relNumber" />
<span class="unit">{{unit}}</span> <span class="unit" v-if="unit">{{unit}}</span>
</div> </div>
</div> </div>
</template> </template>
......
...@@ -146,7 +146,7 @@ function initRoleRoute() { ...@@ -146,7 +146,7 @@ function initRoleRoute() {
const newRouter = createRouter(); // 新建路由 const newRouter = createRouter(); // 新建路由
router.matcher = newRouter.matcher; // 置换router router.matcher = newRouter.matcher; // 置换router
router.addRoutes([...newRoleRoutes, ...anyRoutes]); router.addRoutes([...newRoleRoutes, ...anyRoutes]);
console.log('路由初始化完成', newRoleRoutes); // console.log('路由初始化完成', newRoleRoutes);
} }
// 初始化用户、电厂、机组列表,从本地读取,如果都存在并未过期,返回undefined,否则返回1或2 // 初始化用户、电厂、机组列表,从本地读取,如果都存在并未过期,返回undefined,否则返回1或2
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="chart-title">机组背景量</div> <div class="chart-title">机组背景量</div>
<div class="chart-main"> <div class="chart-main">
<div class="chart-nums"> <div class="chart-nums">
<number-flipper v-for="v of dataLeftBottom" class="chart-num" :key="v.kksCode" :title="v.cpName" :unit="v.cpUnit" :number="v.kksValueR" :state="v.state" :point="1" simple="1" /> <number-flipper v-for="v of dataLeftBottom" class="chart-num" :key="v.kksCode" :title="v.cpName" :unit="v.cpType ? v.cpUnit : ''" :number="v.kksValueR" :state="v.state" :point="1" simple="1" />
</div> </div>
<!-- <chart-bar-three id="ChartLeftBottom" ref="ChartLeftBottom" class="chart-chart" :chartData="dataLeftBottom" /> --> <!-- <chart-bar-three id="ChartLeftBottom" ref="ChartLeftBottom" class="chart-chart" :chartData="dataLeftBottom" /> -->
</div> </div>
......
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
// 展开电厂 // 展开电厂
showFactory(item) { showFactory(item) {
if(!this.socketData) { if(!this.socketData) {
this.$message.error('暂未获取到机组数据,请稍后重试!'); if(document.getElementsByClassName('el-message').length === 0) this.$message.error('暂未获取到机组数据,请稍后重试!'); // 防止重复提示
return; return;
} }
this.factoryItem = item; this.factoryItem = item;
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
</div> --> </div> -->
<transition name="fade"> <transition name="fade">
<div class="crew-list" v-show="crewListShow"> <div class="crew-list" v-show="crewListShow">
<div class="crew-item" v-for="item of $x_allData" :key="item.deviceId" @click="goPage(item.deviceId)"> <div class="crew-item" v-for="item of $x_allData" :key="item.deviceId">
<!-- <img src="../assets/img/crew.png" /> --> <!-- <img src="../assets/img/crew.png" /> -->
<div class="name" :class="item.runstate ? (item.runstate == 1 ? 'name-run' : 'name-stop') : 'name-error'">{{item.deviceName}}</div> <div class="name" :class="item.runstate ? (item.runstate == 1 ? 'name-run' : 'name-stop') : 'name-error'" @click="goPage(item.deviceId)">{{item.deviceName}}</div>
<!-- <number-flipper class="number" unit="kW" :number="item.power" :point="1" /> --> <!-- <number-flipper class="number" unit="kW" :number="item.power" :point="1" /> -->
<scroll-window class="roll-left"> <scroll-window class="roll-left">
<el-scrollbar class="win-list"> <el-scrollbar class="win-list">
...@@ -173,7 +173,6 @@ ...@@ -173,7 +173,6 @@
position: relative; position: relative;
width: 20%; width: 20%;
height: 50%; height: 50%;
cursor: pointer;
img { img {
width: auto; width: auto;
...@@ -193,6 +192,7 @@ ...@@ -193,6 +192,7 @@
top: 0.5rem; top: 0.5rem;
// position: absolute; // position: absolute;
// left: 5%; // left: 5%;
cursor: pointer;
} }
.name-run{ .name-run{
border-color: $color-red; border-color: $color-red;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-button class="btn" @click="exportData">导出数据</el-button> <el-button class="btn" @click="exportData">导出数据</el-button>
</div> </div>
<div class="center"> <div class="center">
{{$x_factory.plantName}} - 趋势分析 趋势分析
</div> </div>
<div class="right"> <div class="right">
<!-- <i class="el-icon-close" @click="back" /> --> <!-- <i class="el-icon-close" @click="back" /> -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment