Merge branch 'master' of http://175.27.169.173:10880/zkqy-sass-platform/mec-cloud_-intelligent-manufacturing_crm

zkqy-admin/src/main/resources/sql/initialize_sys_tenant_menu_i18n.json

@@ -1375,17 +1375,17 @@
     "updateBy": null,
     "updateTime": null,
     "remark": null,
-    "menuId": 4216,
-    "menuName": "生产管理",
+    "menuId": 11445,
+    "menuName": "电子表格",
     "parentName": null,
     "parentId": 0,
-    "orderNum": 2,
-    "path": "processMange",
-    "component": null,
+    "orderNum": 4,
+    "path": "excelSheet",
+    "component": "excelSheet/excel",
     "query": null,
     "isFrame": "1",
     "isCache": "0",
-    "menuType": "M",
+    "menuType": "C",
     "visible": "0",
     "status": "0",
     "perms": "",
@@ -1425,6 +1425,34 @@
     "tenantId": null,
     "menuNameEn": "Pending Approval"
   },
+  {
+    "createBy": null,
+    "createTime": "2023-10-11 01:28:10",
+    "updateBy": null,
+    "updateTime": null,
+    "remark": null,
+    "menuId": 4216,
+    "menuName": "生产管理",
+    "parentName": null,
+    "parentId": 0,
+    "orderNum": 2,
+    "path": "processMange",
+    "component": null,
+    "query": null,
+    "isFrame": "1",
+    "isCache": "0",
+    "menuType": "M",
+    "visible": "0",
+    "status": "0",
+    "perms": "",
+    "icon": "bpmn-icon-end-event-error",
+    "children": [
+
+    ],
+    "tenantName": null,
+    "tenantId": null,
+    "menuNameEn": "Production Management"
+  },
   {
     "createBy": null,
     "createTime": "2023-10-11 01:28:10",
@@ -1817,34 +1845,6 @@
     "tenantId": null,
     "menuNameEn": "Mobile Engine"
   },
-  {
-    "createBy": null,
-    "createTime": "2023-10-11 01:28:10",
-    "updateBy": null,
-    "updateTime": null,
-    "remark": null,
-    "menuId": 11444,
-    "menuName": "导航条配置",
-    "parentName": null,
-    "parentId": 9574,
-    "orderNum": 1,
-    "path": "navigationBar",
-    "component": "formCreate/layout/home/navigationBar",
-    "query": null,
-    "isFrame": "1",
-    "isCache": "0",
-    "menuType": "C",
-    "visible": "0",
-    "status": "0",
-    "perms": "",
-    "icon": "bpmn-icon-intermediate-event-catch-cancel",
-    "children": [
-
-    ],
-    "tenantName": null,
-    "tenantId": null,
-    "menuNameEn": "Navigation Bar Config"
-  },
   {
     "createBy": null,
     "createTime": "2023-10-11 01:28:10",
@@ -1957,6 +1957,62 @@
     "tenantId": null,
     "menuNameEn": "Tree Table"
   },
+  {
+    "createBy": null,
+    "createTime": "2025-03-08 15:22:00",
+    "updateBy": null,
+    "updateTime": null,
+    "remark": null,
+    "menuId": 15004,
+    "menuName": "电子表格",
+    "parentName": null,
+    "parentId": 1103,
+    "orderNum": 5,
+    "path": "excelSheet",
+    "component": "excelSheet/index",
+    "query": null,
+    "isFrame": "1",
+    "isCache": "0",
+    "menuType": "C",
+    "visible": "0",
+    "status": "0",
+    "perms": "",
+    "icon": "form",
+    "children": [
+
+    ],
+    "tenantName": null,
+    "tenantId": null,
+    "menuNameEn": "excel"
+  },
+  {
+    "createBy": null,
+    "createTime": "2025-03-08 15:22:00",
+    "updateBy": null,
+    "updateTime": null,
+    "remark": null,
+    "menuId": 15005,
+    "menuName": "电子表格编辑",
+    "parentName": null,
+    "parentId": 1103,
+    "orderNum": 5,
+    "path": "excelSheetEdit",
+    "component": "excelSheetEdit/index",
+    "query": null,
+    "isFrame": "1",
+    "isCache": "0",
+    "menuType": "C",
+    "visible": "1",
+    "status": "0",
+    "perms": "",
+    "icon": "form",
+    "children": [
+
+    ],
+    "tenantName": null,
+    "tenantId": null,
+    "menuNameEn": "excel edit"
+  },
   {
     "createBy": null,
     "createTime": "2025-03-08 15:22:01",
@@ -1985,4 +2041,5 @@
     "tenantId": null,
     "menuNameEn": "Tree Table Edit"
   }
+
 ]

zkqy-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -46,7 +46,7 @@
                ifnull(perms, '') as perms,
                icon,
                create_time
-        from sys_menu_default
+        from sys_menu
     </sql>
 
     <select id="selectMenuList" parameterType="com.zkqy.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">

zkqy-ui/src/api/formCreateMange/mobilePageDesignData.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import path from "path";
 
 // 查询新新页面设计列表 name
 export function listMobilePageDesignData(query) {
@@ -19,8 +20,8 @@ export function getMobilePageDesignData(id) {
   })
 }
 
-// 新增新新页面设计 
-export function addMobilePageDesignData(data) { 
+// 新增新新页面设计
+export function addMobilePageDesignData(data) {
   return request({
     url: '/system/mobilePageDesignData',
     method: 'post',
@@ -102,4 +103,22 @@ export function getListName(data) {
 //     parentIdField: "parent_id"
 //   }
 // }
-// this.getTreeApi({}, dataSource)
+// this.getTreeApi({}, dataSource)
+
+// 获取表里的所有字段：http://192.168.10.103:8088/dataSource/getInfoTable
+export function upload(data) {
+  return request({
+    url: '/system/mobilePageDesignData/upload',
+    method: 'post',
+    data: data,
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
+}
+export function download(path) {
+  return request({
+    url: '/system/mobilePageDesignData/download?path='+path,
+    method: 'get',
+    baseURL: process.env.VUE_APP_BASE_API3,
+    responseType: 'blob' // 关键！告诉axios接收二进制数据
+  })
+}

zkqy-ui/src/lang/en.js

@@ -679,6 +679,9 @@ export default {
     modify: 'Modify',
     delete: 'Delete',
     add: 'Add',
+    upload:'Upload',
+    download: 'Download',
+    htmlUrl:'Html Url',
     pleaseSelectDelete: 'Please select records to delete first',
     confirmDelete: 'Are you sure to delete number',
     pleaseEnterPageName: 'Please enter page name'

zkqy-ui/src/lang/zh.js

@@ -680,6 +680,9 @@ export default {
     modify: '修改',
     delete: '删除',
     add: '新增',
+    upload:'上传',
+    download:'下载',
+    htmlUrl:'页面访问路径',
     pleaseSelectDelete: '请先选择要删除的记录',
     confirmDelete: '是否确认删除编号为',
     pleaseEnterPageName: '请输入页面名称'

zkqy-ui/src/views/asEditor/layout/home/pageDesign.vue

@@ -322,7 +322,6 @@ export default {
           selectDataKey: [{ label: "", value: "" }],
         },
       },
-      clickTimer: null,
       isSingleClick: false, // 是否是单击
       clickTimer: null, // 存储定时器引用
       isEdit: false, //是否编辑