main
wangchenxing 2 weeks ago
parent 87bc8fdd6d
commit 30b9b4cecc

@ -5,11 +5,12 @@ 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://192.168.1.100:8080', // baseUrl: 'http://192.168.1.5:8080',
// baseUrl: 'http://192.168.1.5:8083', baseUrl: 'http://localhost:8080',
//图片上传 //图片上传
baseUrlImg: 'http://36.112.48.53:88/emergencyManage', // baseUrlImg: 'http://36.112.48.53:88/emergencyManage',
baseUrlImg: 'http://localhost:8080',
// 应用信息 // 应用信息
appInfo: { appInfo: {

@ -8,7 +8,7 @@ import invite from './utils/invite'
import VConsole from 'vconsole'; import VConsole from 'vconsole';
// 初始化vConsole // 初始化vConsole
const vConsole = new VConsole(); // const vConsole = new VConsole();
// 安装插件全局弹窗 // 安装插件全局弹窗
Vue.use(invite) Vue.use(invite)
Vue.use(plugins) Vue.use(plugins)

@ -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>
@ -262,6 +262,18 @@
this.getConfigKeyData(); this.getConfigKeyData();
}, },
methods: { methods: {
goback() {
// 退
if (window.history.length > 1) { //
window.history.back();
} else { //
if (window.JSBridge && window.JSBridge.close) { // App WebView
window.JSBridge.close();
} else { //
window.location.href = window.location.origin; // http://your-domain.com
}
}
},
// goback() { // goback() {
// const pages = getCurrentPages(); // // const pages = getCurrentPages(); //
// console.log(pages); // // console.log(pages); //
@ -291,9 +303,9 @@
// } // }
// } // }
// } // }
goback() { // goback() {
window.location.href="/nljzVue/#/" // window.location.href="/nljzVue/#/"
}, // },
// // this.$router.go(-3) // // this.$router.go(-3)
// // window.history.back() // // window.history.back()
@ -389,7 +401,7 @@
}, },
getConfigKeyData() { getConfigKeyData() {
getConfigKey('emergency_phone').then(res => { getConfigKey('emergency_phone').then(res => {
this.phoCall = res.msg; this.phoCall = res.data;
}); });
}, },
// tabs // tabs

