vbea 3 жил өмнө
parent
commit
581b302468

+ 3 - 0
Strides-APP/ios/Podfile

@@ -65,6 +65,9 @@ target 'JuicePlus' do
   post_install do |installer|
     react_native_post_install(installer)
     fix_library_search_paths(installer)
+	installer.pods_project.build_configurations.each do |config|
+      config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
+    ends
   end
 end
 

+ 1 - 1
Strides-APP/package.json

@@ -52,7 +52,7 @@
     "react-native-maps": "^0.28.0",
     "react-native-modal": "^13.0.1",
     "react-native-modal-datetime-picker": "^13.1.2",
-    "react-native-permissions": "^3.0.1",
+    "react-native-permissions": "3.0.1",
     "react-native-progress": "^4.1.2",
     "react-native-push-notification": "^7.3.1",
     "react-native-qrcode-scanner": "^1.5.4",

+ 4 - 5
Strides-Admin/src/views/ocpp/OCPPOperations.vue

@@ -3,10 +3,10 @@
     <div class="card-content">
       <div class="ocpp-content">
         <div class="section-title">Selected Stations</div>
-        <div class="flex-item">
-          <span style="padding-right: 15px;">Site: </span>
+        <div class="flexc">
+          <span style="width: 200px;">Site: </span>
           <el-select
-            class="flex1"
+            class="flex-item"
             filterable
             remote
             v-model="listQuery.pageVo.sitePk"
@@ -20,9 +20,8 @@
               :label="item.siteName"
               :value="item.sitePk"/>
           </el-select>
-          <span class="flex1"></span>
         </div>
-        <div class="flex-item" style="padding: 20px 0; justify-content: flex-end;">
+        <div class="flexc" style="padding: 20px 0; justify-content: flex-end;">
           <el-button
             type="primary"
             @click="selectNone">