yanghao 1 månad sedan
förälder
incheckning
4c7811c90a
8 ändrade filer med 298 tillägg och 189 borttagningar
  1. 12 12
      config/env.dev.js
  2. 1 0
      locale/en.json
  3. 1 0
      locale/ja.json
  4. 1 0
      locale/ru.json
  5. 11 9
      locale/zh-Hans.json
  6. 11 9
      locale/zh-Hant.json
  7. 261 159
      pages/home/index.vue
  8. BIN
      static/home/rh.png

+ 12 - 12
config/env.dev.js

@@ -1,14 +1,14 @@
 // 开发环境配置
 export default {
-  // apiUrl: "http://192.168.188.198:48080",
-  apiUrl: "https://iot.deepoli.css:5443",
-  // 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.188.198:48080",
+	apiUrl: "https://iot.deepoil.cc:5443",
+	// 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 - 正式环境
+};

+ 1 - 0
locale/en.json

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

+ 1 - 0
locale/ja.json

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

+ 1 - 0
locale/ru.json

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

+ 11 - 9
locale/zh-Hans.json

@@ -128,6 +128,7 @@
   "home.dailyReportRuiDu": "瑞都日报",
   "home.dailyReportRuiDuTip": "填写日报",
   "home.ruiDuReport": "瑞都报表",
+  "home.ruiHengReport": "瑞恒报表",
   "home.ruiDuReportTip": "查看日报报表",
   "home.dailyReportRuiHen": "瑞恒日报",
   "home.dailyReportRuiHenTip": "填写日报",
@@ -188,17 +189,18 @@
   "operationRecordFilling.PleaseLoadAllItems": "请加载所有填报项后再提交",
   // --------------------------------------- 瑞都报表 ----------------------------------------
   "ruiDuReport.selectTitle": "选择瑞都报表",
+  "ruiHengReport.selectTitle": "选择瑞恒报表",
   "ruiDuReport.dailyDetail": "日报详情",
   "ruiDuReport.dailyTeamStatistic": "日报单井队统计",
-  "ruiDuReport.filterAction": "筛选",
-  "ruiDuReport.filterTitle": "筛选条件",
-  "ruiDuReport.searchKey": "查询条件",
-  "ruiDuReport.searchKeyPlaceholder": "请输入查询条件",
-  "ruiDuReport.project": "项目",
-  "ruiDuReport.projectPlaceholder": "请输入项目",
-  "ruiDuReport.task": "任务",
-  "ruiDuReport.taskPlaceholder": "请输入任务",
-  "ruiDuReport.dept": "部门",
+  "ruiDuReport.filterAction": "筛选",
+  "ruiDuReport.filterTitle": "筛选条件",
+  "ruiDuReport.searchKey": "查询条件",
+  "ruiDuReport.searchKeyPlaceholder": "请输入查询条件",
+  "ruiDuReport.project": "项目",
+  "ruiDuReport.projectPlaceholder": "请输入项目",
+  "ruiDuReport.task": "任务",
+  "ruiDuReport.taskPlaceholder": "请输入任务",
+  "ruiDuReport.dept": "部门",
   "ruiDuReport.constructionBrief": "施工简报",
   "ruiDuReport.createTime": "创建时间",
   // --------------------------------------- 保养查询 ----------------------------------------

+ 11 - 9
locale/zh-Hant.json

@@ -84,6 +84,7 @@
   "home.faultReporting": "故障上报",
   "home.fillAndReportFaultWorkOrder": "故障工单的填报及上报故障问题",
   "home.ruiDuReport": "瑞都报表",
+  "home.ruiHengReport": "瑞恒报表",
   "home.ruiDuReportTip": "查看日报报表",
   "home.inventoryQuery": "库存查询",
   "home.clickToQueryInventoryData": "点击查询库存数据",
@@ -124,17 +125,18 @@
   "operationRecordFilling.belongToTeam": "所属队伍",
   "operationRecordFilling.totalRunningTime": "累计运行时间",
   "ruiDuReport.selectTitle": "选择瑞都报表",
+  "ruiHengReport.selectTitle": "选择瑞恒报表",
   "ruiDuReport.dailyDetail": "日报详情",
   "ruiDuReport.dailyTeamStatistic": "日报单井队统计",
