diff --git a/.prettierrc b/.prettierrc index d4daf05b..f124b4e6 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,6 +1,6 @@ { "printWidth": 120, - "tabWidth": 4, + "tabWidth": 2, "singleQuote": true, "semi": false, "bracketSpacing": true, diff --git a/src/api/ma/base.js b/src/api/ma/base.js index 2cb2c020..cf154e8a 100644 --- a/src/api/ma/base.js +++ b/src/api/ma/base.js @@ -122,3 +122,102 @@ export function getMaTypeHistoryList(query) { params: query }) } + +// 标准配置清单-tree +export function getConfigTreeSelect(query) { + return request({ + url: '/material/standardConfig/getConfigTreeSelect', + method: 'get', + params: query + }) +} + +// 标准配置清单-tree新增 +export function addConfig(data) { + return request({ + url: '/material/standardConfig/add', + method: 'post', + data, + }) +} + +// 标准配置清单-tree修改 +export function editConfig(data) { + return request({ + url: '/material/standardConfig/edit', + method: 'post', + data, + }) +} + +// 标准配置清单-tree删除 +export function delConfig(data) { + return request({ + url: '/material/standardConfig/del', + method: 'post', + data + }) +} + +// 标准配置清单-列表 +export function getListByConfigId(query) { + return request({ + url: '/material/standardConfig/getListByConfigId', + method: 'get', + params: query + }) +} + +// 标准配置清单-select +export function getConfigList(data = {}) { + return request({ + url: '/material/standardConfig/getConfigLevelTwoList', + method: 'post', + data + }) +} + +// 物资名称-tree +export function getEquipmentThreeType(query) { + return request({ + url: '/material/ma_type/equipmentThreeType', + method: 'get', + params: query + }) +} + +// 规格型号-select +export function getMaTypeOpt(data) { + return request({ + url: '/material/select/getMaType', + method: 'post', + data + }) +} + +// 新增配置明细 +export function addConfigDetails(data) { + return request({ + url: '/material/standardConfig/addConfigDetails', + method: 'post', + data + }) +} + +// 修改配置明细 +export function editConfigDetails(data) { + return request({ + url: '/material/standardConfig/editConfigDetails', + method: 'post', + data + }) +} + +// 删除配置明细 +export function delConfigDetails(data) { + return request({ + url: '/material/standardConfig/delConfigDetails', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/views/material/ma/mechEquipConfigMgmt/index.vue b/src/views/material/ma/mechEquipConfigMgmt/index.vue new file mode 100644 index 00000000..8d3a87f6 --- /dev/null +++ b/src/views/material/ma/mechEquipConfigMgmt/index.vue @@ -0,0 +1,690 @@ + + + + diff --git a/src/views/material/stquery/deviceStatusRecord.vue b/src/views/material/stquery/deviceStatusRecord.vue index ed81898d..1ecff291 100644 --- a/src/views/material/stquery/deviceStatusRecord.vue +++ b/src/views/material/stquery/deviceStatusRecord.vue @@ -101,7 +101,7 @@ --> - + - + + + + + + + @@ -553,6 +577,8 @@ export default { repairNum: response.data.repairNum||0, inputNum: response.data.inputNum||0, repairInputNum: response.data.repairInputNum||0, + pendingScrapNum: response.data.pendingScrapNum||0, + scrapNum: response.data.scrapNum||0, allNum: response.data.allNum||0, totalPrice: response.data.totalPrice||0, fiveReplacementRate: response.data.fiveReplacementRate||0, diff --git a/vue.config.js b/vue.config.js index 9bb3fbad..af82ad38 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,7 +36,7 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `http://localhost:18080`, - target: `http://192.168.2.247:18080`,//马 + target: `http://192.168.0.15:18080`,//马 // target: `http://192.168.0.244:18580`,//测试 // target: `http://192.168.2.223:18080`,//山 // target: `http://192.168.2.23:18080`,//洪