Merge branch 'dev' of http://192.168.18.88:8077/sznyb/daimp-front into dev

main/.env.development

@@ -3,8 +3,9 @@ VITE_PORT = 9000
 VITE_APP_NAME = 'daimp-front-main'
 VITE_APP_TITLE = '数字农业产业管理平台'
 VITE_APP_SUB_OS = '//localhost:9526/sub-operation-service/'
-VITE_APP_SUB_ADMIN = '//localhost:9527/sub-admin/'
+VITE_APP_SUB_OA = '//localhost:9527/sub-operation-admin/'
 VITE_APP_SUB_GAS = '//localhost:9528/sub-government-affairs-service/'
+VITE_APP_SUB_GAA = '//localhost:9525/sub-government-affairs-admin/'
 VITE_APP_SUB_GSS = '//localhost:9529/sub-government-screen-service/'
 # 接口
 VITE_APP_BASE_API = '/apis' 

main/.env.production

@@ -2,8 +2,9 @@
 VITE_APP_NAME = 'daimp-front-main'
 VITE_APP_TITLE = '数字农业产业管理平台'
 VITE_APP_SUB_OS = '//192.168.18.99:88/sub-operation-service/'
-VITE_APP_SUB_ADMIN = '//192.168.18.99:88/sub-admin/'
+VITE_APP_SUB_OA = '//192.168.18.99:88/sub-operation-admin/'
 VITE_APP_SUB_GAS = '//192.168.18.99:88/sub-government-affairs-service/'
+VITE_APP_SUB_GAA = '//192.168.18.99:88/sub-government-affairs-admin/'
 VITE_APP_SUB_GSS = '//192.168.18.99:88/sub-government-screen-service/'
 # 接口
 VITE_APP_BASE_API = '/apis' 

main/.env.test

@@ -1,10 +1,11 @@
-# 开发环境
+# 测试环境
 VITE_APP_NAME = 'daimp-front-main'
 VITE_APP_TITLE = '数字农业产业管理平台'
-VITE_APP_SUB_OS = '//localhost:8090/sub-operation-service/'
-VITE_APP_SUB_ADMIN = '//localhost:8090/sub-admin/'
-VITE_APP_SUB_GAS = '//localhost:8090/sub-government-affairs-service/'
-VITE_APP_SUB_GSS = '//localhost:8090/sub-government-screen-service/'
+VITE_APP_SUB_OS = '//192.168.18.99:88/sub-operation-service/'
+VITE_APP_SUB_OA = '//192.168.18.99:88/sub-operation-admin/'
+VITE_APP_SUB_GAS = '//192.168.18.99:88/sub-government-affairs-service/'
+VITE_APP_SUB_GAA = '//192.168.18.99:88/sub-government-affairs-admin/'
+VITE_APP_SUB_GSS = '//192.168.18.99:88/sub-government-screen-service/'
 # 接口
 VITE_APP_BASE_API = '/apis'
 VITE_APP_BASE_URL = ''

main/package.json

@@ -7,6 +7,7 @@
     "dev": "vite --mode development",
     "build": "vite build --mode production",
     "test": "vite build --mode test",
+    "local": "vite build --mode local",
     "preview": "vite preview",
     "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'",
     "eslint": "npx eslint --init",

sub-government-affairs-service/package.json

@@ -7,6 +7,7 @@
     "dev": "vite --mode development",
     "build": "vite build --mode production",
     "test": "vite build --mode test",
+    "local": "vite build --mode local",
     "preview": "vite preview",
     "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'",
     "eslint": "npx eslint --init",

sub-government-affairs-service/src/apis/plan.js

