yanghao 1 неделя назад
Родитель
Сommit
81d9e94ac4

+ 9 - 0
api/ruiYingReport.js

@@ -0,0 +1,9 @@
+import { request } from "@/utils/request";
+
+export const getRyProductionBriefs = (params) => {
+  return request({
+    url: "/pms/iot-ry-daily-report/productionBriefs",
+    method: "get",
+    params,
+  });
+};

+ 1 - 0
locale/en.json

@@ -141,6 +141,7 @@
 	"operationRecordFilling.fillContentCannotGreaterThanThreshold": "Filled content cannot be greater than",
 	"ruiDuReport.selectTitle": "Select RuiDu report",
 	"ruiHengReport.selectTitle": "Select RuiHeng report",
+	"ruiYingReport.selectTitle": "Select RuiYing report",
 	"ruiDuReport.dailyDetail": "Daily detail",
 	"ruiDuReport.dailyTeamStatistic": "Daily single-team statistics",
 	"ruiDuReport.filterAction": "Filter",

+ 1 - 0
locale/ja.json

@@ -141,6 +141,7 @@
 	"operationRecordFilling.fillContentCannotGreaterThanThreshold": "入力内容は次の値を超えることができません",
 	"ruiDuReport.selectTitle": "瑞都レポートを選択",
 	"ruiHengReport.selectTitle": "瑞恒レポートを選択",
+	"ruiYingReport.selectTitle": "瑞鹰レポートを選択",
 	"ruiDuReport.dailyDetail": "日報詳細",
 	"ruiDuReport.dailyTeamStatistic": "日報単一チーム統計",
 	"ruiDuReport.filterAction": "絞り込み",

+ 1 - 0
locale/ru.json

@@ -141,6 +141,7 @@
 	"operationRecordFilling.fillContentCannotGreaterThanThreshold": "Заполненное содержимое не может превышать",
 	"ruiDuReport.selectTitle": "Выберите отчет RuiDu",
 	"ruiHengReport.selectTitle": "Выберите отчет RuiHeng",
+	"ruiYingReport.selectTitle": "Выберите отчет RuiYing",
 	"ruiDuReport.dailyDetail": "Детали ежедневного отчета",
 	"ruiDuReport.dailyTeamStatistic": "Статистика ежедневного отчета по бригаде",
 	"ruiDuReport.filterAction": "Фильтр",

+ 2 - 0
locale/zh-Hans.json

@@ -129,6 +129,7 @@
   "home.dailyReportRuiDuTip": "填写日报",
   "home.ruiDuReport": "瑞都报表",
   "home.ruiHengReport": "瑞恒报表",
+  "home.ruiYingReport": "瑞鹰报表",
   "home.ruiDuReportTip": "查看日报报表",
   "home.dailyReportRuiHen": "瑞恒日报",
   "home.dailyReportRuiHenTip": "填写日报",
@@ -190,6 +191,7 @@
   // --------------------------------------- 瑞都报表 ----------------------------------------
   "ruiDuReport.selectTitle": "选择瑞都报表",
   "ruiHengReport.selectTitle": "选择瑞恒报表",
+  "ruiYingReport.selectTitle": "选择瑞鹰报表",
   "ruiDuReport.dailyDetail": "日报详情",
   "ruiDuReport.dailyTeamStatistic": "日报单井队统计",
   "ruiDuReport.filterAction": "筛选",

+ 2 - 0
locale/zh-Hant.json

@@ -85,6 +85,7 @@
   "home.fillAndReportFaultWorkOrder": "故障工单的填报及上报故障问题",
   "home.ruiDuReport": "瑞都报表",
   "home.ruiHengReport": "瑞恒报表",
+   "home.ruiYingReport": "瑞鹰报表",
   "home.ruiDuReportTip": "查看日报报表",
   "home.inventoryQuery": "库存查询",
   "home.clickToQueryInventoryData": "点击查询库存数据",
@@ -126,6 +127,7 @@
   "operationRecordFilling.totalRunningTime": "累计运行时间",
   "ruiDuReport.selectTitle": "选择瑞都报表",
   "ruiHengReport.selectTitle": "选择瑞恒报表",
