update homepage

.env.dev

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

.env.front

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

.env.prod

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

.env.stage

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

.env.static

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

src/layout/components/Navbar.vue

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

src/router/index.js

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

src/views/base/equipmentPlcConnect/index.vue

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

vue.config.js

@@ -8,7 +8,7 @@ function resolve(dir) {
 
 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 // 端口