-  "ruiDuReport.filterAction": "筛选",
-  "ruiDuReport.filterTitle": "筛选条件",
-  "ruiDuReport.searchKey": "查询条件",
-  "ruiDuReport.searchKeyPlaceholder": "请输入查询条件",
-  "ruiDuReport.project": "项目",
-  "ruiDuReport.projectPlaceholder": "请输入项目",
-  "ruiDuReport.task": "任务",
-  "ruiDuReport.taskPlaceholder": "请输入任务",
-  "ruiDuReport.dept": "部门",
+  "ruiDuReport.filterAction": "筛选",
+  "ruiDuReport.filterTitle": "筛选条件",
+  "ruiDuReport.searchKey": "查询条件",
+  "ruiDuReport.searchKeyPlaceholder": "请输入查询条件",
+  "ruiDuReport.project": "项目",
+  "ruiDuReport.projectPlaceholder": "请输入项目",
+  "ruiDuReport.task": "任务",
+  "ruiDuReport.taskPlaceholder": "请输入任务",
+  "ruiDuReport.dept": "部门",
   "ruiDuReport.constructionBrief": "施工简报",
   "ruiDuReport.createTime": "创建时间",
   "maintenanceSearch.title": "保养查询",

+ 261 - 159
pages/home/index.vue

@@ -11,12 +11,14 @@
         </uni-col>
         <uni-col
           :span="6"
-          style="display: flex; justify-content: end; padding-right: 20px">
+          style="display: flex; justify-content: end; padding-right: 20px"
+        >
           <uni-badge absolute="rightTop" size="small" :text="messageCount">
             <image
               src="~@/static/home/message.png"
               style="width: 20px; height: 20px; background-color: transparent"
-              @click="navigatorTo('/pages/message/index')" />
+              @click="navigatorTo('/pages/message/index')"
+            />
           </uni-badge>
         </uni-col>
       </uni-row>
@@ -39,14 +41,17 @@
             :autoplay="true"
             :vertical="true"
             :interval="2000"
-            :duration="500">
+            :duration="500"
+          >
             <swiper-item
               class="flex-col justify-between"
               v-for="{ item1, item2 } in overtimeTaskList"
-              @click="navigatorTo('/pages/overtime/index')">
+              @click="navigatorTo('/pages/overtime/index')"
+            >
               <view
                 class="daiban flex-row align-center justify-around"
-                style="margin-top: 10px">
+                style="margin-top: 10px"
+              >
                 <view class="dt-status green">
                   <!-- 超时未保养 -->
                   {{ item1.status }}
@@ -63,7 +68,8 @@
               <view
                 v-if="item2"
                 class="daiban flex-row align-center justify-around"
-                style="margin-bottom: 10px">
+                style="margin-bottom: 10px"
+              >
                 <view class="dt-status green">
                   <!--  超时未保养  -->
                   {{ item2?.status }}
@@ -87,7 +93,8 @@
         <uni-col
           :span="12"
           class="yunxingjilu flex-col justify-between"
-          @click="navigatorTo('/pages/recordFilling/list')">
+          @click="navigatorTo('/pages/recordFilling/list')"
+        >
           <view class="half-title">
             {{ $t("home.operationRecordFilling") }}
           </view>
@@ -99,7 +106,8 @@
         <uni-col
           :span="12"
           class="baoyang flex-col justify-between"
-          @click="navigatorTo('/pages/maintenance/index')">
+          @click="navigatorTo('/pages/maintenance/index')"
+        >
           <view class="half-title">
             {{ $t("home.maintenanceWorkOrder") }}
           </view>
@@ -113,7 +121,8 @@
         <uni-col
           :span="12"
           class="shebeiweixiu flex-col justify-between"
-          @click="navigatorTo('/pages/repair/index')">
+          @click="navigatorTo('/pages/repair/index')"
+        >
           <view class="half-title">
             {{ $t("home.equipmentMaintenance") }}
           </view>
@@ -125,7 +134,8 @@
         <uni-col
           :span="12"
           class="xunjian flex-col justify-between"
-          @click="navigatorTo('/pages/inspection/index')">
+          @click="navigatorTo('/pages/inspection/index')"
+        >
           <view class="half-title">
             {{ $t("home.inspectionWorkOrder") }}
           </view>
@@ -138,7 +148,8 @@
         <!-- 故障上报 -->
         <uni-col
           class="guzhang flex-row align-center"
-          @click="navigatorTo('/pages/fault/index')">
+          @click="navigatorTo('/pages/fault/index')"
+        >
           <view class="half-title" style="margin-right: 10px">
             {{ $t("home.faultReporting") }}
           </view>
@@ -149,10 +160,11 @@
       </uni-row>
       <view class="card">
         <!-- 瑞都日报 -->
