diff --git a/.env.development b/.env.development index 7e2a07d..7416cdc 100644 --- a/.env.development +++ b/.env.development @@ -6,8 +6,8 @@ VUE_APP_TITLE = 隆姿集团 # 象纬云科 # 接口地址 -VUE_APP_API_BASEURL = https://xwapi.dev.dwoodauto.com/api/v1 -VUE_APP_API_DEV = https://xwapi.dev.dwoodauto.com +VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1 +VUE_APP_API_DEV = https://dev.api.linkwing.com # WS地址 VUE_APP_WS_URL = wss://xwapi.dev.dwoodauto.com/wss diff --git a/src/api/model/orders.js b/src/api/model/orders.js index b1ee77a..0e273aa 100644 --- a/src/api/model/orders.js +++ b/src/api/model/orders.js @@ -113,6 +113,14 @@ export default { return await http.post(this.url,params,{'Content-Type': 'multipart/form-data'}); } }, + logs:{ + url: `${config.API_URL}/order.op.log.list`, + name: "维保工单操作日志", + get: async function (params) { + return await http.post(this.url,params); + } + }, + }, sock: { list:{ diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index 6df8b42..31a67ef 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -30,6 +30,7 @@ export { default as DataSource } from './DataSource.vue' export { default as MachineRoom } from './MachineRoom.vue' export { default as CreateFolder } from './CreateFolder.vue' export { default as CreateShare } from './CreateShare.vue' +export { default as Fingerprint } from './Fingerprint.vue' export { default as Folder } from './Folder.vue' export { default as File7z } from './file/7z.vue' export { default as FileBmp } from './file/Bmp.vue' diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index dae1c08..0763ed6 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -194,7 +194,7 @@ delete reqData[config.request.page] delete reqData[config.request.pageSize] } - Object.assign(reqData, this.tableParams) + Object.assign(reqData, this.tableParams); try { var res = await this.apiObj.get(reqData); diff --git a/src/style/user.scss b/src/style/user.scss index 03743bf..c210a11 100644 --- a/src/style/user.scss +++ b/src/style/user.scss @@ -37,6 +37,7 @@ } .userMain{ margin: 0 0 0 10px; + padding: 0 10px 0 10px; box-sizing: border-box; .el-card{ border:0; @@ -67,6 +68,9 @@ } } } + .userMainMargin_0{ + margin: 0; + } } diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index 07b5311..5ce8cfb 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -28,8 +28,8 @@ data() { return { form: { - user: "ykxiao", - password: "123456", + user: "", + password: "", autologin: false }, rules: { diff --git a/src/views/order/create-order.vue b/src/views/order/create-order.vue new file mode 100644 index 0000000..872714a --- /dev/null +++ b/src/views/order/create-order.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/order/order-info.vue b/src/views/order/order-info.vue new file mode 100644 index 0000000..665b05d --- /dev/null +++ b/src/views/order/order-info.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/order/order-logs.vue b/src/views/order/order-logs.vue new file mode 100644 index 0000000..9587923 --- /dev/null +++ b/src/views/order/order-logs.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue index 93f46d6..bb6dba6 100644 --- a/src/views/order/orderList/index.vue +++ b/src/views/order/orderList/index.vue @@ -52,8 +52,8 @@ 编辑工单 删除工单 工单详情 - 执行维修 - 工单日志 + 执行维修 + 工单日志 @@ -63,19 +63,15 @@ - - - + +