From 18b324482e8ec2681674bc46dc82598920a03813 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Wed, 5 Jun 2024 14:34:18 +0800
Subject: [PATCH] 1

---
 config/common.js             |   2 +-
 manifest.json                |  18 +++++++-------
 pages/performance/index1.vue |  46 +++++++++++++++++------------------
 services/app.js              |   2 +-
 static/40—40.png           | Bin 0 -> 2304 bytes
 static/logo_40_40.png        | Bin 2304 -> 3084 bytes
 utils/request.js             |   2 +-
 7 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 static/40—40.png

diff --git a/config/common.js b/config/common.js
index a95ae82..cab46f0 100644
--- a/config/common.js
+++ b/config/common.js
@@ -125,7 +125,7 @@ if (process.env.CUSTOM_PLATFORM === "dev") {
 		},
 		uni_app_web_url: "",
 		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
 
 	}
diff --git a/manifest.json b/manifest.json
index 7da9cb9..96863d9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "连锰矿山安全",
+    "name" : "矿山安全Beta",
     "appid" : "__UNI__A6AA052",
     "description" : "连锰矿山安全app",
     "versionName" : "1.0.0",
@@ -39,7 +39,7 @@
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a" ,"arm64-v8a"]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
             /* ios打包配置 */
             "ios" : {
@@ -106,13 +106,13 @@
     /* 快应用特有相关 */
     "quickapp" : {},
     /* 小程序特有相关 */
-   "mp-weixin" : {
-       "appid" : "wxdf9daae309e2a840",
-       "setting" : {
-           "urlCheck" : false
-       },
-       "usingComponents" : true
-   },
+    "mp-weixin" : {
+        "appid" : "wxdf9daae309e2a840",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
     "mp-alipay" : {
         "usingComponents" : true
     },
diff --git a/pages/performance/index1.vue b/pages/performance/index1.vue
index 4ea9ff4..10256bb 100644
--- a/pages/performance/index1.vue
+++ b/pages/performance/index1.vue
@@ -132,7 +132,7 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="this.localMintype.length !== 0">
+		<view>
 			<view class="per-title">
 				<!-- <view :class="chooseIndex === true? 'personal-choose':'personal'" @click="changePerIndex">个人绩效</view> -->
 				<view class="tissue-choose">组织绩效</view>
@@ -229,7 +229,7 @@
 
 <script>
 	import {
-		// getChartData,
+		getChartData,
 		// getStandardScore,
 		getRiskLevel,
 		getClassActive,
@@ -515,26 +515,26 @@
 			
 			const startTime = uni.$u.timeFormat(new Date(y, m, d), 'yyyy-mm-dd')
 			const endTime = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd')
-			// let json = initFilter(orgId, User.NAME, "", "", "", startTime, endTime);
-			// const res = await getChartData(json)
-			// if (res.IsSuccessful) {
-			// 	this.chartData = res.Data
-			// 	const preLineChartData = (res.Data?.groupDataLine || []).splice(-6, 6)
-			// 	const lineChartConfig = {
-			// 		categories: preLineChartData.map(i => i.MONTHStr.split('年')[1]),
-			// 		series: [{
-			// 				name: "完成率",
-			// 				data: preLineChartData.map(i => i.FINISH_RATE)
-			// 			},
-			// 			{
-			// 				name: "及时完成率",
-			// 				data: preLineChartData.map(i => i.NORMAL_FINISH_RATE)
-			// 			}
-			// 		]
-			// 	}
-			// 	this.lineChartData = JSON.parse(JSON.stringify(lineChartConfig));
-			// 	this.tableData = res.Data?.groupData || []
-			// }
+			let json = initFilter(orgId, User.NAME, "", "", "", startTime, endTime);
+			const res = await getChartData(json)
+			if (res.IsSuccessful) {
+				this.chartData = res.Data
+				const preLineChartData = (res.Data?.groupDataLine || []).splice(-6, 6)
+				const lineChartConfig = {
+					categories: preLineChartData.map(i => i.MONTHStr.split('年')[1]),
+					series: [{
+							name: "完成率",
+							data: preLineChartData.map(i => i.FINISH_RATE)
+						},
+						{
+							name: "及时完成率",
+							data: preLineChartData.map(i => i.NORMAL_FINISH_RATE)
+						}
+					]
+				}
+				this.lineChartData = JSON.parse(JSON.stringify(lineChartConfig));
+				this.tableData = res.Data?.groupData || []
+			}
 			// this.getStandard()
 			this.getRiskLevel()
 			// this.getClassActive()
@@ -741,7 +741,7 @@
 				const orgId = uni.getStorageSync('orgId')
 				let json = initFilter(
 					orgId,
-					'30',
+					'',
 					"NUM",
 				);
 				const res = await getDangerTotal(json)
diff --git a/services/app.js b/services/app.js
index f67d72e..5201054 100644
--- a/services/app.js
+++ b/services/app.js
@@ -8,7 +8,7 @@ export function toLogin(params) {
       uni.setStorageSync('accessToken', access_token)
       uni.setStorageSync('refreshToken', refreshToken)
       uni.setStorageSync('orgId', orgId)
-      uni.setStorageSync('Tenant', Tenant)
+      uni.setStorageSync('Tenant', '01')
       request.post('/PF/Login/Login', {
         Parameter1: username,
         Parameter2: password,
diff --git a/static/40—40.png b/static/40—40.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4881ed0b4f2f6fbb05e9d2f7eca17b1cf9c773f
GIT binary patch
literal 2304
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
aWB&o?P}l+cY65!z0000<MNUMnLSTX;++~IU

literal 0
HcmV?d00001

diff --git a/static/logo_40_40.png b/static/logo_40_40.png
index b4881ed0b4f2f6fbb05e9d2f7eca17b1cf9c773f..21fa670582c930d50402dd7acd1ab17516eadd59 100644
GIT binary patch
delta 3071
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
N002ovPDHLkV1g7~?{xqG

delta 2285
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
Hu0mjf3(RQM

diff --git a/utils/request.js b/utils/request.js
index 391cefa..3619114 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -12,7 +12,7 @@ export default {
 		// const user = uni.getStorageSync('loginUserVerify')
 		// const RootOrgId = uni.getStorageSync('RootOrgId')
 		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 userName = appInfoData?.User?.NAME || ''
 		const orgId = appInfoData?.User?.ORG_ID || ''