diff --git a/yunxi-ui-admin-vben/.env.development b/yunxi-ui-admin-vben/.env.development
index 0c9f922..f43a104 100644
--- a/yunxi-ui-admin-vben/.env.development
+++ b/yunxi-ui-admin-vben/.env.development
@@ -7,14 +7,14 @@ VITE_PUBLIC_PATH = /
# 本地开发代理,可以解决跨域及多地址代理
# 如果接口地址匹配到,则会转发到http://localhost:3000,防止本地出现跨域问题
# 可以有多个,注意多个不能换行,否则代理将会失效
-VITE_PROXY = [["/dev-api","http://127.0.0.1:8091/admin-api"],["/upload","http://127.0.0.1:8091/admin-api/infra/file/upload"]]
+VITE_PROXY = [["/dev-api","http://192.168.0.162:8091/admin-api"],["/upload","http://192.168.0.162:8091/admin-api/infra/file/upload"]]
# VITE_PROXY=[["/api","http://vben.xingyuv.com/test"]]
# 是否删除Console.log
VITE_DROP_CONSOLE = false
# 基础页面地址,例如 swagger 等页面
-VITE_GLOB_BASE_URL = "http://127.0.0.1:8091"
+VITE_GLOB_BASE_URL = "http://192.168.0.162:8091"
# 接口地址,如果没有跨域问题,直接在这里配置即可
VITE_GLOB_API_URL = /dev-api
diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/index.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/index.vue
index 1bdc167..1104635 100644
--- a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/index.vue
+++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/index.vue
@@ -1,5 +1,6 @@
@@ -52,40 +52,72 @@ const activeKey = ref('1');
- 编辑
- 打印
+
+ 编辑
+
+
+ 打印
+
- 商户代码:
- CO2023099999877
- 行业类型:
- 资源
- 首联系人:
- 徐守量(2683902877255)
+
+ 商户代码:
+
+
+ CO2023099999877
+
+
+ 行业类型:
+
+
+ 资源
+
+
+ 首联系人:
+
+
+ 徐守量(2683902877255)
+
- 平台对接人:
- 雪豹(19340873890)
- 创建时间:
- 2023/09/03 23:23:00
+
+ 平台对接人:
+
+
+ 雪豹(19340873890)
+
+
+ 创建时间:
+
+
+ 2023/09/03 23:23:00
+
- 合约状态
- 商户状态
+
+ 合约状态
+
+
+ 商户状态
+
-
- 生效中
-
-
- 未开通
-
+
+
+ 生效中
+
+
+
+
+ 未开通
+
+
@@ -194,18 +226,18 @@ const activeKey = ref('1');
float: left;
width: 10px;
height: 10px;
+ margin: 10px 2px;
background-color: #15AD31;
border-radius: 100%;
- margin: 10px 2px;
}
.xy-dot-false {
float: left;
width: 10px;
height: 10px;
+ margin: 10px 2px;
background-color: #EE3A3D;
border-radius: 100%;
- margin: 10px 2px;
}
.xy-right {
@@ -218,41 +250,41 @@ const activeKey = ref('1');
.y1 {
margin: 24px;
- border-radius: 3px;
font-size: 14px;
- background-color: #FFFFFF;
+ background-color: #FFF;
+ border-radius: 3px;
.y1y1 {
margin: 24px;
.y1y1x2 {
padding: 34px 18px;
- line-height: 28px;
font-size: 18px;
+ line-height: 28px;
}
.y1y1x3 {
- padding: 34px 0px;
+ padding: 34px 0;
}
}
.y1y2 {
- margin: 24px;
+ height: 106px;
padding: 24px;
+ margin: 24px;
line-height: 29px;
- height: 106px;
background-color: #F7F8FA;
}
}
.y2 {
margin: 24px;
- border-radius: 3px;
font-size: 14px;
- background-color: #FFFFFF;
+ background-color: #FFF;
+ border-radius: 3px;
.y2y1 {
margin: 24px;
}
}
-
\ No newline at end of file
+
diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/CustomerInfo.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/CustomerInfo.vue
index 16de80e..0341f4a 100644
--- a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/CustomerInfo.vue
+++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/CustomerInfo.vue
@@ -1,17 +1,17 @@
-
+
-
-
+
+
+
{{ title }}
- {{ title }}
+
+ {{ title }}
+
-
+
+
-
+
-
+
-
- 待确认
- 待认证
- 待审核
- 待签署
- 正常合作
- 暂停合作
- 已关闭
+
+
+ 待确认
+
+
+ 待认证
+
+
+ 待审核
+
+
+ 待签署
+
+
+ 正常合作
+
+
+ 暂停合作
+
+
+ 已关闭
+
-
- 钢厂
- 钢贸企业
- VIP大客户
- 其他企业
+
+
+ 钢厂
+
+
+ 钢贸企业
+
+
+ VIP大客户
+
+
+ 其他企业
+
- 查询
- 重置
+
+ 查询
+
+
+ 重置
+
-
+
@@ -253,10 +288,12 @@ const dataSource: any = [
-
+ :scroll="{ x: 1500, y: 500 }"
+ >
@@ -310,20 +347,20 @@ const dataSource: any = [
- 启用
+ 启用
- 禁用
+ 禁用
- 已关闭
+ 已关闭
-
+
已关闭
@@ -333,7 +370,7 @@ const dataSource: any = [
-
+
已关闭
@@ -343,7 +380,7 @@ const dataSource: any = [
-
+
已关闭
@@ -353,7 +390,7 @@ const dataSource: any = [
-
+
已关闭
@@ -363,7 +400,7 @@ const dataSource: any = [
-
+
已关闭
@@ -373,7 +410,7 @@ const dataSource: any = [
-
+
离线
@@ -382,7 +419,7 @@ const dataSource: any = [
-
+
@@ -425,31 +462,31 @@ const dataSource: any = [
\ No newline at end of file
+
diff --git a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/EmployeeInfo.vue b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/EmployeeInfo.vue
index a6ff6d3..f472be5 100644
--- a/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/EmployeeInfo.vue
+++ b/yunxi-ui-admin-vben/src/views/stpagea/enterpriseCentre/enterpriseDetails/src/EmployeeInfo.vue
@@ -1,17 +1,17 @@
-
+
-
-
+
+
+
{{ title }}
- {{ title }}
+
+ {{ title }}
+
-
+
+
-
+
-
+
-
- 选择项一
- 选择项二
- 选择项三
- 选择项四
- 选择项五
+
+
+ 选择项一
+
+
+ 选择项二
+
+
+ 选择项三
+
+
+ 选择项四
+
+
+ 选择项五
+
-
- 启用
- 禁用
+
+
+ 启用
+
+
+ 禁用
+
- 查询
- 重置
+
+ 查询
+
+
+ 重置
+
-
+
@@ -352,9 +379,11 @@ const dataSource: any = [
-
+ :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-tr-b' : 'table-tr-a')" :scroll="{ x: 1500, y: 500 }"
+ >
@@ -410,7 +439,7 @@ const dataSource: any = [
-
+
启用
@@ -420,7 +449,7 @@ const dataSource: any = [
-
+
禁用
@@ -432,7 +461,7 @@ const dataSource: any = [
-
+
在线
@@ -442,7 +471,7 @@ const dataSource: any = [
-
+
离线
@@ -491,31 +520,31 @@ const dataSource: any = [
\ No newline at end of file
+
diff --git a/yunxi-ui-admin-vben/src/views/users/configuration/index.vue b/yunxi-ui-admin-vben/src/views/users/configuration/index.vue
index f5f4716..7ef6a5b 100644
--- a/yunxi-ui-admin-vben/src/views/users/configuration/index.vue
+++ b/yunxi-ui-admin-vben/src/views/users/configuration/index.vue
@@ -122,42 +122,250 @@ function filterOption(input: string, option: any) {
const department = ref(undefined)
//表格
-const columns: TableColumnsType = [
- { title: 'Full Name', width: 100, dataIndex: 'name', key: 'name', fixed: 'left' },
- { title: 'Age', width: 100, dataIndex: 'age', key: 'age', fixed: 'left' },
- { title: 'Column 1', dataIndex: 'address', key: '1', width: 150 },
- { title: 'Column 2', dataIndex: 'address', key: '2', width: 150 },
- { title: 'Column 3', dataIndex: 'address', key: '3', width: 150 },
- { title: 'Column 4', dataIndex: 'address', key: '4', width: 150 },
- { title: 'Column 5', dataIndex: 'address', key: '5', width: 150 },
- { title: 'Column 6', dataIndex: 'address', key: '6', width: 150 },
- { title: 'Column 7', dataIndex: 'address', key: '7', width: 150 },
- { title: 'Column 8', dataIndex: 'address', key: '8' },
+const rowSelection = ref({
+ checkStrictly: false,
+ onChange: (selectedRowKeys: (string | number)[], selectedRows: any[]) => {
+ console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+ },
+ onSelect: (record: any, selected: boolean, selectedRows: any[]) => {
+ console.log(record, selected, selectedRows)
+ },
+ onSelectAll: (selected: boolean, selectedRows: any[], changeRows: any[]) => {
+ console.log(selected, selectedRows, changeRows)
+ },
+})
+const columns: any = [
+ {
+ title: '姓名',
+ dataIndex: 'k1a',
+ key: 'k1a',
+ sorter: true,
+ fixed: 'left',
+ width: 150,
+ },
+ {
+ title: '职务',
+ dataIndex: 'k2a',
+ key: 'k2a',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '组织部门',
+ dataIndex: 'k3a',
+ key: 'k3a',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '关联业务',
+ dataIndex: 'k4a',
+ key: 'k4a',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '账号状态',
+ dataIndex: 'k5',
+ key: 'k5',
+ width: 200,
+ },
+ {
+ title: '手机',
+ dataIndex: 'k6',
+ key: 'k6',
+ width: 200,
+ },
{
- title: 'Action',
- key: 'operation',
+ title: '在线状态',
+ dataIndex: 'k7',
+ key: 'k7',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '最后登录',
+ dataIndex: 'k8',
+ key: 'k8',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '添加时间',
+ dataIndex: 'k9a',
+ key: 'k9a',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '更新时间',
+ dataIndex: 'k10a',
+ key: 'k10a',
+ sorter: true,
+ width: 200,
+ },
+ {
+ title: '操作',
+ dataIndex: 'k1a',
+ key: 'key',
fixed: 'right',
width: 100,
},
]
-
-interface DataItem {
- key: number
- name: string
- age: number
- address: string
-}
-
-const data: DataItem[] = []
-for (let i = 0; i < 100; i++) {
- data.push({
- key: i,
- name: `Edrward ${i}`,
- age: 32,
- address: `London Park no. ${i}`,
- })
-}
-
+const dataSource: any = [
+ {
+ key: '1',
+ k1a: '康宁',
+ k1b: '202309080001',
+ k2a: '商品经理',
+ k2b: '商品部',
+ k3a: '再生资源事业部-销售组',
+ k3b: '济钢城市矿产',
+ k4a: '废钢、废铝',
+ k4b: '济钢城市矿产',
+ k5: true,
+ k6: '18088889999',
+ k7: true,
+ k8: '2023-09-03 23:26:08',
+ k9a: '康宁',
+ k9b: '2023-09-03 23:26:08',
+ k10a: '康宁',
+ k10b: '2023-09-03 23:26:08',
+ },
+ {
+ key: '2',
+ k1a: '康宁',
+ k1b: '202309080001',
+ k2a: '商品经理',
+ k2b: '商品部',
+ k3a: '再生资源事业部-销售组',
+ k3b: '济钢城市矿产',
+ k4a: '废钢、废铝',
+ k4b: '济钢城市矿产',
+ k5: true,
+ k6: '18088889999',
+ k7: true,
+ k8: '2023-09-03 23:26:08',
+ k9a: '康宁',
+ k9b: '2023-09-03 23:26:08',
+ k10a: '康宁',
+ k10b: '2023-09-03 23:26:08',
+ },
+ {
+ key: '3',
+ k1a: '康宁',
+ k1b: '202309080001',
+ k2a: '商品经理',
+ k2b: '商品部',
+ k3a: '再生资源事业部-销售组',
+ k3b: '济钢城市矿产',
+ k4a: '废钢、废铝',
+ k4b: '济钢城市矿产',
+ k5: true,
+ k6: '18088889999',
+ k7: true,
+ k8: '2023-09-03 23:26:08',
+ k9a: '康宁',
+ k9b: '2023-09-03 23:26:08',
+ k10a: '康宁',
+ k10b: '2023-09-03 23:26:08',
+ },
+ {
+ key: '4',
+ k1a: '康宁',
+ k1b: '202309080001',
+ k2a: '商品经理',
+ k2b: '商品部',
+ k3a: '再生资源事业部-销售组',
+ k3b: '济钢城市矿产',
+ k4a: '废钢、废铝',
+ k4b: '济钢城市矿产',
+ k5: true,
+ k6: '18088889999',
+ k7: true,
+ k8: '2023-09-03 23:26:08',
+ k9a: '康宁',
+ k9b: '2023-09-03 23:26:08',
+ k10a: '康宁',
+ k10b: '2023-09-03 23:26:08',
+ },
+ {
+ key: '5',
+ k1a: '康宁',
+ k1b: '202309080001',
+ k2a: '商品经理',
+ k2b: '商品部',
+ k3a: '再生资源事业部-销售组',
+ k3b: '济钢城市矿产',
+ k4a: '废钢、废铝',
+ k4b: '济钢城市矿产',
+ k5: true,
+ k6: '18088889999',
+ k7: true,
+ k8: '2023-09-03 23:26:08',
+ k9a: '康宁',
+ k9b: '2023-09-03 23:26:08',
+ k10a: '康宁',
+ k10b: '2023-09-03 23:26:08',
+ },
+ {
+ key: '6',
+ k1a: '康宁',
+ k1b: '202309080001',
+ k2a: '商品经理',
+ k2b: '商品部',
+ k3a: '再生资源事业部-销售组',
+ k3b: '济钢城市矿产',
+ k4a: '废钢、废铝',
+ k4b: '济钢城市矿产',
+ k5: false,
+ k6: '18088889999',
+ k7: true,
+ k8: '2023-09-03 23:26:08',
+ k9a: '康宁',
+ k9b: '2023-09-03 23:26:08',
+ k10a: '康宁',
+ k10b: '2023-09-03 23:26:08',
+ },
+ {
+ key: '7',
+ k1a: '康宁',
+ k1b: '202309080001',
+ k2a: '商品经理',
+ k2b: '商品部',
+ k3a: '再生资源事业部-销售组',
+ k3b: '济钢城市矿产',
+ k4a: '废钢、废铝',
+ k4b: '济钢城市矿产',
+ k5: true,
+ k6: '18088889999',
+ k7: false,
+ k8: '2023-09-03 23:26:08',
+ k9a: '康宁',
+ k9b: '2023-09-03 23:26:08',
+ k10a: '康宁',
+ k10b: '2023-09-03 23:26:08',
+ },
+ {
+ key: '8',
+ k1a: '康宁',
+ k1b: '202309080001',
+ k2a: '商品经理',
+ k2b: '商品部',
+ k3a: '再生资源事业部-销售组',
+ k3b: '济钢城市矿产',
+ k4a: '废钢、废铝',
+ k4b: '济钢城市矿产',
+ k5: true,
+ k6: '18088889999',
+ k7: true,
+ k8: '2023-09-03 23:26:08',
+ k9a: '康宁',
+ k9b: '2023-09-03 23:26:08',
+ k10a: '康宁',
+ k10b: '2023-09-03 23:26:08',
+ },
+]
// //被选中时调
// function myFunction({ item, key, selectedKeys }) {
@@ -301,15 +509,139 @@ watch(navopenKeys, (val) => {
-
-
-
-
- action
+
+
+
+
+
+
+
+
+ {{ record.k1a }}
+
+
+
+
+ {{ record.k1b }}
+
+
+
+
+
+
+
+ {{ record.k2a }}
+
+
+
+
+ {{ record.k2b }}
+
+
+
+
+
+
+ {{ record.k3a }}
+
+
+
+
+ {{ record.k3b }}
+
+
+
+
+
+
+ {{ record.k4a }}
+
+
+
+
+ {{ record.k4b }}
+
+
+
+
+
+
+
+
+
+
+ 启用
+
+
+
+
+
+
+
+
+
+ 禁用
+
+
+
+
+
+
+
+
+
+
+
+ 在线
+
+
+
+
+
+
+
+
+
+ 离线
+
+
+
+
+
+
+
+ {{ record.k9a }}
+
+
+
+
+ {{ record.k9b }}
+
+
+
+
+
+
+ {{ record.k10a }}
+
+
+
+
+ {{ record.k10b }}
+
+
+
+
+
+
-
-
-
+
+
+
@@ -364,13 +696,29 @@ watch(navopenKeys, (val) => {
.inquiry{
display: flex;
- justify-content: space-around;
+ justify-content:left;
width: 100%;
}
.relevance{
margin: 30px 0;
}
+
+ .dot-true {
+ width: 10px;
+ height: 10px;
+ margin: 7px 0;
+ background-color: green;
+ border-radius: 100%;
+ }
+
+ .dot-false {
+ width: 10px;
+ height: 10px;
+ margin: 7px 0;
+ background-color: red;
+ border-radius: 100%;
+}
}
}
}
diff --git a/yunxi-ui-admin-vben/src/views/users/mine/index.vue b/yunxi-ui-admin-vben/src/views/users/mine/index.vue
index f47166c..a263626 100644
--- a/yunxi-ui-admin-vben/src/views/users/mine/index.vue
+++ b/yunxi-ui-admin-vben/src/views/users/mine/index.vue
@@ -1,8 +1,8 @@