From 19410226dab797f415194d081218a7e3269c5e44 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 05 Aug 2021 14:21:07 +0800
Subject: [PATCH] 问题修复
---
public/map/widgets/patrolManagement/PatrolManagement_copy.js | 0
src/views/system/dept.vue | 2
vue.config.js | 6 +-
src/api/alarm/alarm.js | 1
src/api/zc/zc.js | 2
src/router/views/index.js | 28 ++++++++++++++
src/views/feedbackReport/feedbackReport.vue | 3 -
src/views/system/menu.vue | 2
src/views/zc/zc.vue | 58 ++++++++++++++++++++++++-----
public/map/widgets/patrolManagement/template_copy.html | 0
src/styles/element-ui.scss | 9 ++++
11 files changed, 93 insertions(+), 18 deletions(-)
diff --git a/public/map/widgets/patrolManagement/PatrolManagement copy.js b/public/map/widgets/patrolManagement/PatrolManagement_copy.js
similarity index 100%
rename from public/map/widgets/patrolManagement/PatrolManagement copy.js
rename to public/map/widgets/patrolManagement/PatrolManagement_copy.js
diff --git a/public/map/widgets/patrolManagement/template copy.html b/public/map/widgets/patrolManagement/template_copy.html
similarity index 100%
rename from public/map/widgets/patrolManagement/template copy.html
rename to public/map/widgets/patrolManagement/template_copy.html
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index ad5bc81..d1ac26b 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -8,6 +8,7 @@
...params,
current,
size,
+
}
})
}
diff --git a/src/api/zc/zc.js b/src/api/zc/zc.js
index 014907b..a4fe5f8 100644
--- a/src/api/zc/zc.js
+++ b/src/api/zc/zc.js
@@ -2,7 +2,7 @@
export const getList = (current, size, params) => {
return request({
- url: '/api/zc/list',
+ url: '/api/zc/page',
method: 'get',
params: {
...params,
diff --git a/src/router/views/index.js b/src/router/views/index.js
index d4b84f9..0a8ab3c 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -483,6 +483,34 @@
component: () =>
import( /* webpackChunkName: "views" */ '@/components/real-popup/kongbai')
}]
+ },
+ {
+ path: '/role',
+ redirect: '/role/index',
+ component: Layout,
+ children: [{
+ path: 'index',
+ name: '权限管理',
+ meta: {
+ i18n: 'index'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/authority/role')
+ }]
+ },
+ {
+ path: '/zc',
+ redirect: '/zc/index',
+ component: Layout,
+ children: [{
+ path: 'index',
+ name: '注册审核',
+ meta: {
+ i18n: 'index'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/zc/zc')
+ }]
}
]
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 3deeb9c..be569e2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -421,3 +421,12 @@
background-color: transparent !important;
border-bottom: 1px solid $mainB !important;
}
+//菜单scroll
+.menuClass .el-card{
+ height: auto !important;
+}
+
+//机构管理
+.deptClass .el-card{
+ height: auto !important;
+}
diff --git a/src/views/feedbackReport/feedbackReport.vue b/src/views/feedbackReport/feedbackReport.vue
index 26caf76..bd72cc1 100644
--- a/src/views/feedbackReport/feedbackReport.vue
+++ b/src/views/feedbackReport/feedbackReport.vue
@@ -431,8 +431,7 @@
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
+ cancelButtonText: "取消", type: "warning",
})
.then(() => {
return remove(row.id);
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index c29a095..158ce85 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container>
+ <basic-container class="deptClass">
<avue-crud
:option="option"
:table-loading="loading"
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 53ae66c..135e8b0 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container>
+ <basic-container class="menuClass">
<avue-crud :option="option"
:table-loading="loading"
:data="data"
diff --git a/src/views/zc/zc.vue b/src/views/zc/zc.vue
index 715bd4d..028d040 100644
--- a/src/views/zc/zc.vue
+++ b/src/views/zc/zc.vue
@@ -30,6 +30,14 @@
<template slot-scope="{row}" slot="type">
<el-tag>{{row.type==='0'?'未审核':row.type==='1'?'审核通过':'审核未通过'}}</el-tag>
</template>
+ <template slot-scope="{ row }" slot="examination_type">
+ 正常
+ </template>
+
+ <template slot-scope="{ row }" slot="examination_mx">
+ 正常
+ </template>
+
<template slot-scope="{row}"
slot="roleName">
<el-tag>{{row.roleName}}</el-tag>
@@ -65,7 +73,7 @@
calcHeight: 54,
tip: false,
searchShow: true,
- searchMenuSpan: 6,
+ searchMenuSpan: 4,
border: true,
index: true,
viewBtn: true,
@@ -76,6 +84,8 @@
column: [
{
label: "账号",
+ search: true,
+ searchSpan:4,
display: false,
disabled:true,
prop: "username",
@@ -90,12 +100,16 @@
{
label: "姓名",
display: false,
+ searchSpan:4,
+ search: true,
disabled:true,
prop: "sname",
},
{
label: "性别",
display: false,
+ searchSpan:4,
+ search: true,
disabled:true,
prop: "sex",
type: "select",
@@ -118,15 +132,13 @@
},
{
label: "部门",
- disabled:true,
- display: false,
- prop: "deptid",
- type: "tree",
- dicUrl: "/api/blade-system/dept/selectInfo",
- props: {
- label: "dept_name",
- value: "deptid"
- },
+ prop: "deptName",
+ // type: "tree",
+ // dicUrl: "/api/blade-system/dept/selectInfo",
+ // props: {
+ // label: "title",
+ // value: "value"
+ // },
},
{
label: "角色",
@@ -141,7 +153,9 @@
{
label: "审核状态",
prop: "type",
+ search: true,
slot: true,
+ searchSpan:4,
type: "select",
dicData: [
{
@@ -158,7 +172,31 @@
}
],
+ },{
+ label: "审查状态",
+ prop: "examination_type",
+ slot: true,
+ search: true,
+ searchSpan:4,
+ display: false,
+ type: "select",
+ dicData: [
+ {
+ label: "正常",
+ value: "0",
+ },
+ {
+ label: "异常",
+ value: "1",
+ },
+ ],
},
+ {
+ label: "审查明细",
+ prop: "examination_mx",
+ display: false,
+ slot: true,
+ }
]
},
data: []
diff --git a/vue.config.js b/vue.config.js
index 5eee893..b654439 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,9 +36,9 @@
proxy: {
'/api': {
//本地服务接口地址
- target: 'http://s16s652780.51mypc.cn/api/',
- // target: 'http://192.168.0.114:82/',
- //target: 'http://localhost:82/',
+ //target: 'http://s16s652780.51mypc.cn/api/',
+ //target: 'http://223.82.109.183:83/',
+ target: 'http://localhost:82/',
//target: 'https://web.byisf.com/api/',
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api',
--
Gitblit v1.9.3