Commit 71df02fd authored by 李翠鸿's avatar 李翠鸿

v3

parent 678ba089
......@@ -11,4 +11,8 @@
.base-style{
position: absolute;
}
\ No newline at end of file
}
.data-conponent-style{
box-sizing: border-box;
}
\ No newline at end of file
......@@ -18,9 +18,15 @@ const showModal = (title, success) => {
success: success
})
}
const defaultLoading = () => {
return uni.showLoading({
title: "加载中"
});
}
export default {
toast: toast,
showModal: showModal,
defaultLoading:defaultLoading
// successToast: successToast,
// showLoading: showLoading,
// tipLoading: tipLoading,
......
{
"name": "demo2",
"appid": "__UNI__630CE47",
"description": "",
"versionName": "1.0.0",
"versionCode": "100",
"transformPx": false,
/* 5+App特有相关 */
"app-plus": {
"usingComponents": true,
"nvueStyleCompiler": "uni-app",
"compilerVersion": 3,
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
/* 模块配置 */
"modules": {},
/* 应用发布信息 */
"distribute": {
/* android打包配置 */
"android": {
"permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
},
/* ios打包配置 */
"ios": {},
/* SDK配置 */
"sdkConfigs": {}
}
},
/* 快应用特有相关 */
"quickapp": {},
/* 小程序特有相关 */
"mp-weixin": {
"appid": "",
"setting": {
"urlCheck": false
},
"usingComponents": true
},
"mp-alipay": {
"usingComponents": true
},
"mp-baidu": {
"usingComponents": true
},
"mp-toutiao": {
"usingComponents": true
},
"uniStatistics": {
"enable": false
},
"orientation": [
//竖屏正方向
"portrait-primary",
//竖屏反方向
"portrait-secondary",
//横屏正方向
"landscape-primary",
//横屏反方向
"landscape-secondary",
//自然方向
"default"
],
"h5": {
// "devServer": {
// "https": false,
// "proxy": {
// // "/web": {
// // "target": "http://192.168.1.151:8804",
// // "changeOrigin": true,
// // "secure": false,
// // "pathRewrite": {
// // "^/web": "/"
// // }
// // }
// "/api": {
// "target": "http://192.168.1.151:8804",
// "changeOrigin": true,
// "pathRewrite":{
// "^/api": "/api"
// }
// }
// }
// }
}
"name" : "demo2",
"appid" : "__UNI__630CE47",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
},
/* 模块配置 */
"modules" : {},
/* 应用发布信息 */
"distribute" : {
/* android打包配置 */
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
},
/* ios打包配置 */
"ios" : {},
/* SDK配置 */
"sdkConfigs" : {
"ad" : {}
}
}
},
/* 快应用特有相关 */
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "",
"setting" : {
"urlCheck" : false
},
"usingComponents" : true
},
"mp-alipay" : {
"usingComponents" : true
},
"mp-baidu" : {
"usingComponents" : true
},
"mp-toutiao" : {
"usingComponents" : true
},
"uniStatistics" : {
"enable" : false
},
"orientation" : [
//竖屏正方向
"portrait-primary",
//竖屏反方向
"portrait-secondary",
//横屏正方向
"landscape-primary",
//横屏反方向
"landscape-secondary",
//自然方向
"default"
],
"h5" : {}
}
// "devServer": {
// "https": false,
// "proxy": {
// // "/web": {
// // "target": "http://192.168.1.151:8804",
// // "changeOrigin": true,
// // "secure": false,
// // "pathRewrite": {
// // "^/web": "/"
// // }
// // }
// "/api": {
// "target": "http://192.168.1.151:8804",
// "changeOrigin": true,
// "pathRewrite":{
// "^/api": "/api"
// }
// }
// }
// }
......@@ -68,6 +68,12 @@
// "titleNView":false
// }
}
},
{
"path": "pages/data/jump-view/index",
"style": {
// "navigationBarTitleText": "数据"
}
}
],
"tabBar": {
......
This diff is collapsed.
......@@ -90,8 +90,29 @@
})
// #endif
// #ifdef H5
uni.switchTab({
url: "/pages/monitoring/index"
this.$api.login(this.userName, this.password).then(res => {
console.log(JSON.stringify(data))
let data = res.data.data
if (data) {
// console.log(data.LoginIsSuccess)
if (data.LoginIsSuccess) {
console.log(JSON.stringify(data))
uni.setStorageSync('userInfo1', data);
this.$toast.toast('登录成功')
this.$api.loginInOutRecord(data.SCMSUserName, '网页登录').then(res => {
console.log('登录成功')
uni.switchTab({
url: "/pages/monitoring/index"
})
})
} else {
this.$toast.toast('登录失败')
}
}
}).catch(error => {
this.$toast.toast(error)
})
// #endif
......
......@@ -135,24 +135,7 @@
console.log(err)
})
},
//建立WebSocket连接
getWebSocket() {
uni.connectSocket({
url: 'ws://api/hubs/chart', //仅为示例,并非真实接口地址
success: (res => {
// console.log('res==>' + JSON.stringify(res))
}),
complete: (res) => {
// console.log('res==>'+JSON.stringify(res))
}
});
uni.onSocketMessage(function(res) {
console.log('收到服务器内容:' + res.data);
});
}
},
mounted() {
......
This diff is collapsed.
<!-- 工作页面 -->
<template>
<view></view>
<view @click="test" style="height: 50px;background-color: #007AFF;">
<button></button>
</view>
</template>
<script>
export default{
data(){
return{
export default {
data() {
return {
timer1: null
}
},
methods: {
test() {
clearInterval(this.timer1)
this.timer1 = null
this.timer1 = setInterval(() => {
for (let i = 0; i < 10; i++) {
// console.log(JSON.stringify(i))
let data = {
"filterControls": [{
"value1": "2020-8-1",
"controlType": "AssociateDateTimePicker",
"pickerType": "BeginTime",
"name": "a1"
},
{
"value1": "2021-9-1",
"controlType": "AssociateDateTimePicker",
"pickerType": "EndTime",
"name": "a2"
}
],
"variables": [{
"name": "EJZ2",
"digit": 5
},
{
"name": "EJZ1",
"digit": 5
},
{
"name": "EJZ3",
"digit": 5
},
{
"name": "EJZ4",
"digit": 5
}
],
"sourceType": "History",
"historySettings": {
"pre": 40,
"valueMethod": "Sum",
"xAxisSetting": "Time"
}
}
this.$api.getQueryMulitySource(data).then(res => {
// console.log(JSON.stringify(res))
}).catch(err => {
// console.log('err=>'+JSON.stringify(err))
})
}
}, 1000)
}
},
beforeDestroy() {
clearInterval(this.timer1)
},
onShow() {
console.log(22)
// this.test()
},
onHide() {
console.log(JSON.stringify(this.timer1))
if(this.timer1){
clearInterval(Number(this.timer1))
this.timer1 = null
}
},
onLoad() {
// console.log('App Launch'),
// #ifdef APP-PLUS
plus.screen.lockOrientation('portrait-primary'); //锁定
// #endif
plus.screen.lockOrientation('portrait-primary'); //锁定
// #endif
},
}
</script>
<style>
</style>
......@@ -107,7 +107,28 @@ function getChartQuery(data){
return api.baseRequest(`/api/chart/query`,"POST",1,data)
}
//获取app制作画面数据
function getView(projectName,viewName){
return api.baseRequest(`/api/view/getview?projectName=${projectName}&viewName=${viewName}`,"GET",0)
}
//获取app制作画面页面图片
function getAppDataImage(projectName,viewName,imageName){
return api.baseRequest(`/api/view/GetImage?projectName=${projectName}&viewName=${viewName}&imageName=${imageName}`,"GET",0)
}
//获取全局属性
function getGlobalProps(projectName){
return api.baseRequest(`/api/view/GetGlobalProps?projectName=${projectName}`,"GET",0)
}
//数据选项卡历史、实时、统计、外部数据请求
function getQueryMulitySource(data){
return api.baseRequest(`/api/Data/QueryMulitySource`,"POST",1,data)
}
//获取开始时间
function getStartTime(time,recent,setting){
return api.baseRequest(`/api/Data/GetTime?endTime=${time}&recent=${recent}&setting=${setting}`,"GET",1)
}
......@@ -131,7 +152,13 @@ export default {
executeScript,
getRelayEchart,
getChartControlNames,
getChartQuery
getChartQuery,
getView,
getAppDataImage,
getGlobalProps,
getQueryMulitySource,
getStartTime
}
import $toast from '../js/toast.js'
// 全局请求封装
const token = '自己的token令牌,最好读取缓存中的'
......@@ -7,7 +8,7 @@ const apiUrl = 'http://192.168.1.68:8804' //app ip
const apiUrl1 = 'http://192.168.1.68:8806' //web ip
//#endif
//#ifndef APP-PLUS
const apiUrl = 'http://192.168.1.68:8806'
const apiUrl1 = '/apv'
//#endif
// const apiUrl = 'http://localhost:5000'
......@@ -31,9 +32,11 @@ const baseRequest = (url,method,type,data) => {
newApiUrl = serviceAddress + url //app ip
}else if(type == 1){
newApiUrl = apiAddress + url //web ip
}else{
newApiUrl = url //完整路径
}
console.log('url1=>'+newApiUrl)
return new Promise((resolve, reject) => {
uni.request({
......@@ -43,6 +46,7 @@ const baseRequest = (url,method,type,data) => {
header: {
// 'token': token
},
sslVerify:false,
success(res) {
// console.log(JSON.stringify(res))
//响应成功拦截
......@@ -50,6 +54,8 @@ const baseRequest = (url,method,type,data) => {
},
fail(err) {
//响应失败拦截
// console.log(22+JSON.stringify(err))
$toast.toast(err.errMsg)
reject(err)
},
complete(res) {
......
......@@ -8,87 +8,87 @@ const store = new Vuex.Store({
state: { //存放状态
routerInfo: '',
systemInfo: '', //系统信息
GetProjectResourceBaseUrl:'/api/view/GetProjectResource',
baseUrl:'http://192.168.1.68:8806'
GetProjectResourceBaseUrl: '/api/view/GetProjectResource',
GetViewImgResourceBaseUrl: '/api/view/GetImage',//获取app制作图片
baseUrl: 'http://192.168.1.68:8806'
},
actions: {
//扫码获取信息
getCodeInfoFun({
commit
}) {
uni.removeStorageSync('projectInfo');
uni.removeStorageSync('projectInfo');
return new Promise((resolve, reject) => {
// #ifdef APP-PLUS
uni.scanCode({
// onlyFromCamera: true,
scanType: ['qrCode', 'barCode'],
success: function(res) {
// console.log(333)
let projectName = res.result
// console.log(22+JSON.stringify(res))
if(projectName){
// console.log(88+JSON.stringify(projectName))
$api.getAppInfo(projectName).then(res=>{
console.log(88+JSON.stringify( res.data.data))
// console.log(22 + JSON.stringify(res))
if (projectName) {
$api.getAppInfo(projectName).then(res => {
console.log(88 + JSON.stringify(res.data.data))
const code = res.data.code
// console.log(JSON.stringify( res.data.data))
if(code == 1){
if (code == 1) {
$toast.toast(res.data.msg)
}else{
uni.setStorageSync('projectInfo', res.data.data);
} else {
uni.setStorageSync('projectInfo', res.data
.data);
resolve(res)
}
if(res.statusCode == 500){
$toast.toast('扫码失败')
if (res.statusCode == 500) {
$toast.toast('获取工程信息失败')
}
}).catch(err=>{
console.log('err'+JSON.stringify(res))
$toast.toast('扫码失败')
}).catch(err => {
console.log('err' + JSON.stringify(err))
$toast.toast('获取工程信息失败')
})
}else{
} else {
// console.log(444)
$toast.toast('扫码失败')
}
},
complete: function(res) {
uni.hideLoading();
},
fail: function(res) {
reject(res)
console.log('失败条码类型:' + res.scanType);
}
});
// uni.redirectTo({
// url: "/pages/login/index"
// })
// #endif
// #ifndef APP-PLUS || APP-NVUE
$api.getAppInfo('test').then(res=>{
uni.removeStorageSync('projectInfo');
let projectName = 'http://192.168.1.72:5000/api/view/GetAppInfo?projectName=测试项目'
$api.getAppInfo(projectName).then(res => {
const code = res.data.code
if(code == 1){
if (code == 1) {
$toast.toast(res.data.msg)
}else{
} else {
console.log(JSON.stringify(res.data.data))
uni.setStorageSync('projectInfo', res.data.data);
uni.redirectTo({
url: "/pages/login/index"
})
resolve(res)
}
if(res.statusCode == 500){
if (res.statusCode == 500) {
$toast.toast('扫码失败')
}
}).catch(res=>{
}).catch(res => {
$toast.toast('扫码失败')
})
// #endif
})
......@@ -96,8 +96,11 @@ const store = new Vuex.Store({
},
//权限请求
jurisdictionShow(context,payload) {
const {item,dataId } = payload
jurisdictionShow(context, payload) {
const {
item,
dataId
} = payload
return new Promise((resolve, reject) => {
let userinfoID = ''
// console.log(uni.getStorageSync('userInfo1'))
......@@ -115,9 +118,11 @@ const store = new Vuex.Store({
} else {
reject(res.data)
}
}).catch(err=>{
reject(res.data)
})
})
},
}
......
var isReady=false;var onReadyCallbacks=[];
var isServiceReady=false;var onServiceReadyCallbacks=[];
var __uniConfig = {"pages":["pages/scan-code/index","pages/login/index","pages/monitoring/index","pages/data/index","pages/working/index","pages/message/index","pages/my/index","pages/monitoring/monitoring-view/index","pages/scan-code/app-scan/index"],"window":{"navigationBarTextStyle":"white","navigationBarTitleText":"cms","navigationBarBackgroundColor":"#00B2A5","backgroundColor":"#f2f2f2","pageOrientation":"portrait-primary"},"tabBar":{"color":"#2D2D2D","selectedColor":"#2D2D2D","borderStyle":"rgba(220, 220, 220, 0.24)","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"22px","spacing":"2px","list":[{"pagePath":"pages/monitoring/index","iconPath":"static/img1/jiankong.png","selectedIconPath":"static/img1/jiankong1.png","text":"监控"},{"pagePath":"pages/data/index","iconPath":"static/img1/shuju.png","selectedIconPath":"static/img1/shuju1.png","text":"数据"},{"pagePath":"pages/working/index","iconPath":"static/img1/gongzuo.png","selectedIconPath":"static/img1/gongzuo1.png","text":"工作"},{"pagePath":"pages/message/index","iconPath":"static/img1/xiaoxi.png","selectedIconPath":"static/img1/xiaoxi1.png","text":"消息","backgroundColor":"#000"},{"pagePath":"pages/my/index","iconPath":"static/img1/wo.png","selectedIconPath":"static/img1/wo1.png","text":"我的"}]},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"demo2","compilerVersion":"3.1.18","entryPagePath":"pages/scan-code/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
var __uniRoutes = [{"path":"/pages/scan-code/index","meta":{"isQuit":true},"window":{"navigationBarTitleText":"扫码","titleNView":false}},{"path":"/pages/login/index","meta":{},"window":{"titleNView":false}},{"path":"/pages/monitoring/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"监控"}},{"path":"/pages/data/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"数据"}},{"path":"/pages/working/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"工作"}},{"path":"/pages/message/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"消息"}},{"path":"/pages/my/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的"}},{"path":"/pages/monitoring/monitoring-view/index","meta":{},"window":{"titleNView":false,"bounce":false}},{"path":"/pages/scan-code/app-scan/index","meta":{"isNVue":true},"window":{"navigationBarTitleText":"扫码"}}];
var __uniConfig = {"pages":["pages/scan-code/index","pages/login/index","pages/monitoring/index","pages/data/index","pages/working/index","pages/message/index","pages/my/index","pages/monitoring/monitoring-view/index","pages/scan-code/app-scan/index","pages/data/jump-view/index"],"window":{"navigationBarTextStyle":"white","navigationBarTitleText":"cms","navigationBarBackgroundColor":"#00B2A5","backgroundColor":"#f2f2f2","pageOrientation":"portrait-primary"},"tabBar":{"color":"#2D2D2D","selectedColor":"#2D2D2D","borderStyle":"rgba(220, 220, 220, 0.24)","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"22px","spacing":"2px","list":[{"pagePath":"pages/monitoring/index","iconPath":"static/img1/jiankong.png","selectedIconPath":"static/img1/jiankong1.png","text":"监控"},{"pagePath":"pages/data/index","iconPath":"static/img1/shuju.png","selectedIconPath":"static/img1/shuju1.png","text":"数据"},{"pagePath":"pages/working/index","iconPath":"static/img1/gongzuo.png","selectedIconPath":"static/img1/gongzuo1.png","text":"工作"},{"pagePath":"pages/message/index","iconPath":"static/img1/xiaoxi.png","selectedIconPath":"static/img1/xiaoxi1.png","text":"消息","backgroundColor":"#000"},{"pagePath":"pages/my/index","iconPath":"static/img1/wo.png","selectedIconPath":"static/img1/wo1.png","text":"我的"}]},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"demo2","compilerVersion":"3.1.22","entryPagePath":"pages/scan-code/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
var __uniRoutes = [{"path":"/pages/scan-code/index","meta":{"isQuit":true},"window":{"navigationBarTitleText":"扫码","titleNView":false}},{"path":"/pages/login/index","meta":{},"window":{"titleNView":false}},{"path":"/pages/monitoring/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"监控"}},{"path":"/pages/data/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"数据"}},{"path":"/pages/working/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"工作"}},{"path":"/pages/message/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"消息"}},{"path":"/pages/my/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的"}},{"path":"/pages/monitoring/monitoring-view/index","meta":{},"window":{"titleNView":false,"bounce":false}},{"path":"/pages/scan-code/app-scan/index","meta":{"isNVue":true},"window":{"navigationBarTitleText":"扫码"}},{"path":"/pages/data/jump-view/index","meta":{},"window":{}}];
__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});
No preview for this file type
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