-        <view
-          class="card-cell flex-row align-center justify-between"
-          @click="navigatorTo('/pages/ruiDu/index')"
-          v-if="isShowRuiduDaily">
+        <view
+          class="card-cell flex-row align-center justify-between"
+          @click="navigatorTo('/pages/ruiDu/index')"
+          v-if="isShowRuiduDaily"
+        >
           <image src="/static/home/ribao.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -163,31 +175,53 @@
                 {{ $t("home.dailyReportRuiDuTip") }}
               </view>
             </view>
-            <uni-icons type="right" :color="'#CACCCF'" size="15" />
-          </view>
-        </view>
-        <!-- 瑞都报表 -->
-        <view
-          class="card-cell flex-row align-center justify-between"
-          @click="openRuiDuReportPopup"
-          v-if="rdReportStatisticsFlag">
-          <image src="/static/home/ribao.svg" 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.ruiDuReport") }}
-              </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')"
-          v-if="rhTaskFlag">
+            <uni-icons type="right" :color="'#CACCCF'" size="15" />
+          </view>
+        </view>
+        <!-- 瑞都报表 -->
+        <view
+          class="card-cell flex-row align-center justify-between"
+          @click="openRuiDuReportPopup"
+          v-if="rdReportStatisticsFlag"
+        >
+          <image src="/static/home/ribao.svg" 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.ruiDuReport") }}
+              </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="openRuiHengReportPopup"
+          v-if="rdReportStatisticsFlag"
+        >
+          <image src="/static/home/rh.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.ruiHengReport") }}
+              </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')"
+          v-if="rhTaskFlag"
+        >
           <image src="/static/home/ribao.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -204,7 +238,8 @@
         <view
           class="card-cell flex-row align-center justify-between"
           @click="navigatorTo('/pages/ruihen/index?type=edit')"
-          v-if="rhReportFlag">
+          v-if="rhReportFlag"
+        >
           <image src="/static/home/ribao.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -221,7 +256,8 @@
         <view
           class="card-cell flex-row align-center justify-between"
           @click="navigatorTo('/pages/ruihen/index?type=approval')"
-          v-if="rhReportApprovalFlag">
+          v-if="rhReportApprovalFlag"
+        >
           <image src="/static/home/ribao.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -238,7 +274,8 @@
         <view
           class="card-cell flex-row align-center justify-between"
           @click="navigatorTo('/pages/ruiying/index?type=edit')"
-          v-if="ryReportFlag">
+          v-if="ryReportFlag"
+        >
           <image src="/static/home/ribao.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -255,7 +292,8 @@
         <view
           class="card-cell flex-row align-center justify-between"
           @click="navigatorTo('/pages/ruiying/index?type=approval')"
-          v-if="ryReportApprovalFlag">
+          v-if="ryReportApprovalFlag"
+        >
           <image src="/static/home/ribao.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -272,7 +310,8 @@
         <view
           class="card-cell flex-row align-center justify-between"
           @click="navigatorTo('/pages/ruiyingx/index?type=edit')"
-          v-if="ryXjReportFlag">
+          v-if="ryXjReportFlag"
+        >
           <image src="/static/home/ribao.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -289,7 +328,8 @@
         <view
           class="card-cell flex-row align-center justify-between"
           @click="navigatorTo('/pages/ruiyingx/index?type=approval')"
-          v-if="ryXjReportApprovalFlag">
+          v-if="ryXjReportApprovalFlag"
+        >
           <image src="/static/home/ribao.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -303,11 +343,12 @@
             <uni-icons type="right" :color="'#CACCCF'" size="15" />
           </view>
         </view>
-        <!-- 库存查询 -->
-        <view
-          class="card-cell flex-row align-center justify-between"
-          @click="navigatorTo('/pages/inventory/index')">
-          <image src="/static/home/kucun.svg" mode="aspectFill"></image>
+        <!-- 库存查询 -->
+        <view
+          class="card-cell flex-row align-center justify-between"
+          @click="navigatorTo('/pages/inventory/index')"
+        >
+          <image src="/static/home/kucun.svg" 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">
@@ -317,30 +358,32 @@
                 {{ $t("home.clickToQueryInventoryData") }}
               </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/maintenance/search')">
-          <image src="/static/home/taizhang.svg" 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.maintenanceSearch") }}
-              </view>
-              <view class="subtitle">
-                {{ $t("home.maintenanceSearchTip") }}
-              </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/ledger/index')">
+            <uni-icons type="right" :color="'#CACCCF'" size="15" />
+          </view>
+        </view>
+        <!-- 保养查询 -->
+        <view
+          class="card-cell flex-row align-center justify-between"
+          @click="navigatorTo('/pages/maintenance/search')"
+        >
+          <image src="/static/home/taizhang.svg" 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.maintenanceSearch") }}
+              </view>
+              <view class="subtitle">
+                {{ $t("home.maintenanceSearchTip") }}
+              </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/ledger/index')"
+        >
           <image src="/static/home/taizhang.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -357,10 +400,12 @@
         <!-- 设备状态变更 -->
         <view
           class="card-cell flex-row align-center justify-between"