@@ -1,61 +0,0 @@
-import request from '@/utils/axios';
-
-/**
- * @Title: 列表
- */
-export function GetEntityList(params = {}) {
-  return request('/land-resource/annualManage/page', {
-    method: 'GET',
-    params,
-  });
-}
-
-/**
- * @Title: 新增
- */
-export function AddEntity(data = {}) {
-  return request('/land-resource/annualManage/save', {
-    method: 'POST',
-    data,
-  });
-}
-
-/**
- * @Title: 修改
- */
-export function UpdateEntity(data = {}) {
-  return request('/land-resource/annualManage/edit', {
-    method: 'PUT',
-    data,
-  });
-}
-
-/**
- * @Title: 审核
- */
-export function AuditEntity(data = {}) {
-  return request('/land-resource/annualManage/exam', {
-    method: 'PUT',
-    data,
-  });
-}
-
-/**
- * @Title: 删除
- */
-export function DeleteEntity(params = {}) {
-  return request(`/land-resource/annualManage/delete/${params.id}`, {
-    method: 'DELETE',
-  });
-}
-
-/**
- * @Title: 导出
- */
-export function ExportEntity(params = {}) {
-  return request('/land-resource/annualManage/export', {
-    method: 'GET',
-    params,
-    responseType: 'blob',
-  });
-}

sub-government-affairs-service/src/apis/user.js

@@ -1,53 +0,0 @@
-import request from '@/utils/axios';
-
-/**
- * @Title: 列表
- */
-export function GetEntityList(data, params) {
-  return request('/store/user/query-user', {
-    method: 'POST',
-    data: data,
-    params: params,
-  });
-}
-
-/**
- * @Title: 新增
- */
-export function AddEntity(data, params = {}) {
-  return request('/store/user/add-user', {
-    method: 'POST',
-    data: data,
-    params: params,
-  });
-}
-
-/**
- * @Title: 修改
- */
-export function UpdateEntity(data, params = {}) {
-  return request('/store/user/update-user', {
-    method: 'PUT',
-    data: data,
-    params: params,
-  });
-}
-
-/**
- * @Title: 删除
- */
-export function DeleteEntity(data, params) {
-  return request('/store/user/del-user', {
-    method: 'DELETE',
-    data: data,
-    params: params,
-  });
-}
-
-export function UploadAvatar(data, params) {
-  return request('/store/self/generate-avatar-pic-upload-url', {
-    method: 'POST',
-    data: data,
-    params: params,
-  });
-}

sub-government-affairs-service/src/views/resource/grid/index.vue

@@ -35,7 +35,7 @@ import { CRUD_OPTIONS } from '@/config';
 import { isEmpty, downloadFile } from '@/utils';
 import { useUserStore } from '@/store/modules/user';
 import { compact } from 'lodash';
-import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ExportEntity } from '@/apis/grid';
+import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ExportEntity } from '@/apis/resource/grid';
 
 const { VITE_APP_BASE_API } = import.meta.env;
 const app = useApp();

sub-government-affairs-service/src/views/resource/statisticAnalysis/land/index.vue

@@ -26,7 +26,7 @@
 <script setup>
 import { reactive } from 'vue';
 import { useApp } from '@/hooks';
-import { GetCropData, GetLandData } from '@/apis/statisticAnalysis';
+import { GetCropData, GetLandData } from '@/apis/resource/statisticAnalysis';
 
 const app = useApp();
 const state = reactive({

sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue

@@ -63,7 +63,7 @@ import { isEmpty, imageToBase64, getAssetsFile, downloadFile } from '@/utils';
 import { useUserStore } from '@/store/modules/user';
 import { CommonUpload } from '@/apis';
 import { compact } from 'lodash';
-import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ImportEntity, ExportEntity } from '@/apis/coding';
+import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ImportEntity, ExportEntity } from '@/apis/trace/coding';
 import CustomInfo from './info.vue';
 import CustomQualityAdd from '../quality/form.vue';
 

sub-government-affairs-service/src/views/trace/agricultural/coding/info.vue

@@ -23,7 +23,7 @@ import { reactive, ref, watch } from 'vue';
 import { useApp } from '@/hooks';
 import { CRUD_VIEW_OPTIONS } from '@/config';
 import { downloadFile } from '@/utils';
