Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

main/.gitignore

@@ -23,3 +23,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+*.zip
+*.rar

main/src/micro/app.js

@@ -13,7 +13,7 @@ export const leftApps = [
   {
     name: 'sub-operation-admin',
     entry: VITE_APP_SUB_OA,
-    activeRule: '/sub-operation-admin',
+    activeRule: 'http://192.168.18.99:82/login?loginType=2',
     title: '管理后台',
     icon: 'images/platform/icon-admin.png',
   },
@@ -44,7 +44,7 @@ export const rightApps = [
   {
     name: 'sub-government-admin',
     entry: VITE_APP_SUB_GAS,
-    activeRule: '/sub-government-affairs-service',
+    activeRule: 'http://192.168.18.99:81/login?loginType=1',
     title: '管理后台',
     icon: 'images/platform/icon-admin.png',
   },

sub-operation-service/src/views/smartFarm/manageControl/growSeedlings.vue

@@ -80,14 +80,14 @@ const devices = ref([
 const leftTableData = ref([
   {
     name: '温度',
-    value: '>25',
+    value: '>25°C',
     device: '制冷机',
     behavior: '开启',
     time: 10,
   },
   {
     name: '湿度',
-    value: '<24',
+    value: '<24%',
     device: '喷洒机',
     behavior: '关闭',
     time: 15,

sub-operation-service/src/views/smartFarm/manageControl/pestPrevention.vue

@@ -80,14 +80,14 @@ const devices = ref([
 const leftTableData = ref([
   {
     name: '虫群数量',
-    value: '>20',
+    value: '>20只',
     device: '诱虫灯',
     behavior: '开启',
     time: 10,
   },
   {
     name: '诱捕数量',
-    value: '>30',
+    value: '>30只',
     device: '灭虫灯',
     behavior: '开启',
     time: 15,
@@ -101,14 +101,14 @@ const leftTableData = ref([
   },
   {
     name: '虫群数量',
-    value: '>20',
+    value: '>20只',
     device: '通风窗',
     behavior: '关闭',
     time: '/',
   },
   {
     name: '诱捕数量',
-    value: '>30',
+    value: '>30只',
     device: '幕布',
     behavior: '开启',
     time: '/',

sub-operation-service/src/views/userCenter/mySource.vue

@@ -205,7 +205,6 @@ const handleSelectionChange = (selection) => {
 let nowClickRow = ref(null);
 const dialogVisible = ref(false);
 let codeUrl = ref('');
-codeUrl.value = getAssetsFile('images/userCenter/检测报告.png').href ?? '';
 // 编辑操作
 const handleEdit = (row, num) => {
   nowClickRow.value = row;
@@ -223,7 +222,7 @@ const seeReportImg = (row) => {
   if (row.reportUrl) {
     // 支持相对路径处理
     // const imgUrl = row.reportUrl.startsWith('http') ? row.reportUrl : `${import.meta.env.VITE_API_BASE}${row.reportUrl}`;
-    const imgUrl = codeUrl.value;
+    const imgUrl = getAssetsFile('images/userCenter/检测报告.png').href ?? '';
 
     previewImageUrl.value = imgUrl;
     showPreview.value = true;