yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-9-3

master
guoxing 2 years ago
parent
a9224d4978
commit
f8c36dca0c
16 changed files with 182 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      supervise-uniapp/App.vue
  2. 4
      supervise-uniapp/common/config.js
  3. 8
      supervise-uniapp/common/request.api.js
  4. 20
      supervise-uniapp/manifest.json
  5. 2
      supervise-uniapp/pages.json
  6. 14
      supervise-uniapp/pages/home/UserFragment.vue
  7. 6
      supervise-uniapp/pages/home/WorkFragment.vue
  8. 2
      supervise-uniapp/pages/index/DataAssembleList.vue
  9. 3
      supervise-uniapp/pages/index/MyProject.vue
  10. 43
      supervise-uniapp/pages/index/ProjectDetail.vue
  11. 41
      supervise-uniapp/pages/index/SetUp.vue
  12. 4
      supervise-uniapp/pages/index/SetUp2.vue
  13. 52
      supervise-uniapp/pages/index/WarehouseDetaile.vue
  14. 2
      supervise-uniapp/plugins/APPUpdate/index.js
  15. BIN
      supervise-uniapp/static/baseIcon/loading.gif
  16. BIN
      supervise-uniapp/static/ic_ar.png

3
supervise-uniapp/App.vue
View File

@ -3,7 +3,8 @@
export default {
globalData: {
// wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin",
wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin",
wxSilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxSilentLogin",
// wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin",
wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal//v1/wxuser/wxAuthLogin",
SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",// 注册
token: "",

4
supervise-uniapp/common/config.js
View File

@ -7,9 +7,9 @@
*/
module.exports = {
// baseUrl: 'https://jianguan.yyundong.com/api',
// baseUrl: 'https://supervise.yxtsoft.com',
baseUrl: 'https://supervise.yxtsoft.com',
// baseUrl: 'http://192.168.1.193:8112',
baseUrl: 'http://192.168.1.110:8112',
// baseUrl: 'http://192.168.1.110:8112',
tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面

8
supervise-uniapp/common/request.api.js
View File

@ -72,7 +72,7 @@ export default {
// 获取首页面数据
getWorkData: (params = {}) => request.get("/report/messagepushlog/numberOfJobs/" + params, params),
getWorkData: (params = {}) => request.get("/reportwxmpapi/messagepushlog/numberOfJobs/" + params, params),
// 获取云仓列表
storeHouseListPage: (params = {}) => request.post("/api/portal/v1/flow/storeHouseListPage", params),
@ -88,7 +88,7 @@ export default {
params),
// 获取我的项目-仓库详情
getStorehouseBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getStorehouseBySid/" + params,
getStorehouseBySid: (params = {}) => request.post("/api/crm/v1/storehouseproject/selectStoreBySid/" + params,
params),
// 获取库存信息列表
@ -105,9 +105,9 @@ export default {
// 修改密码
updatePassword: (params = {}) => request.post("/portal/v1/sysuser/updatePassword", params),
updatePassword: (params = {}) => request.post("/api/portal/v1/sysuser/updatePassword", params),
// 修改头像
uploadHandImage: (params = {}) => request.post("/portal/v1/sysuser/uploadImage", params),
uploadHandImage: (params = {}) => request.post("/api/portal/v1/sysuser/uploadImage", params),
}

20
supervise-uniapp/manifest.json
View File

@ -29,7 +29,8 @@
"Barcode" : {},
"Contacts" : {},
"Push" : {},
"OAuth" : {}
"OAuth" : {},
"Geolocation" : {}
},
"distribute" : {
"android" : {
@ -38,15 +39,20 @@
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CONTROL_LOCATION_UPDATES\"/>",
"<uses-permission android:name=\"android.permission.DIAGNOSTIC\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.INSTALL_LOCATION_PROVIDER\"/>",
"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
"<uses-permission android:name=\"android.permission.LOCATION_HARDWARE\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
@ -68,10 +74,8 @@
"sdkConfigs" : {
"ad" : {},
"geolocation" : {
"amap" : {
"__platform__" : [ "android" ],
"appkey_ios" : "",
"appkey_android" : ""
"system" : {
"__platform__" : [ "ios", "android" ]
}
},
"push" : {},
@ -123,10 +127,10 @@
"mp-weixin" : {
"appid" : "wx05604ce2a8bede05",
"setting" : {
"urlCheck" : false,
"urlCheck" : true,
"es6" : false,
"minified" : false,
"postcss" : false
"minified" : true,
"postcss" : true
},
"optimization" : {
"subPackages" : true

2
supervise-uniapp/pages.json
View File

@ -326,7 +326,7 @@
"selectedColor": "#41adf8",
"backgroundColor": "#FFFFFF",
"borderStyle": "black",
"iconWidth": "25px", // 字体大小
"iconWidth": "13px", // 字体大小
"list": [{
"pagePath": "pages/home/WorkFragment",
"iconPath": "static/bottom-icon/gongzuotai1.png",

14
supervise-uniapp/pages/home/UserFragment.vue
View File

@ -3,7 +3,7 @@
<view class="top">
<image class="img" :src="baseUrl" mode="aspectFit" @click="chooseImage" ></image>
<image class="img" :src="baseUrl" @click="chooseImage" ></image>
<view class="top_right">
@ -28,15 +28,15 @@
</UserItem>
</view>
<!-- #ifdef APP-PLUS -->
<view class="user-item-bg">
<!-- <view class="user-item-bg"> -->
<!-- <UserItem src='https://supervise.yxtsoft.com/img/user/zzjg.png' text="组织结构" @click="click" clickId="3"></UserItem>
<UserItem src='https://supervise.yxtsoft.com/img/user/xmgl.png' text="项目管理" @click="click" clickId="4"></UserItem>
<UserItem src='https://supervise.yxtsoft.com/img/user/ycgl.png' text="云仓管理" @click="click" clickId="5"></UserItem>
<UserItem src='https://supervise.yxtsoft.com/img/user/xtgl.png' text="系统管理" @click="click" clickId="6"></UserItem> -->
<UserItem src='https://supervise.yxtsoft.com/img/user/xtgl.png' text="检查更新" :notes="version" @click="click"
<!-- <UserItem src='https://supervise.yxtsoft.com/img/user/xtgl.png' text="检查更新" :notes="version" @click="click"
clickId="7">
</UserItem>
</view>
</UserItem> -->
<!-- </view> -->
<!-- #endif -->
</view>
</template>
@ -98,8 +98,8 @@
console.log(">>>>>", username)
console.log(">>>>>", orgNamePath)
this.name = username
this.orgName = orgNamePath==""?"暂无数据":orgNamePath
this.name = username==""?"用户名称":username
this.orgName = orgNamePath==""?"暂无部门信息":orgNamePath
this.baseUrl = headImage==""?"https://supervise.yxtsoft.com/img/user/userImage.png":headImage

6
supervise-uniapp/pages/home/WorkFragment.vue
View File

@ -1,7 +1,7 @@
<template>
<view style="width: 100%;height: 100%;">
<view v-show="!isShow" style="width: 100%;height: 100%;">
<image src="../../static/baseIcon/loading.gif" mode="aspectFill" style="width: 100%;height: 100%;"></image>
<image src="https://supervise.yxtsoft.com/img/base/loading.gif" mode="aspectFill" style="width: 100%;height: 100%;"></image>
</view>
<view class="content" v-show="isShow">
@ -588,7 +588,7 @@
.top_item_text {
margin-top: 5px;
color: #101010;
font-size: 15px;
font-size: 13px;
}
}
@ -674,7 +674,7 @@
}
.centre_text {
font-size: 15px;
font-size: 12px;
color: #000;
margin-top: 5px;
}

2
supervise-uniapp/pages/index/DataAssembleList.vue
View File

@ -43,7 +43,7 @@
<uni-drawer ref="drawer" width="320" mode="right">
<view class="drawerView">
<text style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif;">申请日期</text>
<text style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif;">数据日期</text>
<view class="drawerView-date">
<input class="drawerView-date-text" v-model="listQuery.params.dataDateStart" placeholder="开始日期"
:disabled="true" @click="openDate(1)">

3
supervise-uniapp/pages/index/MyProject.vue
View File

@ -142,8 +142,7 @@
<style lang="scss">
.page {
width: 100%;
height: 100%;
padding-bottom: 20px;
.newslist {
margin-top: 15px;

43
supervise-uniapp/pages/index/ProjectDetail.vue
View File

@ -40,16 +40,19 @@
</view>
<view v-show="isShow">
<view class="layout" style="margin-top: 10px;">
<text style="margin-top: 15px;margin-left: 13px;">项目仓库</text>
<view class="list">
<view class="list-item" v-for="item in imageArr">
<view class="list-item" v-for="item in imageArr" >
<view class="list-item-lay">
<image class="item-img" :src="item.src" mode="aspectFill" @tap="previewImage(item.src)"></image>
<view class="list-item-lay" @click="imgClick(item)">
<image class="item-img" :src="item.src" mode="aspectFill">
</image>
<text class="item-text">{{item.title}}</text>
</view>
@ -60,7 +63,7 @@
</view>
</view>
<view class="layout" style="margin-top: 10px;">
@ -110,10 +113,9 @@
</view>
<view class="layout" style="margin-top: 10px;padding: 20px; padding-bottom: 50px;">
<view class="layout" style="margin-top: 10px;padding: 20px;">
<text
style="font-size: 14px;color: #919191;line-height: 25px;">项目说明：{{info.remarks}}</text>
<text style="font-size: 14px;color: #919191;line-height: 25px;">项目说明：{{info.remarks}}</text>
</view>
@ -121,11 +123,13 @@
</template>
<script>
export default {
data() {
return {
info: {},
isShow: false,
imageArr: [
// {
// src: "https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg",
@ -170,13 +174,15 @@
// if (resp.success) {
console.log('222', resp)
// this.dataList = resp
this.imageArr =[]
this.imageArr = []
for (var i = 0; i < resp.length; i++) {
this.isShow = true
let item = resp[i]
this.imageArr.push(
{
src:item.picUrl,
title:item.simpleName
console.log('item', item.name)
this.imageArr.push({
src: item.picUrl,
sid:item.shSid,
title: item.name
})
}
@ -185,6 +191,14 @@
})
},
imgClick(item){
console.log('item', item)
uni.navigateTo({
url: 'WarehouseDetaile?sid='+item.sid
});
}
}
}
@ -193,9 +207,9 @@
<style lang="scss">
.pages {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
padding-bottom: 20px;
.layout {
@ -242,6 +256,7 @@
height: 105px;
border: 1px solid #4D72FF;
}
.item-text {
z-index: 1000;
position: relative;
@ -249,7 +264,7 @@
padding: 3px 15px 3px 15px;
color: #fff;
background: #4D72FF;
opacity:0.7;
opacity: 0.7;
font-size: 13px;
border-top-right-radius: 15px;
}

41
supervise-uniapp/pages/index/SetUp.vue
View File

@ -6,6 +6,36 @@
<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;"></image>
</view>
<!-- <view class="item" @click="itemClick('1')" style="margin-top: 10px;">
<text class="text">清除缓存</text>
<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;"></image>
</view> -->
<!-- #ifdef APP-PLUS -->
<!-- <view class="item" @click="itemClick('2')" style="border-bottom: none;">
<text class="text">检查新版本</text>
<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;"></image>
</view> -->
<!-- #endif -->
<view class="item" @click="itemClick('3')" style="margin-top: 10px;">
<text class="text">关于我们</text>
<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;"></image>
</view>
<view class="item" @click="itemClick('4')" style="border-bottom: none;">
<text class="text">帮助与反馈</text>
<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;"></image>
</view>
</view>
</template>
@ -19,11 +49,17 @@
methods: {
itemClick(index) {
switch (index) {
case "1":
case "0":
uni.navigateTo({
url: '../index/ChangePassword'
});
break;
case "2":
break;
case "3":
break;
case "4":
break;
default:
break;
}
@ -42,10 +78,11 @@
.item {
background: #fff;
padding: 20px 15px;
padding: 16px 15px;
display: flex;
flex-direction: row;
justify-content: space-between;
border-bottom: 1px solid #eee;
.text {
color: #101010;

4
supervise-uniapp/pages/index/SetUp2.vue
View File

@ -14,8 +14,8 @@
export default {
data() {
return {
uploadAction: config.baseUrl + "/portal/v1/sysuser/uploadfile",
headImage: getApp().globalData.headImage
uploadAction: config.baseUrl + "/api/portal/v1/sysuser/uploadfile",
headImage: getApp().globalData.headImage==""?"https://supervise.yxtsoft.com/img/user/userImage.png":getApp().globalData.headImage
// headImage: "https://supervise.yxtsoft.com/img/user/userImage.png"
}
},

52
supervise-uniapp/pages/index/WarehouseDetaile.vue
View File

@ -20,12 +20,13 @@
</view>
<view class="view"></view>
<image class="top-img" src="https://supervise.yxtsoft.com/img/newApp/phone.png" mode="aspectFit"></image>
<image class="top-img" src="https://supervise.yxtsoft.com/img/newApp/phone.png" mode="aspectFit" @click="makeCall"></image>
</view>
<view class="top" style="margin-top: 10px;">
<image style="width: 20px;height: 40px;" src="https://supervise.yxtsoft.com/img/newApp/location.png" mode="aspectFit"></image>
<view class="top" style="margin-top: 10px;" @click="getLat">
<image style="width: 20px;height: 40px;" src="https://supervise.yxtsoft.com/img/newApp/location.png"
mode="aspectFit"></image>
<view style="display: flex;
flex-direction: column;margin-left: 10px;">
<text class="top-name-text3">{{info.address}}</text>
@ -139,15 +140,15 @@
// if (resp.success) {
console.log('1111', resp)
this.info = resp
this.info.swipers =[]
this.info.swipers = []
if(resp.pics.length==0){
if (resp.pics.length == 0) {
this.info.swipers.push(
resp.picUrl)
}else{
} else {
for (var i = 0; i <resp.pics.length; i++) {
for (var i = 0; i < resp.pics.length; i++) {
var url = resp.pics[i].fileUrl
this.info.swipers.push(url)
}
@ -157,7 +158,42 @@
}).catch(e => {
console.log('eeeee', e)
})
},
getLat() {
console.log('lon', this.info.lon)
console.log('lat', this.info.lat)
if (this.info.lon == '' || this.info.lon == null || this.info.lat == '' || this.info.lat == null) {
uni.showToast({
icon: "none",
title: '当前仓库位置错误，请核实后在进行导航操作。',
duration: 5000,
});
return
}
var longitude = parseFloat(this.info.lon)
var latitude = parseFloat(this.info.lat)
var name = this.info.name
var address = this.info.address
wx.openLocation({
latitude: latitude,
longitude: longitude,
scale: 15,
name: name,
address: address
})
},
makeCall(){
wx.makePhoneCall({
//仅为示例，并非真实的电话号码
phoneNumber: this.info.linkerPhone
})
}
}
}
</script>
@ -279,7 +315,7 @@
padding-right: 30px;
flex-direction: column;
.bottom-item-lay{
.bottom-item-lay {
margin-top: 10px;
display: flex;
flex-direction: row;

2
supervise-uniapp/plugins/APPUpdate/index.js
View File

@ -5,7 +5,7 @@ const platform = uni.getSystemInfoSync().platform;
// 主颜色
const $mainColor = "FF5B78";
// 弹窗图标url
const $iconUrl = "/static/ic_ar.png";
const $iconUrl = "https://supervise.yxtsoft.com/img/base/ic_ar.png";
// 获取当前应用的版本号
export const getCurrentNo = function(callback) {
// 获取本地应用资源版本号

BIN
supervise-uniapp/static/baseIcon/loading.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 56 KiB

BIN
supervise-uniapp/static/ic_ar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

Write Preview
Loading…
Cancel
Save