-          @click="navigatorTo('/pages/statusChange/index')">
+          @click="navigatorTo('/pages/statusChange/index')"
+        >
           <image
             src="/static/home/zhuangtaibiangeng.svg"
-            mode="aspectFill"></image>
+            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">
@@ -376,7 +421,8 @@
         <!-- 设备责任人 -->
         <view
           class="card-cell flex-row align-center justify-between"
-          @click="navigatorTo('/pages/deviceUser/index')">
+          @click="navigatorTo('/pages/deviceUser/index')"
+        >
           <image src="/static/home/deviceUser.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -393,7 +439,8 @@
         <!-- 设备实时数据监控 -->
         <view
           class="card-cell flex-row align-center justify-between"
-          @click="navigatorTo('/pages/realTimeData/index')">
+          @click="navigatorTo('/pages/realTimeData/index')"
+        >
           <image src="/static/home/shujujiankong.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -410,7 +457,8 @@
         <!-- 统计分析 -->
         <view
           class="card-cell flex-row align-center justify-between"
-          @click="navigatorTo('/pages/statistic/index')">
+          @click="navigatorTo('/pages/statistic/index')"
+        >
           <image src="/static/home/tongjifenxi.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -425,27 +473,71 @@
           </view>
         </view>
       </view>
-    </view>
-    <!-- 升级提示 -->
-    <upgrade />
-    <uni-popup ref="ruiDuReportPopup" type="bottom" background-color="#fff" border-radius="10px 10px 0 0">
-      <view class="report-popup">
-        <view class="report-popup-header">
-          {{ $t("ruiDuReport.selectTitle") }}
-        </view>
-        <view class="report-popup-item" @click="navigateToRuiDuReport('/pages/ruiDuReport/daily-detail')">
-          {{ $t("ruiDuReport.dailyDetail") }}
-        </view>
-        <view class="report-popup-item" @click="navigateToRuiDuReport('/pages/ruiDuReport/daily-team-statistic')">
-          {{ $t("ruiDuReport.dailyTeamStatistic") }}
-        </view>
-        <view class="report-popup-cancel" @click="closeRuiDuReportPopup">
-          {{ $t("operation.cancel") }}
-        </view>
-      </view>
-    </uni-popup>
-  </view>
-</template>
+    </view>
+    <!-- 升级提示 -->
+    <upgrade />
+    <uni-popup
+      ref="ruiDuReportPopup"
+      type="bottom"
+      background-color="#fff"
+      border-radius="10px 10px 0 0"
+    >
+      <view class="report-popup">
+        <view class="report-popup-header">
+          {{ $t("ruiDuReport.selectTitle") }}
+        </view>
+        <view
+          class="report-popup-item"
+          @click="navigateToRuiDuReport('/pages/ruiDuReport/daily-detail')"
+        >
+          {{ $t("ruiDuReport.dailyDetail") }}
+        </view>
+        <view
+          class="report-popup-item"
+          @click="
+            navigateToRuiDuReport('/pages/ruiDuReport/daily-team-statistic')
+          "
+        >
+          {{ $t("ruiDuReport.dailyTeamStatistic") }}
+        </view>
+        <view class="report-popup-cancel" @click="closeRuiDuReportPopup">
+          {{ $t("operation.cancel") }}
+        </view>
+      </view>
+    </uni-popup>
+
+    <!-- 瑞恒 -->
+    <uni-popup
+      ref="ruiHengReportPopup"
+      type="bottom"
+      background-color="#fff"
+      border-radius="10px 10px 0 0"
+    >
+      <view class="report-popup">
+        <view class="report-popup-header">
+          {{ $t("ruiHengReport.selectTitle") }}
+        </view>
+        <view
+          class="report-popup-item"
+          @click="navigateToRuiHengReport('/pages/ruiDuReport/daily-detail')"
+        >
+          {{ $t("ruiDuReport.dailyDetail") }}
+        </view>
+        <view
+          class="report-popup-item"
+          @click="
+            navigateToRuiHengReport('/pages/ruiDuReport/daily-team-statistic')
+          "
+        >
+          {{ $t("ruiDuReport.dailyTeamStatistic") }}
+        </view>
+        <view class="report-popup-cancel" @click="closeRuiHengReportPopup">
+          {{ $t("operation.cancel") }}
+        </view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
 
 <script setup>
 import { onShow } from "@dcloudio/uni-app";