@ -3,7 +3,7 @@
<!-- 自定义导航栏 --> <!-- 自定义导航栏 -->
<u-navbar bgColor="#ffffff" :placeholder="true" :autoBack="true" titleStyle="font-weight:600"> <u-navbar bgColor="#ffffff" :placeholder="true" :autoBack="true" titleStyle="font-weight:600">
<!-- @click="popCheBian()" --> <!-- @click="popCheBian()" -->
<view slot="center" style="display: flex;align-items: center;"> <view slot="center" style="display: flex;a lign-items: center;" @click="popCheBian()">
<span style="font-size: 32rpx; font-weight: 600;color: #333333;margin-right: 10rpx;">{{ changku }}</span> <span style="font-size: 32rpx; font-weight: 600;color: #333333;margin-right: 10rpx;">{{ changku }}</span>
<!-- <image style="width: 32rpx; height: 32rpx;" src="../../../../static/images/wuzhi/zhuanhuan.png"></image> --> <!-- <image style="width: 32rpx; height: 32rpx;" src="../../../../static/images/wuzhi/zhuanhuan.png"></image> -->
</view> </view>
@ -117,7 +117,7 @@
</view> </view>
<!-- 侧边栏弹窗 --> <!-- 侧边栏弹窗 -->
<!-- <u-popup :show="wuzhiCheBian" mode="left" :customStyle="{ width: '70vw' }" :safeAreaInsetBottom="true" @close="offPop()"> <u-popup :show="wuzhiCheBian" mode="left" :customStyle="{ width: '70vw' }" :safeAreaInsetBottom="true" @close="offPop()">
<view style="height: 50px;margin-bottom: 10rpx;"></view> <view style="height: 50px;margin-bottom: 10rpx;"></view>
<u-search placeholder="请输入仓库名称搜索" v-model="keyword" :clearabled="false" :showAction="false"></u-search> <u-search placeholder="请输入仓库名称搜索" v-model="keyword" :clearabled="false" :showAction="false"></u-search>
<scroll-view scroll-y="true" style="height: 95vh;" scroll-with-animation="true"> <scroll-view scroll-y="true" style="height: 95vh;" scroll-with-animation="true">
@ -127,7 +127,7 @@
</uni-list> </uni-list>
<view style="height: 50px;"></view> <view style="height: 50px;"></view>
</scroll-view> </scroll-view>
</u-popup> --> </u-popup>
<!-- 出库物资下弹框 --> <!-- 出库物资下弹框 -->
<u-popup :show="ChukuDialogshow" :round="10" mode="bottom" @close="closeRuKuDialog" @open="RuKuDialogOpened"> <u-popup :show="ChukuDialogshow" :round="10" mode="bottom" @close="closeRuKuDialog" @open="RuKuDialogOpened">
<view class="bottomPopup" style="height: 85vh"> <view class="bottomPopup" style="height: 85vh">
@ -462,6 +462,9 @@ export default {
popCheBian() { popCheBian() {
// //
this.wuzhiCheBian = true; this.wuzhiCheBian = true;
listWarehouse().then(res => {
this.titlelist = res.rows;
});
}, },
offPop() { offPop() {
// //

@ -3,7 +3,7 @@
<!-- 自定义导航栏 --> <!-- 自定义导航栏 -->
<u-navbar bgColor="#ffffff" :placeholder="true" :autoBack="true" titleStyle="font-weight:600"> <u-navbar bgColor="#ffffff" :placeholder="true" :autoBack="true" titleStyle="font-weight:600">
<!-- @click="popCheBian()" --> <!-- @click="popCheBian()" -->
<view slot="center" style="display: flex;align-items: center;"> <view slot="center" style="display: flex;align-items: center;" @click="popCheBian2()">
<span style="font-size: 32rpx; font-weight: 600;color: #333333;margin-right: 10rpx;">{{ changku }}</span> <span style="font-size: 32rpx; font-weight: 600;color: #333333;margin-right: 10rpx;">{{ changku }}</span>
<!-- <image style="width: 32rpx; height: 32rpx;" src="../../../../static/images/wuzhi/zhuanhuan.png"></image> --> <!-- <image style="width: 32rpx; height: 32rpx;" src="../../../../static/images/wuzhi/zhuanhuan.png"></image> -->
</view> </view>
@ -135,6 +135,20 @@
</scroll-view> </scroll-view>
</u-popup> </u-popup>
<!-- 侧边栏弹窗 -->
<u-popup :show="wuzhiCheBian2" mode="left" :customStyle="{ width: '70vw' }" :safeAreaInsetBottom="true" @close="offPop()">
<view style="height: 50px;margin-bottom: 10rpx;"></view>
<u-search placeholder="请输入仓库名称搜索" v-model="keyword" :clearabled="false" :showAction="false"></u-search>
<scroll-view scroll-y="true" style="height: 95vh;" scroll-with-animation="true">
<view class="status_bar"></view>
<uni-list>
<uni-list-item v-for="(item, index) in titlelist" :title="`${index + 1}.${item.name}`" :clickable="true" @click="xuanZheChangKu2(item)"></uni-list-item>
</uni-list>
<view style="height: 50px;"></view>
</scroll-view>
</u-popup>
<!-- 物资调拨下弹框 --> <!-- 物资调拨下弹框 -->
<u-popup :show="diaoBoDialogshow" :round="10" mode="bottom" @close="closeRuKuDialog" @open="RuKuDialogOpened"> <u-popup :show="diaoBoDialogshow" :round="10" mode="bottom" @close="closeRuKuDialog" @open="RuKuDialogOpened">
<view class="bottomPopup" style="height: 85vh"> <view class="bottomPopup" style="height: 85vh">
@ -291,6 +305,7 @@ export default {
changku: '仓库名称', // changku: '仓库名称', //
changkuId: '', //ID changkuId: '', //ID
wuzhiCheBian: false, // wuzhiCheBian: false, //
wuzhiCheBian2: false,
titlelist: [], // titlelist: [], //
diaoBoDialogshow: false, // diaoBoDialogshow: false, //
tabsList: [], tabsList: [],
@ -518,6 +533,16 @@ export default {
popCheBian() { popCheBian() {
// //
this.wuzhiCheBian = true; this.wuzhiCheBian = true;
// listWarehouse().then(res => {
// this.titlelist = res.rows;
// });
},
popCheBian2() {
//
this.wuzhiCheBian2 = true;
// listWarehouse().then(res => {
// this.titlelist = res.rows;
// });
}, },
offPop() { offPop() {
// //
@ -533,6 +558,19 @@ export default {
this.wuzhiCheBian = false; this.wuzhiCheBian = false;
// //
this.keyword = ''; this.keyword = '';
},
xuanZheChangKu2(item) {
console.log("item",item)
//
this.changku = item.name;
this.changkuId = item.id;
this.deptId=item.deptId;
this.deptName=item.deptName;
//
this.wuzhiCheBian2 = false;
//
this.keyword = '';
this.getKuCun();
} }
} }
}; };

@ -1,7 +1,10 @@
<template> <template>
<view> <view>
<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="物资盘点" :autoBack="true"> <u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="物资盘点" :autoBack="true">
<view slot="right" style="display: flex;align-items: center;flex-direction: column;" @click="popCheBian()">
<image style="width: 48rpx; height: 48rpx;" src="../../../../static/images/wuzhi/qiehuancangku.png"></image>
<span style="font-size: 18rpx; font-weight: 600;margin-right: 10rpx;color: #1296db;">切换仓库</span>
</view>
</u-navbar> </u-navbar>
<u-sticky bgColor="#fff" style="padding: 20rpx;"> <u-sticky bgColor="#fff" style="padding: 20rpx;">
<u-search placeholder="请输入需要搜索的物资名称" @focus="openSelect" :clearabled="false" v-model="keyword" :showAction="false"></u-search> <u-search placeholder="请输入需要搜索的物资名称" @focus="openSelect" :clearabled="false" v-model="keyword" :showAction="false"></u-search>
@ -208,7 +211,18 @@
</view> </view>
</view> </view>
</u-popup> </u-popup>
<!-- 侧边栏 -->
<u-popup :show="wuzhiCheBian" mode="left" :customStyle="{ width: '70vw' }" :safeAreaInsetBottom="true" @close="offPop()">
<view style="height: 50px;margin-bottom: 10rpx;"></view>
<u-search placeholder="请输入仓库名称搜索" v-model="keyword" :clearabled="false" :showAction="false"></u-search>
<scroll-view scroll-y="true" style="height: 95vh;" scroll-with-animation="true">
<view class="status_bar"></view>
<uni-list>
<uni-list-item v-for="(item, index) in titlelist" :title="`${index + 1}.${item.name}`" :clickable="true" @click="xuanZheChangKu(item)"></uni-list-item>
</uni-list>
<view style="height: 50px;"></view>
</scroll-view>
</u-popup>
<!-- <u-popup mode="bottom" :round="10" :show="SelectPanDianNumShow" @close="SelectPanDianclose" <!-- <u-popup mode="bottom" :round="10" :show="SelectPanDianNumShow" @close="SelectPanDianclose"
@open="SelectPanDianopen"> @open="SelectPanDianopen">
<view style="display: flex; width: 100vw;height: 900rpx; margin-top: 15rpx;padding-bottom: 15rpx; align-items: center; <view style="display: flex; width: 100vw;height: 900rpx; margin-top: 15rpx;padding-bottom: 15rpx; align-items: center;
@ -297,9 +311,11 @@ export default {
materialName: '', materialName: '',
categoryId: '' categoryId: ''
}, },
wuzhiCheBian: false,
changkuId: '', changkuId: '',
kucunlist: [], kucunlist: [],
tabsList: [], tabsList: [],
titlelist: [],
keyword: '', keyword: '',
SelectPanDianNumShow: false, SelectPanDianNumShow: false,
operationWZ: {}, operationWZ: {},
@ -336,6 +352,40 @@ export default {
} }
}, },
methods: { methods: {
//
popCheBian() {
//
this.wuzhiCheBian = true;
//
listWarehouse().then(res => {
this.titlelist = res.rows;
});
},
xuanZheChangKu(item) {
console.log("item,",item)
//
// this.addWzParams.deptId = item.deptId;
// this.addWzParams.houseId = item.id;
//
this.deptName = item.deptName;
//
this.name = item.name;
this.houseId=item.id;
//ID
this.changku = item.name;
this.changkuId = item.id;
this.getKuCun();
//
this.wuzhiCheBian = false;
//
this.keyword = '';
},
offPop() {
//
this.wuzhiCheBian = false;
//
this.keyword = '';
},
SelectPanDianNumCancel() { SelectPanDianNumCancel() {
this.pandianShow = false; this.pandianShow = false;
}, },

@ -3,7 +3,7 @@
<!-- 自定义导航栏 --> <!-- 自定义导航栏 -->
<u-navbar bgColor="#ffffff" :placeholder="true" :autoBack="true" titleStyle="font-weight:600"> <u-navbar bgColor="#ffffff" :placeholder="true" :autoBack="true" titleStyle="font-weight:600">
<!-- @click="popCheBian()" --> <!-- @click="popCheBian()" -->
<view slot="center" style="display: flex;align-items: center;"> <view slot="center" style="display: flex;align-items: center;" @click="popCheBian()">
<span style="font-size: 32rpx; font-weight: 600;color: #333333;margin-right: 10rpx;">{{ changku }}</span> <span style="font-size: 32rpx; font-weight: 600;color: #333333;margin-right: 10rpx;">{{ changku }}</span>
<!-- <image style="width: 32rpx; height: 32rpx;" src="../../../../static/images/wuzhi/zhuanhuan.png"></image> --> <!-- <image style="width: 32rpx; height: 32rpx;" src="../../../../static/images/wuzhi/zhuanhuan.png"></image> -->
</view> </view>
@ -453,6 +453,9 @@ export default {
popCheBian() { popCheBian() {
// //
this.wuzhiCheBian = true; this.wuzhiCheBian = true;
listWarehouse().then(res => {
this.titlelist = res.rows;
});
}, },
offPop() { offPop() {
// //

@ -147,7 +147,7 @@ export default {
uploadFilePromise(url) { uploadFilePromise(url) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let a = uni.uploadFile({ let a = uni.uploadFile({
url: `${config.baseUrlImg}/filemanage/upload1`, // url: `${config.baseUrlImg}/resource/oss/upload`, //
filePath: url, filePath: url,
name: 'file', name: 'file',
header: { header: {
@ -162,7 +162,7 @@ export default {
let result = JSON.parse(res.data); let result = JSON.parse(res.data);
console.log('result', result); console.log('result', result);
setTimeout(() => { setTimeout(() => {
resolve(result.data.id); resolve(result.data.url);
}, 1000); }, 1000);
} }
}); });

@ -39,7 +39,7 @@
</view> </view>
<view class="item-bottom"> <view class="item-bottom">
<u-album singleSize="60" multipleSize="60" rowCount="1" class="item-bottom-left" <u-album singleSize="60" multipleSize="60" rowCount="1" class="item-bottom-left"
:urls="item.showUrls" maxCount="1"></u-album> :urls="item.facilitiesPicList" maxCount="1"></u-album>
<view class="item-bottom-right" @click="goToPage(item.id)"> <view class="item-bottom-right" @click="goToPage(item.id)">
<view class="right-title">{{ item.facilitiesName }}</view> <view class="right-title">{{ item.facilitiesName }}</view>
<view class="right-area"> <view class="right-area">

@ -212,13 +212,16 @@ export default {
}) })
}) })
getDicts('source_ba_status').then(res => { getDicts('source_ba_status').then(res => {
console.log("11111111111111")
let dataInfo = res.data let dataInfo = res.data
this.beianStatusList = dataInfo.map(item => { this.beianStatusList = dataInfo.map(item => {
return { return {
key: item.dictLabel, key: item.dictLabel,
value: item.dictValue value: item.dictValue
} }
}) })
console.log("beianStatusList",beianStatusList)
}) })
}, },
setDict(stauts, list) { setDict(stauts, list) {
@ -240,6 +243,11 @@ export default {
this.baNum = res.data.baNum; this.baNum = res.data.baNum;
this.wbaNum = res.data.wbaNum; this.wbaNum = res.data.wbaNum;
this.tableData = res.data.sourceVoList; this.tableData = res.data.sourceVoList;
// this.totalNum = 1;
// this.baNum = 2;
// this.wbaNum = 3;
// this.tableData = "";
// console.log(this.tableData, '') // console.log(this.tableData, '')
}) })
}, },

