mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lb #34

Merged
g7hoo merged 7 commits from lb into test 2023-09-25 17:14:23 +08:00
Conversation 0 Commits 7 Files Changed 21 +93 -90
10 changed files with 93 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 980f3468b7 - Show all commits

2
.env.dev
View File

@ -9,7 +9,7 @@
ENV = 'development' ENV = 'development'
# 页面标题 # 页面标题
VUE_APP_TITLE = 芋道管理系统 VUE_APP_TITLE = 产线监控系统
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48080'

2
.env.front
View File

@ -2,7 +2,7 @@
ENV = 'development' ENV = 'development'
# 页面标题 # 页面标题
VUE_APP_TITLE = 芋道管理系统 VUE_APP_TITLE = 产线监控系统
# 芋道管理系统/本地环境 # 芋道管理系统/本地环境
VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn' VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'

2
.env.prod
View File

@ -2,7 +2,7 @@
ENV = 'production' ENV = 'production'
# 页面标题 # 页面标题
VUE_APP_TITLE = 芋道管理系统 VUE_APP_TITLE = 产线监控系统
# 芋道管理系统/生产环境 # 芋道管理系统/生产环境
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/prod-api'

2
.env.stage
View File

@ -1,7 +1,7 @@
NODE_ENV = production NODE_ENV = production
# 页面标题 # 页面标题
VUE_APP_TITLE = 芋道管理系统 VUE_APP_TITLE = 产线监控系统
# 测试环境配置 # 测试环境配置
ENV = 'staging' ENV = 'staging'

2
.env.static
View File

@ -4,7 +4,7 @@ NODE_ENV = development
ENV = 'staging' ENV = 'staging'
# 页面标题 # 页面标题
VUE_APP_TITLE = 芋道管理系统 VUE_APP_TITLE = 产线监控系统
# 芋道管理系统/测试环境 # 芋道管理系统/测试环境
VUE_APP_BASE_API = 'http://127.0.0.1:48080' VUE_APP_BASE_API = 'http://127.0.0.1:48080'

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

2
src/layout/components/Navbar.vue
View File

