Merge remote-tracking branch 'remotes/origin/hxh' into dev

# Conflicts:
#	src/main.js
#	src/router/index.js
#	src/views/home/navMenu.vue
#	vue.config.js

src/common/api/production/assistantManage.js

+import axios from '../axios'
+
+export function erpProductionAssistantManage(data) {
+  return axios.post('/erpAppManage/uploadToLocal', data, {
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+export function erpProductionAssistantManageListPage(data) {
+  return axios.post('/erpAppManage/list_page', data)
+}
+
+export function deleteErpProductionAssistantManage(data) {
+  return axios.get('/erpAppManage/delete?ids=' + data)
+}

src/common/components/element-ui.js

@@ -38,6 +38,7 @@ import {
   CheckboxGroup,
   CheckboxGroup,
   Divider,
   Divider,
   Popover,
   Popover,
+  Upload
 } from 'element-ui'
 } from 'element-ui'
 
 
 const components = [
 const components = [
@@ -75,6 +76,7 @@ const components = [
   ColorPicker,
   ColorPicker,
   CheckboxGroup,
   CheckboxGroup,
   Popover,
   Popover,
+  Upload
 ]
 ]
 
 
 export default {
 export default {

src/main.js

@@ -4,7 +4,6 @@ import router from './router'
 import store from './store'
 import store from './store'
 import './plugins/myui'
 import './plugins/myui'
 import element from '@/common/components/element-ui.js'
 import element from '@/common/components/element-ui.js'
-// import vxeTable from '@/common/components/vxeTable.js'
 import vxeTable from 'vxe-table'
 import vxeTable from 'vxe-table'
 import 'xe-utils'
 import 'xe-utils'
 import 'vxe-table/lib/index.css'
 import 'vxe-table/lib/index.css'

src/router/index.js

@@ -133,12 +133,19 @@ const routes = [
         meta: { title: '丢单管理' }
         meta: { title: '丢单管理' }
       },
       },
       {
       {
+
         path: '/operation/exceptionMessage',
         path: '/operation/exceptionMessage',
         component: () => import('@/views/operation/exceptionMessage.vue'),
         component: () => import('@/views/operation/exceptionMessage.vue'),
         name: 'exceptionMessage',
         name: 'exceptionMessage',
         meta: { title: '异常消息' }
         meta: { title: '异常消息' }
       },
       },
       {
       {
+        path: '/saas/production/assistant/manage',
+        component: () => import('@/views/production/AssistantManage.vue'),
+        name: 'production_assistant_manage',
+        meta: { title: '应用版本管理' }
+      },
+      {
         path: '/dynamicForm',
         path: '/dynamicForm',
         component: () => import('@/components/dynamicForms/index.vue'),
         component: () => import('@/components/dynamicForms/index.vue'),
         name: 'system_management',
         name: 'system_management',
@@ -147,7 +154,6 @@ const routes = [
     ]
     ]
   }
   }
 ]
 ]
-
 const router = new VueRouter({
 const router = new VueRouter({
   mode: 'history',
   mode: 'history',
   base: process.env.BASE_URL,
   base: process.env.BASE_URL,

src/views/home/navMenu.vue

@@ -122,6 +122,7 @@ import { mapGetters, mapState } from 'vuex'
 import { logout, resetPassword } from '@/common/api/login'
 import { logout, resetPassword } from '@/common/api/login'
 import { setToken, setUser } from '@/utils/auth'
 import { setToken, setUser } from '@/utils/auth'
 import { post } from '@/common/api/axios'
 import { post } from '@/common/api/axios'
+
 export default {
 export default {
   name: 'navMenu',
   name: 'navMenu',
   data() {
   data() {
@@ -262,7 +263,7 @@ export default {
               icon: 'el-icon-box',
               icon: 'el-icon-box',
               index: '/saas/sku-manage',
               index: '/saas/sku-manage',
               children: []
               children: []
-            },
+            }
             // {
             // {
             //   id: 11,
             //   id: 11,
             //   path: '',
             //   path: '',
@@ -303,7 +304,7 @@ export default {
               icon: 'el-icon-bank-card',
               icon: 'el-icon-bank-card',
               index: '',
               index: '',
               children: []
               children: []
-            },
+            }
           ]
           ]
         },
         },
         {
         {
@@ -314,6 +315,14 @@ export default {
           index: '/saas/app',
           index: '/saas/app',
           children: []
           children: []
         },
         },
+        {
+          id: 8,
+          path: '',
+          label: '应用版本管理',
+          icon: 'el-icon-suitcase-1',
+          index: '/saas/production/assistant/manage',
+          children: []
+        }
       ],
       ],
       dialogVisible: false,
       dialogVisible: false,
       oldPwd: '',
       oldPwd: '',
@@ -426,10 +435,12 @@ export default {
     .el-menu {
     .el-menu {
       border-bottom: none;
       border-bottom: none;
     }
     }
+
     .el-submenu__title i {
     .el-submenu__title i {
       color: #fff;
       color: #fff;
     }
     }
   }
   }
+
   i {
   i {
     color: #fff;
     color: #fff;
   }
   }
@@ -446,6 +457,7 @@ export default {
 .label {
 .label {
   font-size: 16px;
   font-size: 16px;
 }
 }
+
 .user-area {
 .user-area {
   float: right;
   float: right;
   display: flex;
   display: flex;
@@ -453,6 +465,7 @@ export default {
   flex-shrink: 0;
   flex-shrink: 0;
   padding-right: 16px;
   padding-right: 16px;
   color: #fff;
   color: #fff;
+
   .user-name {
   .user-name {
     margin-right: 10px;
     margin-right: 10px;
   }
   }

vue.config.js

@@ -6,10 +6,12 @@ module.exports = defineConfig({
     host: '',
     host: '',
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        target: 'http://10.168.31.142:8070',
-        changeOrigin: true
-        // 路径重写规则，这里将 /api 开头的请求路径替换为空字符串，即去掉 /api 前缀
-      }
-    }
-  }
+        target: 'http://10.168.31.188:8096',
+        changeOrigin: true,
+        // pathRewrite: {
+        //   '^/api': '',
+        // },
+      },
+    },
+  },
 })
 })