From 9549a946aced583d478d5d209635c8f04b86faf2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 20 Mar 2021 11:40:10 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
src/views/realTimePolice/real.vue | 11 ++++++-----
vue.config.js | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index ddc1371..6daca88 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -29,6 +29,7 @@
>
<template slot="menuLeft">
<el-button
+ hidden="hidden"
type="danger"
size="small"
icon="el-icon-delete"
@@ -48,19 +49,19 @@
</el-button>
<el-button
v-bind:class="activeClass == 1 ? 'btn-color' : ''"
- size="small"
+ size="mini"
@click="getBZdata(1)"
>本周
</el-button>
<el-button
v-bind:class="activeClass == 2 ? 'btn-color' : ''"
- size="small"
+ size="mini"
@click="getBYdata(2)"
>本月
</el-button>
<el-button
v-bind:class="activeClass == 3 ? 'btn-color' : ''"
- size="small"
+ size="mini"
@click="getQBdata(3)"
>全部
</el-button>
@@ -680,8 +681,8 @@
return {
addBtn: this.vaildData(this.permission.real_add, false),
viewBtn: this.vaildData(null, false),
- delBtn: this.vaildData(this.permission.real_delete, false),
- editBtn: this.vaildData(this.permission.real_edit, false),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false),
};
},
ids() {
diff --git a/vue.config.js b/vue.config.js
index 9f0126f..b2d4373 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@
proxy: {
'/api': {
//本地服务接口地址
- //target: 'http://192.168.1.125:82/',
- target: 'https://web.byisf.com:18001/api/',
+ // target: 'http://192.168.1.125:82/',
+ target: 'https://web.byisf.com:18001/api/',
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3