@@ -459,23 +551,33 @@ import { useDeviceStore } from "@/store/modules/device";
 import { messageNavigate } from "@/utils/navigate";
 import Upgrade from "@/components/upgrade.vue";
 
-const navigatorTo = (url) => {
-  uni.navigateTo({
-    url: url,
-  });
-};
-
-const ruiDuReportPopup = ref(null);
-const openRuiDuReportPopup = () => {
-  ruiDuReportPopup.value?.open();
-};
-const closeRuiDuReportPopup = () => {
-  ruiDuReportPopup.value?.close();
-};
-const navigateToRuiDuReport = (url) => {
-  closeRuiDuReportPopup();
-  uni.navigateTo({ url });
-};
+const navigatorTo = (url) => {
+  uni.navigateTo({
+    url: url,
+  });
+};
+
+const ruiDuReportPopup = ref(null);
+const openRuiDuReportPopup = () => {
+  ruiDuReportPopup.value?.open();
+};
+const closeRuiDuReportPopup = () => {
+  ruiDuReportPopup.value?.close();
+};
+
+// 瑞恒
+const ruiHengReportPopup = ref(null);
+const openRuiHengReportPopup = () => {
+  ruiHengReportPopup.value?.open();
+};
+const closeRuiHengReportPopup = () => {
+  ruiHengReportPopup.value?.close();
+};
+
+const navigateToRuiDuReport = (url) => {
+  closeRuiDuReportPopup();
+  uni.navigateTo({ url });
+};
 
 const messageCount = ref(0);
 onMounted(async () => {
@@ -487,9 +589,9 @@ onMounted(async () => {
 });
 
 // 是否展示瑞都日报入口
-const isShowRuiduDaily = ref(false);
-const rdReportStatisticsFlag = ref(false);
-const rhReportFlag = ref(false);
+const isShowRuiduDaily = ref(false);
+const rdReportStatisticsFlag = ref(false);
+const rhReportFlag = ref(false);
 const rhTaskFlag = ref(false);
 const rhReportApprovalFlag = ref(false);
 const ryReportFlag = ref(false);
@@ -500,10 +602,10 @@ const userInfo = ref({});
 const getLoginUser = async () => {
   const response = await getLoginUserInfo();
   if (response.code === 0) {
-    userInfo.value = response.data;
-    isShowRuiduDaily.value = response.data.rdReportFlag;
-    rdReportStatisticsFlag.value = response.data.rdReportStatisticsFlag;
-    // isShowRuiduDaily.value = true;
+    userInfo.value = response.data;
+    isShowRuiduDaily.value = response.data.rdReportFlag;
+    rdReportStatisticsFlag.value = response.data.rdReportStatisticsFlag;
+    // isShowRuiduDaily.value = true;
     rhReportFlag.value = response.data.rhReportFlag;
     rhTaskFlag.value = response.data.rhReportFlag;
     // rhTaskFlag.value = true;
@@ -579,45 +681,45 @@ onShow(async () => {
 </script>
 
 <style lang="scss" scoped>
-.home {
+.home {
   width: 100%;
   height: 100%;
   position: relative;
   box-sizing: border-box;
   overflow: hidden;
-}
-
-.report-popup {
-  padding: 8px 16px calc(61px + env(safe-area-inset-bottom));
-  background: #fff;
-  box-sizing: border-box;
-}
-
-.report-popup-header {
-  height: 44px;
-  line-height: 44px;
-  text-align: center;
-  font-weight: 600;
-  font-size: 16px;
-  color: #333;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.report-popup-item,
-.report-popup-cancel {
-  height: 48px;
-  line-height: 48px;
-  text-align: center;
-  font-size: 15px;
-  color: #333;
-  border-bottom: 1px solid #f5f5f5;
-}
-
-.report-popup-cancel {
-  margin-top: 8px;
-  color: #666;
-  border-bottom: none;
-}
+}
+
+.report-popup {
+  padding: 8px 16px calc(61px + env(safe-area-inset-bottom));
+  background: #fff;
+  box-sizing: border-box;
+}
+
+.report-popup-header {
+  height: 44px;
+  line-height: 44px;
+  text-align: center;
+  font-weight: 600;
+  font-size: 16px;
+  color: #333;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.report-popup-item,
+.report-popup-cancel {
+  height: 48px;
+  line-height: 48px;
+  text-align: center;
+  font-size: 15px;
+  color: #333;
+  border-bottom: 1px solid #f5f5f5;
+}
+
+.report-popup-cancel {
+  margin-top: 8px;
+  color: #666;
+  border-bottom: none;
+}
 
 .row-full {
   width: 100%;

BIN
static/home/rh.png