Skip to content

W
weiqiao-vue
Commit 335117fb by 张恒
Options

Merge remote-tracking branch 'origin/weiqiao-vue3' into weiqiao-vue3

parents 3377b82c 1b36ac0a
Showing with 4 additions and 366 deletions
xjrsoft-uni/common/config/index.js
......@@ -8,7 +8,7 @@ const config = {
IM_WS_URL:"ws://192.168.0.162:8878/im",// IM socket 地址
}
if (process.env.NODE_ENV === 'development') {
config.baseUrl = 'http://192.168.0.139:8080';
config.baseUrl = 'http://localhost:8080';
} else {
config.baseUrl = 'http://192.168.0.72:8080';
}
......
xjrsoft-vue3/.env.development
......@@ -17,7 +17,7 @@ VITE_DROP_CONSOLE = false
# 接口地址
# 如果没有跨域问题，直接在这里配置即可
# VITE_GLOB_API_URL=http://192.168.8.73:8080
VITE_GLOB_API_URL=http://192.168.8.83:8080
VITE_GLOB_API_URL=http://localhost:8080
# 文件上传接口 可选
VITE_GLOB_UPLOAD_URL = /system/oss/upload
......
xjrsoft-vue3/src/api/jcsj/sbgl/model/SbglModel.ts
......@@ -7,34 +7,6 @@ export interface MesEquipmentFileInfoPageParams extends BasicPageParams {
sbmc: string;
sbbm: string;
sblx: string;
sbzt: string;
fzr: string;
gs: string;
ggxh: string;
zjbm: string;
cj: string;
ccbh: string;
zcdm: string;
syz: string;
bxqrq: string;
bcjyrq: string;
xcjyrq: string;
bz: string;
}
/**
......@@ -53,27 +25,7 @@ export interface MesEquipmentFileInfoPageModel {
ggxh: string;
zjbm: string;
cj: string;
fzr: string;
gs: string;
ccbh: string;
zcdm: string;
syz: string;
bxqrq: string;
bcjyrq: string;
xcjyrq: string;
bz: string;
}
/**
......
xjrsoft-vue3/src/views/jcsj/sbgl/components/config.ts
......@@ -14,188 +14,6 @@ export const searchFormSchema: FormSchema[] = [
defaultValue: undefined,
component: 'Input',
},
{
field: 'sblx',
label: '设备类型',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'api',
apiConfig: {
path: '/jcxx//cjcx/getEquipmentType',
method: 'GET',
apiId: 'cd65b71f0c124581b331f52db2f9566b',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select lxid as value,lxmc as label from mes_equipment_dict where delete_mark = 0 and lxbm = \'type\' and zt = 1";\r\nreturn db.select(sql);',
},
labelField: 'label',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'sbzt',
label: '设备状态',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'api',
apiConfig: {
path: '/jcxx//cjcx/getEquipmentStatus',
method: 'GET',
apiId: '265de6946ca24f5588374a54ac3c6484',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select lxid as value,lxmc as label from mes_equipment_dict where delete_mark = 0 and lxbm = \'status\' and zt = 1";\r\nreturn db.select(sql);',
},
labelField: 'label',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'fzr',
label: '负责人',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'api',
apiConfig: {
path: '/bmxx/getEmployeeList',
method: 'GET',
apiId: 'copy1765432049337d61208',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select *,id as value,name as label from roke_employee where active = 1 and delete_mark = 0";\r\nreturn db.select(sql);',
},
labelField: 'label',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'gs',
label: '公司',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'api',
apiConfig: {
path: '/bmxx/getCompanyList',
method: 'GET',
apiId: 'copy1765431632890d13798',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select id as value,name as label from res_company";\r\nreturn db.select(sql);',
},
labelField: 'label',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'ggxh',
label: '规格型号',
defaultValue: undefined,
component: 'Input',
},
{
field: 'zjbm',
label: '整机编码',
defaultValue: undefined,
component: 'Input',
},
{
field: 'cj',
label: '厂家',
defaultValue: undefined,
component: 'Input',
},
{
field: 'ccbh',
label: '出厂编号',
defaultValue: undefined,
component: 'Input',
},
{
field: 'zcdm',
label: '注册代码',
defaultValue: undefined,
component: 'Input',
},
{
field: 'syz',
label: '使用证编号',
defaultValue: undefined,
component: 'Input',
},
{
field: 'bxqrq',
label: '保修期日期',
defaultValue: undefined,
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'bcjyrq',
label: '本次检验日期',
defaultValue: undefined,
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'xcjyrq',
label: '下次检验日期',
defaultValue: undefined,
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'bz',
label: '备注',
defaultValue: undefined,
component: 'Input',
},
];
export const columns: BasicColumn[] = [
......@@ -266,123 +84,6 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'zjbm',
title: '整机编码',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'cj',
title: '厂家',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'fzr',
title: '负责人',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'gs',
title: '公司',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'ccbh',
title: '出厂编号',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'zcdm',
title: '注册代码',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'syz',
title: '使用证编号',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'bxqrq',
title: '保修期日期',
componentType: 'date',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'bcjyrq',
title: '本次检验日期',
componentType: 'date',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'xcjyrq',
title: '下次检验日期',
componentType: 'date',
......@@ -393,19 +94,6 @@ export const columns: BasicColumn[] = [
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'bz',
title: '备注',
componentType: 'textarea',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
];
//表头合并配置
export const headerMergingData = [];
......@@ -1267,7 +955,7 @@ export const formProps: FormProps = {
disabled: false,
allowClear: false,
showLabel: true,
required: false,
required: true,
rules: [],
events: {},
listStyle: '',
......
xjrsoft-vue3/src/views/jcsj/sbgl/index.vue
......@@ -196,9 +196,7 @@
formConfig: {
labelWidth: 100,
schemas: searchFormSchema,
fieldMapToTime: [['bxqrq', ['bxqrqStart', 'bxqrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
['bcjyrq', ['bcjyrqStart', 'bcjyrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
['xcjyrq', ['xcjyrqStart', 'xcjyrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
fieldMapToTime: [],
showResetButton: false,
},
bordered:false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment