admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-25 19:55:24 +08:00
parent 2cd64c6bcc
commit 33ce5012d7
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main.js
View File

@ -46,9 +46,9 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
// Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
// Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里 // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
// Vue.prototype.url_config = 'http://139.9.66.234:5173/' // Vue.prototype.url_config = 'http://139.9.66.234:5173/'
// Vue.prototype.url_config = 'http://192.168.34.125:6023/' // Vue.prototype.url_config = 'http://192.168.34.125:6023/'
@ -308,8 +308,6 @@ Vue.prototype.sendRequest = function(param) {
// 判断权限的函数 // 判断权限的函数
Vue.prototype.checkPermission = function(permission) { Vue.prototype.checkPermission = function(permission) {
var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList; var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList;
console.log(permission,'我的测试指令1')
console.log(permissions,'我的测试指令2')
// var permissions = store.state.userInfo.menuAuthority.menuList; // var permissions = store.state.userInfo.menuAuthority.menuList;
permissions = permissions.filter( permissions = permissions.filter(
(x) => x.path == permission.menuPath (x) => x.path == permission.menuPath
@ -320,7 +318,6 @@ Vue.prototype.checkPermission = function(permission) {
let index = permissions.actionList.findIndex( let index = permissions.actionList.findIndex(
(x) => x.actionCode == permission.key (x) => x.actionCode == permission.key
) )
console.log(index,'我的测试指令3')
return index != -1 ? true : false; return index != -1 ? true : false;
} }
const app = new Vue({ const app = new Vue({

2
pages/login/login.vue
View File

@ -7,7 +7,7 @@
<view class="loginBox"> <view class="loginBox">
<view class="loginTitle"> <view class="loginTitle">
<image class="loginLogo" src="@/static/login/logo.pic.jpg" mode="heightFix"></image> <image class="loginLogo" src="@/static/login/logo.pic.jpg" mode="heightFix"></image>
智慧工地服务平台 智慧安全
</view> </view>
<view class="btns"> <view class="btns">
<view class="user feedback" @click="goto('user')">用户登录</view> <view class="user feedback" @click="goto('user')">用户登录</view>

1
pages/projectEnd/laborManage/workerAnalysis.vue
View File

@ -98,6 +98,7 @@
data() { data() {
return { return {
pieChartData: { pieChartData: {
categories: [],
title: { title: {
name: "", name: "",
color: '#7cb5ec', color: '#7cb5ec',