From 8ea19a6bb34daab1410f6186992a4c1e90299c92 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 14 Sep 2022 08:54:44 +0800
Subject: [PATCH] 服务器配置
---
pages/workbench/workbench.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 7a9385b..25133f4 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -1,6 +1,8 @@
<!-- 工作台 -->
<template>
<view class="work">
+ <!-- 自定义顶部导航栏 -->
+ <navBarTop :title="'我要巡'"></navBarTop>
<view class="hello" v-if="hello">
欢迎回来，{{userName}}
</view>
@@ -20,7 +22,7 @@
</navigator>
</view>
</view>
- <view class="main">
+ <view class="main" style="display: none;">
<div>
<div class="m-title" id="mtitle">
<div class="m-t" @click="ingss" :style="{ borderBottom: ingsDB}">正在进行</div>
@@ -40,7 +42,6 @@
</div>
</view>
<view class="zhanwei" :style="{height:zhanwei}">
-
</view>
</view>
</template>
@@ -48,9 +49,10 @@
<script>
import WxStorage from "../../static/lib/wxStorage.js"
import pColumn from '../../components/pColumn/pColumn.vue'
- export default {
+ import navBarTop from '../../components/nav-bar-top/nav-bar-top.vue';
+ export default{
components: {
- pColumn
+ navBarTop,pColumn
},
data() {
return {
@@ -96,8 +98,8 @@
},
getdataList(need) {
this.fromW = need;
- var url = need == "1" ? this.$store.state.piAPI + "blade-jfpts/alarm/alarm/APP-getAlarm" : need == "0" ?
- this.$store.state.piAPI + "blade-jfpts/alarm/alarm/APP-getAlarming" : '',
+ var url = need == "1" ? this.$store.state.piAPI + "/alarm/alarm/APP-getAlarm" : need == "0" ?
+ this.$store.state.piAPI + "/alarm/alarm/APP-getAlarming" : '',
id = this.$store.state.puserID,
data = need == "1" ? {
securityArr: id
@@ -173,7 +175,7 @@
.work {
width: 100%;
height: 100%;
- padding: 0.625rem 2.5% 3rem 2.5%;
+ padding: 0rem 2.5% 3rem 2.5%;
box-sizing: border-box;
.hello {
@@ -191,6 +193,7 @@
}
.center {
+ margin-top: 0.625rem;
padding-top: 0.5rem;
display: flex;
align-items: center;
--
Gitblit v1.9.3