diff --git a/.env.dev b/.env.dev
index a363e7ac..2dc89b0f 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-09-12 08:47:57
+ # @LastEditTime: 2023-09-15 14:38:26
# @LastEditors: DY
# @Description:
###
diff --git a/.env.prod b/.env.prod
index a1415ed3..4c6133c8 100644
--- a/.env.prod
+++ b/.env.prod
@@ -8,7 +8,9 @@ VUE_APP_TITLE = 芋道管理系统
VUE_APP_BASE_API = '/prod-api'
# 根据服务器或域名修改
-PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+PUBLIC_PATH = 'http://192.168.0.33:8888/'
+
# 二级部署路径
VUE_APP_APP_NAME ='yudao-admin'
diff --git a/src/api/core/analysis/index.js b/src/api/core/analysis/index.js
new file mode 100644
index 00000000..af791ff5
--- /dev/null
+++ b/src/api/core/analysis/index.js
@@ -0,0 +1,24 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-09-12 14:07:04
+ * @LastEditTime: 2023-09-13 09:53:45
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+
+export function getYieldAnalysisPageData(data) {
+ return request({
+ url: '/analysis/production-analysis/getOutput',
+ method: 'post',
+ data: data
+ })
+}
+
+export function getCT(data) {
+ return request({
+ url: '/analysis/production-analysis/getCT',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/api/core/base/workshopSection.js b/src/api/core/base/workshopSection.js
index b460590f..b864282d 100644
--- a/src/api/core/base/workshopSection.js
+++ b/src/api/core/base/workshopSection.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-08-28 14:29:51
+ * @LastEditTime: 2023-08-31 14:33:46
+ * @LastEditors: zhp
+ * @Description:
+ */
import request from '@/utils/request'
// 创建产线工段
diff --git a/src/api/core/monitoring/index.js b/src/api/core/monitoring/index.js
new file mode 100644
index 00000000..13eb6963
--- /dev/null
+++ b/src/api/core/monitoring/index.js
@@ -0,0 +1,16 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-09-12 14:07:04
+ * @LastEditTime: 2023-09-13 09:46:44
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+
+export function getSectionDataSearch(data) {
+ return request({
+ url: '/monitoring/production-monitor/getSectionDataSearch',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/assets/images/pay/icon/alipay_app.svg b/src/assets/images/pay/icon/alipay_app.svg
index ebf11883..c77a3d9f 100644
--- a/src/assets/images/pay/icon/alipay_app.svg
+++ b/src/assets/images/pay/icon/alipay_app.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/src/router/index.js b/src/router/index.js
index 1d64f59b..ca26742b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -247,7 +247,7 @@ Router.prototype.push = function push(location) {
export default new Router({
base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/",
- mode: 'history', // 去掉url中的#
+ mode: 'hash', // 去掉url中的#
scrollBehavior: () => ({y: 0}),
routes: constantRoutes
})
diff --git a/src/views/base/equipmentBindSection/dialogForm.vue b/src/views/base/equipmentBindSection/dialogForm.vue
new file mode 100644
index 00000000..91645365
--- /dev/null
+++ b/src/views/base/equipmentBindSection/dialogForm.vue
@@ -0,0 +1,219 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/base/equipmentBindSection/index.vue b/src/views/base/equipmentBindSection/index.vue
index cd653693..cb46db05 100644
--- a/src/views/base/equipmentBindSection/index.vue
+++ b/src/views/base/equipmentBindSection/index.vue
@@ -37,7 +37,7 @@
@close="cancel"
@cancel="cancel"
@confirm="submitForm">
-
+
@@ -53,10 +53,10 @@ import {
} from '@/api/base/equipmentBindSection';
import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin';
-
+import DialogForm from './dialogForm.vue';
export default {
name: 'EquipmentBindSection',
- components: {},
+ components: { DialogForm },
mixins: [basicPageMixin],
data() {
return {
@@ -181,8 +181,8 @@ export default {
select: true,
label: '工段',
url: '/base/workshop-section/listByParentId', // 根据产线获取
- // depends: '__product_line', // 依赖产线获取数据
- depends: 'productionLineId',
+ // depends: '__product_line', // 依赖产线获取数据
+ depends: 'productionLineId',
prop: 'workshopSectionId',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
diff --git a/src/views/base/equipmentPlcConnect/http.js b/src/views/base/equipmentPlcConnect/http.js
index 16544450..b87d0ed7 100644
--- a/src/views/base/equipmentPlcConnect/http.js
+++ b/src/views/base/equipmentPlcConnect/http.js
@@ -1,6 +1,13 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-09-11 16:18:44
+ * @LastEditTime: 2023-09-12 14:25:01
+ * @LastEditors: zhp
+ * @Description:
+ */
import Mock from 'mockjs';
-const baseURL = 'http://192.168.1.49:48080/admin-api';
+const baseURL = 'http://192.168.1.188:48080/admin-api';
Mock.setup({
timeout: 200,
diff --git a/src/views/core/analysis/LineChart.vue b/src/views/core/analysis/LineChart.vue
new file mode 100644
index 00000000..49c1565f
--- /dev/null
+++ b/src/views/core/analysis/LineChart.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue
new file mode 100644
index 00000000..a3a2ca3f
--- /dev/null
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -0,0 +1,200 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/core/analysis/yieldAnalysis/index.vue b/src/views/core/analysis/yieldAnalysis/index.vue
new file mode 100644
index 00000000..ed38a9fb
--- /dev/null
+++ b/src/views/core/analysis/yieldAnalysis/index.vue
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/core/base/productionLine/index.vue b/src/views/core/base/productionLine/index.vue
index a3e27792..29ac73d2 100644
--- a/src/views/core/base/productionLine/index.vue
+++ b/src/views/core/base/productionLine/index.vue
@@ -195,7 +195,7 @@ export default {
switch (val.btnName) {
case 'search':
this.listQuery.pageNo = 1;
- this.listQuery.pageSize = 10;
+ this.listQuery.pageSize = 10;.7
this.listQuery.name = val.name;
this.getDataList();
break;
diff --git a/src/views/core/monitoring/sectionStatisticsSearch/index.vue b/src/views/core/monitoring/sectionStatisticsSearch/index.vue
new file mode 100644
index 00000000..dfb69b59
--- /dev/null
+++ b/src/views/core/monitoring/sectionStatisticsSearch/index.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
index ef2c84b8..5c2e99a3 100644
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -12,31 +12,7 @@
ref="search-bar"
@headBtnClick="handleSearchBarBtnClick" />
-
-
-