wangchenxing
/
hbj_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

手机端页面调整

Browse Source
main
wangchenxing 5 months ago
parent faebd71210
commit 8e72a751a7
17 changed files with 155 additions and 65 deletions
Show Stats Download Patch File Download Diff File

9
api/indexpage/yjWz/warehouse.js
Unescape View File

@ -2,13 +2,20 @@ import request from '@/utils/request'
// 查询物资库目录列表 // 查询物资库目录列表
export function listWarehouse(query) { export function listWarehouse(query) {
return request({
url: '/material/warehouse/listOnlySelf',
method: 'get',
params: query
})
}
// 查询物资库目录列表
export function listWarehouseAll(query) {
return request({ return request({
url: '/material/warehouse/list', url: '/material/warehouse/list',
method: 'get', method: 'get',
params: query params: query
}) })
} }
// 查询物资库目录详细 // 查询物资库目录详细
export function getWarehouse(id) { export function getWarehouse(id) {
return request({ return request({

3
api/login.js
Unescape View File

@ -9,7 +9,8 @@ export function login(cas, password, code, uuid) {
uuid uuid
} }
return request({ return request({
'url': '/auth/login', // 'url': '/auth/login',
'url': '/auth/loginApp',
headers: { headers: {
isToken: false isToken: false
}, },

4
components/tabbar/tabbar.vue
Unescape View File

@ -1,6 +1,7 @@
<template> <template>
<view> <view>
<u-tabbar :value="value1" :fixed="true" :placeholder="false" :safeAreaInsetBottom="false"> <u-tabbar :value="value1" :fixed="true" :placeholder="true" :safeAreaInsetBottom="true">
<!-- <u-tabbar :value="value1" :fixed="true" :placeholder="false" :safeAreaInsetBottom="false"> -->
<u-tabbar-item :badge="`${item.menuName === '工作待办' ? $store.state.mine.xiaoxi : 0}`" <u-tabbar-item :badge="`${item.menuName === '工作待办' ? $store.state.mine.xiaoxi : 0}`"
v-for="(item, index) in isMenu" :key="index" :text="item.menuName" :name="item.menuName" v-for="(item, index) in isMenu" :key="index" :text="item.menuName" :name="item.menuName"
@click="click1(item.path)"> @click="click1(item.path)">
@ -55,6 +56,7 @@
height: calc(45px + constant(safe-area-inset-bottom)); height: calc(45px + constant(safe-area-inset-bottom));
height: 45px; height: 45px;
position: fixed; position: fixed;
// sticky
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;

6
config.js
Unescape View File

@ -4,9 +4,9 @@ module.exports = {
//三门峡版本 //三门峡版本
// 36.112.48.53:88/emergency/api // 36.112.48.53:88/emergency/api
baseUrl: 'http://36.112.48.53:88/emergency/api', // baseUrl: 'http://36.112.48.53:88/emergency/api',
// baseUrl: 'http://localhost:8083', baseUrl: 'http://192.168.1.100:8080',
// baseUrl: 'http://192.168.1.5:8083',
//图片上传 //图片上传
baseUrlImg: 'http://36.112.48.53:88/emergencyManage', baseUrlImg: 'http://36.112.48.53:88/emergencyManage',

128
pages/index.vue
Unescape View File

@ -79,14 +79,14 @@
<view class="new box"> <view class="new box">
<view style="background-color: #fff;width: 100%;"> <view style="background-color: #fff;width: 100%;">
<!-- 头部 --> <!-- 头部 -->
<view class="sortHead"> <!-- <view class="sortHead">
<image src="../static/images/Yjplan/sort.png" <image src="../static/images/Yjplan/sort.png"
style="width: 36rpx;height: 36rpx;margin-right: 22rpx;"></image> style="width: 36rpx;height: 36rpx;margin-right: 22rpx;"></image>
<span class="sortTitle">最近一次演练计划</span> <span class="sortTitle">最近一次演练计划</span>
</view> </view> -->
<!-- 卡片 --> <!-- 卡片 -->
<view class="sortCard"> <!-- <view class="sortCard"> -->
<view> <!-- <view>
<view class="unfinishlist"> <view class="unfinishlist">
<view class="content" style="border-left: 13rpx #FFD777 solid;margin-left: 4rpx; "> <view class="content" style="border-left: 13rpx #FFD777 solid;margin-left: 4rpx; ">
<view class="name">{{ backlog.drillName }}</view> <view class="name">{{ backlog.drillName }}</view>
@ -105,7 +105,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
@ -182,7 +182,7 @@
<!-- <update @showF="ShowON" :show="$store.state.updateApp.isTrue" :versionNum="$store.state.updateApp.newVesion" <!-- <update @showF="ShowON" :show="$store.state.updateApp.isTrue" :versionNum="$store.state.updateApp.newVesion"
:downloadUrl="$store.state.updateApp.url" :versionContent="$store.state.updateApp.MiaoShu"></update> --> :downloadUrl="$store.state.updateApp.url" :versionContent="$store.state.updateApp.MiaoShu"></update> -->
</view> </view>
<Tabbar :value="'首页'"></Tabbar> <!-- <Tabbar :value="'首页'"></Tabbar> -->
</view> </view>
</template> </template>
<script> <script>
@ -262,39 +262,89 @@
this.getConfigKeyData(); this.getConfigKeyData();
}, },
methods: { methods: {
goback() { // goback() {
// const pages = getCurrentPages(); // 获取页面栈
// this.$router.go(-3) // console.log(pages); // 打印页面栈
// window.history.back()
// window.JSBridge.exit(); // // 如果页面栈大于 1，执行返回操作
// if (pages.length > 1) {
// 获取当前页面栈 // uni.navigateBack(); // 返回上一页
const pages = getCurrentPages(); // console.log("返回上一页");
console.log(pages); // 打印页面栈 // } else {
// console.log("已经在首页，无法返回");
// 如果页面栈大于 1，执行返回操作 // // 如果没有历史记录，可以退出或关闭 WebView
// if (window.JSBridge && window.JSBridge.exit) {
if (pages.length > 1) { // // 如果你有 JSBridge 可以调用它的退出方法
// uni.navigateBack(1);
window.history.back();
console.log("pages.length",pages.length);
} else {
console.log('已经在首页，无法返回');
window.history.back();
console.log('已执行back');
// this.$router.go(-2)
// console.log('已执行$router');
// uni.navigateBack(1);
// console.log('已执行navigateBack');
// window.JSBridge.exit(); // window.JSBridge.exit();
// console.log('已执行exit'); // } else if (window.history.length > 1) {
// // 如果浏览器历史记录大于 1，使用 window.history.back()
// window.history.back();
// } else {
// // 没有历史记录，调用 App 的退出方法或者关闭窗口
// if (window.exitApp) {
// window.exitApp(); // 调用 App 的退出接口
// } else {
// // 如果没有 exitApp 方法，可以尝试关闭窗口
// window.close(); // window.close();
// console.log('已执行close'); // }
} // }
// }
// }
goback() {
window.location.href="/nljzVue/#/"
},
// // this.$router.go(-3)
// // window.history.back()
// // window.JSBridge.exit();
// // 获取当前页面栈
// const pages = getCurrentPages();
// console.log(pages); // 打印页面栈
// uni.closeWebview();
// window.location.href="http://36.112.48.53:88/nljzVue/#/";
// window.location.replace("http://36.112.48.53:88/nljzVue/#/");
// window.location.href="http://36.112.48.53:88/nljzVue/#/"
// 如果页面栈大于 1，执行返回操作
}, // if (pages.length > 1) {
// // uni.navigateBack(1);
// window.history.back();
// console.log("pages.length",pages.length);
// } else {
// console.log('已经在首页，无法返回');
// window.history.back();
// console.log('已执行back');
// // this.$router.go(-2)
// // console.log('已执行$router');
// // uni.navigateBack(1);
// // console.log('已执行navigateBack');
// // window.JSBridge.exit();
// // console.log('已执行exit');
// // window.close();
// // console.log('已执行close');
// }
// if (window.exitApp) {
// console.log("1111")
// window.exitApp(); // 调用 App 的退出接口
// } else if (window.WebViewBridge) {
// console.log("2222")
// window.WebViewBridge.close(); // 调用 App 的 WebView 关闭方法
// } else {
// // 如果没有 WebViewBridge 接口，使用历史记录返回
// if (window.history.length > 1) {
// console.log("33333")
// window.history.back();
// } else {
// console.log("44444")
// window.exitApp()
// // window.close(); // 如果没有历史记录，关闭当前窗口
// }
// }
// },
getYanLian() { getYanLian() {
backlog().then(res => { backlog().then(res => {
this.backlog = res[0]; this.backlog = res[0];
@ -326,7 +376,8 @@ console.log('已执行back');
listNotice().then(res => { listNotice().then(res => {
this.gonggao = res.rows this.gonggao = res.rows
.map(item => { .map(item => {
return item.noticeContent; // 使用正则表达式移除 HTML 标签
return item.noticeContent.replace(/<[^>]+>/g, ''); // 这是去掉所有HTML标签的正则
}) })
.join(' '); .join(' ');
}); });
@ -368,6 +419,8 @@ console.log('已执行back');
this.$store.commit('setshowOverPop', false); this.$store.commit('setshowOverPop', false);
}, },
getquanxian() { getquanxian() {
console.log("item.menuName000")
console.log("saveMenu", this.$store.state.user.saveMenu);
this.$store.state.user.saveMenu.map(item => { this.$store.state.user.saveMenu.map(item => {
if (item.menuName === '首页') { if (item.menuName === '首页') {
//过滤不显示的按钮 //过滤不显示的按钮
@ -381,6 +434,7 @@ console.log('已执行back');
}); });
} }
}); });
console.log("indexQuanXian",this.indexQuanXian)
}, },
changeGrid(path) { changeGrid(path) {
// console.log(path); // console.log(path);
@ -521,7 +575,7 @@ console.log('已执行back');
.zhuye { .zhuye {
width: 100%; width: 100%;
height: 100%;
.swiper { .swiper {
height: 427rpx; height: 427rpx;
width: 100vw; width: 100vw;

6
pages/indexpage/YJgoods/wzDiaoBo/wzDiaoBo.vue
Unescape View File

@ -268,7 +268,7 @@
<script> <script>
//查询仓库列表 //查询仓库列表
import { listWarehouse, listCategory } from '@/api/indexpage/yjWz/warehouse.js'; import { listWarehouse, listCategory,listWarehouseAll } from '@/api/indexpage/yjWz/warehouse.js';
//查询库存物资 //查询库存物资
import { listStock, getStock } from '@/api/indexpage/yjWz/kuCun.js'; import { listStock, getStock } from '@/api/indexpage/yjWz/kuCun.js';
import { listDictionary, getCategory, addOrUpdateOutList } from '@/api/indexpage/yjWz/wzCuKu.js'; import { listDictionary, getCategory, addOrUpdateOutList } from '@/api/indexpage/yjWz/wzCuKu.js';
@ -411,7 +411,7 @@ export default {
getHouseListIn() { getHouseListIn() {
this.houseListIn = []; this.houseListIn = [];
this.queryParamsHouse.deptId = this.form.inUnitId; this.queryParamsHouse.deptId = this.form.inUnitId;
listWarehouse(this.queryParamsHouse).then(res => { listWarehouseAll(this.queryParamsHouse).then(res => {
this.houseListIn = res.rows; this.houseListIn = res.rows;
}); });
}, },
@ -502,7 +502,7 @@ export default {
getChangKu() { getChangKu() {
//发场库请求 //发场库请求
listWarehouse().then(res => { listWarehouseAll().then(res => {
this.titlelist = res.rows; this.titlelist = res.rows;
}); });
}, },

1
pages/indexpage/YJplan/YJplan.vue
Unescape View File

@ -261,6 +261,7 @@
getDict() { getDict() {
getDicts('emergency_plan_type').then(res => { getDicts('emergency_plan_type').then(res => {
let dataInfo = res.data; let dataInfo = res.data;
console.log('emergency_plan_type',res.data);
this.planTypeList = dataInfo.map(item => { this.planTypeList = dataInfo.map(item => {
return { return {
text: item.dictLabel, text: item.dictLabel,

3
pages/indexpage/Yjcar/carXiangQing/carXiangQing.vue
Unescape View File

@ -1,5 +1,8 @@
<template> <template>
<view> <view>
<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="" :autoBack="true">
</u-navbar>
<u-sticky bgColor="#fff" style="padding: 20rpx;"><u-search placeholder="请输入车牌号" :clearabled="false" v-model="keyword" :showAction="false"></u-search></u-sticky> <u-sticky bgColor="#fff" style="padding: 20rpx;"><u-search placeholder="请输入车牌号" :clearabled="false" v-model="keyword" :showAction="false"></u-search></u-sticky>
<view style=" display: flex;flex-wrap: wrap;justify-content: space-between; align-items: center;padding: 10rpx 30rpx;"> <view style=" display: flex;flex-wrap: wrap;justify-content: space-between; align-items: center;padding: 10rpx 30rpx;">
<!-- 车队 --> <!-- 车队 -->

1
pages/indexpage/fireMan/list/list.vue
Unescape View File

@ -23,6 +23,7 @@
<u-tag borderColor="#f36f0d" type="warning" text="队员" plain shape="circle" <u-tag borderColor="#f36f0d" type="warning" text="队员" plain shape="circle"
v-else></u-tag> v-else></u-tag>
</view> </view>
<view class="left-name-type">{{ item1.telephone.split('-')[0] }}</view>
</view> </view>
<!-- <u-icon name="arrow-right" color="#C7C7C7"></u-icon> --> <!-- <u-icon name="arrow-right" color="#C7C7C7"></u-icon> -->
</view> </view>

4
pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue
Unescape View File

@ -46,7 +46,8 @@
<image src="../../../static/images/implement/area.png" mode="scaleToFill" /> <image src="../../../static/images/implement/area.png" mode="scaleToFill" />
<view>{{ item.facilitiesAddress }}</view> <view>{{ item.facilitiesAddress }}</view>
</view> </view>
<view class="right-area">
<view class="right-area" v-if="item.toUseDate!=null">
<image src="../../../static/images/implement/time.png" mode="scaleToFill" /> <image src="../../../static/images/implement/time.png" mode="scaleToFill" />
<view> <view>
<text>投入使用时间:</text> <text>投入使用时间:</text>
@ -138,6 +139,7 @@
let result = await facilitiesList(params); let result = await facilitiesList(params);
this.triggered = false; this.triggered = false;
if (result.code == 200) { if (result.code == 200) {
console.log("result",result)
this.facilitiesLists = result.rows; this.facilitiesLists = result.rows;
if (this.facilitiesLists.length < result.total) { if (this.facilitiesLists.length < result.total) {
this.loadmoreStatus = 'loadmore'; this.loadmoreStatus = 'loadmore';

7
pages/indexpage/sheBeiSheShi/sheBeiSheShiDetail/sheBeiSheShiDetail.vue
Unescape View File

@ -1,5 +1,8 @@
<template> <template>
<view class="sheBeiSheShiDetail-container"> <view class="sheBeiSheShiDetail-container">
<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="设备管理" :autoBack="true">
</u-navbar>
<u-swiper <u-swiper
indicator indicator
class="swiper-top" class="swiper-top"
@ -84,7 +87,7 @@
<text>近期报修</text> <text>近期报修</text>
</view> </view>
<view class="collapse-lsit" v-if="facilitiesRepair.length > 0"> <!-- <view class="collapse-lsit" v-if="facilitiesRepair.length > 0">
<u-collapse <u-collapse
accordion accordion
:border="false" :border="false"
@ -135,7 +138,7 @@
</view> </view>
</u-collapse-item> </u-collapse-item>
</u-collapse> </u-collapse>
</view> </view> -->
<view class="detail-bottom"> <view class="detail-bottom">
<u-button <u-button
class="detail-bottom-btn" class="detail-bottom-btn"

3
pages/indexpage/sheShiXunJian/XunJianDetail/XunJianDetail.vue
Unescape View File

@ -1,5 +1,8 @@
<template> <template>
<view class="sheBeiSheShiDetail-container"> <view class="sheBeiSheShiDetail-container">
<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="设施巡检" :autoBack="true">
</u-navbar>
<u-swiper indicator class="swiper-top" :list="swiperList" height="150" circular :autoplay="false" radius="5" <u-swiper indicator class="swiper-top" :list="swiperList" height="150" circular :autoplay="false" radius="5"
bgColor="#ffffff"></u-swiper> bgColor="#ffffff"></u-swiper>
<view class="detail-info"> <view class="detail-info">

4
pages/indexpage/zdwxy/dangerDetail/dangerDetail.vue
Unescape View File

@ -1,5 +1,9 @@
<template> <template>
<view> <view>
<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="" :autoBack="true">
</u-navbar>
<!-- <u-sticky bgColor="#fff"> <!-- <u-sticky bgColor="#fff">
<u-tabs lineWidth="37" gutter="25" :activeStyle="{ <u-tabs lineWidth="37" gutter="25" :activeStyle="{
color: '#303133', color: '#303133',

8
pages/login.vue
Unescape View File

@ -195,6 +195,7 @@ export default {
.then(() => { .then(() => {
this.xianshiPage = false; this.xianshiPage = false;
this.$modal.closeLoading(); this.$modal.closeLoading();
console.log("afterLogin");
// 登录成功后，处理函数 // 登录成功后，处理函数
this.loginSuccess(); this.loginSuccess();
}) })
@ -206,19 +207,24 @@ export default {
}, },
// 登录成功后，处理函数 // 登录成功后，处理函数
loginSuccess(result) { loginSuccess(result) {
console.log("afterGetInfo");
// 设置用户信息 // 设置用户信息
this.$store.dispatch('GetInfo').then(res => { this.$store.dispatch('GetInfo').then(res => {
console.log("beforeIndex");
console.log(this.$store.getters.userId); console.log(this.$store.getters.userId);
//链接websocket //链接websocket
// this.$store.dispatch('websocketInit'); // this.$store.dispatch('websocketInit');
//开屏提示消息 //开屏提示消息
// this.$store.dispatch('getNewsList'); // this.$store.dispatch('getNewsList');
//获取app是否更新的 //获取app是否更新的
this.$store.dispatch('getNewsApplist'); // this.$store.dispatch('getNewsApplist');
console.log("beforeIndex");
this.$tab.reLaunch('/pages/index'); this.$tab.reLaunch('/pages/index');
console.log("afterIndex");
//获取消息条数 //获取消息条数
this.$store.dispatch('getNewsListOne'); this.$store.dispatch('getNewsListOne');
}); });
} }
} }
}; };

4
pages/message/mineNews/lishiNews.vue
Unescape View File

@ -6,9 +6,9 @@
<u-sticky bgColor="#fff"> <u-sticky bgColor="#fff">
<uni-datetime-picker v-model="datetimerange" type="datetimerange" rangeSeparator="至" @change="souSuoRiQi()"> <uni-datetime-picker v-model="datetimerange" type="datetimerange" rangeSeparator="至" @change="souSuoRiQi()">
<view style="padding-left: 15rpx;padding-right: 15rpx; width: 100%;"> <view style="padding-left: 15rpx;padding-right: 15rpx; width: 100%;">
<view style="background-color: rgb(255, 255, 255); display: flex; width: 100%; height: 80rpx; padding-left: 18rpx;align-items: center;"> <!-- <view style="background-color: rgb(255, 255, 255); display: flex; width: 100%; height: 80rpx; padding-left: 18rpx;align-items: center;">
<u-button icon="search" type="primary" style="width: 20%;margin: 0px 10px 0px 10px;" size="mini" shape="circle" text="按日期范围"></u-button> <u-button icon="search" type="primary" style="width: 20%;margin: 0px 10px 0px 10px;" size="mini" shape="circle" text="按日期范围"></u-button>
</view> </view> -->
</view> </view>
</uni-datetime-picker> </uni-datetime-picker>
</u-sticky> </u-sticky>

6
pages/message/mineNews/mineNews.vue
Unescape View File

@ -1,8 +1,8 @@
<template> <template>
<view class=""> <view class="">
<!-- //导航栏 --> <!-- //导航栏 -->
<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="工作待办" :autoBack="false"> <u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="工作待办" :autoBack="true">
<view slot="left"></view>
<view slot="right" style="display: flex;align-items: center;flex-direction: column;" @click="lishi()"> <view slot="right" style="display: flex;align-items: center;flex-direction: column;" @click="lishi()">
<svgImage height="36rpx" name="lishi"></svgImage> <svgImage height="36rpx" name="lishi"></svgImage>
<span style="font-size: 18rpx; font-weight: 600;margin-right: 10rpx;color: #1296db;">历史待办</span> <span style="font-size: 18rpx; font-weight: 600;margin-right: 10rpx;color: #1296db;">历史待办</span>
@ -61,7 +61,7 @@
<!-- <u-button type="primary" text="确定已读" @click="getXiaoXi2(newobj.id)"></u-button> --> <!-- <u-button type="primary" text="确定已读" @click="getXiaoXi2(newobj.id)"></u-button> -->
</u-popup> </u-popup>
</view> </view>
<Tabbar :value="'工作待办'"></Tabbar> <!-- <Tabbar :value="'工作待办'"></Tabbar> -->
</view> </view>
</template> </template>

7
store/modules/user.js
Unescape View File

@ -81,12 +81,15 @@ const user = {
let menu = [] let menu = []
// 取出主菜单 // 取出主菜单
appMenuList1.map(item => { appMenuList1.map(item => {
if (item.status === "0" || 0) { console.log("item.status,",item.status)
if (item.parentId === "0" || 0) { if (item.status == "0" || 0) {
if (item.parentId == "0" || 0) {
console.log("此菜单已加入主菜单目录",item)
return menu.push(item) return menu.push(item)
} }
} }
}) })
console.log("menu",menu)
//把主菜单的子菜单栏目放在主菜单下 //把主菜单的子菜单栏目放在主菜单下
menu.map(item => { menu.map(item => {
item.children2 = [] item.children2 = []

Write Preview
Loading…
Cancel
Save