Commit 3d9edc03 authored by xinzhedeai's avatar xinzhedeai

fix: 用户密码 大屏替换修改

parent 34c3d30f
...@@ -3,7 +3,7 @@ import request from '@/utils/request' ...@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询应急仓库信息列表 // 查询应急仓库信息列表
export function getChartData() { export function getChartData() {
return request({ return request({
url: '/slope/screen/count', url: '/system/slope/count',
method: 'get', method: 'get',
}) })
} }
...@@ -11,7 +11,7 @@ export function getChartData() { ...@@ -11,7 +11,7 @@ export function getChartData() {
// 查询应急仓库信息详细 // 查询应急仓库信息详细
export function getListData(query) { export function getListData(query) {
return request({ return request({
url: '/slope/screen/day', url: '/system/slope/day',
method: 'get', method: 'get',
params: query params: query
}) })
......
...@@ -3,7 +3,7 @@ import request from '@/utils/request' ...@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 应急预案更新提醒 // 应急预案更新提醒
export function getEquipmentNum(query) { export function getEquipmentNum(query) {
return request({ return request({
url: '/slope/screen/equipmentNum', url: '/system/slope/equipmentNum',
method: 'get', method: 'get',
params: query params: query
}) })
......
...@@ -3,7 +3,7 @@ import request from '@/utils/request' ...@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询应急预案信息列表 // 查询应急预案信息列表
export function listPlans(query) { export function listPlans(query) {
return request({ return request({
url: '/slope/screen/list', url: '/system/slope/list',
method: 'get', method: 'get',
params: query params: query
}) })
......
...@@ -3,7 +3,7 @@ import request from '@/utils/request' ...@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询应急仓库信息列表 // 查询应急仓库信息列表
export function getChartData() { export function getChartData() {
return request({ return request({
url: '/slope/screen/getAlarmCount', url: '/system/slope/getAlarmCount',
method: 'get', method: 'get',
}) })
} }
...@@ -11,7 +11,7 @@ export function getChartData() { ...@@ -11,7 +11,7 @@ export function getChartData() {
// 查询应急仓库信息详细 // 查询应急仓库信息详细
export function getListData(query) { export function getListData(query) {
return request({ return request({
url: '/slope/screen/getTypeMon', url: '/system/slope/getTypeMon',
method: 'get', method: 'get',
params: query params: query
}) })
......
...@@ -3,7 +3,7 @@ import request from '@/utils/request' ...@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询数据字典-物资类别信息列表 // 查询数据字典-物资类别信息列表
export function getList(query) { export function getList(query) {
return request({ return request({
url: '/slope/screen/listMax', url: '/system/slope/listMax',
method: 'get', method: 'get',
params: query params: query
}) })
......
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 99999, pageSize: 99999,
}).then((response) => { }).then((response) => {
this.dataList = response.data; this.dataList = response.data.data;
}); });
}, },
......
...@@ -104,9 +104,9 @@ export default { ...@@ -104,9 +104,9 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 99999, pageSize: 99999,
}).then((response) => { }).then((response) => {
this.plansList = response.voList; this.plansList = response.data.voList;
this.plansNum.hiddenNum = response.total[0] this.plansNum.hiddenNum = response.data.total[0]
this.plansNum.dealNum = response.total[1] this.plansNum.dealNum = response.data.total[1]
this.startScrolling( this.startScrolling(
".bottom-yuan .list-wrap", ".bottom-yuan .list-wrap",
......
...@@ -63,13 +63,25 @@ export const constantRoutes = [ ...@@ -63,13 +63,25 @@ export const constantRoutes = [
}, },
{ {
path: '', path: '',
// component: Layout,
redirect: '/bigscreen/index',
// children: [
// {
// path: 'index',
// component: () => import('@/views/system/user/index'),
// name: 'Index',
// meta: { title: '首页', icon: 'dashboard', affix: true }
// }
// ]
},
{
path: '/home',
component: Layout, component: Layout,
redirect: 'index',
children: [ children: [
{ {
path: 'index', path: 'index',
component: () => import('@/views/bigscreen'), component: () => import('@/views/system/user/index'),
name: 'Index', name: 'Home',
meta: { title: '首页', icon: 'dashboard', affix: true } meta: { title: '首页', icon: 'dashboard', affix: true }
} }
] ]
...@@ -90,7 +102,7 @@ export const constantRoutes = [ ...@@ -90,7 +102,7 @@ export const constantRoutes = [
}, },
{ {
path: '/bigscreen/index', path: '/bigscreen/index',
component: bigscreen, component: () => import('@/views/bigscreen'),
meta: { title: '一张图' }, meta: { title: '一张图' },
name: '一张图', name: '一张图',
hidden: true hidden: true
......
...@@ -6,11 +6,13 @@ ...@@ -6,11 +6,13 @@
<header id="header"> <header id="header">
<div class="b1_bg"> <div class="b1_bg">
<h2>山西华远陆港平台</h2> <h2>山西华远陆港平台</h2>
</div> </div>
</header> </header>
<div class="content"> <div class="content">
<div class="map"> <div class="map">
<i class="el-icon-user home" @click="gohome"></i>
<div class="sys-tit"> <div class="sys-tit">
<span @click="toOtherSys(1)">边坡监测</span> <span @click="toOtherSys(1)">边坡监测</span>
<span @click="toOtherSys(2)">桥梁监测</span> <span @click="toOtherSys(2)">桥梁监测</span>
...@@ -141,6 +143,9 @@ export default { ...@@ -141,6 +143,9 @@ export default {
}); });
}, },
methods: { methods: {
gohome(){
this.$router.push({ path: "/home/index" });
},
getEquipmentNum() { getEquipmentNum() {
getEquipmentNum().then((response) => { getEquipmentNum().then((response) => {
this.equipList = response.data || []; this.equipList = response.data || [];
...@@ -365,7 +370,15 @@ footer{ ...@@ -365,7 +370,15 @@ footer{
width: 100%; width: 100%;
height: 100vh; height: 100vh;
position: relative; position: relative;
.home{
font-size: 0.34rem;
color: #11a8e7;
position: absolute;
right: 0.2rem;
top: 0.36rem;
cursor: pointer;
z-index: 12;
}
.sys-tit { .sys-tit {
width: 8.49rem; width: 8.49rem;
height: 0.63rem; height: 0.63rem;
...@@ -464,6 +477,7 @@ footer{ ...@@ -464,6 +477,7 @@ footer{
z-index: 5; z-index: 5;
display: flex; display: flex;
user-select: none; user-select: none;
.b1_bg { .b1_bg {
position: relative; position: relative;
height: 1.03rem; height: 1.03rem;
......
This diff is collapsed.
...@@ -41,8 +41,8 @@ export default { ...@@ -41,8 +41,8 @@ export default {
], ],
newPassword: [ newPassword: [
{ required: true, message: "新密码不能为空", trigger: "blur" }, { required: true, message: "新密码不能为空", trigger: "blur" },
{ min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }, { min: 8, max: 20, message: "长度在 8 到 20 个字符", trigger: "blur" },
{ pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符:< > \" ' \\\ |", trigger: "blur" } { pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[!@#$%^&*]).{9,}$/, message: "密码需要包含数字、字母、符号", trigger: "blur" }
], ],
confirmPassword: [ confirmPassword: [
{ required: true, message: "确认密码不能为空", trigger: "blur" }, { required: true, message: "确认密码不能为空", trigger: "blur" },
......
...@@ -37,7 +37,7 @@ module.exports = { ...@@ -37,7 +37,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.3.226:8579`, // target: `http://192.168.3.226:8579`,
target: `http://192.168.2.16:9090`, target: `http://192.168.2.16:8579`,
// target: `http://182.92.170.89:10080`, // target: `http://182.92.170.89:10080`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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