From 3cfc9165058d2ea3e2edc3e4b247abfa2dbf843a Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Wed, 14 May 2025 17:10:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=9B=E5=85=A5=E5=AD=90?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=BB=91=E5=B1=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/.env.production     |  8 --------
 main/src/micro/app.js    | 10 ++++++++++
 main/src/views/index.vue |  1 -
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/main/.env.production b/main/.env.production
index 7ab9499..fe0fac2 100644
--- a/main/.env.production
+++ b/main/.env.production
@@ -1,20 +1,12 @@
 # 正式环境
 VITE_APP_NAME = 'daimp-front-main'
 VITE_APP_TITLE = '数字农业产业管理平台'
-<<<<<<< HEAD
 VITE_APP_SUB_OS = '//http://47.109.205.240:88/sub-operation-service/'
 VITE_APP_SUB_OA = '//http://47.109.205.240:88/sub-operation-admin/'
 VITE_APP_SUB_GAS = '//http://47.109.205.240:88/sub-government-affairs-service/'
 VITE_APP_SUB_GAA = '//http://47.109.205.240:88/sub-government-affairs-admin/'
 VITE_APP_SUB_GSS = '//http://47.109.205.240:88/sub-government-screen-service/'
 VITE_APP_SUB_GSR = '//http://47.109.205.240:88/new-digital-agriculture-screen/'
-=======
-VITE_APP_SUB_OS = '//47.109.205.240:80/sub-operation-service/'
-VITE_APP_SUB_OA = '//47.109.205.240:80/sub-operation-admin/'
-VITE_APP_SUB_GAS = '//47.109.205.240:80/sub-government-affairs-service/'
-VITE_APP_SUB_GAA = '//47.109.205.240:80/sub-government-admin/'
-VITE_APP_SUB_GSS = '//47.109.205.240:80/sub-government-screen-service/'
->>>>>>> dev
 # 接口
 VITE_APP_BASE_API = '/apis' 
 VITE_APP_BASE_URL = ''
diff --git a/main/src/micro/app.js b/main/src/micro/app.js
index 9918256..d8c045d 100644
--- a/main/src/micro/app.js
+++ b/main/src/micro/app.js
@@ -89,6 +89,16 @@ export const defaultApps = [
     title: '政务服务',
     icon: 'images/platform/icon-home.png',
   },
+  {
+    name: 'sub-government-screen-service',
+    // name: 'new-digital-agriculture-screen',
+    entry: VITE_APP_SUB_GSS,
+    // entry: VITE_APP_SUB_GSR,
+    activeRule: '/sub-government-screen-service',
+    // activeRule: '/new-digital-agriculture-screen',
+    title: '数据大屏',
+    icon: 'images/platform/icon-screen.png',
+  },
   {
     // name: 'sub-government-screen-service',
     name: 'new-digital-agriculture-screen',
diff --git a/main/src/views/index.vue b/main/src/views/index.vue
index 65ff74a..0a8688b 100644
--- a/main/src/views/index.vue
+++ b/main/src/views/index.vue
@@ -37,7 +37,6 @@ import { getAssetsFile } from '@/utils';
 const gotoPage = (row) => {
   console.log(row);
   console.log(window.history.pushState({}, row.name, row.activeRule));
-  debugger;
   window.history.pushState({}, row.name, row.activeRule);
 };
 </script>