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/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/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" /> - - -
+
- -
+
暂无数据