diff --git a/.env.test b/.env.test
index b993274a1..3d5028e29 100644
--- a/.env.test
+++ b/.env.test
@@ -4,10 +4,10 @@ NODE_ENV=test
VITE_DEV=false
# 请求路径
-VITE_BASE_URL='http://dev.ccwin-in.com:25100/api'
+VITE_BASE_URL='http://dev.ccwin-in.com:25110'
# 上传路径
-VITE_UPLOAD_URL='http://dev.ccwin-in.com:25100/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://dev.ccwin-in.com:25110/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
@@ -29,3 +29,6 @@ VITE_BASE_PATH=/
# 输出路径
VITE_OUT_DIR=dist-test
+
+# 自定义接口路径
+VITE_INTERFACE_URL='http://dev.ccwin-in.com:25110/magic/web/index.html'
diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index 6e5f640c8..3322fa4ba 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -32,7 +32,7 @@ defineComponent({
name: 'Annex'
})
// 接受父组件参数
-const { data } = defineProps({
+const props = defineProps({
data: {
type: Object,
required: true
diff --git a/src/components/ChangeRecord/src/ChangeRecord.vue b/src/components/ChangeRecord/src/ChangeRecord.vue
index 3db371576..206315421 100644
--- a/src/components/ChangeRecord/src/ChangeRecord.vue
+++ b/src/components/ChangeRecord/src/ChangeRecord.vue
@@ -52,10 +52,10 @@
diff --git a/src/components/Tabs/src/Tabs.vue b/src/components/Tabs/src/Tabs.vue
index 8d23db972..aa646613e 100644
--- a/src/components/Tabs/src/Tabs.vue
+++ b/src/components/Tabs/src/Tabs.vue
@@ -26,8 +26,6 @@ const props = defineProps({
default: 0
},
})
-const tabsList = props.tabsList
-
const current = ref(props.current);
const change = (item, index) => {
current.value = index
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 2489f87e3..b06b6597d 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -59,7 +59,7 @@ export const useAppStore = defineStore('app', {
tagsViewIcon: true, // 是否显示标签图标
logo: true, // logo
fixedHeader: true, // 固定toolheader
- footer: true, // 显示页脚
+ footer: false, // 显示页脚
greyMode: false, // 是否开始灰色模式,用于特殊悼念日
fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts
index 7fe51ed8d..1b779fe9d 100644
--- a/src/utils/disposition/tableColumns.ts
+++ b/src/utils/disposition/tableColumns.ts
@@ -9,10 +9,10 @@ export const ItemBasic = useCrudSchemas(reactive([
field: 'code',
sort: 'custom',
table: {
- width:700
+ width: 150
},
tableForm:{
- width: 300,
+ minWidth:200,
sortable:false
}
},
@@ -24,7 +24,7 @@ export const ItemBasic = useCrudSchemas(reactive([
width: 150
},
tableForm:{
- width: 300,
+ minWidth:200,
sortable:false
}
},
@@ -60,6 +60,10 @@ export const ItemBasic = useCrudSchemas(reactive([
} ,
form: {
component: 'Switch',
+ },
+ tableForm:{
+ width: 100,
+ type:'Switch',
}
},
{
@@ -72,7 +76,11 @@ export const ItemBasic = useCrudSchemas(reactive([
isTable: true,
table: {
width: 120
- }
+ } ,
+ tableForm:{
+ width: 200,
+ type:'Select',
+ }
},
{
label: '替代计量单位',
@@ -100,6 +108,10 @@ export const ItemBasic = useCrudSchemas(reactive([
},
form: {
component: 'Switch',
+ },
+ tableForm:{
+ width: 180,
+ type:'Radio',
}
},
{
@@ -131,6 +143,10 @@ export const ItemBasic = useCrudSchemas(reactive([
} ,
form: {
component: 'Radio',
+ },
+ tableForm:{
+ width: 180,
+ type:'Checkbox',
}
},
{
@@ -326,6 +342,10 @@ export const ItemBasic = useCrudSchemas(reactive([
componentProps: {
type: 'datetimerange',
}
+ },
+ tableForm:{
+ width: 200,
+ type:'FormDateTime',
}
},
{
diff --git a/src/views/detail/detail/index.vue b/src/views/detail/detail/index.vue
deleted file mode 100644
index 30274d1b8..000000000
--- a/src/views/detail/detail/index.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
-
-
-
-
-
- 搜索
-
-
- 重置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/infra/customInterface/index.vue b/src/views/infra/customInterface/index.vue
index 823aa1219..935922305 100644
--- a/src/views/infra/customInterface/index.vue
+++ b/src/views/infra/customInterface/index.vue
@@ -1,7 +1,5 @@
-
-
-
+