+  "ruiYingReport.selectTitle": "选择瑞鹰报表",
   "ruiDuReport.dailyDetail": "日报详情",
   "ruiDuReport.dailyTeamStatistic": "日报单井队统计",
   "ruiDuReport.filterAction": "筛选",

+ 7 - 0
pages.json

@@ -338,6 +338,13 @@
 				"navigationBarTitleText": "%ruiDuReport.dailyDetail%"
 			}
 		},
+		{
+			// 瑞鹰报表-日报详情
+			"path": "pages/ruiYingReport/index",
+			"style": {
+				"navigationBarTitleText": "%ruiDuReport.dailyDetail%"
+			}
+		},
 		{
 			// 库存查询
 			"path": "pages/inventory/index",

+ 56 - 1
pages/home/index.vue

@@ -183,6 +183,24 @@
             <uni-icons type="right" :color="'#CACCCF'" size="15" />
           </view>
         </view>
+        <!-- 瑞英报表 -->
+        <view
+          class="card-cell flex-row align-center justify-between"
+          @click="openRuiYingReportPopup"
+        >
+          <image src="/static/home/ruiying.png" mode="aspectFill"></image>
+          <view class="cell-con flex-row align-center justify-between">
+            <view class="cell-text flex-row align-center justify-start">
+              <view class="title">
+                {{ $t("home.ruiYingReport") }}
+              </view>
+              <view class="subtitle">
+                {{ $t("home.ruiDuReportTip") }}
+              </view>
+            </view>
+            <uni-icons type="right" :color="'#CACCCF'" size="15" />
+          </view>
+        </view>
         <view
           class="card-cell flex-row align-center justify-between"
           @click="navigatorTo('/pages/ruihen-task/index')"
@@ -495,6 +513,30 @@
         </view>
       </view>
     </uni-popup>
+
+    <!-- 瑞鹰 -->
+    <uni-popup
+      ref="ruiYingReportPopup"
+      type="bottom"
+      background-color="#fff"
+      border-radius="10px 10px 0 0"
+    >
+      <view class="report-popup">
+        <view class="report-popup-header">
+          {{ $t("ruiYingReport.selectTitle") }}
+        </view>
+        <view
+          class="report-popup-item"
+          @click="navigateToRuiYingReport('/pages/ruiYingReport/index')"
+        >
+          {{ $t("ruiDuReport.dailyDetail") }}
+        </view>
+
+        <view class="report-popup-cancel" @click="closeRuiYingReportPopup">
+          {{ $t("operation.cancel") }}
+        </view>
+      </view>
+    </uni-popup>
   </view>
 </template>
 
@@ -533,6 +575,14 @@ const closeRuiHengReportPopup = () => {
   ruiHengReportPopup.value?.close();
 };
 
+// 瑞鹰
+const ruiYingReportPopup = ref(null);
+const openRuiYingReportPopup = () => {
+  ruiYingReportPopup.value?.open();
+};
+const closeRuiYingReportPopup = () => {
+  ruiYingReportPopup.value?.close();
+};
 const navigateToRuiDuReport = (url) => {
   closeRuiDuReportPopup();
   uni.navigateTo({ url });
@@ -543,6 +593,11 @@ const navigateToRuiHengReport = (url) => {
   uni.navigateTo({ url });
 };
 
+const navigateToRuiYingReport = (url) => {
+  closeRuiYingReportPopup();
+  uni.navigateTo({ url });
+};
+
 const messageCount = ref(0);
 onMounted(async () => {
   await Promise.all([
@@ -647,7 +702,7 @@ onShow(async () => {
 <style lang="scss" scoped>
 .home {
   width: 100%;
-  height: 100%;
+  height: 100vh;
   position: relative;
   box-sizing: border-box;
   overflow: hidden;

+ 10 - 0
pages/ruiYingReport/index.vue

@@ -0,0 +1,10 @@
+<template>
+  <view> aaaaa </view>
+</template>
+
+<script setup>
+import { computed, ref } from "vue";
+import { onMounted } from "vue";
+import dayjs from "dayjs";
+import { getRyProductionBriefs } from "@/api/ruiYingReport"; // 列表接口
+</script>

BIN
static/home/ruiying.png