diff --git a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java
index 3fad3b03..c5506a9e 100644
--- a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java
+++ b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java
@@ -127,6 +127,8 @@ public class FileController {
// 发送删除请求
String requestUrl = String.format("http://g3oss.g3soft.cn:8082/delete?bucketName=%s&objectName=%s", bucketName, objectName);
+ System.out.println(requestUrl);
+
try {
HttpUtils.sendGet(requestUrl);
} catch (Exception e) {
diff --git a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/utils/jwt/JwtUtils.java b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/utils/jwt/JwtUtils.java
index 99d72212..9e0a8c5c 100644
--- a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/utils/jwt/JwtUtils.java
+++ b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/utils/jwt/JwtUtils.java
@@ -10,7 +10,7 @@ public class JwtUtils {
// 秘钥
private static final String SECRET_KEY = "G3_SECRET_KEY";
// 过期时间,1天。
- private static final Integer EXPIRE_TIME = 1;
+ private static final Integer EXPIRE_TIME = 7;
// 创建 Token
public static String createToken(JwtPayload jwtPayload) {
diff --git a/code/container-ocr/ocr-uniapp/env/.env b/code/container-ocr/ocr-uniapp/env/.env
index 99ec4505..802f200a 100644
--- a/code/container-ocr/ocr-uniapp/env/.env
+++ b/code/container-ocr/ocr-uniapp/env/.env
@@ -1,3 +1,3 @@
VITE_APP_PORT = 8080
-VITE_ALIYUN_BUCKET = 'g3cdcont'
\ No newline at end of file
+VITE_ALIYUN_BUCKET = 'g3hy'
\ No newline at end of file
diff --git a/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue b/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue
index d3c89049..d64122a6 100644
--- a/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue
+++ b/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue
@@ -1,24 +1,35 @@
-
-
-
\ No newline at end of file
diff --git a/code/container-ocr/ocr-vue/src/layout/components/menu.vue b/code/container-ocr/ocr-vue/src/layout/components/menu.vue
index 90e9cdd7..3455504b 100644
--- a/code/container-ocr/ocr-vue/src/layout/components/menu.vue
+++ b/code/container-ocr/ocr-vue/src/layout/components/menu.vue
@@ -23,9 +23,9 @@ const menuList = ref([
icon: "lucide:house",
},
{
- label: "业务管理",
- icon: "lucide:briefcase-business",
- children: [],
+ label: "集装箱管理",
+ icon: "lucide:box",
+ path: "/container",
},
{
label: "系统管理",
diff --git a/code/container-ocr/ocr-vue/src/router/routes.js b/code/container-ocr/ocr-vue/src/router/routes.js
index fe524625..3224f16d 100644
--- a/code/container-ocr/ocr-vue/src/router/routes.js
+++ b/code/container-ocr/ocr-vue/src/router/routes.js
@@ -22,6 +22,14 @@ export const routes = [
keepAlive: true,
},
},
+ {
+ path: "/container",
+ component: () => import("@/views/container/index.vue"),
+ meta: {
+ title: "集装箱管理",
+ keepAlive: true,
+ },
+ },
// ==================== 系统管理 ====================
{
path: "/system/field",
diff --git a/code/container-ocr/ocr-vue/src/utils/columns.js b/code/container-ocr/ocr-vue/src/utils/columns.js
index 96ff30c0..6621cc93 100644
--- a/code/container-ocr/ocr-vue/src/utils/columns.js
+++ b/code/container-ocr/ocr-vue/src/utils/columns.js
@@ -1,5 +1,6 @@
import { updateColumnsApi } from "@/request/api";
import { ElMessage } from "element-plus";
+import { formatToDate, formatToDateTime } from "./time";
export function updateEditTableColumns(tableRef) {
const $table = unref(tableRef);
@@ -39,19 +40,24 @@ export function updateViewTableColumns(tableRef) {
}
const columns = $table.getColumns();
+ console.log(columns);
+
if (!$table || $table.length === 0) {
ElMessage.warning("未获取到栏位信息");
return;
}
+
const newColumns = columns
- .filter((item) => item.params.b_id !== undefined)
+ .filter((item) => item.type === undefined && item.params && item.params.b_id)
.map((item, index) => ({
b_id: item.params.b_id,
col_Width: item.renderWidth,
col_Position: index,
}));
+ console.log(newColumns);
+
updateColumnsApi(newColumns).then((res) => {
if (res.success) {
ElMessage.success("保存成功");
@@ -103,9 +109,11 @@ export function formatValueByFormat(value, format) {
minimumFractionDigits: decimals,
maximumFractionDigits: decimals,
}).format(num);
- } else if (fmt.startsWith("date")) {
+ } else if (fmt === "date") {
return formatToDate(value);
- } else if (fmt.startsWith("number")) {
+ } else if (fmt === "datetime") {
+ return formatToDateTime(value);
+ } else if (fmt === "number") {
return Number(value) || 0;
}
diff --git a/code/container-ocr/ocr-vue/src/utils/file.js b/code/container-ocr/ocr-vue/src/utils/file.js
index d1965b27..0a159fcb 100644
--- a/code/container-ocr/ocr-vue/src/utils/file.js
+++ b/code/container-ocr/ocr-vue/src/utils/file.js
@@ -1,4 +1,7 @@
import { getAliyunKeyApi, insertFileApi } from "@/request/api";
+import { saveAs } from "file-saver";
+import JSZip from "jszip";
+import { ElMessage } from "element-plus";
/**
* 选择并压缩图片
diff --git a/code/container-ocr/ocr-vue/src/views/container/index.vue b/code/container-ocr/ocr-vue/src/views/container/index.vue
new file mode 100644
index 00000000..8883901a
--- /dev/null
+++ b/code/container-ocr/ocr-vue/src/views/container/index.vue
@@ -0,0 +1,508 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 批量下载
+
+
+
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 栏位保存
+
+ 导出Execl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatValueByFormat(row[column.col_FieldName], column.col_DisplayFormat) }}
+
+
+
+
+
+
+
+
+
+ 下载
+
+
+
+
+
+ 图片
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/container-ocr/ocr-vue/src/views/system/field/index.vue b/code/container-ocr/ocr-vue/src/views/system/field/index.vue
index 9fda63a2..22c9b332 100644
--- a/code/container-ocr/ocr-vue/src/views/system/field/index.vue
+++ b/code/container-ocr/ocr-vue/src/views/system/field/index.vue
@@ -24,9 +24,7 @@ const isCollapse = ref(false);
const showSql = ref(false);
-const treeData = [
- { b_id: "root", mc_b: "全部分类", isLeaf: false, children: [] },
-];
+const treeData = [{ b_id: "root", mc_b: "全部分类", isLeaf: false, children: [] }];
const treeProps = {
children: "children",
@@ -344,18 +342,15 @@ async function handleTreeLoad(node, resolve) {
}
async function handleTreeNodeClick(nodeData) {
- console.log("===node===")
- console.log(nodeData)
+ console.log("===node===");
+ console.log(nodeData);
if (!nodeData || nodeData.b_id === "root" || !nodeData.b_moduleid) return;
currentNode.value = nodeData;
loading.value = true;
try {
- const res = await loadDataApi(
- "s_module",
- `b_id = '${nodeData.b_moduleid}'`,
- );
+ const res = await loadDataApi("s_module", `b_id = '${nodeData.b_moduleid}'`);
if (res.success) {
currentModule.value = res.data[0] || null;
@@ -493,17 +488,10 @@ function handleCheckColumns() {
- 检查
-
+
+ 检查
+
+
浏览栏位预览
属性预览
-
+
修改标签
-
+
SQL语句
@@ -643,21 +623,11 @@ function handleCheckColumns() {
-
+
-
+
-
+
diff --git a/code/container-ocr/ocr-vue/src/views/system/module/TreeModuleSettingsDialog.vue b/code/container-ocr/ocr-vue/src/views/system/module/TreeModuleSettingsDialog.vue
index 28035597..2302b1d1 100644
--- a/code/container-ocr/ocr-vue/src/views/system/module/TreeModuleSettingsDialog.vue
+++ b/code/container-ocr/ocr-vue/src/views/system/module/TreeModuleSettingsDialog.vue
@@ -38,6 +38,8 @@ watch(
() => props.node,
(val) => {
if (val) {
+ console.log(val)
+
if (props.mode == "add") {
isDisabled.value = false;
if (val.id != "all") {
diff --git a/code/container-ocr/ocr-vue/src/views/system/module/addDialog.vue b/code/container-ocr/ocr-vue/src/views/system/module/addDialog.vue
index c430d666..9b8592c9 100644
--- a/code/container-ocr/ocr-vue/src/views/system/module/addDialog.vue
+++ b/code/container-ocr/ocr-vue/src/views/system/module/addDialog.vue
@@ -1,7 +1,7 @@
-