-import { GetEntity } from '@/apis/coding';
+import { GetEntity } from '@/apis/trace/coding';
 
 const props = defineProps({
   row: {

sub-government-affairs-service/src/views/trace/agricultural/quality/form.vue

@@ -26,7 +26,7 @@ import { reactive, ref, watch } from 'vue';
 import { isEmpty, imageToBase64, setUploadField } from '@/utils';
 import { useApp } from '@/hooks';
 import { CommonUpload } from '@/apis';
-import { AddEntity } from '@/apis/quality';
+import { AddEntity } from '@/apis/trace/quality';
 
 const props = defineProps({
   row: {

sub-government-affairs-service/src/views/trace/agricultural/quality/index.vue

@@ -59,7 +59,7 @@ import { useApp } from '@/hooks';
 import { CRUD_OPTIONS } from '@/config';
 import { isEmpty, imageToBase64, setUploadField, downloadFile } from '@/utils';
 import { CommonUpload } from '@/apis';
-import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity } from '@/apis/quality';
+import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity } from '@/apis/trace/quality';
 
 const app = useApp();
 const crudRef = ref(null);

sub-government-affairs-service/src/views/trace/search/info.vue

@@ -103,7 +103,7 @@ import { useRouter, useRoute } from 'vue-router';
 import { useApp } from '@/hooks';
 import { CRUD_VIEW_OPTIONS } from '@/config';
 import { isEmpty } from '@/utils';
-import { GetTraceDetail } from '@/apis/coding';
+import { GetTraceDetail } from '@/apis/trace/coding';
 
 const { VITE_APP_NAME } = import.meta.env;
 const router = useRouter();

sub-government-screen-service/.env.production

@@ -1,5 +1,4 @@
 # 生产环境
-VITE_MODE = 'PRO'
 VITE_APP_MIAN = 'daimp-front-main'
 VITE_APP_MIAN_URL = 'http://192.168.18.99:88'
 VITE_APP_NAME = 'sub-government-screen-service'

sub-government-screen-service/package.json

@@ -7,6 +7,7 @@
     "dev": "vite --mode development",
     "build": "vite build --mode production",
     "test": "vite build --mode test",
+    "local": "vite build --mode local",
     "preview": "vite preview",
     "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'",
     "eslint": "npx eslint --init",

sub-operation-service/.env.production

@@ -1,5 +1,4 @@
 # 生产环境
-VITE_MODE = 'PRO'
 VITE_APP_MIAN = 'daimp-front-main'
 VITE_APP_MIAN_URL = 'http://192.168.18.99:88'
 VITE_APP_NAME = 'sub-operation-service'
@@ -8,4 +7,3 @@ VITE_APP_BASE_API = '/apis'
 VITE_APP_BASE_URL = ''
 VITE_APP_UPLOAD_API = '/uploadApis'
 VITE_APP_UPLOAD_URL = ''
-

sub-operation-service/package.json

@@ -1,13 +1,13 @@
 {
-  "name": "sub-admin",
+  "name": "sub-operation-service",
   "private": true,
   "version": "0.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite --mode development",
     "build": "vite build --mode production",
-    "build:dev": "vite build --mode dev",
-    "build:qa": "vite build --mode qa",
+    "test": "vite build --mode test",
+    "local": "vite build --mode local",
     "preview": "vite preview",
     "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'",
     "eslint": "npx eslint --init",

sub-operation-service/src/router/index.js

@@ -3,17 +3,12 @@
  * @Author: zenghua.wang
  * @Date: 2023-06-20 11:48:41
  * @LastEditors: zenghua.wang
- * @LastEditTime: 2025-01-25 10:20:40
+ * @LastEditTime: 2025-04-07 17:24:45
  */
 import { createRouter, createWebHistory } from 'vue-router';
-import { qiankunWindow } from 'vite-plugin-qiankun/dist/helper';
 import Layout from '@/layouts/index.vue';
 import Views from '@/layouts/Views.vue';
 
-import demo from './modules/demo';
-
-const { VITE_APP_NAME } = import.meta.env;
-
 export const constantRoutes = [
   {
     path: '/sub-operation-service/404',

sub-operation-service/src/router/modules/demo.js

@@ -1,19 +0,0 @@
-import Layout from '@/layouts/index.vue';
-
-export default [
-  // {
-  //   path: '/demo',
-  //   name: 'demo',
-  //   component: Layout,
-  //   redirect: '/demo-table',
-  //   meta: { title: '案例管理', icon: 'icon-test' },
-  //   children: [
-  //     {
-  //       path: '/demo-table',
-  //       component: () => import('@/views/demo/table.vue'),
-  //       name: 'table',
-  //       meta: { title: '列表', icon: 'Document' },
-  //     },
-  //   ],
-  // },
-];