Quellcode durchsuchen

🦄 refactor(瑞恒日报): 取消瑞恒日报检查时间

Zimo vor 1 Woche
Ursprung
Commit
ac45722ad3
2 geänderte Dateien mit 25 neuen und 27 gelöschten Zeilen
  1. 12 12
      config/env.prod.js
  2. 13 15
      pages/ruihen/components/form.vue

+ 12 - 12
config/env.prod.js

@@ -1,14 +1,14 @@
 // 生产环境配置
 export default {
-	// apiUrl: 'http://192.168.1.63:8888',
-	// apiUrl: 'https://iot.deepoil.cc', //测试
-	apiUrl: 'https://aims.deepoil.cc', //正式
-	apiUrlSuffix: '/admin-api',
-	// 其他开发环境配置...
-	corpId: 'dingbe7f9a7e8cffa2bd35c2f4657eb6378f', //钉钉微应用 企业的CorpID - 正式环境
-	clientId: 'dingmr9ez0ecgbmscfeb', //钉钉微应用的Client ID - 正式环境(原企业内部应用的 AppKey。原第三方企业应用的 SuiteKey。)
-	AgentId: '3687646006', //钉钉微应用的AgentID - 正式环境
-	MiniAppId: '5000000006298501', //钉钉微应用的MiniAppID - 正式环境
-	AppKey: 'dingmr9ez0ecgbmscfeb', //钉钉微应用的AppKey - 正式环境
-	AppSecret: 'VhG_zMdTvIBwA_0Ef8FJ0foH3VYYo5T-kw0ukX_PBA8Ah1xl7AjDw5RVYCU0DTpe', //钉钉微应用的AppSecret - 正式环境
-};
+  // apiUrl: 'http://192.168.1.63:8888',
+  // apiUrl: 'https://iot.deepoil.cc', //测试
+  apiUrl: 'https://aims.deepoil.cc', //正式
+  apiUrlSuffix: '/admin-api',
+  // 其他开发环境配置...
+  corpId: 'dingbe7f9a7e8cffa2bd35c2f4657eb6378f', //钉钉微应用 企业的CorpID - 正式环境
+  clientId: 'dingmr9ez0ecgbmscfeb', //钉钉微应用的Client ID - 正式环境(原企业内部应用的 AppKey。原第三方企业应用的 SuiteKey。)
+  AgentId: '3687646006', //钉钉微应用的AgentID - 正式环境
+  MiniAppId: '5000000006298501', //钉钉微应用的MiniAppID - 正式环境
+  AppKey: 'dingmr9ez0ecgbmscfeb', //钉钉微应用的AppKey - 正式环境
+  AppSecret: 'VhG_zMdTvIBwA_0Ef8FJ0foH3VYYo5T-kw0ukX_PBA8Ah1xl7AjDw5RVYCU0DTpe', //钉钉微应用的AppSecret - 正式环境
+};

+ 13 - 15
pages/ruihen/components/form.vue

@@ -1,8 +1,8 @@
 <script setup>
   import { ref, computed, watch, nextTick, reactive } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
-import { getRuiHenReportDetail } from '@/api/ruihen';
-import { useDataDictStore } from '@/store/modules/dataDict';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { getRuiHenReportDetail } from '@/api/ruihen';
+  import { useDataDictStore } from '@/store/modules/dataDict';
 
   const props = defineProps({
     type: {
@@ -178,10 +178,10 @@ import { useDataDictStore } from '@/store/modules/dataDict';
       rules: [{ required: true, errorMessage: '请输入生产动态' }],
     },
 
-    // 时间字段应用复用规则
-    dailyInjectGasTime: timeRuleItem,
-    dailyInjectWaterTime: timeRuleItem,
-    nonProductionTime: timeRuleItem,
+    // // 时间字段应用复用规则
+    // dailyInjectGasTime: timeRuleItem,
+    // dailyInjectWaterTime: timeRuleItem,
+    // nonProductionTime: timeRuleItem,
 
     // nptReason: {
     //   rules: [{ validateFunction: validateNptReason }],
@@ -213,13 +213,13 @@ import { useDataDictStore } from '@/store/modules/dataDict';
         </view>
         <span class="right red"> >120% 红色预警 </span>
       </view>
-      <view class="item">
+      <!-- <view class="item">
         <view class="left">
           <span>时间平衡:</span>
           注气 + 注水 + 非生产 = 24H
         </view>
         <span class="right orange"> ≠24H 橙色预警 </span>
-      </view>
+      </view> -->
     </view>
     <view v-if="!type.includes('approval') && form.opinion" class="opinion">
       <span class="left">审批意见:</span>
@@ -261,27 +261,25 @@ import { useDataDictStore } from '@/store/modules/dataDict';
           :disabled="disabled('edit')"
           v-model="form.dailyWaterInjection" />
       </uni-forms-item>
-      <uni-forms-item label="当日注气时间(H)" name="dailyInjectGasTime" required>
+      <!-- :class="{ 'orange-text': sumTimes() !== 24 }" -->
+      <uni-forms-item label="当日注气时间(H)" name="dailyInjectGasTime">
         <uni-easyinput
           type="number"
           v-bind="defaultProps"
-          :class="{ 'orange-text': sumTimes() !== 24 }"
           :disabled="disabled('edit')"
           v-model="form.dailyInjectGasTime" />
       </uni-forms-item>
-      <uni-forms-item label="当日注水时间(H)" name="dailyInjectWaterTime" required>
+      <uni-forms-item label="当日注水时间(H)" name="dailyInjectWaterTime">
         <uni-easyinput
           type="number"
           v-bind="defaultProps"
-          :class="{ 'orange-text': sumTimes() !== 24 }"
           :disabled="disabled('edit')"
           v-model="form.dailyInjectWaterTime" />
       </uni-forms-item>
-      <uni-forms-item label="非生产时间(H)" name="nonProductionTime" required>
+      <uni-forms-item label="非生产时间(H)" name="nonProductionTime">
         <uni-easyinput
           type="number"
           v-bind="defaultProps"
-          :class="{ 'orange-text': sumTimes() !== 24 }"
           :disabled="disabled('edit')"
           v-model="form.nonProductionTime" />
       </uni-forms-item>