@ -188,8 +188,8 @@ export default {
}, },
// //
async pwdLogin(cas) { async pwdLogin(cas) {
this.loginForm.cas = cas; // this.loginForm.cas = cas;
// this.loginForm.cas = this.decodeDes(cas); this.loginForm.cas = this.decodeDes(cas);
this.$store this.$store
.dispatch('Login', this.loginForm) .dispatch('Login', this.loginForm)
.then(() => { .then(() => {

@ -1,12 +1,16 @@
<template> <template>
<view> <view>
<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="紧急电话" :autoBack="true">
</u-navbar>
<uni-list :border="true"> <uni-list :border="true">
<!-- 显示圆形头像 --> <!-- 显示圆形头像 -->
<uni-list-chat <uni-list-chat
v-for="(item, index) in pholist" v-for="(item, index) in pholist"
:key="item.id" :key="item.id"
:title="`${item.secUnitName}/${item.deptName}`" :title="`${item.secUnitName}/${item.deptName}`"
clickable="true" clickable
@click="callPoh(item)" @click="callPoh(item)"
:time="item.userName" :time="item.userName"
:note="item.telephoneNum" :note="item.telephoneNum"

@ -125,7 +125,7 @@
uploadFilePromise(url) { uploadFilePromise(url) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let a = uni.uploadFile({ let a = uni.uploadFile({
url: `${config.baseUrlImg}/filemanage/upload1`, // url: `${config.baseUrlImg}/resource/oss/upload`, //
filePath: url, filePath: url,
name: 'file', name: 'file',
header: { header: {
@ -140,7 +140,7 @@
let result = JSON.parse(res.data); let result = JSON.parse(res.data);
console.log('result', result); console.log('result', result);
setTimeout(() => { setTimeout(() => {
resolve(result.data.id); resolve(result.data.url);
}, 1000); }, 1000);
} }
}); });

Loading…
Cancel
Save