diff --git a/.env.dev b/.env.dev index 75b4a12d..5f0b49b6 100644 --- a/.env.dev +++ b/.env.dev @@ -1,8 +1,8 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2024-04-03 11:22:19 - # @LastEditors: DY + # @LastEditTime: 2024-04-09 08:44:55 + # @LastEditors: zhp # @Description: ### # 开发环境配置 @@ -20,10 +20,11 @@ VUE_APP_TITLE = MES系统 # VUE_APP_BASE_API = 'http://192.168.1.8:48082' # VUE_APP_BASE_API = 'http://192.168.4.173:9001' # VUE_APP_BASE_API = 'http://192.168.1.104:48082' -VUE_APP_BASE_API = 'http://192.168.0.33:48082' +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.1.62:48082' # VUE_APP_BASE_API = 'http://192.168.1.78:48082' # VUE_APP_BASE_API = 'http://192.168.1.47:48082' +VUE_APP_BASE_API = 'http://192.168.1.78:48082' # socket地址 VUE_APP_Socket_API = 'ws://10.70.2.2:8080' VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' diff --git a/src/api/base/qualityHotMaterial.js b/src/api/base/qualityHotMaterial.js index b665f1dc..694baa5c 100644 --- a/src/api/base/qualityHotMaterial.js +++ b/src/api/base/qualityHotMaterial.js @@ -2,7 +2,7 @@ /* * @Author: zhp * @Date: 2023-11-06 15:38:12 - * @LastEditTime: 2023-12-15 15:29:16 + * @LastEditTime: 2024-04-09 15:14:40 * @LastEditors: zhp * @Description: */ diff --git a/src/api/base/qualityScrapLog.js b/src/api/base/qualityScrapLog.js index f0bdaa69..dfd51aaa 100644 --- a/src/api/base/qualityScrapLog.js +++ b/src/api/base/qualityScrapLog.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-11-07 15:02:37 - * @LastEditTime: 2023-11-07 18:32:07 + * @LastEditTime: 2024-04-09 15:14:42 * @LastEditors: zhp * @Description: */ diff --git a/src/api/monitoring/statisticalData.js b/src/api/monitoring/statisticalData.js index 2d0f19be..40011cfc 100644 --- a/src/api/monitoring/statisticalData.js +++ b/src/api/monitoring/statisticalData.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-11-07 14:10:18 - * @LastEditTime: 2023-11-16 17:49:52 + * @LastEditTime: 2024-04-09 09:17:02 * @LastEditors: zhp * @Description: */ @@ -18,14 +18,14 @@ export function getStatisticalDataPage(query) { export function getWorkOrderList(query) { return request({ - url: '/base/core-work-order/listbyfilter', + url: 'base/quality-inspection-record/listbyfilter', method: 'get', params: query, }) } export function getProductList(query) { return request({ - url: '/base/core-product/listAll', + url: 'base/statistical-data/listAll', method: 'get', params: query, }) diff --git a/src/views/OperationalOverview/components/coldDoubleYChart.vue b/src/views/OperationalOverview/components/coldDoubleYChart.vue index 39242365..57c58dec 100644 --- a/src/views/OperationalOverview/components/coldDoubleYChart.vue +++ b/src/views/OperationalOverview/components/coldDoubleYChart.vue @@ -2,7 +2,7 @@ @@ -225,6 +225,9 @@ export default { scale: true, type: 'value', name: '良品率/%', + max: 100,//最大值 + min: 0,//最小值 + interval: 20,//间隔 nameTextStyle: {// y轴上方单位的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 align: "left", diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue index 70a842dd..07c646a1 100644 --- a/src/views/OperationalOverview/components/doubleYChart .vue +++ b/src/views/OperationalOverview/components/doubleYChart .vue @@ -1,7 +1,7 @@ @@ -224,6 +224,9 @@ export default { scale: true, type: 'value', name: '良品率/%', + max: 100,//最大值 + min: 0,//最小值 + interval: 20,//间隔 nameTextStyle: {// y轴上方单位的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 align: "left", diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue index e713de4c..9e944998 100644 --- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue +++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue @@ -1,7 +1,7 @@ diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue index 5b83208d..39659cc8 100644 --- a/src/views/quality/base/qualityScrapLog/index.vue +++ b/src/views/quality/base/qualityScrapLog/index.vue @@ -26,7 +26,7 @@ import { getQualityScrapLogPage, deleteQualityScrapLog, getWorkOrderList, - getTeamList + // getTeamList } from '@/api/base/qualityScrapLog'; const tableProps = [ @@ -189,18 +189,18 @@ export default { // console.log(this.formConfig[0].selectOptions); // this.listQuery.total = response.data.total; }) - getTeamList().then((res) => { - console.log(res); - // console.log(response); - this.formConfig[1].selectOptions = res.data.map((item) => { - return { - name: item.name, - id: item.id - } - }) - // console.log(this.formConfig[0].selectOptions); - // this.listQuery.total = response.data.total; - }) + // getTeamList().then((res) => { + // console.log(res); + // // console.log(response); + // this.formConfig[1].selectOptions = res.data.map((item) => { + // return { + // name: item.name, + // id: item.id + // } + // }) + // // console.log(this.formConfig[0].selectOptions); + // // this.listQuery.total = response.data.total; + // }) }, getDataList() { this.dataListLoading = true;