@ -94,7 +94,7 @@ export default {
async logout() { async logout() {
this.$modal.confirm('确定注销并退出系统吗？', '提示').then(() => { this.$modal.confirm('确定注销并退出系统吗？', '提示').then(() => {
this.$store.dispatch('LogOut').then(() => { this.$store.dispatch('LogOut').then(() => {
location.href = getPath('/index'); location.href = getPath('/');
}) })
}).catch(() => {}); }).catch(() => {});
} }

155
src/router/index.js
View File

@ -65,16 +65,17 @@ export const constantRoutes = [
hidden: true hidden: true
}, },
{ {
path: '', path: '/',
component: Layout, component: Layout,
redirect: 'index', redirect: 'core/base/factory',
children: [{ // children: [{
path: 'index', // path: 'index',
component: (resolve) => require(['@/views/index'], resolve), // redirect: 'core/base/factory',
name: '首页', // component: (resolve) => require(['@/views/index'], resolve),
meta: {title: '首页', icon: 'dashboard', affix: true} // name: '首页',
} // meta: { title: '首页', icon: 'dashboard', affix: true }
] // }
// ]
}, },
{ {
path: '/user', path: '/user',
@ -82,15 +83,15 @@ export const constantRoutes = [
hidden: true, hidden: true,
redirect: 'noredirect', redirect: 'noredirect',
children: [{ children: [{
path: 'profile', path: 'profile',
component: (resolve) => require(['@/views/system/user/profile/index'], resolve), component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
name: 'Profile', name: 'Profile',
meta: {title: '个人中心', icon: 'user'} meta: { title: '个人中心', icon: 'user' }
}, { }, {
path: 'notify-message', path: 'notify-message',
component: (resolve) => require(['@/views/system/notify/my/index'], resolve), component: (resolve) => require(['@/views/system/notify/my/index'], resolve),
name: 'MyNotifyMessage', name: 'MyNotifyMessage',
meta: { title: '我的站内信', icon: 'message' }, meta: { title: '我的站内信', icon: 'message' },
}] }]
}, },
{ {
@ -98,11 +99,11 @@ export const constantRoutes = [
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [{
path: 'type/data/:dictId(\\d+)', path: 'type/data/:dictId(\\d+)',
component: (resolve) => require(['@/views/system/dict/data'], resolve), component: (resolve) => require(['@/views/system/dict/data'], resolve),
name: 'SystemDictData', name: 'SystemDictData',
meta: {title: '字典数据', icon: '', activeMenu: '/system/dict'} meta: { title: '字典数据', icon: '', activeMenu: '/system/dict' }
} }
] ]
}, },
{ {
@ -110,22 +111,22 @@ export const constantRoutes = [
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [{
path: 'log', path: 'log',
component: (resolve) => require(['@/views/infra/job/log'], resolve), component: (resolve) => require(['@/views/infra/job/log'], resolve),
name: 'InfraJobLog', name: 'InfraJobLog',
meta: {title: '调度日志', activeMenu: '/infra/job'} meta: { title: '调度日志', activeMenu: '/infra/job' }
} }
] ]
}, { }, {
path: '/codegen', path: '/codegen',
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [{
path: 'edit/:tableId(\\d+)', path: 'edit/:tableId(\\d+)',
component: (resolve) => require(['@/views/infra/codegen/editTable'], resolve), component: (resolve) => require(['@/views/infra/codegen/editTable'], resolve),
name: 'InfraCodegenEditTable', name: 'InfraCodegenEditTable',
meta: {title: '修改生成配置', activeMenu: '/infra/codegen'} meta: { title: '修改生成配置', activeMenu: '/infra/codegen' }
} }
] ]
}, },
{ {
@ -134,16 +135,16 @@ export const constantRoutes = [
hidden: true, hidden: true,
redirect: 'noredirect', redirect: 'noredirect',
children: [{ children: [{
path: 'oa/leave/create', path: 'oa/leave/create',
component: (resolve) => require(['@/views/bpm/oa/leave/create'], resolve), component: (resolve) => require(['@/views/bpm/oa/leave/create'], resolve),
name: 'BpmOALeaveCreate', name: 'BpmOALeaveCreate',
meta: {title: '发起 OA 请假', icon: 'form', activeMenu: '/bpm/oa/leave'} meta: { title: '发起 OA 请假', icon: 'form', activeMenu: '/bpm/oa/leave' }
}, { }, {
path: 'oa/leave/detail', path: 'oa/leave/detail',
component: (resolve) => require(['@/views/bpm/oa/leave/detail'], resolve), component: (resolve) => require(['@/views/bpm/oa/leave/detail'], resolve),
name: 'BpmOALeaveDetail', name: 'BpmOALeaveDetail',
meta: {title: '查看 OA 请假', icon: 'view', activeMenu: '/bpm/oa/leave'} meta: { title: '查看 OA 请假', icon: 'view', activeMenu: '/bpm/oa/leave' }
} }
] ]
}, },
{ {
@ -151,31 +152,31 @@ export const constantRoutes = [
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [{ children: [{
path: 'manager/form/edit', path: 'manager/form/edit',
component: (resolve) => require(['@/views/bpm/form/formEditor'], resolve), component: (resolve) => require(['@/views/bpm/form/formEditor'], resolve),
name: 'BpmFormEditor', name: 'BpmFormEditor',
meta: {title: '流程表单-编辑', activeMenu: '/bpm/manager/form'} meta: { title: '流程表单-编辑', activeMenu: '/bpm/manager/form' }
}, { }, {
path: 'manager/definition', path: 'manager/definition',
component: (resolve) => require(['@/views/bpm/definition/index'], resolve), component: (resolve) => require(['@/views/bpm/definition/index'], resolve),
name: 'BpmProcessDefinition', name: 'BpmProcessDefinition',
meta: {title: '流程定义', activeMenu: '/bpm/manager/model'} meta: { title: '流程定义', activeMenu: '/bpm/manager/model' }
}, { }, {
path: 'manager/model/design', path: 'manager/model/design',
component: (resolve) => require(['@/views/bpm/model/modelEditor'], resolve), component: (resolve) => require(['@/views/bpm/model/modelEditor'], resolve),
name: 'BpmModelEditor', name: 'BpmModelEditor',
meta: {title: '设计流程', activeMenu: '/bpm/manager/model'} meta: { title: '设计流程', activeMenu: '/bpm/manager/model' }
}, { }, {
path: 'process-instance/create', path: 'process-instance/create',
component: (resolve) => require(['@/views/bpm/processInstance/create'], resolve), component: (resolve) => require(['@/views/bpm/processInstance/create'], resolve),
name: 'BpmProcessInstanceCreate', name: 'BpmProcessInstanceCreate',
meta: {title: '发起流程', activeMenu: '/bpm/task/my'} meta: { title: '发起流程', activeMenu: '/bpm/task/my' }
}, { }, {
path: 'process-instance/detail', path: 'process-instance/detail',
component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve), component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve),
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
meta: {title: '流程详情', activeMenu: '/bpm/task/my'} meta: { title: '流程详情', activeMenu: '/bpm/task/my' }
} }
] ]
}, },
{ {
@ -186,7 +187,7 @@ export const constantRoutes = [
path: 'value/:propertyId(\\d+)', path: 'value/:propertyId(\\d+)',
component: (resolve) => require(['@/views/mall/product/property/value'], resolve), component: (resolve) => require(['@/views/mall/product/property/value'], resolve),
name: 'ProductPropertyValue', name: 'ProductPropertyValue',
meta: {title: '商品属性值', icon: '', activeMenu: '/product/property'} meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' }
} }
] ]
}, },
@ -198,14 +199,14 @@ export const constantRoutes = [
path: 'edit/:spuId(\\d+)', path: 'edit/:spuId(\\d+)',
component: (resolve) => require(['@/views/mall/product/spu/save'], resolve), component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
name: 'ProductSpuUpdate', name: 'ProductSpuUpdate',
meta: {title: '修改商品', activeMenu: '/product/spu'} meta: { title: '修改商品', activeMenu: '/product/spu' }
}, },
{ {
path: 'add', path: 'add',
component: (resolve) => require(['@/views/mall/product/spu/save'], resolve), component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
name: 'ProductSpuCreate', name: 'ProductSpuCreate',
meta: {title: '添加商品', activeMenu: '/product/spu'} meta: { title: '添加商品', activeMenu: '/product/spu' }
} }
] ]
}, },
{ {
@ -248,6 +249,6 @@ Router.prototype.push = function push(location) {
export default new Router({ export default new Router({
base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/", base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/",
mode: 'hash', // 去掉url中的# mode: 'hash', // 去掉url中的#
scrollBehavior: () => ({y: 0}), scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes routes: constantRoutes
}) })

14
src/views/base/equipmentPlcConnect/index.vue
View File

@ -144,7 +144,7 @@ export default {
}, },
{ {
type: 'select', type: 'select',
label: 'PLC编码', label: '编码',
placeholder: '请选择编码', placeholder: '请选择编码',
param: 'plcId', param: 'plcId',
selectOptions: [], selectOptions: [],
@ -184,6 +184,9 @@ export default {
labelKey: `plcTableName`, labelKey: `plcTableName`,
url: '/base/equipment-plc/listAll', url: '/base/equipment-plc/listAll',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
bind: {
filterable: true
}
}, },
], ],
[ [
@ -193,6 +196,9 @@ export default {
prop: 'equipmentId', prop: 'equipmentId',
url: '/base/equipment/page?pageNo=1&pageSize=99', url: '/base/equipment/page?pageNo=1&pageSize=99',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
bind: {
filterable: true
}
}, },
], ],
], ],
@ -351,11 +357,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal this.$modal
.confirm( .confirm('是否删除该配置?')
'是否确认删除设备与实时采集关系表（一对多）编号为"' +
id +
'"的数据项?'
)
.then(function () { .then(function () {
return deleteEquipmentPlcConnect(id); return deleteEquipmentPlcConnect(id);
}) })

2
vue.config.js
View File

@ -8,7 +8,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin') const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '芋道管理系统' // 网页标题 const name = process.env.VUE_APP_TITLE || '中建材智能自动化研究院有限公司' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口