ykx/lm-safe-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.122.43.22:3000/ykx/lm-safe-app

Browse Source
This commit is contained in:
wyw 2024-06-20 15:00:28 +08:00
commit 6e5505d889
11 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/common.js
View File

@ -125,7 +125,7 @@ if (process.env.CUSTOM_PLATFORM === "dev") {
}, },
uni_app_web_url: "", uni_app_web_url: "",
uni_app_web_api_url: APP_ENV === 'release' ? "http://xmmhe.com" : "http://47.122.43.22", uni_app_web_api_url: APP_ENV === 'release' ? "http://xmmhe.com" : "http://47.122.43.22",
uni_app_web_source_url: APP_ENV === 'release' ? "http://xmmhe.com:7199" : "http://47.122.43.22:3199", uni_app_web_source_url: APP_ENV === 'release' ? "http://xmmhe.com:7199" : "http://47.122.43.22:7199",
uni_app_web_local_api_url: APP_ENV === 'release' ? "http://xmmhe.com" : "http://47.122.43.22" //打包测试： 47.122.43.22 开发可 localhost uni_app_web_local_api_url: APP_ENV === 'release' ? "http://xmmhe.com" : "http://47.122.43.22" //打包测试： 47.122.43.22 开发可 localhost
} }

18
manifest.json
View File

@ -1,5 +1,5 @@
{ {
"name" : "连锰矿山安全", "name" : "双控安全Beta",
"appid" : "__UNI__A6AA052", "appid" : "__UNI__A6AA052",
"description" : "连锰矿山安全app", "description" : "连锰矿山安全app",
"versionName" : "1.0.0", "versionName" : "1.0.0",
@ -39,7 +39,7 @@
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"abiFilters" : [ "armeabi-v7a" ,"arm64-v8a"] "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios" : {
@ -106,13 +106,13 @@
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxdf9daae309e2a840", "appid" : "wxdf9daae309e2a840",
"setting" : { "setting" : {
"urlCheck" : false "urlCheck" : false
}, },
"usingComponents" : true "usingComponents" : true
}, },
"mp-alipay" : { "mp-alipay" : {
"usingComponents" : true "usingComponents" : true
}, },

6
pages/index/index2.nvue
View File

@ -144,9 +144,9 @@
noticeTotal: 0, noticeTotal: 0,
lists: [], lists: [],
banners: [ banners: [
'../../static/banner02.png', '../../static/banner5.jpg',
'../../static/banner03.png', '../../static/banner6.jpg',
'../../static/banner04.png' '../../static/banner7.png'
], ],
currentBanner: 0, currentBanner: 0,
text: '', text: '',

46
pages/performance/index1.vue
View File

@ -132,7 +132,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="this.localMintype.length !== 0"> <view>
<view class="per-title"> <view class="per-title">
<!-- <view :class="chooseIndex === true? 'personal-choose':'personal'" @click="changePerIndex">个人绩效</view> --> <!-- <view :class="chooseIndex === true? 'personal-choose':'personal'" @click="changePerIndex">个人绩效</view> -->
<view class="tissue-choose">组织绩效</view> <view class="tissue-choose">组织绩效</view>
@ -229,7 +229,7 @@
<script> <script>
import { import {
// getChartData, getChartData,
// getStandardScore, // getStandardScore,
getRiskLevel, getRiskLevel,
getClassActive, getClassActive,
@ -515,26 +515,26 @@
const startTime = uni.$u.timeFormat(new Date(y, m, d), 'yyyy-mm-dd') const startTime = uni.$u.timeFormat(new Date(y, m, d), 'yyyy-mm-dd')
const endTime = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd') const endTime = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd')
// let json = initFilter(orgId, User.NAME, "", "", "", startTime, endTime); let json = initFilter(orgId, User.NAME, "", "", "", startTime, endTime);
// const res = await getChartData(json) const res = await getChartData(json)
// if (res.IsSuccessful) { if (res.IsSuccessful) {
// this.chartData = res.Data this.chartData = res.Data
// const preLineChartData = (res.Data?.groupDataLine || []).splice(-6, 6) const preLineChartData = (res.Data?.groupDataLine || []).splice(-6, 6)
// const lineChartConfig = { const lineChartConfig = {
// categories: preLineChartData.map(i => i.MONTHStr.split('年')[1]), categories: preLineChartData.map(i => i.MONTHStr.split('年')[1]),
// series: [{ series: [{
// name: "完成率", name: "完成率",
// data: preLineChartData.map(i => i.FINISH_RATE) data: preLineChartData.map(i => i.FINISH_RATE)
// }, },
// { {
// name: "及时完成率", name: "及时完成率",
// data: preLineChartData.map(i => i.NORMAL_FINISH_RATE) data: preLineChartData.map(i => i.NORMAL_FINISH_RATE)
// } }
// ] ]
// } }
// this.lineChartData = JSON.parse(JSON.stringify(lineChartConfig)); this.lineChartData = JSON.parse(JSON.stringify(lineChartConfig));
// this.tableData = res.Data?.groupData || [] this.tableData = res.Data?.groupData || []
// } }
// this.getStandard() // this.getStandard()
this.getRiskLevel() this.getRiskLevel()
// this.getClassActive() // this.getClassActive()
@ -741,7 +741,7 @@
const orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
let json = initFilter( let json = initFilter(
orgId, orgId,
'30', '',
"NUM", "NUM",
); );
const res = await getDangerTotal(json) const res = await getDangerTotal(json)

2
services/app.js
View File

@ -8,7 +8,7 @@ export function toLogin(params) {
uni.setStorageSync('accessToken', access_token) uni.setStorageSync('accessToken', access_token)
uni.setStorageSync('refreshToken', refreshToken) uni.setStorageSync('refreshToken', refreshToken)
uni.setStorageSync('orgId', orgId) uni.setStorageSync('orgId', orgId)
uni.setStorageSync('Tenant', Tenant) uni.setStorageSync('Tenant', '01')
request.post('/PF/Login/Login', { request.post('/PF/Login/Login', {
Parameter1: username, Parameter1: username,
Parameter2: password, Parameter2: password,

BIN
static/40—40.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
static/banner5.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 101 KiB

BIN
static/banner6.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
static/banner7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 312 KiB

BIN
static/logo_40_40.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

2
utils/request.js
View File

@ -12,7 +12,7 @@ export default {
// const user = uni.getStorageSync('loginUserVerify') // const user = uni.getStorageSync('loginUserVerify')
// const RootOrgId = uni.getStorageSync('RootOrgId') // const RootOrgId = uni.getStorageSync('RootOrgId')
const appInfoData = uni.getStorageSync('appInfo') const appInfoData = uni.getStorageSync('appInfo')
const tenant = '01'//uni.getStorageSync('Tenant') || const tenant = uni.getStorageSync('Tenant') || '01' //uni.getStorageSync('Tenant') ||
const userId = appInfoData?.User?.ID || '' const userId = appInfoData?.User?.ID || ''
const userName = appInfoData?.User?.NAME || '' const userName = appInfoData?.User?.NAME || ''
const orgId = appInfoData?.User?.ORG_ID || '' const orgId = appInfoData?.User?.ORG_ID || ''