update

.prettierrc

@@ -0,0 +1,11 @@
+{
+	"singleQuote": true,
+	"tabWidth": 2,
+	"bracketSameLine": true,
+	"embeddedLanguageFormatting": "auto",
+	"printWidth": 180,
+	"quoteProps": "consistent",
+	"trailingComma": "none",
+	"semi": false,
+	"useTabs": true
+}

public/index.html

@@ -10,6 +10,7 @@
     window.SITE_CONFIG['version'] = 'v5.0.0';
     window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>';
     window.SITE_CONFIG['apiURL'] = '';                      // api请求地址
+    window.SITE_CONFIG['projURL'] = '/yd-monitor';                      // api请求地址
     window.SITE_CONFIG['storeState'] = {};                  // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态）
     window.SITE_CONFIG['contentTabDefault'] = {             // 内容标签页默认属性对象
       'name': '',        // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径）
@@ -30,7 +31,7 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
-    window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.65:8080';
     </script>
   <% } %>
   <!-- 集成测试环境 -->

src/App.vue

@@ -1,34 +1,34 @@
 <template>
-  <transition name="el-fade-in-linear">
-    <router-view />
-  </transition>
+	<transition name="el-fade-in-linear">
+		<router-view />
+	</transition>
 </template>
 
 <style>
-  .el-table th.gutter{
-    display: table-cell!important;
-  }
+.el-table th.gutter {
+	display: table-cell !important;
+}
 </style>
 <script>
 import Cookies from 'js-cookie'
 import { messages } from '@/i18n'
 export default {
-  watch: {
-    '$i18n.locale': 'i18nHandle'
-  },
-  created () {
-    this.i18nHandle(this.$i18n.locale)
-  },
-  methods: {
-    i18nHandle (val, oldVal) {
-      Cookies.set('language', val)
-      document.querySelector('html').setAttribute('lang', val)
-      document.title = messages[val].brand.lg
-      // 非登录页面，切换语言刷新页面
-      if (this.$route.name !== 'login' && oldVal) {
-        window.location.reload()
-      }
-    }
-  }
+	watch: {
+		'$i18n.locale': 'i18nHandle'
+	},
+	created() {
+		this.i18nHandle(this.$i18n.locale)
+	},
+	methods: {
+		i18nHandle(val, oldVal) {
+			Cookies.set('language', val)
+			document.querySelector('html').setAttribute('lang', val)
+			document.title = messages[val].brand.lg
+			// 非登录页面，切换语言刷新页面
+			if (this.$route.name !== 'login' && oldVal) {
+				window.location.reload()
+			}
+		}
+	}
 }
 </script>

src/components/base-dialog/addOrUpdate/index.vue

@@ -0,0 +1,249 @@
+<template>
+	<el-dialog :title="isDetail ? title.detail : !dataForm.id ? title.add : title.edit" :visible.sync="visible" @close="handleClose">
+		<el-form :model="dataForm" :rules="dataFormRules">
+			<!-- 如果需要更精细一点的布局，可以根据配置项实现地再复杂一点，但此处暂时全部采用一行两列布局  -->
+			<el-row v-for="n in rows" :key="n" :gutter="20">
+				<el-col v-for="c in COLUMN_PER_ROW" :key="`${n}+'col'+${c}`" :span="24 / COLUMN_PER_ROW">
+					<!-- <el-form-item
+						v-for="field in configs.fields"
+						:key="field.name || field"
+						:prop="field.name || field"
+						:label="field.label || field.name | nameFilter || field | nameFilter"
+					> -->
+					<!-- <el-form-item
+						:prop="
+							typeof configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)] === 'string'
+								? configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]
+								: configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].type
+						"
+						:key="`${n}-col-${c}-item`"
+						:label="
+							`
+							${configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].label ||
+								(configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name && defaultNames[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]) ||
+								defaultNames[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]]}
+						`
+						"
+					> -->
+					<el-form-item :prop="`${n}-test-${c}`" :key="`${n}-col-${c}-item`" :label="'f'">
+						{{ n - c - JSON.stringify(configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]) }}
+						<!-- 暂时先不实现部分输入方式 -->
+						<!-- <el-input></el-input>
+						<el-radio></el-radio>
+						<el-checkbox></el-checkbox>
+						<el-select></el-select>
+						<el-switch></el-switch>
+						<el-cascader></el-cascader>
+						<el-time-select></el-time-select>
+						<el-date-picker></el-date-picker> -->
+					</el-form-item>
+				</el-col>
+			</el-row>
+
+			<!-- extra components , like Markdown or RichEdit -->
+			<template v-if="configs.extraComponents && configs.extraComponents.length > 0">
+				<el-form-item v-for="ec in configs.extraComponents" :key="ec.name" :label="ec.label">
+					<component :is="ec.component" v-model="dataForm[ec.name]"></component>
+				</el-form-item>
+			</template>
+		</el-form>
+
+		<span slot="footer" class="dialog-footer">
+			<el-button v-for="(operate, index) in configs.operations" :key="`operate-${index}`" :type="btnType[operate.name]" @click="handleClick(operate)">
+				<!-- {{ operate.name | btnNameFilter }} -->
+				{{ btnName[operate.name] }}
+			</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+// 标题 for i18n
+const title = {
+	detail: '详情',
+	add: '新增',
+	edit: '编辑'
+}
+
+// 或者也可以改造成自定义颜色：
+const btnType = {
+	save: 'success',
+	update: 'primary',
+	reset: 'text'
+	// add more...
+}
+
+const btnName = {
+	// for i18n
+	save: '保存',
+	update: '更新',
+	reset: '重置'
+	// add more...
+}
+
+// 每行的列数
+const COLUMN_PER_ROW = 2
+
+export default {
+	name: 'AddOrUpdateDialog',
+	props: {
+		configs: {
+			/**
+			 * type: 'dialog' | 'drawer' | 'page'
+			 * fields: Array<string|object>
+			 * - fields.object: { name, type: 'number'|'textarea'|'select'|'date'|.., required: boolean,  validator: boolean(是否需要验证), [options]: any[], api: string(自动获取数据的接口，一般为getcode接口)}
+			 * operations: Array[object], 操作名和对应的接口地址
+			 */
+			type: Object,
+			default: () => ({}) // 此处省去类型检查，使用者自行注意就好
+		}
+	},
+	filters: {
+		nameFilter: function(name) {
+			if (!name) return null
+			// for i18n
+			const defaultNames = {
+				name: '名称',
+				code: '编码',
+				remark: '备注',
+				specifications: '规格'
+				// add more...
+			}
+
+			return defaultNames[name]
+		}
+	},
+	data() {
+		return {
+			COLUMN_PER_ROW,
+			title,
+			btnName,
+			btnType,
+			visible: false,
+			isEdit: false,
+			isDetail: false,
+			// cached: false // 不采用缓存比较的方案了，采用 updated 方案： 如果更新了dataForm就在 confirm 时 emit(refreshDataList)
+			isUpdated: false,
+			dataForm: {},
+			dataFormRules: {},
+			defaultNames: {
+				name: '名称',
+				code: '编码',
+				remark: '备注',
+				specifications: '规格'
+				// add more...
+			}
+		}
+	},
+	computed: {
+		rows() {
+			// 本组件只实现了'一行两列'的表单布局
+			return Math.ceil(this.configs.fields.length / COLUMN_PER_ROW)
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			/** 动态设置dataForm字段 */
+			this.configs.fields.forEach(item => {
+				if (typeof item === 'string') {
+					this.$set(this.dataForm, [item], '')
+				} else if (typeof item === 'object') {
+					this.$set(this.dataForm, [item.name], '')
+					if (item.api) {
+						/** 自动请求并填充 */
+						this.$http({
+							url: this.$http.adornUrl(item.api),
+							methods: 'get'
+						}).then(({ data: res }) => {
+							if (data & (data.code === 0)) {
+								this.dataFrom[item.name] = res.data // <=== 此处需要对接口
+							}
+						})
+					} // end if (item.api)
+
+					if (item.required) {
+						const requiredRule = {
+							required: true,
+							message: '请输入必填项',
+							trigger: 'change'
+						}
+						/** 检查是否已经存在该字段的规则 */
+						const exists = this.dataFormRules[item.name] || null
+						/** 设置验证规则  */
+						if (exists) {
+							const unset = true
+							for (const rule of exists) {
+								if (rule.required) unset = false
+							}
+							if (unset) {
+								exists.push(requiredRule)
+							}
+						} else {
+							/** 不存在已有规则 */
+							this.$set(this.dataFormRules, [item.name], [requiredRule])
+						}
+					} // end if (item.required)
+
+					if (item.rules) {
+						const exists = this.dataFormRules[item.name] || null
+						if (exists) {
+							// 浅拷贝过去
+							exists.push(...item.rules)
+						} else {
+							this.$set(this.dataFormRules, [item.name], [...item.rules])
+						}
+					} // end if (item.rules)
+				}
+			})
+
+			/** 检查是否需要额外的组件 */
+			this.configs.extraComponents &&
+				this.configs.extraComponents.forEach(item => {
+					this.$set(this.dataForm, [item.name], '')
+				})
+
+			/** 单独设置 id */
+			this.$set(this.dataForm, 'id', null)
+
+			// TODO：delete next lines
+			console.log('dataform: ', this.dataForm)
+			console.log('rules: ', this.dataFormRules)
+		})
+	},
+	updated() {
+		this.isUpdated = true // 此时如果点击保存就会 emit(refreshDataList)
+	},
+	// beforeDestroy() {
+	// 缓存比较方案：
+	// 在组件快要销毁时，比较localStorage和dataForm里的值
+	// 如果有改变则 emit
+	// 否则直接销毁
+	// 清除localStorage里的缓存
+	// if (cached && compareCache(this.dataForm, localStorage...) || !isEdit) {
+	//   // 如果是编辑页面，并且已经更新了内容；或者是新增页面，就emit刷新列表
+	//   clearCache()
+	//   this.$emit('refreshDataList')
+	// }
+	// },
+	methods: {
+		init() {
+			this.visible = true
+		},
+		handleClick(btn) {
+			switch (btn.name) {
+				case 'save':
+					break
+				case 'update':
+					break
+				case 'reset':
+					break
+				// add more..
+			}
+		},
+		handleClose() {
+			if (this.isAdd || this.isUpdated) this.$emit('refreshDataList')
+			this.visible = false
+		}
+	}
+}
+</script>

src/components/base-table/components/detailComponent.js

@@ -0,0 +1,34 @@
+/**
+ * @Author: lb
+ * @CreateDate: 2022.8.8
+ * @Modifier: 
+ * @ModifiedDate: 
+ * 表格里的文本组件
+ * 一般用途：展示查看详情入口
+ */
+export default {
+  name: 'TableTextComponent',
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      // for i18n inject:
+      defaultText: '查看详情'
+    }
+  },
+  methods: {
+    emitClick() {
+      this.$emit('emitData', {
+        action: this.injectData.actionName || 'view-detail-action',
+        data: this.injectData.emitFullData ? this.injectData : { id: this.injectData.id }
+      })
+    }
+  },
+  render: function (h) {
+    return h('span', null, [h('el-button', { props: { type: 'text' }, style: { paddingLeft: 0 } }, this.injectData.buttonContent || this.defaultText)])
+  }
+}

src/components/base-table/components/operationComponent.js

@@ -0,0 +1,50 @@
+/**
+ * @Author: lb
+ * @CreateDate: 2022.8.8
+ * @Modifier: 
+ * @ModifiedDate: 
+ * 表格里的操作组件
+ * 一般用途：展示添加删除按钮
+ */
+export default {
+  name: 'TableOperations',
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      btnTypes: {
+        add: 'primary',
+        delete: 'danger',
+        detail: 'info'
+        // add more...
+      },
+      colors: {
+        delete: '#FF5454',
+        // add more...
+      },
+      text: {
+        // for i18n inject:
+        edit: '编辑',
+        detail: '详情',
+        delete: '删除',
+        viewAttr: '查看属性'
+        // add more...
+      }
+    }
+  },
+  methods: {
+    // 发射事件
+  },
+  render: function (h) {
+    let btns = []
+    for (const optionStr of this.injectData.head?.options) {
+      // btns.push(h('el-button', { props: { type: this.btnTypes[optionStr] } }, optionStr))
+      btns.push(h('el-button', { props: { type: 'text' }, style: { color: this.colors[optionStr] || '#409EFF' } }, this.text[optionStr]))
+    }
+    return h('span', null, btns)
+  }
+}

src/components/base-table/index.vue

@@ -0,0 +1,74 @@
+<template>
+	<div class="base-table">
+		<el-table :data="data" style="width: 100%" fit border :header-cell-style="{ background: '#FAFAFA', color: '#606266', height: '40px' }" :max-height="maxHeight">
+			<!-- 表格头定义 -->
+			<template v-for="(head, idx) in tableHeadConfigs">
+				<!-- 带type的表头 -->
+				<el-table-column
+					:key="idx"
+					v-if="head.type"
+					:type="head.type"
+					:label="head.label || head.name || ''"
+					:header-align="head.align || 'center'"
+					:align="head.align || 'center'"
+					:width="head.width || 50"
+					v-bind="head.more"
+				></el-table-column>
+				<!-- 普通的表头 -->
+				<el-table-column
+					v-else
+					:key="idx"
+					:label="head.label ? head.label : head.name"
+					:prop="head.prop"
+					:width="head.width"
+					:min-width="head.minWidth"
+					:fixed="head.fixed"
+					:show-overflow-tooltip="head.showOverflowTooltip || false"
+					filter-placement="top"
+					:align="head.align"
+					v-bind="head.more"
+				>
+					<!-- 子组件 -->
+					<template v-if="head.prop" slot-scope="scope">
+						<component v-if="head.subcomponent" :is="head.subcomponent" :key="idx + 'sub'" :inject-data="{ ...scope.row, head }" @emitData="handleSubEmitData" />
+						<!-- 直接展示数据或应用过滤器 -->
+						<span v-else>{{ scope.row[head.prop] | commonFilter(head.filter) }}</span>
+					</template>
+				</el-table-column>
+			</template>
+		</el-table>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'BaseTable',
+	props: {
+		tableHeadConfigs: {
+			type: Array,
+			default: () => []
+		},
+		data: {
+			type: Array,
+			default: () => []
+		},
+		maxHeight: {
+			type: Number,
+			default: 500
+		}
+	},
+	filters: {
+		commonFilter: (source, filterType = a => a) => {
+			return filterType(source)
+		}
+	},
+	data() {
+		return {}
+	},
+	methods: {
+		handleSubEmitData(payload) {
+			this.$emit('operate-event', payload)
+		}
+	}
+}
+</script>

src/components/ren-dept-tree/src/ren-dept-tree.vue

@@ -76,7 +76,7 @@ export default {
       return data.name.indexOf(value) !== -1
     },
     getDeptList (id) {
-      return this.$http.get('/sys/dept/list').then(({ data: res }) => {
+      return this.$http.get(this.$http.adornUrl('/sys/dept/list')).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }

src/components/ren-region-tree/src/ren-region-tree.vue

@@ -90,7 +90,7 @@ export default {
       return data.name.indexOf(value) !== -1
     },
     getDataList (id) {
-      return this.$http.get('/sys/region/tree').then(({ data: res }) => {
+      return this.$http.get(this.$http.adornUrl('/sys/region/tree')).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }

src/i18n/index.js

@@ -15,6 +15,7 @@ export const messages = {
 }
 
 export default new VueI18n({
-  locale: Cookies.get('language') || 'zh-CN',
+  // locale: Cookies.get('language') || 'zh-CN',
+  locale: 'zh-CN', // 先默认中文
   messages
 })

src/main.js

@@ -31,6 +31,10 @@ Vue.use(renRegionTree)
 Vue.prototype.$http = http
 Vue.prototype.$hasPermission = hasPermission
 Vue.prototype.$getDictLabel = getDictLabel
+// is auth
+Vue.prototype.isAuth = permission => {
+  return "正在检查的权限是：" + permission
+}
 
 // 保存整站vuex本地储存初始状态
 window.SITE_CONFIG['storeState'] = cloneDeep(store.state)

src/mixins/view-module.js

@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import qs from 'qs'
 export default {
-  data () {
+  data() {
     /* eslint-disable */
     return {
       // 设置属性
@@ -29,22 +29,24 @@ export default {
     }
     /* eslint-enable */
   },
-  created () {
+  created() {
     if (this.mixinViewModuleOptions.createdIsNeed) {
       this.query()
     }
   },
-  activated () {
+  activated() {
     if (this.mixinViewModuleOptions.activatedIsNeed) {
       this.query()
     }
   },
   methods: {
     // 获取数据列表
-    query () {
+    query() {
       this.dataListLoading = true
       this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL,
+        this.$http.adornUrl(
+          this.mixinViewModuleOptions.getDataListURL
+        ),
         {
           params: {
             order: this.order,
@@ -68,11 +70,11 @@ export default {
       })
     },
     // 多选
-    dataListSelectionChangeHandle (val) {
+    dataListSelectionChangeHandle(val) {
       this.dataListSelections = val
     },
     // 排序
-    dataListSortChangeHandle (data) {
+    dataListSortChangeHandle(data) {
       if (!data.order || !data.prop) {
         this.order = ''
         this.orderField = ''
@@ -83,13 +85,13 @@ export default {
       this.query()
     },
     // 分页, 每页条数
-    pageSizeChangeHandle (val) {
+    pageSizeChangeHandle(val) {
       this.page = 1
       this.limit = val
       this.query()
     },
     // 分页, 当前页
-    pageCurrentChangeHandle (val) {
+    pageCurrentChangeHandle(val) {
       this.page = val
       this.query()
     },
@@ -98,7 +100,7 @@ export default {
       this.query()
     },
     // 新增 / 修改
-    addOrUpdateHandle (id) {
+    addOrUpdateHandle(id) {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
         this.$refs.addOrUpdate.dataForm.id = id
@@ -106,7 +108,7 @@ export default {
       })
     },
     // 关闭当前窗口
-    closeCurrentTab (data) {
+    closeCurrentTab(data) {
       var tabName = this.$store.state.contentTabsActiveName
       this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
       if (this.$store.state.contentTabs.length <= 0) {
@@ -118,7 +120,7 @@ export default {
       }
     },
     // 删除
-    deleteHandle (id) {
+    deleteHandle(id) {
       if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) {
         return this.$message({
           message: this.$t('prompt.deleteBatch'),
@@ -132,7 +134,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$http.delete(
-          `${this.mixinViewModuleOptions.deleteURL}${this.mixinViewModuleOptions.deleteIsBatch ? '' : '/' + id}`,
+          this.$http.adornUrl(`${this.mixinViewModuleOptions.deleteURL}${this.mixinViewModuleOptions.deleteIsBatch ? '' : '/' + id}`),
           this.mixinViewModuleOptions.deleteIsBatch ? {
             'data': id ? [id] : this.dataListSelections.map(item => item[this.mixinViewModuleOptions.deleteIsBatchKey])
           } : {}
@@ -148,11 +150,11 @@ export default {
               this.query()
             }
           })
-        }).catch(() => {})
-      }).catch(() => {})
+        }).catch(() => { })
+      }).catch(() => { })
     },
     // 导出
-    exportHandle () {
+    exportHandle() {
       var params = qs.stringify({
         'token': Cookies.get('token'),
         ...this.dataForm

src/router/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import http from '@/utils/request'
 import { isURL } from '@/utils/validate'
+import Cookies from 'js-cookie'
 
 Vue.use(Router)
 
@@ -12,7 +13,7 @@ export const pageRoutes = [
     component: () => import('@/views/pages/404'),
     name: '404',
     meta: { title: '404未找到' },
-    beforeEnter (to, from, next) {
+    beforeEnter(to, from, next) {
       // 拦截处理特殊业务场景
       // 如果, 重定向路由包含__双下划线, 为临时添加路由
       if (/__.*/.test(to.redirectedFrom)) {
@@ -21,7 +22,20 @@ export const pageRoutes = [
       next()
     }
   },
-  { path: '/login', component: () => import('@/views/pages/login'), name: 'login', meta: { title: '登录' } }
+  {
+    path: '/login',
+    component: () => import('@/views/pages/login'),
+    name: 'login',
+    meta: { title: '登录' },
+    beforeEnter(to, from, next) {
+      if (Cookies.get('token')) {
+        Vue.prototype.$message({ message:'已经登录过了', type: 'error' })
+        next(false)
+      } else {
+        next()
+      }
+    }
+  }
 ]
 
 // 模块路由(基于主入口布局页面)
@@ -36,7 +50,7 @@ export const moduleRoutes = {
   ]
 }
 
-export function addDynamicRoute (routeParams, router) {
+export function addDynamicRoute(routeParams, router) {
   // 组装路由名称, 并判断是否已添加, 如是: 则直接跳转
   var routeName = routeParams.routeName
   var dynamicRoute = window.SITE_CONFIG['dynamicRoutes'].filter(item => item.name === routeName)[0]
@@ -78,22 +92,25 @@ router.beforeEach((to, from, next) => {
     return next()
   }
   // 获取字典列表, 添加并全局变量保存
-  http.get('/sys/dict/type/all').then(({ data: res }) => {
+  http.get(http.adornUrl('/sys/dict/type/all')).then(({ data: res }) => {
     if (res.code !== 0) {
       return
     }
     window.SITE_CONFIG['dictList'] = res.data
-  }).catch(() => {})
+  }).catch((err) => {
+    // console.log("catch /sys/dict/type/all", err)
+  })
   // 获取菜单列表, 添加并全局变量保存
-  http.get('/sys/menu/nav').then(({ data: res }) => {
+  http.get(http.adornUrl('/sys/menu/nav')).then(({ data: res }) => {
     if (res.code !== 0) {
       Vue.prototype.$message.error(res.msg)
       return next({ name: 'login' })
     }
+    console.log('menulist: ', res.data)
     window.SITE_CONFIG['menuList'] = res.data
     fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList'])
     next({ ...to, replace: true })
-  }).catch(() => {
+  }).catch((err) => {
     next({ name: 'login' })
   })
 })
@@ -103,7 +120,7 @@ router.beforeEach((to, from, next) => {
  * @param {*} route 当前路由
  * @param {*} pageRoutes 页面路由
  */
-function fnCurrentRouteIsPageRoute (route, pageRoutes = []) {
+function fnCurrentRouteIsPageRoute(route, pageRoutes = []) {
   var temp = []
   for (var i = 0; i < pageRoutes.length; i++) {
     if (route.path === pageRoutes[i].path) {
@@ -121,7 +138,7 @@ function fnCurrentRouteIsPageRoute (route, pageRoutes = []) {
  * @param {*} menuList 菜单列表
  * @param {*} routes 递归创建的动态(菜单)路由
  */
-function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
+function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
   var temp = []
   for (var i = 0; i < menuList.length; i++) {
     if (menuList[i].children && menuList[i].children.length >= 1) {

src/utils/index.js

@@ -73,7 +73,7 @@ export function getIconList () {
 }
 
 /**
- * 树形数据转换
+ * 树形数据转换，把扁平的数据，转换为树形结构的数据
  * @param {*} data
  * @param {*} id
  * @param {*} pid

src/utils/request.js

@@ -4,6 +4,7 @@ import router from '@/router'
 import qs from 'qs'
 import { clearLoginInfo } from '@/utils'
 import isPlainObject from 'lodash/isPlainObject'
+import merge from 'lodash/merge'
 
 const http = axios.create({
   baseURL: window.SITE_CONFIG['apiURL'],
@@ -61,4 +62,42 @@ http.interceptors.response.use(response => {
   return Promise.reject(error)
 })
 
+/**
+ * 请求地址处理
+ * @param {*} actionName action方法名称
+ */
+http.adornUrl = (actionName) => {
+  // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
+  return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.projURL) + actionName
+}
+
+/**
+ * get请求参数处理
+ * @param {*} params 参数对象
+ * @param {*} openDefultParams 是否开启默认参数?
+ */
+http.adornParams = (params = {}, openDefaultParams = true) => {
+  var defaults = {
+    't': new Date().getTime()
+  }
+  return openDefaultParams ? merge(defaults, params) : params
+}
+
+/**
+ * post请求数据处理
+ * @param {*} data 数据对象
+ * @param {*} openDefultdata 是否开启默认数据?
+ * @param {*} contentType 数据格式
+ *  json: 'application/json; charset=utf-8'
+ *  form: 'application/x-www-form-urlencoded; charset=utf-8'
+ */
+http.adornData = (data = {}, openDefaultdata = true, contentType = 'json') => {
+  var defaults = {
+    't': new Date().getTime()
+  }
+  data = openDefaultdata ? merge(defaults, data) : data
+  return contentType === 'json' ? JSON.stringify(data) : qs.stringify(data)
+}
+
+
 export default http

src/views/main-content.vue

@@ -1,96 +1,96 @@
 <template>
-  <main :class="['aui-content', { 'aui-content--tabs': $route.meta.isTab }]">
-    <!-- tab展示内容 -->
-    <template v-if="$route.meta.isTab">
-      <el-dropdown class="aui-content--tabs-tools">
-        <i class="el-icon-arrow-down"></i>
-        <el-dropdown-menu slot="dropdown" :show-timeout="0">
-          <el-dropdown-item @click.native="tabRemoveHandle($store.state.contentTabsActiveName)">{{ $t('contentTabs.closeCurrent') }}</el-dropdown-item>
-          <el-dropdown-item @click.native="tabsCloseOtherHandle()">{{ $t('contentTabs.closeOther') }}</el-dropdown-item>
-          <el-dropdown-item @click.native="tabsCloseAllHandle()">{{ $t('contentTabs.closeAll') }}</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-tabs v-model="$store.state.contentTabsActiveName" @tab-click="tabSelectedHandle" @tab-remove="tabRemoveHandle">
-        <el-tab-pane
-          v-for="item in $store.state.contentTabs"
-          :key="item.name"
-          :name="item.name"
-          :label="item.title"
-          :closable="item.name !== 'home'"
-          :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }">
-          <template v-if="item.name === 'home'">
-            <svg slot="label" class="icon-svg aui-content--tabs-icon-nav" aria-hidden="true"><use xlink:href="#icon-home"></use></svg>
-          </template>
-          <iframe v-if="tabIsIframe(item.iframeURL)" :src="item.iframeURL" width="100%" height="100%" frameborder="0" scrolling="yes"></iframe>
-          <keep-alive v-else>
-            <router-view v-if="item.name === $store.state.contentTabsActiveName" />
-          </keep-alive>
-        </el-tab-pane>
-      </el-tabs>
-    </template>
-    <!-- 其他方式, 展示内容 -->
-    <template v-else>
-      <keep-alive>
-        <router-view />
-      </keep-alive>
-    </template>
-  </main>
+	<main :class="['aui-content', { 'aui-content--tabs': $route.meta.isTab }]">
+		<!-- tab展示内容 -->
+		<template v-if="$route.meta.isTab">
+			<el-dropdown class="aui-content--tabs-tools">
+				<i class="el-icon-arrow-down"></i>
+				<el-dropdown-menu slot="dropdown" :show-timeout="0">
+					<el-dropdown-item @click.native="tabRemoveHandle($store.state.contentTabsActiveName)">{{ $t('contentTabs.closeCurrent') }}</el-dropdown-item>
+					<el-dropdown-item @click.native="tabsCloseOtherHandle()">{{ $t('contentTabs.closeOther') }}</el-dropdown-item>
+					<el-dropdown-item @click.native="tabsCloseAllHandle()">{{ $t('contentTabs.closeAll') }}</el-dropdown-item>
+				</el-dropdown-menu>
+			</el-dropdown>
+			<el-tabs v-model="$store.state.contentTabsActiveName" @tab-click="tabSelectedHandle" @tab-remove="tabRemoveHandle">
+				<el-tab-pane
+					v-for="item in $store.state.contentTabs"
+					:key="item.name"
+					:name="item.name"
+					:label="item.title"
+					:closable="item.name !== 'home'"
+					:class="{ 'is-iframe': tabIsIframe(item.iframeURL) }"
+				>
+					<template v-if="item.name === 'home'">
+						<svg slot="label" class="icon-svg aui-content--tabs-icon-nav" aria-hidden="true"><use xlink:href="#icon-home"></use></svg>
+					</template>
+					<iframe v-if="tabIsIframe(item.iframeURL)" :src="item.iframeURL" width="100%" height="100%" frameborder="0" scrolling="yes"></iframe>
+					<keep-alive v-else>
+						<router-view v-if="item.name === $store.state.contentTabsActiveName" />
+					</keep-alive>
+				</el-tab-pane>
+			</el-tabs>
+		</template>
+		<!-- 其他方式, 展示内容 -->
+		<template v-else>
+			<keep-alive>
+				<router-view />
+			</keep-alive>
+		</template>
+	</main>
 </template>
 
 <script>
 import { isURL } from '@/utils/validate'
 export default {
-  data () {
-    return {
-    }
-  },
-  methods: {
-    // tabs, 是否通过iframe展示
-    tabIsIframe (url) {
-      return isURL(url)
-    },
-    // tabs, 选中tab
-    tabSelectedHandle (tab) {
-      tab = this.$store.state.contentTabs.filter(item => item.name === tab.name)[0]
-      if (tab) {
-        this.$router.push({
-          'name': tab.name,
-          'params': { ...tab.params },
-          'query': { ...tab.query }
-        })
-      }
-    },
-    // tabs, 删除tab
-    tabRemoveHandle (tabName) {
-      if (tabName === 'home') {
-        return false
-      }
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
-      if (this.$store.state.contentTabs.length <= 0) {
-        this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home'
-        return false
-      }
-      // 当前选中tab被删除
-      if (tabName === this.$store.state.contentTabsActiveName) {
-        let tab = this.$store.state.contentTabs[this.$store.state.contentTabs.length - 1]
-        this.$router.push({
-          name: tab.name,
-          params: { ...tab.params },
-          query: { ...tab.query }
-        })
-      }
-    },
-    // tabs, 关闭其它
-    tabsCloseOtherHandle () {
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => {
-        return item.name === 'home' || item.name === this.$store.state.contentTabsActiveName
-      })
-    },
-    // tabs, 关闭全部
-    tabsCloseAllHandle () {
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home')
-      this.$router.push({ name: 'home' })
-    }
-  }
+	data() {
+		return {}
+	},
+	methods: {
+		// tabs, 是否通过iframe展示
+		tabIsIframe(url) {
+			return isURL(url)
+		},
+		// tabs, 选中tab
+		tabSelectedHandle(tab) {
+			tab = this.$store.state.contentTabs.filter(item => item.name === tab.name)[0]
+			if (tab) {
+				this.$router.push({
+					name: tab.name,
+					params: { ...tab.params },
+					query: { ...tab.query }
+				})
+			}
+		},
+		// tabs, 删除tab
+		tabRemoveHandle(tabName) {
+			if (tabName === 'home') {
+				return false
+			}
+			this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
+			if (this.$store.state.contentTabs.length <= 0) {
+				this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home'
+				return false
+			}
+			// 当前选中tab被删除
+			if (tabName === this.$store.state.contentTabsActiveName) {
+				let tab = this.$store.state.contentTabs[this.$store.state.contentTabs.length - 1]
+				this.$router.push({
+					name: tab.name,
+					params: { ...tab.params },
+					query: { ...tab.query }
+				})
+			}
+		},
+		// tabs, 关闭其它
+		tabsCloseOtherHandle() {
+			this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => {
+				return item.name === 'home' || item.name === this.$store.state.contentTabsActiveName
+			})
+		},
+		// tabs, 关闭全部
+		tabsCloseAllHandle() {
+			this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home')
+			this.$router.push({ name: 'home' })
+		}
+	}
 }
 </script>

src/views/main-navbar-update-password.vue

@@ -1,97 +1,95 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="$t('updatePassword.title')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    :append-to-body="true">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item :label="$t('updatePassword.username')">
-        <span>{{ $store.state.user.name }}</span>
-      </el-form-item>
-      <el-form-item prop="password" :label="$t('updatePassword.password')">
-        <el-input v-model="dataForm.password" type="password" :placeholder="$t('updatePassword.password')"></el-input>
-      </el-form-item>
-      <el-form-item prop="newPassword" :label="$t('updatePassword.newPassword')">
-        <el-input v-model="dataForm.newPassword" type="password" :placeholder="$t('updatePassword.newPassword')"></el-input>
-      </el-form-item>
-      <el-form-item prop="confirmPassword" :label="$t('updatePassword.confirmPassword')">
-        <el-input v-model="dataForm.confirmPassword" type="password" :placeholder="$t('updatePassword.confirmPassword')"></el-input>
-      </el-form-item>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
+	<el-dialog :visible.sync="visible" :title="$t('updatePassword.title')" :close-on-click-modal="false" :close-on-press-escape="false" :append-to-body="true">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+			<el-form-item :label="$t('updatePassword.username')">
+				<span>{{ $store.state.user.name }}</span>
+			</el-form-item>
+			<el-form-item prop="password" :label="$t('updatePassword.password')">
+				<el-input v-model="dataForm.password" type="password" :placeholder="$t('updatePassword.password')"></el-input>
+			</el-form-item>
+			<el-form-item prop="newPassword" :label="$t('updatePassword.newPassword')">
+				<el-input v-model="dataForm.newPassword" type="password" :placeholder="$t('updatePassword.newPassword')"></el-input>
+			</el-form-item>
+			<el-form-item prop="confirmPassword" :label="$t('updatePassword.confirmPassword')">
+				<el-input v-model="dataForm.confirmPassword" type="password" :placeholder="$t('updatePassword.confirmPassword')"></el-input>
+			</el-form-item>
+		</el-form>
+		<template slot="footer">
+			<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+			<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
 import { clearLoginInfo } from '@/utils'
 export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        password: '',
-        newPassword: '',
-        confirmPassword: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      var validateConfirmPassword = (rule, value, callback) => {
-        if (this.dataForm.newPassword !== value) {
-          return callback(new Error(this.$t('updatePassword.validate.confirmPassword')))
-        }
-        callback()
-      }
-      return {
-        password: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        newPassword: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        confirmPassword: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
-          { validator: validateConfirmPassword, trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http.put('/sys/user/password', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              clearLoginInfo()
-              this.$router.replace({ name: 'login' })
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				password: '',
+				newPassword: '',
+				confirmPassword: ''
+			}
+		}
+	},
+	computed: {
+		dataRule() {
+			var validateConfirmPassword = (rule, value, callback) => {
+				if (this.dataForm.newPassword !== value) {
+					return callback(new Error(this.$t('updatePassword.validate.confirmPassword')))
+				}
+				callback()
+			}
+			return {
+				password: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				newPassword: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				confirmPassword: [
+					{ required: true, message: this.$t('validate.required'), trigger: 'blur' },
+					{ validator: validateConfirmPassword, trigger: 'blur' }
+				]
+			}
+		}
+	},
+	methods: {
+		init() {
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+			})
+		},
+		// 表单提交
+		dataFormSubmitHandle: debounce(
+			function() {
+				this.$refs['dataForm'].validate(valid => {
+					if (!valid) {
+						return false
+					}
+					this.$http
+						.put('/sys/user/password', this.dataForm)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg)
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false
+									clearLoginInfo()
+									this.$router.replace({ name: 'login' })
+								}
+							})
+						})
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
+	}
 }
 </script>

src/views/main-navbar.vue

@@ -1,103 +1,108 @@
 <template>
-  <nav class="aui-navbar" :class="`aui-navbar--${$store.state.navbarLayoutType}`">
-    <div class="aui-navbar__header">
-      <h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
-        <a class="aui-navbar__brand-lg" href="javascript:;">{{ $t('brand.lg') }}</a>
-        <a class="aui-navbar__brand-mini" href="javascript:;">{{ $t('brand.mini') }}</a>
-      </h1>
-    </div>
-    <div class="aui-navbar__body">
-      <el-menu class="aui-navbar__menu mr-auto" mode="horizontal">
-        <el-menu-item index="1" @click="$store.state.sidebarFold = !$store.state.sidebarFold">
-          <svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch" aria-hidden="true"><use xlink:href="#icon-outdent"></use></svg>
-        </el-menu-item>
-        <el-menu-item index="2" @click="refresh()">
-          <svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--refresh" aria-hidden="true"><use xlink:href="#icon-sync"></use></svg>
-        </el-menu-item>
-      </el-menu>
-      <el-menu class="aui-navbar__menu" mode="horizontal">
-        <el-menu-item index="2">
-          <a href="https://www.renren.io/" target="_blank">
-            <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true"><use xlink:href="#icon-earth"></use></svg>
-          </a>
-        </el-menu-item>
-        <el-menu-item index="2">
-          <a href="https://gitee.com/renrenio/renren-security" target="_blank">
-            <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true"><use xlink:href="#gitee"></use></svg>
-          </a>
-        </el-menu-item>
-        <el-menu-item index="4" @click="fullscreenHandle()">
-          <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true"><use xlink:href="#icon-fullscreen"></use></svg>
-        </el-menu-item>
-        <el-menu-item index="5" class="aui-navbar__avatar">
-          <el-dropdown placement="bottom" :show-timeout="0">
-            <span class="el-dropdown-link">
-              <img src="~@/assets/img/avatar.png">
-              <span>{{ $store.state.user.name }}</span>
-              <i class="el-icon-arrow-down"></i>
-            </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item>
-              <el-dropdown-item @click.native="logoutHandle()">{{ $t('logout') }}</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </el-menu-item>
-      </el-menu>
-    </div>
-    <!-- 弹窗, 修改密码 -->
-    <update-password v-if="updatePasswordVisible" ref="updatePassword"></update-password>
-  </nav>
+	<nav class="aui-navbar" :class="`aui-navbar--${$store.state.navbarLayoutType}`">
+		<div class="aui-navbar__header">
+			<h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
+				<a class="aui-navbar__brand-lg" href="javascript:;">{{ $t('brand.lg') }}</a>
+				<a class="aui-navbar__brand-mini" href="javascript:;">{{ $t('brand.mini') }}</a>
+			</h1>
+		</div>
+		<div class="aui-navbar__body">
+			<el-menu class="aui-navbar__menu mr-auto" mode="horizontal">
+				<el-menu-item index="1" @click="$store.state.sidebarFold = !$store.state.sidebarFold">
+					<svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch" aria-hidden="true"><use xlink:href="#icon-outdent"></use></svg>
+				</el-menu-item>
+				<el-menu-item index="2" @click="refresh()">
+					<svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--refresh" aria-hidden="true"><use xlink:href="#icon-sync"></use></svg>
+				</el-menu-item>
+			</el-menu>
+			<el-menu class="aui-navbar__menu" mode="horizontal">
+				<el-menu-item index="2">
+					<a href="https://www.renren.io/" target="_blank">
+						<svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true"><use xlink:href="#icon-earth"></use></svg>
+					</a>
+				</el-menu-item>
+				<el-menu-item index="2">
+					<a href="https://gitee.com/renrenio/renren-security" target="_blank">
+						<svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true"><use xlink:href="#gitee"></use></svg>
+					</a>
+				</el-menu-item>
+				<el-menu-item index="4" @click="fullscreenHandle()">
+					<svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true"><use xlink:href="#icon-fullscreen"></use></svg>
+				</el-menu-item>
+				<el-menu-item index="5" class="aui-navbar__avatar">
+					<el-dropdown placement="bottom" :show-timeout="0">
+						<span class="el-dropdown-link">
+							<img src="~@/assets/img/avatar.png" />
+							<span>{{ $store.state.user.name }}</span>
+							<i class="el-icon-arrow-down"></i>
+						</span>
+						<el-dropdown-menu slot="dropdown">
+							<el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item>
+							<el-dropdown-item @click.native="logoutHandle()">{{ $t('logout') }}</el-dropdown-item>
+						</el-dropdown-menu>
+					</el-dropdown>
+				</el-menu-item>
+			</el-menu>
+		</div>
+		<!-- 弹窗, 修改密码 -->
+		<update-password v-if="updatePasswordVisible" ref="updatePassword"></update-password>
+	</nav>
 </template>
 <script>
 import screenfull from 'screenfull'
 import UpdatePassword from './main-navbar-update-password'
 import { clearLoginInfo } from '@/utils'
 export default {
-  inject: ['refresh'],
-  data () {
-    return {
-      updatePasswordVisible: false,
-      messageTip: false
-    }
-  },
-  components: {
-    UpdatePassword
-  },
-  methods: {
-    // 全屏
-    fullscreenHandle () {
-      if (!screenfull.enabled) {
-        return this.$message({
-          message: this.$t('fullscreen.prompt'),
-          type: 'warning',
-          duration: 500
-        })
-      }
-      screenfull.toggle()
-    },
-    // 修改密码
-    updatePasswordHandle () {
-      this.updatePasswordVisible = true
-      this.$nextTick(() => {
-        this.$refs.updatePassword.init()
-      })
-    },
-    // 退出
-    logoutHandle () {
-      this.$confirm(this.$t('prompt.info', { 'handle': this.$t('logout') }), this.$t('prompt.title'), {
-        confirmButtonText: this.$t('confirm'),
-        cancelButtonText: this.$t('cancel'),
-        type: 'warning'
-      }).then(() => {
-        this.$http.post('/logout').then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          clearLoginInfo()
-          this.$router.push({ name: 'login' })
-        }).catch(() => {})
-      }).catch(() => {})
-    }
-  }
+	inject: ['refresh'],
+	data() {
+		return {
+			updatePasswordVisible: false,
+			messageTip: false
+		}
+	},
+	components: {
+		UpdatePassword
+	},
+	methods: {
+		// 全屏
+		fullscreenHandle() {
+			if (!screenfull.enabled) {
+				return this.$message({
+					message: this.$t('fullscreen.prompt'),
+					type: 'warning',
+					duration: 500
+				})
+			}
+			screenfull.toggle()
+		},
+		// 修改密码
+		updatePasswordHandle() {
+			this.updatePasswordVisible = true
+			this.$nextTick(() => {
+				this.$refs.updatePassword.init()
+			})
+		},
+		// 退出
+		logoutHandle() {
+			this.$confirm(this.$t('prompt.info', { handle: this.$t('logout') }), this.$t('prompt.title'), {
+				confirmButtonText: this.$t('confirm'),
+				cancelButtonText: this.$t('cancel'),
+				type: 'warning'
+			})
+				.then(() => {
+					this.$http
+						.post(this.$http.adornUrl('/doLogout'))
+						.then(({ data: res }) => {
+							if (res.code !== 200) {
+								return this.$message.error(res.msg)
+							}
+							clearLoginInfo()
+							this.$router.push({ name: 'Login' })
+						})
+						.catch(() => {})
+				})
+				.catch(() => {})
+		}
+	}
 }
 </script>

src/views/main-sidebar-sub-menu.vue

@@ -1,38 +1,38 @@
 <template>
-  <el-submenu v-if="menu.children && menu.children.length >= 1" :index="menu.id" :popper-append-to-body="false">
-    <template slot="title">
-      <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true"><use :xlink:href="`#${menu.icon}`"></use></svg>
-      <span>{{ menu.name }}</span>
-    </template>
-    <sub-menu v-for="item in menu.children" :key="item.id" :menu="item"></sub-menu>
-  </el-submenu>
-  <el-menu-item v-else :index="menu.id" @click="gotoRouteHandle(menu.id)">
-    <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true"><use :xlink:href="`#${menu.icon}`"></use></svg>
-    <span>{{ menu.name }}</span>
-  </el-menu-item>
+	<el-submenu v-if="menu.children && menu.children.length >= 1" :index="menu.id" :popper-append-to-body="false">
+		<template slot="title">
+			<svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true"><use :xlink:href="`#${menu.icon}`"></use></svg>
+			<span>{{ menu.name }}</span>
+		</template>
+		<sub-menu v-for="item in menu.children" :key="item.id" :menu="item"></sub-menu>
+	</el-submenu>
+	<el-menu-item v-else :index="menu.id" @click="gotoRouteHandle(menu.id)">
+		<svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true"><use :xlink:href="`#${menu.icon}`"></use></svg>
+		<span>{{ menu.name }}</span>
+	</el-menu-item>
 </template>
 
 <script>
 import SubMenu from './main-sidebar-sub-menu'
 export default {
-  name: 'sub-menu',
-  props: {
-    menu: {
-      type: Object,
-      required: true
-    }
-  },
-  components: {
-    SubMenu
-  },
-  methods: {
-    // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
-    gotoRouteHandle (menuId) {
-      var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(item => item.meta.menuId === menuId)[0]
-      if (route) {
-        this.$router.push({ name: route.name })
-      }
-    }
-  }
+	name: 'sub-menu',
+	props: {
+		menu: {
+			type: Object,
+			required: true
+		}
+	},
+	components: {
+		SubMenu
+	},
+	methods: {
+		// 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
+		gotoRouteHandle(menuId) {
+			var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(item => item.meta.menuId === menuId)[0]
+			if (route) {
+				this.$router.push({ name: route.name })
+			}
+		}
+	}
 }
 </script>

src/views/main-sidebar.vue

@@ -1,30 +1,30 @@
 <template>
-  <aside :class="['aui-sidebar', `aui-sidebar--${$store.state.sidebarLayoutSkin}`]">
-    <div class="aui-sidebar__inner">
-      <el-menu
-        :default-active="$store.state.sidebarMenuActiveName"
-        :collapse="$store.state.sidebarFold"
-        :unique-opened="true"
-        :collapseTransition="false"
-        class="aui-sidebar__menu">
-        <sub-menu v-for="menu in $store.state.sidebarMenuList" :key="menu.id" :menu="menu" />
-      </el-menu>
-    </div>
-  </aside>
+	<aside :class="['aui-sidebar', `aui-sidebar--${$store.state.sidebarLayoutSkin}`]">
+		<div class="aui-sidebar__inner">
+			<el-menu
+				:default-active="$store.state.sidebarMenuActiveName"
+				:collapse="$store.state.sidebarFold"
+				:unique-opened="true"
+				:collapseTransition="false"
+				class="aui-sidebar__menu"
+			>
+				<sub-menu v-for="menu in $store.state.sidebarMenuList" :key="menu.id" :menu="menu" />
+			</el-menu>
+		</div>
+	</aside>
 </template>
 
 <script>
 import SubMenu from './main-sidebar-sub-menu'
 export default {
-  data () {
-    return {
-    }
-  },
-  components: {
-    SubMenu
-  },
-  created () {
-    this.$store.state.sidebarMenuList = window.SITE_CONFIG['menuList']
-  }
+	data() {
+		return {}
+	},
+	components: {
+		SubMenu
+	},
+	created() {
+		this.$store.state.sidebarMenuList = window.SITE_CONFIG['menuList']
+	}
 }
 </script>

src/views/main.vue

@@ -1,13 +1,13 @@
 <template>
-  <div v-loading.fullscreen.lock="loading" :element-loading-text="$t('loading')" :class="['aui-wrapper', { 'aui-sidebar--fold': $store.state.sidebarFold }]">
-    <template v-if="!loading">
-      <main-navbar />
-      <main-sidebar />
-      <div class="aui-content__wrapper">
-        <main-content v-if="!$store.state.contentIsNeedRefresh" />
-      </div>
-    </template>
-  </div>
+	<div v-loading.fullscreen.lock="loading" :element-loading-text="$t('loading')" :class="['aui-wrapper', { 'aui-sidebar--fold': $store.state.sidebarFold }]">
+		<template v-if="!loading">
+			<main-navbar />
+			<main-sidebar />
+			<div class="aui-content__wrapper">
+				<main-content v-if="!$store.state.contentIsNeedRefresh" />
+			</div>
+		</template>
+	</div>
 </template>
 
 <script>
@@ -16,87 +16,93 @@ import MainSidebar from './main-sidebar'
 import MainContent from './main-content'
 import debounce from 'lodash/debounce'
 export default {
-  provide () {
-    return {
-      // 刷新
-      refresh () {
-        this.$store.state.contentIsNeedRefresh = true
-        this.$nextTick(() => {
-          this.$store.state.contentIsNeedRefresh = false
-        })
-      }
-    }
-  },
-  data () {
-    return {
-      loading: true
-    }
-  },
-  components: {
-    MainNavbar,
-    MainSidebar,
-    MainContent
-  },
-  watch: {
-    $route: 'routeHandle'
-  },
-  created () {
-    this.windowResizeHandle()
-    this.routeHandle(this.$route)
-    Promise.all([
-      this.getUserInfo(),
-      this.getPermissions()
-    ]).then(() => {
-      this.loading = false
-    })
-  },
-  methods: {
-    // 窗口改变大小
-    windowResizeHandle () {
-      this.$store.state.sidebarFold = document.documentElement['clientWidth'] <= 992 || false
-      window.addEventListener('resize', debounce(() => {
-        this.$store.state.sidebarFold = document.documentElement['clientWidth'] <= 992 || false
-      }, 150))
-    },
-    // 路由, 监听
-    routeHandle (route) {
-      if (!route.meta.isTab) {
-        return false
-      }
-      var tab = this.$store.state.contentTabs.filter(item => item.name === route.name)[0]
-      if (!tab) {
-        tab = {
-          ...window.SITE_CONFIG['contentTabDefault'],
-          ...route.meta,
-          'name': route.name,
-          'params': { ...route.params },
-          'query': { ...route.query }
-        }
-        this.$store.state.contentTabs = this.$store.state.contentTabs.concat(tab)
-      }
-      this.$store.state.sidebarMenuActiveName = tab.menuId
-      this.$store.state.contentTabsActiveName = tab.name
-    },
-    // 获取当前管理员信息
-    getUserInfo () {
-      return this.$http.get('/sys/user/info').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.$store.state.user.id = res.data.id
-        this.$store.state.user.name = res.data.username
-        this.$store.state.user.superAdmin = res.data.superAdmin
-      }).catch(() => {})
-    },
-    // 获取权限
-    getPermissions () {
-      return this.$http.get('/sys/menu/permissions').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        window.SITE_CONFIG['permissions'] = res.data
-      }).catch(() => {})
-    }
-  }
+	provide() {
+		return {
+			// 刷新
+			refresh() {
+				this.$store.state.contentIsNeedRefresh = true
+				this.$nextTick(() => {
+					this.$store.state.contentIsNeedRefresh = false
+				})
+			}
+		}
+	},
+	data() {
+		return {
+			loading: true
+		}
+	},
+	components: {
+		MainNavbar,
+		MainSidebar,
+		MainContent
+	},
+	watch: {
+		$route: 'routeHandle'
+	},
+	created() {
+		this.windowResizeHandle()
+		this.routeHandle(this.$route)
+		Promise.all([this.getUserInfo(), this.getPermissions()]).then(() => {
+			this.loading = false
+		})
+	},
+	methods: {
+		// 窗口改变大小
+		windowResizeHandle() {
+			this.$store.state.sidebarFold = document.documentElement['clientWidth'] <= 992 || false
+			window.addEventListener(
+				'resize',
+				debounce(() => {
+					this.$store.state.sidebarFold = document.documentElement['clientWidth'] <= 992 || false
+				}, 150)
+			)
+		},
+		// 路由, 监听
+		routeHandle(route) {
+			if (!route.meta.isTab) {
+				return false
+			}
+			var tab = this.$store.state.contentTabs.filter(item => item.name === route.name)[0]
+			if (!tab) {
+				tab = {
+					...window.SITE_CONFIG['contentTabDefault'],
+					...route.meta,
+					name: route.name,
+					params: { ...route.params },
+					query: { ...route.query }
+				}
+				this.$store.state.contentTabs = this.$store.state.contentTabs.concat(tab)
+			}
+			this.$store.state.sidebarMenuActiveName = tab.menuId
+			this.$store.state.contentTabsActiveName = tab.name
+		},
+		// 获取当前管理员信息
+		getUserInfo() {
+			return this.$http
+				.get(this.$http.adornUrl('/sys/user/info'))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.$store.state.user.id = res.data.id
+					this.$store.state.user.name = res.data.username
+					this.$store.state.user.superAdmin = res.data.superAdmin
+				})
+				.catch(() => {})
+		},
+		// 获取权限
+		getPermissions() {
+			return this.$http
+				.get(this.$http.adornUrl('/sys/menu/permissions'))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					window.SITE_CONFIG['permissions'] = res.data
+				})
+				.catch(() => {})
+		}
+	}
 }
 </script>

src/views/modules/home.vue

@@ -1,31 +1,33 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-home">
-      <h3>项目介绍</h3>
-      <ul>
-        <li>renren-ui基于vue、element-ui构建开发，实现<a href="https://gitee.com/renrenio/renren-ui" target="_blank">renren-security</a>后台管理前端功能，提供一套更优的前端解决方案</li>
-        <li>前后端分离，通过token进行数据交互，可独立部署</li>
-        <li>动态菜单，通过菜单管理统一管理访问路由</li>
-        <li>演示地址：<a href="http://demo.open.renren.io/renren-security" target="_blank">http://demo.open.renren.io/renren-security</a> (账号密码：admin/admin)</li>
-      </ul>
-      <h3>获取帮助</h3>
-      <ul>
-        <li>官方社区：<a href="https://www.renren.io/community" target="_blank">https://www.renren.io/community</a></li>
-        <li>前端Git地址：<a href="https://gitee.com/renrenio/renren-ui" target="_blank">https://gitee.com/renrenio/renren-ui</a></li>
-        <li>后台Git地址：<a href="https://gitee.com/renrenio/renren-security" target="_blank">https://gitee.com/renrenio/renren-security</a></li>
-        <li>如需关注项目最新动态，请Watch、Star项目，同时也是对项目最好的支持</li>
-      </ul>
-      <h3>官方微信群</h3>
-      <ul>
-        <li>扫码下面的二维码，关注【人人开源】公众号，回复【加群】，即可根据提示加入微信群！</li>
-        <li><img src="https://cdn.renren.io/f5cef202207132229319338.jpg" alt="微信群" /></li>
-      </ul>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-home">
+			<h3>项目介绍</h3>
+			<ul>
+				<li>
+					renren-ui基于vue、element-ui构建开发，实现<a href="https://gitee.com/renrenio/renren-ui" target="_blank">renren-security</a>后台管理前端功能，提供一套更优的前端解决方案
+				</li>
+				<li>前后端分离，通过token进行数据交互，可独立部署</li>
+				<li>动态菜单，通过菜单管理统一管理访问路由</li>
+				<li>演示地址：<a href="http://demo.open.renren.io/renren-security" target="_blank">http://demo.open.renren.io/renren-security</a> (账号密码：admin/admin)</li>
+			</ul>
+			<h3>获取帮助</h3>
+			<ul>
+				<li>官方社区：<a href="https://www.renren.io/community" target="_blank">https://www.renren.io/community</a></li>
+				<li>前端Git地址：<a href="https://gitee.com/renrenio/renren-ui" target="_blank">https://gitee.com/renrenio/renren-ui</a></li>
+				<li>后台Git地址：<a href="https://gitee.com/renrenio/renren-security" target="_blank">https://gitee.com/renrenio/renren-security</a></li>
+				<li>如需关注项目最新动态，请Watch、Star项目，同时也是对项目最好的支持</li>
+			</ul>
+			<h3>官方微信群</h3>
+			<ul>
+				<li>扫码下面的二维码，关注【人人开源】公众号，回复【加群】，即可根据提示加入微信群！</li>
+				<li><img src="https://cdn.renren.io/f5cef202207132229319338.jpg" alt="微信群" /></li>
+			</ul>
+		</div>
+	</el-card>
 </template>
 
 <style>
 .mod-home {
-  line-height: 1.5;
+	line-height: 1.5;
 }
 </style>

src/views/modules/job/schedule-add-or-update.vue

@@ -72,7 +72,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/sys/schedule/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(this.$http.adornUrl(`/sys/schedule/${this.dataForm.id}`)).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }

src/views/modules/job/schedule-log.vue

@@ -62,7 +62,7 @@ export default {
     },
     // 失败信息
     showErrorInfo (id) {
-      this.$http.get(`/sys/scheduleLog/${id}`).then(({ data: res }) => {
+      this.$http.get(this.$http.adornUrl(`/sys/scheduleLog/${id}`)).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }

src/views/modules/monitoring/equipment-add-or-update.vue

@@ -0,0 +1,254 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="编码"></el-input>
+			</el-form-item>
+			<el-form-item label="设备名称" prop="name">
+				<el-input v-model="dataForm.name" placeholder="设备名称"></el-input>
+			</el-form-item>
+			<el-form-item label="英文名称" prop="enName">
+				<el-input v-model="dataForm.enName" placeholder="英文名称"></el-input>
+			</el-form-item>
+			<el-form-item label="缩写" prop="abbr">
+				<el-input v-model="dataForm.abbr" placeholder="缩写"></el-input>
+			</el-form-item>
+			<el-form-item label="进厂日期" prop="enterTime">
+				<el-input v-model="dataForm.enterTime" placeholder="进厂日期"></el-input>
+			</el-form-item>
+			<el-form-item label="生产日期" prop="productionTime">
+				<el-input v-model="dataForm.productionTime" placeholder="生产日期"></el-input>
+			</el-form-item>
+			<el-form-item label="设备类型，关联设备类型表" prop="equipmentTypeId">
+				<el-input v-model="dataForm.equipmentTypeId" placeholder="设备类型，关联设备类型表"></el-input>
+			</el-form-item>
+			<el-form-item label="分组id （关联 T_EQUIPMENT_GROUP）" prop="groupId">
+				<el-input v-model="dataForm.groupId" placeholder="分组id （关联 T_EQUIPMENT_GROUP）"></el-input>
+			</el-form-item>
+			<el-form-item label="0:无类别，1:上片数据设备，2:下片数据设备" prop="dataType">
+				<el-input v-model="dataForm.dataType" placeholder="0:无类别，1:上片数据设备，2:下片数据设备"></el-input>
+			</el-form-item>
+			<el-form-item label="每小时生产数量" prop="tvalue">
+				<el-input v-model="dataForm.tvalue" placeholder="每小时生产数量"></el-input>
+			</el-form-item>
+			<el-form-item label="单件加工时间 s/件" prop="processingTime">
+				<el-input v-model="dataForm.processingTime" placeholder="单件加工时间 s/件"></el-input>
+			</el-form-item>
+			<el-form-item label="制造商" prop="manufacturer">
+				<el-input v-model="dataForm.manufacturer" placeholder="制造商"></el-input>
+			</el-form-item>
+			<el-form-item label="规格" prop="spec">
+				<el-input v-model="dataForm.spec" placeholder="规格"></el-input>
+			</el-form-item>
+			<el-form-item label="功能描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="功能描述"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+			<el-form-item label="外部系统代码" prop="externalCode">
+				<el-input v-model="dataForm.externalCode" placeholder="外部系统代码"></el-input>
+			</el-form-item>
+			<el-form-item label="统一用的外部代码，代表用哪个设备的数据代替该设备，目前用于生产数量统计" prop="externalCodeStatis">
+				<el-input v-model="dataForm.externalCodeStatis" placeholder="统一用的外部代码，代表用哪个设备的数据代替该设备，目前用于生产数量统计"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				code: '',
+				name: '',
+				enName: '',
+				abbr: '',
+				enterTime: '',
+				productionTime: '',
+				equipmentTypeId: '',
+				groupId: '',
+				dataType: '',
+				tvalue: '',
+				processingTime: '',
+				manufacturer: '',
+				spec: '',
+				description: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: '',
+				externalCode: '',
+				externalCodeStatis: ''
+			},
+			dataRule: {
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+				enName: [{ required: true, message: '英文名称不能为空', trigger: 'blur' }],
+				abbr: [{ required: true, message: '缩写不能为空', trigger: 'blur' }],
+				enterTime: [{ required: true, message: '进厂日期不能为空', trigger: 'blur' }],
+				productionTime: [{ required: true, message: '生产日期不能为空', trigger: 'blur' }],
+				equipmentTypeId: [{ required: true, message: '设备类型，关联设备类型表不能为空', trigger: 'blur' }],
+				groupId: [{ required: true, message: '分组id （关联 T_EQUIPMENT_GROUP）不能为空', trigger: 'blur' }],
+				dataType: [{ required: true, message: '0:无类别，1:上片数据设备，2:下片数据设备不能为空', trigger: 'blur' }],
+				tvalue: [{ required: true, message: '每小时生产数量不能为空', trigger: 'blur' }],
+				processingTime: [{ required: true, message: '单件加工时间 s/件不能为空', trigger: 'blur' }],
+				manufacturer: [{ required: true, message: '制造商不能为空', trigger: 'blur' }],
+				spec: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '功能描述不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+				externalCode: [{ required: true, message: '外部系统代码不能为空', trigger: 'blur' }],
+				externalCodeStatis: [{ required: true, message: '统一用的外部代码，代表用哪个设备的数据代替该设备，目前用于生产数量统计不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipment/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.code = data.equipment.code
+							this.dataForm.name = data.equipment.name
+							this.dataForm.enName = data.equipment.enName
+							this.dataForm.abbr = data.equipment.abbr
+							this.dataForm.enterTime = data.equipment.enterTime
+							this.dataForm.productionTime = data.equipment.productionTime
+							this.dataForm.equipmentTypeId = data.equipment.equipmentTypeId
+							this.dataForm.groupId = data.equipment.groupId
+							this.dataForm.dataType = data.equipment.dataType
+							this.dataForm.tvalue = data.equipment.tvalue
+							this.dataForm.processingTime = data.equipment.processingTime
+							this.dataForm.manufacturer = data.equipment.manufacturer
+							this.dataForm.spec = data.equipment.spec
+							this.dataForm.description = data.equipment.description
+							this.dataForm.enabled = data.equipment.enabled
+							this.dataForm.remark = data.equipment.remark
+							this.dataForm.valid = data.equipment.valid
+							this.dataForm.creatorId = data.equipment.creatorId
+							this.dataForm.creatorName = data.equipment.creatorName
+							this.dataForm.createTime = data.equipment.createTime
+							this.dataForm.updaterId = data.equipment.updaterId
+							this.dataForm.updaterName = data.equipment.updaterName
+							this.dataForm.updateTime = data.equipment.updateTime
+							this.dataForm.version = data.equipment.version
+							this.dataForm.externalCode = data.equipment.externalCode
+							this.dataForm.externalCodeStatis = data.equipment.externalCodeStatis
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipment/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							enName: this.dataForm.enName,
+							abbr: this.dataForm.abbr,
+							enterTime: this.dataForm.enterTime,
+							productionTime: this.dataForm.productionTime,
+							equipmentTypeId: this.dataForm.equipmentTypeId,
+							groupId: this.dataForm.groupId,
+							dataType: this.dataForm.dataType,
+							tvalue: this.dataForm.tvalue,
+							processingTime: this.dataForm.processingTime,
+							manufacturer: this.dataForm.manufacturer,
+							spec: this.dataForm.spec,
+							description: this.dataForm.description,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version,
+							externalCode: this.dataForm.externalCode,
+							externalCodeStatis: this.dataForm.externalCodeStatis
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipment.vue

@@ -0,0 +1,159 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipment:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		></el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipment-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{
+		type: 'index',
+		name: '序号',
+		more: {
+			index: function(index) {
+				return (index + 1) * 2
+			}
+		}
+	},
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '设备名称' },
+	{ prop: 'code', name: '设备编码' },
+	{ prop: 'equipmentTypeId', name: '设备类型' },
+	{ prop: 'groupId', name: '设备分组' },
+	{ prop: 'enName', name: '英文名称' },
+	{ prop: 'abbr', name: '缩写' },
+	{ prop: 'details', name: '详情', subcomponent: TableTextComponent },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		console.log('activated')
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipment/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipment'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue

@@ -0,0 +1,163 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="报警信息ID，关联T_equipment_group_alarm表" prop="alarmId">
+				<el-input v-model="dataForm.alarmId" placeholder="报警信息ID，关联T_equipment_group_alarm表"></el-input>
+			</el-form-item>
+			<el-form-item label="报警来源" prop="alarmSource">
+				<el-input v-model="dataForm.alarmSource" placeholder="报警来源"></el-input>
+			</el-form-item>
+			<el-form-item label="报警详细内容" prop="alarmContent">
+				<el-input v-model="dataForm.alarmContent" placeholder="报警详细内容"></el-input>
+			</el-form-item>
+			<el-form-item label="报警设备id 关联equipment表" prop="alarmEquipmentId">
+				<el-input v-model="dataForm.alarmEquipmentId" placeholder="报警设备id 关联equipment表"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				alarmId: '',
+				alarmSource: '',
+				alarmContent: '',
+				alarmEquipmentId: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				alarmId: [{ required: true, message: '报警信息ID，关联T_equipment_group_alarm表不能为空', trigger: 'blur' }],
+				alarmSource: [{ required: true, message: '报警来源不能为空', trigger: 'blur' }],
+				alarmContent: [{ required: true, message: '报警详细内容不能为空', trigger: 'blur' }],
+				alarmEquipmentId: [{ required: true, message: '报警设备id 关联equipment表不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentAlarmLog/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.alarmId = data.equipmenalarmLog.alarmId
+							this.dataForm.alarmSource = data.equipmenalarmLog.alarmSource
+							this.dataForm.alarmContent = data.equipmenalarmLog.alarmContent
+							this.dataForm.alarmEquipmentId = data.equipmenalarmLog.alarmEquipmentId
+							this.dataForm.remark = data.equipmenalarmLog.remark
+							this.dataForm.valid = data.equipmenalarmLog.valid
+							this.dataForm.creatorId = data.equipmenalarmLog.creatorId
+							this.dataForm.creatorName = data.equipmenalarmLog.creatorName
+							this.dataForm.createTime = data.equipmenalarmLog.createTime
+							this.dataForm.updaterId = data.equipmenalarmLog.updaterId
+							this.dataForm.updaterName = data.equipmenalarmLog.updaterName
+							this.dataForm.updateTime = data.equipmenalarmLog.updateTime
+							this.dataForm.version = data.equipmenalarmLog.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentAlarmLog/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							alarmId: this.dataForm.alarmId,
+							alarmSource: this.dataForm.alarmSource,
+							alarmContent: this.dataForm.alarmContent,
+							alarmEquipmentId: this.dataForm.alarmEquipmentId,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentAlarmLog.vue

@@ -0,0 +1,175 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmenalarmlog:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="alarmId" header-align="center" align="center" label="报警信息ID，关联T_equipment_group_alarm表"> </el-table-column>
+			<el-table-column prop="alarmSource" header-align="center" align="center" label="报警来源"> </el-table-column>
+			<el-table-column prop="alarmContent" header-align="center" align="center" label="报警详细内容"> </el-table-column>
+			<el-table-column prop="alarmEquipmentId" header-align="center" align="center" label="报警设备id 关联equipment表"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentAlarmLog-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'id', name: 'ID' },
+	{ prop: 'alarmId', name: '报警信息ID，关联T_equipment_group_alarm表' },
+	{ prop: 'alarmSource', name: '报警来源' },
+	{ prop: 'alarmContent', name: '报警详细内容' },
+	{ prop: 'alarmEquipmentId', name: '报警设备id 关联equipment表' },
+	{ prop: 'remark', name: '备注' },
+	{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	{ prop: 'creatorId', name: '创建人' },
+	{ prop: 'creatorName', name: '创建人姓名' },
+	{ prop: 'createTime', name: '创建时间' },
+	{ prop: 'updaterId', name: '更新人' },
+	{ prop: 'updaterName', name: '更新人姓名' },
+	{ prop: 'updateTime', name: '更新时间' },
+	{ prop: 'version', name: '版本号' },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentAlarmLog/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentAlarmLog'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentAttr-add-or-update.vue

@@ -0,0 +1,156 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="设备ID" prop="equipmentId">
+				<el-input v-model="dataForm.equipmentId" placeholder="设备ID"></el-input>
+			</el-form-item>
+			<el-form-item label="属性名称" prop="attrName">
+				<el-input v-model="dataForm.attrName" placeholder="属性名称"></el-input>
+			</el-form-item>
+			<el-form-item label="属性值" prop="attrValue">
+				<el-input v-model="dataForm.attrValue" placeholder="属性值"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				equipmentId: '',
+				attrName: '',
+				attrValue: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				equipmentId: [{ required: true, message: '设备ID不能为空', trigger: 'blur' }],
+				attrName: [{ required: true, message: '属性名称不能为空', trigger: 'blur' }],
+				attrValue: [{ required: true, message: '属性值不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentAttr/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.equipmentId = data.equipmenattr.equipmentId
+							this.dataForm.attrName = data.equipmenattr.attrName
+							this.dataForm.attrValue = data.equipmenattr.attrValue
+							this.dataForm.remark = data.equipmenattr.remark
+							this.dataForm.valid = data.equipmenattr.valid
+							this.dataForm.creatorId = data.equipmenattr.creatorId
+							this.dataForm.creatorName = data.equipmenattr.creatorName
+							this.dataForm.createTime = data.equipmenattr.createTime
+							this.dataForm.updaterId = data.equipmenattr.updaterId
+							this.dataForm.updaterName = data.equipmenattr.updaterName
+							this.dataForm.updateTime = data.equipmenattr.updateTime
+							this.dataForm.version = data.equipmenattr.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentAttr/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							equipmentId: this.dataForm.equipmentId,
+							attrName: this.dataForm.attrName,
+							attrValue: this.dataForm.attrValue,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentFile-add-or-update.vue

@@ -0,0 +1,184 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="设备ID" prop="equipmentId">
+				<el-input v-model="dataForm.equipmentId" placeholder="设备ID"></el-input>
+			</el-form-item>
+			<el-form-item label="文件ID" prop="fileId">
+				<el-input v-model="dataForm.fileId" placeholder="文件ID"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+			<el-form-item label="文件类型编号" prop="typeCode">
+				<el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input>
+			</el-form-item>
+			<el-form-item label="文件名字" prop="fileName">
+				<el-input v-model="dataForm.fileName" placeholder="文件名字"></el-input>
+			</el-form-item>
+			<el-form-item label="下载地址" prop="fileUrl">
+				<el-input v-model="dataForm.fileUrl" placeholder="下载地址"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				equipmentId: '',
+				fileId: '',
+				description: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: '',
+				typeCode: '',
+				fileName: '',
+				fileUrl: ''
+			},
+			dataRule: {
+				equipmentId: [{ required: true, message: '设备ID不能为空', trigger: 'blur' }],
+				fileId: [{ required: true, message: '文件ID不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+				typeCode: [{ required: true, message: '文件类型编号不能为空', trigger: 'blur' }],
+				fileName: [{ required: true, message: '文件名字不能为空', trigger: 'blur' }],
+				fileUrl: [{ required: true, message: '下载地址不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentFile/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.equipmentId = data.equipmenfile.equipmentId
+							this.dataForm.fileId = data.equipmenfile.fileId
+							this.dataForm.description = data.equipmenfile.description
+							this.dataForm.enabled = data.equipmenfile.enabled
+							this.dataForm.remark = data.equipmenfile.remark
+							this.dataForm.valid = data.equipmenfile.valid
+							this.dataForm.creatorId = data.equipmenfile.creatorId
+							this.dataForm.creatorName = data.equipmenfile.creatorName
+							this.dataForm.createTime = data.equipmenfile.createTime
+							this.dataForm.updaterId = data.equipmenfile.updaterId
+							this.dataForm.updaterName = data.equipmenfile.updaterName
+							this.dataForm.updateTime = data.equipmenfile.updateTime
+							this.dataForm.version = data.equipmenfile.version
+							this.dataForm.typeCode = data.equipmenfile.typeCode
+							this.dataForm.fileName = data.equipmenfile.fileName
+							this.dataForm.fileUrl = data.equipmenfile.fileUrl
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentFile/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							equipmentId: this.dataForm.equipmentId,
+							fileId: this.dataForm.fileId,
+							description: this.dataForm.description,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version,
+							typeCode: this.dataForm.typeCode,
+							fileName: this.dataForm.fileName,
+							fileUrl: this.dataForm.fileUrl
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentFile.vue

@@ -0,0 +1,184 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmenfile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label=""> </el-table-column>
+			<el-table-column prop="equipmentId" header-align="center" align="center" label="设备ID"> </el-table-column>
+			<el-table-column prop="fileId" header-align="center" align="center" label="文件ID"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column prop="typeCode" header-align="center" align="center" label="文件类型编号"> </el-table-column>
+			<el-table-column prop="fileName" header-align="center" align="center" label="文件名字"> </el-table-column>
+			<el-table-column prop="fileUrl" header-align="center" align="center" label="下载地址"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentFile-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'id', name: '' },
+	{ prop: 'equipmentId', name: '设备ID' },
+	{ prop: 'fileId', name: '文件ID' },
+	{ prop: 'description', name: '描述' },
+	{ prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
+	{ prop: 'remark', name: '备注' },
+	{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	{ prop: 'creatorId', name: '创建人' },
+	{ prop: 'creatorName', name: '创建人姓名' },
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'updaterId', name: '更新人' },
+	{ prop: 'updaterName', name: '更新人姓名' },
+	{ prop: 'updateTime', name: '更新时间' },
+	{ prop: 'version', name: '版本号' },
+	{ prop: 'typeCode', name: '文件类型编号' },
+	{ prop: 'fileName', name: '文件名字' },
+	{ prop: 'fileUrl', name: '下载地址' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentFile/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentFile'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentGroup-add-or-update.vue

@@ -0,0 +1,163 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="分组编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="分组编码"></el-input>
+			</el-form-item>
+			<el-form-item label="分组名字" prop="name">
+				<el-input v-model="dataForm.name" placeholder="分组名字"></el-input>
+			</el-form-item>
+			<el-form-item label="设备类型id" prop="typeId">
+				<el-input v-model="dataForm.typeId" placeholder="设备类型id"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				code: '',
+				name: '',
+				typeId: '',
+				description: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				code: [{ required: true, message: '分组编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '分组名字不能为空', trigger: 'blur' }],
+				typeId: [{ required: true, message: '设备类型id不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentGroup/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.code = data.equipmengroup.code
+							this.dataForm.name = data.equipmengroup.name
+							this.dataForm.typeId = data.equipmengroup.typeId
+							this.dataForm.description = data.equipmengroup.description
+							this.dataForm.remark = data.equipmengroup.remark
+							this.dataForm.valid = data.equipmengroup.valid
+							this.dataForm.creatorId = data.equipmengroup.creatorId
+							this.dataForm.creatorName = data.equipmengroup.creatorName
+							this.dataForm.createTime = data.equipmengroup.createTime
+							this.dataForm.updaterId = data.equipmengroup.updaterId
+							this.dataForm.updaterName = data.equipmengroup.updaterName
+							this.dataForm.updateTime = data.equipmengroup.updateTime
+							this.dataForm.version = data.equipmengroup.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentGroup/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							typeId: this.dataForm.typeId,
+							description: this.dataForm.description,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentGroup.vue

@@ -0,0 +1,179 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmengroup:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="分组编码"> </el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="分组名字"> </el-table-column>
+			<el-table-column prop="typeId" header-align="center" align="center" label="设备类型id"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentGroup-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '分组名称' },
+	{ prop: 'code', name: '分组编码' },
+	{ prop: 'remark', name: '备注' },
+	{ prop: 'alarm', name: '报警', buttonContent: '查看报警', subcomponent: TableTextComponent },
+	// { "prop": "typeId", "name": "设备类型id" },
+	// { "prop": "id", "name": "ID" },
+	// { "prop": "description", "name": "描述" },
+	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+	// { "prop": "creatorId", "name": "创建人" },
+	// { "prop": "creatorName", "name": "创建人姓名" },
+	// { "prop": "updaterId", "name": "更新人" },
+	// { "prop": "updaterName", "name": "更新人姓名" },
+	// { "prop": "updateTime", "name": "更新时间" },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentGroup/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentGroup'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentGroupAlarm-add-or-update.vue

@@ -0,0 +1,198 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="设备分组ID，关联t_equipment_group" prop="equipmentGroupId">
+				<el-input v-model="dataForm.equipmentGroupId" placeholder="设备分组ID，关联t_equipment_group"></el-input>
+			</el-form-item>
+			<el-form-item label="编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="编码"></el-input>
+			</el-form-item>
+			<el-form-item label="报警类型 字典表关联label_value" prop="typeDictValue">
+				<el-input v-model="dataForm.typeDictValue" placeholder="报警类型 字典表关联label_value"></el-input>
+			</el-form-item>
+			<el-form-item label="报警级别 字典表关联label_value" prop="gradeDictValue">
+				<el-input v-model="dataForm.gradeDictValue" placeholder="报警级别 字典表关联label_value"></el-input>
+			</el-form-item>
+			<el-form-item label="报警内容" prop="alarmContent">
+				<el-input v-model="dataForm.alarmContent" placeholder="报警内容"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="外部编码，用于对照外部系统的编码" prop="externalCode">
+				<el-input v-model="dataForm.externalCode" placeholder="外部编码，用于对照外部系统的编码"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+			<el-form-item label="推送方式 0邮箱 1微信" prop="alarmNotify">
+				<el-input v-model="dataForm.alarmNotify" placeholder="推送方式 0邮箱 1微信"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				equipmentGroupId: '',
+				code: '',
+				typeDictValue: '',
+				gradeDictValue: '',
+				alarmContent: '',
+				description: '',
+				externalCode: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: '',
+				alarmNotify: ''
+			},
+			dataRule: {
+				equipmentGroupId: [{ required: true, message: '设备分组ID，关联t_equipment_group不能为空', trigger: 'blur' }],
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				typeDictValue: [{ required: true, message: '报警类型 字典表关联label_value不能为空', trigger: 'blur' }],
+				gradeDictValue: [{ required: true, message: '报警级别 字典表关联label_value不能为空', trigger: 'blur' }],
+				alarmContent: [{ required: true, message: '报警内容不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				externalCode: [{ required: true, message: '外部编码，用于对照外部系统的编码不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+				alarmNotify: [{ required: true, message: '推送方式 0邮箱 1微信不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentGroupAlarm/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.equipmentGroupId = data.equipmengroupAlarm.equipmentGroupId
+							this.dataForm.code = data.equipmengroupAlarm.code
+							this.dataForm.typeDictValue = data.equipmengroupAlarm.typeDictValue
+							this.dataForm.gradeDictValue = data.equipmengroupAlarm.gradeDictValue
+							this.dataForm.alarmContent = data.equipmengroupAlarm.alarmContent
+							this.dataForm.description = data.equipmengroupAlarm.description
+							this.dataForm.externalCode = data.equipmengroupAlarm.externalCode
+							this.dataForm.enabled = data.equipmengroupAlarm.enabled
+							this.dataForm.remark = data.equipmengroupAlarm.remark
+							this.dataForm.valid = data.equipmengroupAlarm.valid
+							this.dataForm.creatorId = data.equipmengroupAlarm.creatorId
+							this.dataForm.creatorName = data.equipmengroupAlarm.creatorName
+							this.dataForm.createTime = data.equipmengroupAlarm.createTime
+							this.dataForm.updaterId = data.equipmengroupAlarm.updaterId
+							this.dataForm.updaterName = data.equipmengroupAlarm.updaterName
+							this.dataForm.updateTime = data.equipmengroupAlarm.updateTime
+							this.dataForm.version = data.equipmengroupAlarm.version
+							this.dataForm.alarmNotify = data.equipmengroupAlarm.alarmNotify
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentGroupAlarm/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							equipmentGroupId: this.dataForm.equipmentGroupId,
+							code: this.dataForm.code,
+							typeDictValue: this.dataForm.typeDictValue,
+							gradeDictValue: this.dataForm.gradeDictValue,
+							alarmContent: this.dataForm.alarmContent,
+							description: this.dataForm.description,
+							externalCode: this.dataForm.externalCode,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version,
+							alarmNotify: this.dataForm.alarmNotify
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentGroupAlarm.vue

@@ -0,0 +1,197 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item label="设备分组名称"> <strong>111</strong></el-form-item>
+
+			<el-form-item label="设备分组编码">
+				<strong>111</strong>
+			</el-form-item>
+			<!-- <el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmengroupalarm:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmengroupalarm:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">
+					批量删除
+				</el-button>
+			</el-form-item> -->
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
+			<el-table-column prop="equipmentGroupId" header-align="center" align="center" label="设备分组ID，关联t_equipment_group"></el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="编码"></el-table-column>
+			<el-table-column prop="typeDictValue" header-align="center" align="center" label="报警类型 字典表关联label_value"></el-table-column>
+			<el-table-column prop="gradeDictValue" header-align="center" align="center" label="报警级别 字典表关联label_value"></el-table-column>
+			<el-table-column prop="alarmContent" header-align="center" align="center" label="报警内容"></el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"></el-table-column>
+			<el-table-column prop="externalCode" header-align="center" align="center" label="外部编码，用于对照外部系统的编码"></el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"></el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"></el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"></el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"></el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"></el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"></el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"></el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"></el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"></el-table-column>
+			<el-table-column prop="alarmNotify" header-align="center" align="center" label="推送方式 0邮箱 1微信"></el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		></el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentGroupAlarm-add-or-update'
+
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'code', name: '报警编码' },
+	{ prop: 'typeDictValue', name: '报警类型' },
+	{ prop: 'gradeDictValue', name: '报警级别' },
+	{ prop: 'alarmContent', name: '报警内容' }
+	// { prop: 'typeDictValue', name: '报警类型 字典表关联label_value' },
+	// { prop: 'gradeDictValue', name: '报警级别 字典表关联label_value' },
+	// { "prop": "id", "name": "ID" },
+	// { "prop": "equipmentGroupId", "name": "设备分组ID，关联t_equipment_group" },
+	// { "prop": "description", "name": "描述" },
+	// { "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
+	// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+	// { "prop": "remark", "name": "备注" },
+	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+	// { "prop": "creatorId", "name": "创建人" },
+	// { "prop": "creatorName", "name": "创建人姓名" },
+	// { "prop": "updaterId", "name": "更新人" },
+	// { "prop": "updaterName", "name": "更新人姓名" },
+	// { "prop": "updateTime", "name": "更新时间" },
+	// { "prop": "version", "name": "版本号" },
+	// { prop: 'alarmNotify', name: '推送方式 0邮箱 1微信' },
+	// { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentGroupAlarm/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentGroupAlarm'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentPlc-add-or-update.vue

@@ -0,0 +1,219 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="plc类型" prop="plcType">
+				<el-input v-model="dataForm.plcType" placeholder="plc类型"></el-input>
+			</el-form-item>
+			<el-form-item label="编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="编码"></el-input>
+			</el-form-item>
+			<el-form-item label="plc名称（ip+名称对应实时数据库表名）" prop="name">
+				<el-input v-model="dataForm.name" placeholder="plc名称（ip+名称对应实时数据库表名）"></el-input>
+			</el-form-item>
+			<el-form-item label="英文名称" prop="enName">
+				<el-input v-model="dataForm.enName" placeholder="英文名称"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="plc条码" prop="barcode">
+				<el-input v-model="dataForm.barcode" placeholder="plc条码"></el-input>
+			</el-form-item>
+			<el-form-item label="链接方式，0 tcp，1 udp等" prop="controlType">
+				<el-input v-model="dataForm.controlType" placeholder="链接方式，0 tcp，1 udp等"></el-input>
+			</el-form-item>
+			<el-form-item label="是否监控 0 代表不监控, 1 代表监控" prop="monitor">
+				<el-input v-model="dataForm.monitor" placeholder="是否监控 0 代表不监控, 1 代表监控"></el-input>
+			</el-form-item>
+			<el-form-item label="是否采集 0 代表不采集, 1 代表采集" prop="collection">
+				<el-input v-model="dataForm.collection" placeholder="是否采集 0 代表不采集, 1 代表采集"></el-input>
+			</el-form-item>
+			<el-form-item label="IP" prop="ip">
+				<el-input v-model="dataForm.ip" placeholder="IP"></el-input>
+			</el-form-item>
+			<el-form-item label="端口号" prop="port">
+				<el-input v-model="dataForm.port" placeholder="端口号"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				plcType: '',
+				code: '',
+				name: '',
+				enName: '',
+				description: '',
+				barcode: '',
+				controlType: '',
+				monitor: '',
+				collection: '',
+				ip: '',
+				port: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				plcType: [{ required: true, message: 'plc类型不能为空', trigger: 'blur' }],
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: 'plc名称（ip+名称对应实时数据库表名）不能为空', trigger: 'blur' }],
+				enName: [{ required: true, message: '英文名称不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				barcode: [{ required: true, message: 'plc条码不能为空', trigger: 'blur' }],
+				controlType: [{ required: true, message: '链接方式，0 tcp，1 udp等不能为空', trigger: 'blur' }],
+				monitor: [{ required: true, message: '是否监控 0 代表不监控, 1 代表监控不能为空', trigger: 'blur' }],
+				collection: [{ required: true, message: '是否采集 0 代表不采集, 1 代表采集不能为空', trigger: 'blur' }],
+				ip: [{ required: true, message: 'IP不能为空', trigger: 'blur' }],
+				port: [{ required: true, message: '端口号不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentPlc/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.plcType = data.equipmenplc.plcType
+							this.dataForm.code = data.equipmenplc.code
+							this.dataForm.name = data.equipmenplc.name
+							this.dataForm.enName = data.equipmenplc.enName
+							this.dataForm.description = data.equipmenplc.description
+							this.dataForm.barcode = data.equipmenplc.barcode
+							this.dataForm.controlType = data.equipmenplc.controlType
+							this.dataForm.monitor = data.equipmenplc.monitor
+							this.dataForm.collection = data.equipmenplc.collection
+							this.dataForm.ip = data.equipmenplc.ip
+							this.dataForm.port = data.equipmenplc.port
+							this.dataForm.enabled = data.equipmenplc.enabled
+							this.dataForm.remark = data.equipmenplc.remark
+							this.dataForm.valid = data.equipmenplc.valid
+							this.dataForm.creatorId = data.equipmenplc.creatorId
+							this.dataForm.creatorName = data.equipmenplc.creatorName
+							this.dataForm.createTime = data.equipmenplc.createTime
+							this.dataForm.updaterId = data.equipmenplc.updaterId
+							this.dataForm.updaterName = data.equipmenplc.updaterName
+							this.dataForm.updateTime = data.equipmenplc.updateTime
+							this.dataForm.version = data.equipmenplc.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentPlc/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							plcType: this.dataForm.plcType,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							enName: this.dataForm.enName,
+							description: this.dataForm.description,
+							barcode: this.dataForm.barcode,
+							controlType: this.dataForm.controlType,
+							monitor: this.dataForm.monitor,
+							collection: this.dataForm.collection,
+							ip: this.dataForm.ip,
+							port: this.dataForm.port,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentPlc.vue

@@ -0,0 +1,193 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmenplc:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
+			<el-table-column prop="plcType" header-align="center" align="center" label="plc类型"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="plc名称（ip+名称对应实时数据库表名）"> </el-table-column>
+			<el-table-column prop="enName" header-align="center" align="center" label="英文名称"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="barcode" header-align="center" align="center" label="plc条码"> </el-table-column>
+			<el-table-column prop="controlType" header-align="center" align="center" label="链接方式，0 tcp，1 udp等"> </el-table-column>
+			<el-table-column prop="monitor" header-align="center" align="center" label="是否监控 0 代表不监控, 1 代表监控"> </el-table-column>
+			<el-table-column prop="collection" header-align="center" align="center" label="是否采集 0 代表不采集, 1 代表采集"> </el-table-column>
+			<el-table-column prop="ip" header-align="center" align="center" label="IP"> </el-table-column>
+			<el-table-column prop="port" header-align="center" align="center" label="端口号"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentPlc-add-or-update'
+
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+  { "prop": "id", "name": "id" },
+  { "prop": "plcType", "name": "plc类型" },
+  { "prop": "code", "name": "编码" },
+  { "prop": "name", "name": "plc名称（ip+名称对应实时数据库表名）" },
+  { "prop": "enName", "name": "英文名称" },
+  { "prop": "description", "name": "描述" },
+  { "prop": "barcode", "name": "plc条码" },
+  { "prop": "controlType", "name": "链接方式，0 tcp，1 udp等" },
+  { "prop": "monitor", "name": "是否监控 0 代表不监控, 1 代表监控" },
+  { "prop": "collection", "name": "是否采集 0 代表不采集, 1 代表采集" },
+  { "prop": "ip", "name": "IP" },
+  { "prop": "port", "name": "端口号" },
+  { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+  { "prop": "remark", "name": "备注" },
+  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+  { "prop": "creatorId", "name": "创建人" },
+  { "prop": "creatorName", "name": "创建人姓名" },
+  { "prop": "createTime", "name": "添加时间" },
+  { "prop": "updaterId", "name": "更新人" },
+  { "prop": "updaterName", "name": "更新人姓名" },
+  { "prop": "updateTime", "name": "更新时间" },
+  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+
+export default {
+	data() {
+		return {tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentPlc/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentPlc'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentPlcConnect-add-or-update.vue

@@ -0,0 +1,156 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="plc表iD" prop="plcId">
+				<el-input v-model="dataForm.plcId" placeholder="plc表iD"></el-input>
+			</el-form-item>
+			<el-form-item label="设备表id" prop="equipmentId">
+				<el-input v-model="dataForm.equipmentId" placeholder="设备表id"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				plcId: '',
+				equipmentId: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				plcId: [{ required: true, message: 'plc表iD不能为空', trigger: 'blur' }],
+				equipmentId: [{ required: true, message: '设备表id不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentPlcConnect/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.plcId = data.equipmenplcConnect.plcId
+							this.dataForm.equipmentId = data.equipmenplcConnect.equipmentId
+							this.dataForm.enabled = data.equipmenplcConnect.enabled
+							this.dataForm.remark = data.equipmenplcConnect.remark
+							this.dataForm.valid = data.equipmenplcConnect.valid
+							this.dataForm.creatorId = data.equipmenplcConnect.creatorId
+							this.dataForm.creatorName = data.equipmenplcConnect.creatorName
+							this.dataForm.createTime = data.equipmenplcConnect.createTime
+							this.dataForm.updaterId = data.equipmenplcConnect.updaterId
+							this.dataForm.updaterName = data.equipmenplcConnect.updaterName
+							this.dataForm.updateTime = data.equipmenplcConnect.updateTime
+							this.dataForm.version = data.equipmenplcConnect.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentPlcConnect/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							plcId: this.dataForm.plcId,
+							equipmentId: this.dataForm.equipmentId,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentPlcConnect.vue

@@ -0,0 +1,173 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmenplcconnect:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
+			<el-table-column prop="plcId" header-align="center" align="center" label="plc表iD"> </el-table-column>
+			<el-table-column prop="equipmentId" header-align="center" align="center" label="设备表id"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentPlcConnect-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+  { "prop": "id", "name": "id" },
+  { "prop": "plcId", "name": "plc表iD" },
+  { "prop": "equipmentId", "name": "设备表id" },
+  { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+  { "prop": "remark", "name": "备注" },
+  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+  { "prop": "creatorId", "name": "创建人" },
+  { "prop": "creatorName", "name": "创建人姓名" },
+  { "prop": "createTime", "name": "添加时间" },
+  { "prop": "updaterId", "name": "更新人" },
+  { "prop": "updaterName", "name": "更新人姓名" },
+  { "prop": "updateTime", "name": "更新时间" },
+  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+
+export default {
+	data() {
+		return {tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentPlcConnect/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentPlcConnect'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentPlcParam-add-or-update.vue

@@ -0,0 +1,254 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="plc连接表ID" prop="plcConId">
+				<el-input v-model="dataForm.plcConId" placeholder="plc连接表ID"></el-input>
+			</el-form-item>
+			<el-form-item label="类型：status、data、constant" prop="type">
+				<el-input v-model="dataForm.type" placeholder="类型：status、data、constant"></el-input>
+			</el-form-item>
+			<el-form-item label="参数编码" prop="paramCode">
+				<el-input v-model="dataForm.paramCode" placeholder="参数编码"></el-input>
+			</el-form-item>
+			<el-form-item label="参数名称" prop="paramName">
+				<el-input v-model="dataForm.paramName" placeholder="参数名称"></el-input>
+			</el-form-item>
+			<el-form-item label="参数地址，对应实时数据库表的列名" prop="paramAddress">
+				<el-input v-model="dataForm.paramAddress" placeholder="参数地址，对应实时数据库表的列名"></el-input>
+			</el-form-item>
+			<el-form-item label="参数值类型：int、long、boolean、string、list 暂不使用" prop="valueType">
+				<el-input v-model="dataForm.valueType" placeholder="参数值类型：int、long、boolean、string、list 暂不使用"></el-input>
+			</el-form-item>
+			<el-form-item label="单位 关联数据字典表label_value" prop="unitDictValue">
+				<el-input v-model="dataForm.unitDictValue" placeholder="单位 关联数据字典表label_value"></el-input>
+			</el-form-item>
+			<el-form-item label="最小值" prop="minValue">
+				<el-input v-model="dataForm.minValue" placeholder="最小值"></el-input>
+			</el-form-item>
+			<el-form-item label="最大值" prop="maxValue">
+				<el-input v-model="dataForm.maxValue" placeholder="最大值"></el-input>
+			</el-form-item>
+			<el-form-item label="参数设定标准值" prop="defaultValue">
+				<el-input v-model="dataForm.defaultValue" placeholder="参数设定标准值"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+			<el-form-item label="0 代表不采集, 1 代表采集" prop="collection">
+				<el-input v-model="dataForm.collection" placeholder="0 代表不采集, 1 代表采集"></el-input>
+			</el-form-item>
+			<el-form-item label="采集周期（s） 暂不使用" prop="collectionCycle">
+				<el-input v-model="dataForm.collectionCycle" placeholder="采集周期（s） 暂不使用"></el-input>
+			</el-form-item>
+			<el-form-item label="上报周期（s） 暂不使用" prop="reportingCycle">
+				<el-input v-model="dataForm.reportingCycle" placeholder="上报周期（s） 暂不使用"></el-input>
+			</el-form-item>
+			<el-form-item label="上报方式 暂不使用" prop="reportingMethod">
+				<el-input v-model="dataForm.reportingMethod" placeholder="上报方式 暂不使用"></el-input>
+			</el-form-item>
+			<el-form-item label="上报编码 暂不使用" prop="reportingCode">
+				<el-input v-model="dataForm.reportingCode" placeholder="上报编码 暂不使用"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				plcConId: '',
+				type: '',
+				paramCode: '',
+				paramName: '',
+				paramAddress: '',
+				valueType: '',
+				unitDictValue: '',
+				minValue: '',
+				maxValue: '',
+				defaultValue: '',
+				description: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: '',
+				collection: '',
+				collectionCycle: '',
+				reportingCycle: '',
+				reportingMethod: '',
+				reportingCode: ''
+			},
+			dataRule: {
+				plcConId: [{ required: true, message: 'plc连接表ID不能为空', trigger: 'blur' }],
+				type: [{ required: true, message: '类型：status、data、constant不能为空', trigger: 'blur' }],
+				paramCode: [{ required: true, message: '参数编码不能为空', trigger: 'blur' }],
+				paramName: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
+				paramAddress: [{ required: true, message: '参数地址，对应实时数据库表的列名不能为空', trigger: 'blur' }],
+				valueType: [{ required: true, message: '参数值类型：int、long、boolean、string、list 暂不使用不能为空', trigger: 'blur' }],
+				unitDictValue: [{ required: true, message: '单位 关联数据字典表label_value不能为空', trigger: 'blur' }],
+				minValue: [{ required: true, message: '最小值不能为空', trigger: 'blur' }],
+				maxValue: [{ required: true, message: '最大值不能为空', trigger: 'blur' }],
+				defaultValue: [{ required: true, message: '参数设定标准值不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+				collection: [{ required: true, message: '0 代表不采集, 1 代表采集不能为空', trigger: 'blur' }],
+				collectionCycle: [{ required: true, message: '采集周期（s） 暂不使用不能为空', trigger: 'blur' }],
+				reportingCycle: [{ required: true, message: '上报周期（s） 暂不使用不能为空', trigger: 'blur' }],
+				reportingMethod: [{ required: true, message: '上报方式 暂不使用不能为空', trigger: 'blur' }],
+				reportingCode: [{ required: true, message: '上报编码 暂不使用不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentPlcParam/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.plcConId = data.equipmenplcParam.plcConId
+							this.dataForm.type = data.equipmenplcParam.type
+							this.dataForm.paramCode = data.equipmenplcParam.paramCode
+							this.dataForm.paramName = data.equipmenplcParam.paramName
+							this.dataForm.paramAddress = data.equipmenplcParam.paramAddress
+							this.dataForm.valueType = data.equipmenplcParam.valueType
+							this.dataForm.unitDictValue = data.equipmenplcParam.unitDictValue
+							this.dataForm.minValue = data.equipmenplcParam.minValue
+							this.dataForm.maxValue = data.equipmenplcParam.maxValue
+							this.dataForm.defaultValue = data.equipmenplcParam.defaultValue
+							this.dataForm.description = data.equipmenplcParam.description
+							this.dataForm.enabled = data.equipmenplcParam.enabled
+							this.dataForm.remark = data.equipmenplcParam.remark
+							this.dataForm.valid = data.equipmenplcParam.valid
+							this.dataForm.creatorId = data.equipmenplcParam.creatorId
+							this.dataForm.creatorName = data.equipmenplcParam.creatorName
+							this.dataForm.createTime = data.equipmenplcParam.createTime
+							this.dataForm.updaterId = data.equipmenplcParam.updaterId
+							this.dataForm.updaterName = data.equipmenplcParam.updaterName
+							this.dataForm.updateTime = data.equipmenplcParam.updateTime
+							this.dataForm.version = data.equipmenplcParam.version
+							this.dataForm.collection = data.equipmenplcParam.collection
+							this.dataForm.collectionCycle = data.equipmenplcParam.collectionCycle
+							this.dataForm.reportingCycle = data.equipmenplcParam.reportingCycle
+							this.dataForm.reportingMethod = data.equipmenplcParam.reportingMethod
+							this.dataForm.reportingCode = data.equipmenplcParam.reportingCode
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentPlcParam/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							plcConId: this.dataForm.plcConId,
+							type: this.dataForm.type,
+							paramCode: this.dataForm.paramCode,
+							paramName: this.dataForm.paramName,
+							paramAddress: this.dataForm.paramAddress,
+							valueType: this.dataForm.valueType,
+							unitDictValue: this.dataForm.unitDictValue,
+							minValue: this.dataForm.minValue,
+							maxValue: this.dataForm.maxValue,
+							defaultValue: this.dataForm.defaultValue,
+							description: this.dataForm.description,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version,
+							collection: this.dataForm.collection,
+							collectionCycle: this.dataForm.collectionCycle,
+							reportingCycle: this.dataForm.reportingCycle,
+							reportingMethod: this.dataForm.reportingMethod,
+							reportingCode: this.dataForm.reportingCode
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentPlcParam.vue

@@ -0,0 +1,205 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmenplcparam:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="plcConId" header-align="center" align="center" label="plc连接表ID"> </el-table-column>
+			<el-table-column prop="type" header-align="center" align="center" label="类型：status、data、constant"> </el-table-column>
+			<el-table-column prop="paramCode" header-align="center" align="center" label="参数编码"> </el-table-column>
+			<el-table-column prop="paramName" header-align="center" align="center" label="参数名称"> </el-table-column>
+			<el-table-column prop="paramAddress" header-align="center" align="center" label="参数地址，对应实时数据库表的列名"> </el-table-column>
+			<el-table-column prop="valueType" header-align="center" align="center" label="参数值类型：int、long、boolean、string、list 暂不使用"> </el-table-column>
+			<el-table-column prop="unitDictValue" header-align="center" align="center" label="单位 关联数据字典表label_value"> </el-table-column>
+			<el-table-column prop="minValue" header-align="center" align="center" label="最小值"> </el-table-column>
+			<el-table-column prop="maxValue" header-align="center" align="center" label="最大值"> </el-table-column>
+			<el-table-column prop="defaultValue" header-align="center" align="center" label="参数设定标准值"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column prop="collection" header-align="center" align="center" label="0 代表不采集, 1 代表采集"> </el-table-column>
+			<el-table-column prop="collectionCycle" header-align="center" align="center" label="采集周期（s） 暂不使用"> </el-table-column>
+			<el-table-column prop="reportingCycle" header-align="center" align="center" label="上报周期（s） 暂不使用"> </el-table-column>
+			<el-table-column prop="reportingMethod" header-align="center" align="center" label="上报方式 暂不使用"> </el-table-column>
+			<el-table-column prop="reportingCode" header-align="center" align="center" label="上报编码 暂不使用"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentPlcParam-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+  { "prop": "id", "name": "ID" },
+  { "prop": "plcConId", "name": "plc连接表ID" },
+  { "prop": "type", "name": "类型：status、data、constant" },
+  { "prop": "paramCode", "name": "参数编码" },
+  { "prop": "paramName", "name": "参数名称" },
+  { "prop": "paramAddress", "name": "参数地址，对应实时数据库表的列名" },
+  {
+    "prop": "valueType",
+    "name": "参数值类型：int、long、boolean、string、list 暂不使用"
+  },
+  { "prop": "unitDictValue", "name": "单位 关联数据字典表label_value" },
+  { "prop": "minValue", "name": "最小值" },
+  { "prop": "maxValue", "name": "最大值" },
+  { "prop": "defaultValue", "name": "参数设定标准值" },
+  { "prop": "description", "name": "描述" },
+  { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+  { "prop": "remark", "name": "备注" },
+  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+  { "prop": "creatorId", "name": "创建人" },
+  { "prop": "creatorName", "name": "创建人姓名" },
+  { "prop": "createTime", "name": "添加时间" },
+  { "prop": "updaterId", "name": "更新人" },
+  { "prop": "updaterName", "name": "更新人姓名" },
+  { "prop": "updateTime", "name": "更新时间" },
+  { "prop": "version", "name": "版本号" },
+  { "prop": "collection", "name": "0 代表不采集, 1 代表采集" },
+  { "prop": "collectionCycle", "name": "采集周期（s） 暂不使用" },
+  { "prop": "reportingCycle", "name": "上报周期（s） 暂不使用" },
+  { "prop": "reportingMethod", "name": "上报方式 暂不使用" },
+  { "prop": "reportingCode", "name": "上报编码 暂不使用" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+
+export default {
+	data() {
+		return {tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentPlcParam/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentPlcParam'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentQuantity-add-or-update.vue

@@ -0,0 +1,191 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="设备外部编码" prop="externalCode">
+				<el-input v-model="dataForm.externalCode" placeholder="设备外部编码"></el-input>
+			</el-form-item>
+			<el-form-item label="设备名称" prop="equipmentName">
+				<el-input v-model="dataForm.equipmentName" placeholder="设备名称"></el-input>
+			</el-form-item>
+			<el-form-item label="进入设备的数量" prop="inQuantity">
+				<el-input v-model="dataForm.inQuantity" placeholder="进入设备的数量"></el-input>
+			</el-form-item>
+			<el-form-item label="离开设备的数量，若plc只记录一个生产数量，也写入该字段" prop="outQuantity">
+				<el-input v-model="dataForm.outQuantity" placeholder="离开设备的数量，若plc只记录一个生产数量，也写入该字段"></el-input>
+			</el-form-item>
+			<el-form-item label="" prop="okQuantity">
+				<el-input v-model="dataForm.okQuantity" placeholder=""></el-input>
+			</el-form-item>
+			<el-form-item label="设备上报的报废数量" prop="nokQuantity">
+				<el-input v-model="dataForm.nokQuantity" placeholder="设备上报的报废数量"></el-input>
+			</el-form-item>
+			<el-form-item label="" prop="description">
+				<el-input v-model="dataForm.description" placeholder=""></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+			<el-form-item label="生产数量的记录时间" prop="recordTime">
+				<el-input v-model="dataForm.recordTime" placeholder="生产数量的记录时间"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				externalCode: '',
+				equipmentName: '',
+				inQuantity: '',
+				outQuantity: '',
+				okQuantity: '',
+				nokQuantity: '',
+				description: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: '',
+				recordTime: ''
+			},
+			dataRule: {
+				externalCode: [{ required: true, message: '设备外部编码不能为空', trigger: 'blur' }],
+				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+				inQuantity: [{ required: true, message: '进入设备的数量不能为空', trigger: 'blur' }],
+				outQuantity: [{ required: true, message: '离开设备的数量，若plc只记录一个生产数量，也写入该字段不能为空', trigger: 'blur' }],
+				okQuantity: [{ required: true, message: '不能为空', trigger: 'blur' }],
+				nokQuantity: [{ required: true, message: '设备上报的报废数量不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+				recordTime: [{ required: true, message: '生产数量的记录时间不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentQuantity/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.externalCode = data.equipmenquantity.externalCode
+							this.dataForm.equipmentName = data.equipmenquantity.equipmentName
+							this.dataForm.inQuantity = data.equipmenquantity.inQuantity
+							this.dataForm.outQuantity = data.equipmenquantity.outQuantity
+							this.dataForm.okQuantity = data.equipmenquantity.okQuantity
+							this.dataForm.nokQuantity = data.equipmenquantity.nokQuantity
+							this.dataForm.description = data.equipmenquantity.description
+							this.dataForm.remark = data.equipmenquantity.remark
+							this.dataForm.valid = data.equipmenquantity.valid
+							this.dataForm.creatorId = data.equipmenquantity.creatorId
+							this.dataForm.creatorName = data.equipmenquantity.creatorName
+							this.dataForm.createTime = data.equipmenquantity.createTime
+							this.dataForm.updaterId = data.equipmenquantity.updaterId
+							this.dataForm.updaterName = data.equipmenquantity.updaterName
+							this.dataForm.updateTime = data.equipmenquantity.updateTime
+							this.dataForm.version = data.equipmenquantity.version
+							this.dataForm.recordTime = data.equipmenquantity.recordTime
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentQuantity/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							externalCode: this.dataForm.externalCode,
+							equipmentName: this.dataForm.equipmentName,
+							inQuantity: this.dataForm.inQuantity,
+							outQuantity: this.dataForm.outQuantity,
+							okQuantity: this.dataForm.okQuantity,
+							nokQuantity: this.dataForm.nokQuantity,
+							description: this.dataForm.description,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version,
+							recordTime: this.dataForm.recordTime
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentQuantity.vue

@@ -0,0 +1,187 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmenquantity:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
+			<el-table-column prop="externalCode" header-align="center" align="center" label="设备外部编码"> </el-table-column>
+			<el-table-column prop="equipmentName" header-align="center" align="center" label="设备名称"> </el-table-column>
+			<el-table-column prop="inQuantity" header-align="center" align="center" label="进入设备的数量"> </el-table-column>
+			<el-table-column prop="outQuantity" header-align="center" align="center" label="离开设备的数量，若plc只记录一个生产数量，也写入该字段"> </el-table-column>
+			<el-table-column prop="okQuantity" header-align="center" align="center" label=""> </el-table-column>
+			<el-table-column prop="nokQuantity" header-align="center" align="center" label="设备上报的报废数量"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label=""> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column prop="recordTime" header-align="center" align="center" label="生产数量的记录时间"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentQuantity-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+  { "prop": "id", "name": "id" },
+  { "prop": "externalCode", "name": "设备外部编码" },
+  { "prop": "equipmentName", "name": "设备名称" },
+  { "prop": "inQuantity", "name": "进入设备的数量" },
+  {
+    "prop": "outQuantity",
+    "name": "离开设备的数量，若plc只记录一个生产数量，也写入该字段"
+  },
+  { "prop": "okQuantity", "name": "" },
+  { "prop": "nokQuantity", "name": "设备上报的报废数量" },
+  { "prop": "description", "name": "" },
+  { "prop": "remark", "name": "备注" },
+  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+  { "prop": "creatorId", "name": "创建人" },
+  { "prop": "creatorName", "name": "创建人姓名" },
+  { "prop": "createTime", "name": "添加时间" },
+  { "prop": "updaterId", "name": "更新人" },
+  { "prop": "updaterName", "name": "更新人姓名" },
+  { "prop": "updateTime", "name": "更新时间" },
+  { "prop": "version", "name": "版本号" },
+  { "prop": "recordTime", "name": "生产数量的记录时间" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+
+export default {
+	data() {
+		return {tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentQuantity/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentQuantity'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentStatusLog-add-or-update.vue

@@ -0,0 +1,184 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="设备外部代码" prop="externalCode">
+				<el-input v-model="dataForm.externalCode" placeholder="设备外部代码"></el-input>
+			</el-form-item>
+			<el-form-item label="plc id" prop="plcId">
+				<el-input v-model="dataForm.plcId" placeholder="plc id"></el-input>
+			</el-form-item>
+			<el-form-item label="plc" prop="plc">
+				<el-input v-model="dataForm.plc" placeholder="plc"></el-input>
+			</el-form-item>
+			<el-form-item label="设备id" prop="equipmentId">
+				<el-input v-model="dataForm.equipmentId" placeholder="设备id"></el-input>
+			</el-form-item>
+			<el-form-item label="设备名称" prop="equipmentName">
+				<el-input v-model="dataForm.equipmentName" placeholder="设备名称"></el-input>
+			</el-form-item>
+			<el-form-item label="状态，0正常 1计划停机 2故障" prop="status">
+				<el-input v-model="dataForm.status" placeholder="状态，0正常 1计划停机 2故障"></el-input>
+			</el-form-item>
+			<el-form-item label="记录时间" prop="logTime">
+				<el-input v-model="dataForm.logTime" placeholder="记录时间"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				externalCode: '',
+				plcId: '',
+				plc: '',
+				equipmentId: '',
+				equipmentName: '',
+				status: '',
+				logTime: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				externalCode: [{ required: true, message: '设备外部代码不能为空', trigger: 'blur' }],
+				plcId: [{ required: true, message: 'plc id不能为空', trigger: 'blur' }],
+				plc: [{ required: true, message: 'plc不能为空', trigger: 'blur' }],
+				equipmentId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
+				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+				status: [{ required: true, message: '状态，0正常 1计划停机 2故障不能为空', trigger: 'blur' }],
+				logTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentStatusLog/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.externalCode = data.equipmenstatusLog.externalCode
+							this.dataForm.plcId = data.equipmenstatusLog.plcId
+							this.dataForm.plc = data.equipmenstatusLog.plc
+							this.dataForm.equipmentId = data.equipmenstatusLog.equipmentId
+							this.dataForm.equipmentName = data.equipmenstatusLog.equipmentName
+							this.dataForm.status = data.equipmenstatusLog.status
+							this.dataForm.logTime = data.equipmenstatusLog.logTime
+							this.dataForm.remark = data.equipmenstatusLog.remark
+							this.dataForm.valid = data.equipmenstatusLog.valid
+							this.dataForm.creatorId = data.equipmenstatusLog.creatorId
+							this.dataForm.creatorName = data.equipmenstatusLog.creatorName
+							this.dataForm.createTime = data.equipmenstatusLog.createTime
+							this.dataForm.updaterId = data.equipmenstatusLog.updaterId
+							this.dataForm.updaterName = data.equipmenstatusLog.updaterName
+							this.dataForm.updateTime = data.equipmenstatusLog.updateTime
+							this.dataForm.version = data.equipmenstatusLog.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentStatusLog/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							externalCode: this.dataForm.externalCode,
+							plcId: this.dataForm.plcId,
+							plc: this.dataForm.plc,
+							equipmentId: this.dataForm.equipmentId,
+							equipmentName: this.dataForm.equipmentName,
+							status: this.dataForm.status,
+							logTime: this.dataForm.logTime,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentStatusLog.vue

@@ -0,0 +1,181 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmenstatuslog:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
+			<el-table-column prop="externalCode" header-align="center" align="center" label="设备外部代码"> </el-table-column>
+			<el-table-column prop="plcId" header-align="center" align="center" label="plc id"> </el-table-column>
+			<el-table-column prop="plc" header-align="center" align="center" label="plc"> </el-table-column>
+			<el-table-column prop="equipmentId" header-align="center" align="center" label="设备id"> </el-table-column>
+			<el-table-column prop="equipmentName" header-align="center" align="center" label="设备名称"> </el-table-column>
+			<el-table-column prop="status" header-align="center" align="center" label="状态，0正常 1计划停机 2故障"> </el-table-column>
+			<el-table-column prop="logTime" header-align="center" align="center" label="记录时间"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentStatusLog-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+  { "prop": "id", "name": "id" },
+  { "prop": "externalCode", "name": "设备外部代码" },
+  { "prop": "plcId", "name": "plc id" },
+  { "prop": "plc", "name": "plc" },
+  { "prop": "equipmentId", "name": "设备id" },
+  { "prop": "equipmentName", "name": "设备名称" },
+  { "prop": "status", "name": "状态，0正常 1计划停机 2故障" },
+  { "prop": "logTime", "name": "记录时间" },
+  { "prop": "remark", "name": "备注" },
+  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+  { "prop": "creatorId", "name": "创建人" },
+  { "prop": "creatorName", "name": "创建人姓名" },
+  { "prop": "createTime", "name": "添加时间" },
+  { "prop": "updaterId", "name": "更新人" },
+  { "prop": "updaterName", "name": "更新人姓名" },
+  { "prop": "updateTime", "name": "更新时间" },
+  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+
+export default {
+	data() {
+		return {tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentStatusLog/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentStatusLog'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentType-add-or-update.vue

@@ -0,0 +1,177 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="编码"></el-input>
+			</el-form-item>
+			<el-form-item label="名称" prop="name">
+				<el-input v-model="dataForm.name" placeholder="名称"></el-input>
+			</el-form-item>
+			<el-form-item label="父类ID" prop="parentId">
+				<el-input v-model="dataForm.parentId" placeholder="父类ID"></el-input>
+			</el-form-item>
+			<el-form-item label="父类名称" prop="parentName">
+				<el-input v-model="dataForm.parentName" placeholder="父类名称"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				code: '',
+				name: '',
+				parentId: '',
+				parentName: '',
+				description: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				parentId: [{ required: true, message: '父类ID不能为空', trigger: 'blur' }],
+				parentName: [{ required: true, message: '父类名称不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentType/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.code = data.equipmentype.code
+							this.dataForm.name = data.equipmentype.name
+							this.dataForm.parentId = data.equipmentype.parentId
+							this.dataForm.parentName = data.equipmentype.parentName
+							this.dataForm.description = data.equipmentype.description
+							this.dataForm.enabled = data.equipmentype.enabled
+							this.dataForm.remark = data.equipmentype.remark
+							this.dataForm.valid = data.equipmentype.valid
+							this.dataForm.creatorId = data.equipmentype.creatorId
+							this.dataForm.creatorName = data.equipmentype.creatorName
+							this.dataForm.createTime = data.equipmentype.createTime
+							this.dataForm.updaterId = data.equipmentype.updaterId
+							this.dataForm.updaterName = data.equipmentype.updaterName
+							this.dataForm.updateTime = data.equipmentype.updateTime
+							this.dataForm.version = data.equipmentype.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentType/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							parentId: this.dataForm.parentId,
+							parentName: this.dataForm.parentName,
+							description: this.dataForm.description,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentType.vue

@@ -0,0 +1,182 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmentype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
+			<el-table-column prop="parentId" header-align="center" align="center" label="父类ID"> </el-table-column>
+			<el-table-column prop="parentName" header-align="center" align="center" label="父类名称"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentType-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '类型名称' },
+	{ prop: 'code', name: '类型编码' },
+	{ prop: 'remark', name: '备注' },
+	// { "prop": "id", "name": "ID" },
+	// { "prop": "parentId", "name": "父类ID" },
+	// { "prop": "parentName", "name": "父类名称" },
+	// { "prop": "description", "name": "描述" },
+	// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+	// { "prop": "creatorId", "name": "创建人" },
+	// { "prop": "creatorName", "name": "创建人姓名" },
+	// { "prop": "updaterId", "name": "更新人" },
+	// { "prop": "updaterName", "name": "更新人姓名" },
+	// { "prop": "updateTime", "name": "更新时间" },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentType/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentType'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentTypeFile-add-or-update.vue

@@ -0,0 +1,184 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="设备类型ID" prop="equipmentTypeId">
+				<el-input v-model="dataForm.equipmentTypeId" placeholder="设备类型ID"></el-input>
+			</el-form-item>
+			<el-form-item label="文件ID" prop="fileId">
+				<el-input v-model="dataForm.fileId" placeholder="文件ID"></el-input>
+			</el-form-item>
+			<el-form-item label="文件类型编码" prop="typeCode">
+				<el-input v-model="dataForm.typeCode" placeholder="文件类型编码"></el-input>
+			</el-form-item>
+			<el-form-item label="文件名称" prop="fileName">
+				<el-input v-model="dataForm.fileName" placeholder="文件名称"></el-input>
+			</el-form-item>
+			<el-form-item label="下载地址" prop="fileUrl">
+				<el-input v-model="dataForm.fileUrl" placeholder="下载地址"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				equipmentTypeId: '',
+				fileId: '',
+				typeCode: '',
+				fileName: '',
+				fileUrl: '',
+				description: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				equipmentTypeId: [{ required: true, message: '设备类型ID不能为空', trigger: 'blur' }],
+				fileId: [{ required: true, message: '文件ID不能为空', trigger: 'blur' }],
+				typeCode: [{ required: true, message: '文件类型编码不能为空', trigger: 'blur' }],
+				fileName: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
+				fileUrl: [{ required: true, message: '下载地址不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentTypeFile/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.equipmentTypeId = data.equipmentypeFile.equipmentTypeId
+							this.dataForm.fileId = data.equipmentypeFile.fileId
+							this.dataForm.typeCode = data.equipmentypeFile.typeCode
+							this.dataForm.fileName = data.equipmentypeFile.fileName
+							this.dataForm.fileUrl = data.equipmentypeFile.fileUrl
+							this.dataForm.description = data.equipmentypeFile.description
+							this.dataForm.enabled = data.equipmentypeFile.enabled
+							this.dataForm.remark = data.equipmentypeFile.remark
+							this.dataForm.valid = data.equipmentypeFile.valid
+							this.dataForm.creatorId = data.equipmentypeFile.creatorId
+							this.dataForm.creatorName = data.equipmentypeFile.creatorName
+							this.dataForm.createTime = data.equipmentypeFile.createTime
+							this.dataForm.updaterId = data.equipmentypeFile.updaterId
+							this.dataForm.updaterName = data.equipmentypeFile.updaterName
+							this.dataForm.updateTime = data.equipmentypeFile.updateTime
+							this.dataForm.version = data.equipmentypeFile.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/equipmentTypeFile/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							equipmentTypeId: this.dataForm.equipmentTypeId,
+							fileId: this.dataForm.fileId,
+							typeCode: this.dataForm.typeCode,
+							fileName: this.dataForm.fileName,
+							fileUrl: this.dataForm.fileUrl,
+							description: this.dataForm.description,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentTypeFile.vue

@@ -0,0 +1,182 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmentypefile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="equipmentTypeId" header-align="center" align="center" label="设备类型ID"> </el-table-column>
+			<el-table-column prop="fileId" header-align="center" align="center" label="文件ID"> </el-table-column>
+			<el-table-column prop="typeCode" header-align="center" align="center" label="文件类型编码"> </el-table-column>
+			<el-table-column prop="fileName" header-align="center" align="center" label="文件名称"> </el-table-column>
+			<el-table-column prop="fileUrl" header-align="center" align="center" label="下载地址"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentTypeFile-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+  { "prop": "id", "name": "ID" },
+  { "prop": "equipmentTypeId", "name": "设备类型ID" },
+  { "prop": "fileId", "name": "文件ID" },
+  { "prop": "typeCode", "name": "文件类型编码" },
+  { "prop": "fileName", "name": "文件名称" },
+  { "prop": "fileUrl", "name": "下载地址" },
+  { "prop": "description", "name": "描述" },
+  { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+  { "prop": "remark", "name": "备注" },
+  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+  { "prop": "creatorId", "name": "创建人" },
+  { "prop": "creatorName", "name": "创建人姓名" },
+  { "prop": "createTime", "name": "添加时间" },
+  { "prop": "updaterId", "name": "更新人" },
+  { "prop": "updaterName", "name": "更新人姓名" },
+  { "prop": "updateTime", "name": "更新时间" },
+  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+
+export default {
+	data() {
+		return {tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentTypeFile/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentTypeFile'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/equipmentattr.vue

@@ -0,0 +1,176 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:equipmenattr:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="equipmentId" header-align="center" align="center" label="设备ID"> </el-table-column>
+			<el-table-column prop="attrName" header-align="center" align="center" label="属性名称"> </el-table-column>
+			<el-table-column prop="attrValue" header-align="center" align="center" label="属性值"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './equipmentAttr-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'equipmentId', name: '设备ID' },
+	{ prop: 'attrName', name: '属性名' },
+	{ prop: 'attrValue', name: '属性值' },
+	// { "prop": "id", "name": "ID" },
+	// { "prop": "remark", "name": "备注" },
+	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+	// { "prop": "creatorId", "name": "创建人" },
+	// { "prop": "creatorName", "name": "创建人姓名" },
+	// { "prop": "updaterId", "name": "更新人" },
+	// { "prop": "updaterName", "name": "更新人姓名" },
+	// { "prop": "updateTime", "name": "更新时间" },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/equipmentAttr/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/equipmentAttr'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/factory-add-or-update.vue

@@ -0,0 +1,177 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="工厂编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="工厂编码"></el-input>
+			</el-form-item>
+			<el-form-item label="工厂名称" prop="name">
+				<el-input v-model="dataForm.name" placeholder="工厂名称"></el-input>
+			</el-form-item>
+			<el-form-item label="地址" prop="address">
+				<el-input v-model="dataForm.address" placeholder="地址"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+			<el-form-item label="外部系统编码" prop="externalCode">
+				<el-input v-model="dataForm.externalCode" placeholder="外部系统编码"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				code: '',
+				name: '',
+				address: '',
+				description: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: '',
+				externalCode: ''
+			},
+			dataRule: {
+				code: [{ required: true, message: '工厂编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '工厂名称不能为空', trigger: 'blur' }],
+				address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+				externalCode: [{ required: true, message: '外部系统编码不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/factory/{this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.code = data.factory.code
+							this.dataForm.name = data.factory.name
+							this.dataForm.address = data.factory.address
+							this.dataForm.description = data.factory.description
+							this.dataForm.enabled = data.factory.enabled
+							this.dataForm.remark = data.factory.remark
+							this.dataForm.valid = data.factory.valid
+							this.dataForm.creatorId = data.factory.creatorId
+							this.dataForm.creatorName = data.factory.creatorName
+							this.dataForm.createTime = data.factory.createTime
+							this.dataForm.updaterId = data.factory.updaterId
+							this.dataForm.updaterName = data.factory.updaterName
+							this.dataForm.updateTime = data.factory.updateTime
+							this.dataForm.version = data.factory.version
+							this.dataForm.externalCode = data.factory.externalCode
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/factory/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							address: this.dataForm.address,
+							description: this.dataForm.description,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version,
+							externalCode: this.dataForm.externalCode
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/factory.vue

@@ -0,0 +1,182 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:factory:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="工厂编码"> </el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="工厂名称"> </el-table-column>
+			<el-table-column prop="address" header-align="center" align="center" label="地址"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column prop="externalCode" header-align="center" align="center" label="外部系统编码"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './factory-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '工厂名称' },
+	{ prop: 'code', name: '工厂编码' },
+	{ prop: 'address', name: '地址' },
+	{ prop: 'remark', name: '备注' },
+	// { prop: 'id', name: 'id' },
+	// { prop: 'description', name: '描述' },
+	// { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	// { prop: 'externalCode', name: '外部系统编码' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/factory/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.totalCount
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/factory'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/product-add-or-update.vue

@@ -0,0 +1,205 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="编码"></el-input>
+			</el-form-item>
+			<el-form-item label="名称" prop="name">
+				<el-input v-model="dataForm.name" placeholder="名称"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="外部编码，用于对照外部系统的编码" prop="externalCode">
+				<el-input v-model="dataForm.externalCode" placeholder="外部编码，用于对照外部系统的编码"></el-input>
+			</el-form-item>
+			<el-form-item label="规格" prop="specifications">
+				<el-input v-model="dataForm.specifications" placeholder="规格"></el-input>
+			</el-form-item>
+			<el-form-item label="单位value，对应到数据字典label_value" prop="unitDictValue">
+				<el-input v-model="dataForm.unitDictValue" placeholder="单位value，对应到数据字典label_value"></el-input>
+			</el-form-item>
+			<el-form-item label="一单位的面积（平方米）" prop="area">
+				<el-input v-model="dataForm.area" placeholder="一单位的面积（平方米）"></el-input>
+			</el-form-item>
+			<el-form-item label="加工一单位产品需要的时间" prop="processTime">
+				<el-input v-model="dataForm.processTime" placeholder="加工一单位产品需要的时间"></el-input>
+			</el-form-item>
+			<el-form-item label="产品类型value，对应到数据字典label_value" prop="typeDictValue">
+				<el-input v-model="dataForm.typeDictValue" placeholder="产品类型value，对应到数据字典label_value"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				code: '',
+				name: '',
+				description: '',
+				externalCode: '',
+				specifications: '',
+				unitDictValue: '',
+				area: '',
+				processTime: '',
+				typeDictValue: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				externalCode: [{ required: true, message: '外部编码，用于对照外部系统的编码不能为空', trigger: 'blur' }],
+				specifications: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
+				unitDictValue: [{ required: true, message: '单位value，对应到数据字典label_value不能为空', trigger: 'blur' }],
+				area: [{ required: true, message: '一单位的面积（平方米）不能为空', trigger: 'blur' }],
+				processTime: [{ required: true, message: '加工一单位产品需要的时间不能为空', trigger: 'blur' }],
+				typeDictValue: [{ required: true, message: '产品类型value，对应到数据字典label_value不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/product/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.code = data.product.code
+							this.dataForm.name = data.product.name
+							this.dataForm.description = data.product.description
+							this.dataForm.externalCode = data.product.externalCode
+							this.dataForm.specifications = data.product.specifications
+							this.dataForm.unitDictValue = data.product.unitDictValue
+							this.dataForm.area = data.product.area
+							this.dataForm.processTime = data.product.processTime
+							this.dataForm.typeDictValue = data.product.typeDictValue
+							this.dataForm.enabled = data.product.enabled
+							this.dataForm.remark = data.product.remark
+							this.dataForm.valid = data.product.valid
+							this.dataForm.creatorId = data.product.creatorId
+							this.dataForm.creatorName = data.product.creatorName
+							this.dataForm.createTime = data.product.createTime
+							this.dataForm.updaterId = data.product.updaterId
+							this.dataForm.updaterName = data.product.updaterName
+							this.dataForm.updateTime = data.product.updateTime
+							this.dataForm.version = data.product.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/product/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							description: this.dataForm.description,
+							externalCode: this.dataForm.externalCode,
+							specifications: this.dataForm.specifications,
+							unitDictValue: this.dataForm.unitDictValue,
+							area: this.dataForm.area,
+							processTime: this.dataForm.processTime,
+							typeDictValue: this.dataForm.typeDictValue,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/product.vue

@@ -0,0 +1,267 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button @click="test()">测试</el-button>
+				<el-button v-if="$hasPermission('monitoring:product:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="编码"></el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="名称"></el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"></el-table-column>
+			<el-table-column prop="externalCode" header-align="center" align="center" label="外部编码，用于对照外部系统的编码"></el-table-column>
+			<el-table-column prop="specifications" header-align="center" align="center" label="规格"></el-table-column>
+			<el-table-column prop="unitDictValue" header-align="center" align="center" label="单位value，对应到数据字典label_value"></el-table-column>
+			<el-table-column prop="area" header-align="center" align="center" label="一单位的面积（平方米）"></el-table-column>
+			<el-table-column prop="processTime" header-align="center" align="center" label="加工一单位产品需要的时间"></el-table-column>
+			<el-table-column prop="typeDictValue" header-align="center" align="center" label="产品类型value，对应到数据字典label_value"></el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"></el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"></el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"></el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"></el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"></el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"></el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"></el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"></el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"></el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		></el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+
+		<base-dialog v-if="showbasedialog" ref="basedialog" :configs="addOrUpdateConfigs"></base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './product-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+import BaseDialog from '@/components/base-dialog/addOrUpdate'
+const tableConfigs = [
+	{ type: 'index', name: '序号' },
+	{ prop: 'updateTime', name: '添加时间' },
+	{ prop: 'name', name: '产品名称' },
+	{ prop: 'code', name: '产品编码' },
+	{ prop: 'specifications', name: '规格' },
+	{ prop: 'unitDictValue', name: '单位' },
+	// { prop: 'unitDictValue', name: '单位value，对应到数据字典label_value' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['viewAttr', 'delete'] }
+
+	// { "prop": "id", "name": "ID" },
+	// { "prop": "description", "name": "描述" },
+	// { "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
+	// { "prop": "area", "name": "一单位的面积（平方米）" },
+	// { "prop": "processTime", "name": "加工一单位产品需要的时间" },
+	// {
+	//   "prop": "typeDictValue",
+	//   "name": "产品类型value，对应到数据字典label_value"
+	// },
+	// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+	// { "prop": "remark", "name": "备注" },
+	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+	// { "prop": "creatorId", "name": "创建人" },
+	// { "prop": "creatorName", "name": "创建人姓名" },
+	// { "prop": "createTime", "name": "添加时间" },
+	// { "prop": "updaterId", "name": "更新人" },
+	// { "prop": "updaterName", "name": "更新人姓名" },
+	// { "prop": "version", "name": "版本号" }
+]
+
+const addOrUpdateConfigs = {
+	type: 'dialog', // dialog | drawer | page
+	fields: [
+		'name',
+		{
+			name: 'code',
+			api: 'xx/code'
+		},
+		{
+			name: 'processTime',
+			type: 'number', // type: number(input+number) | default(input) | textarea | select(options在父组件里获取) | datetime
+			required: true,
+			rules: [
+				// 除了required之外的验证规则
+				{
+					type: 'number',
+					trigger: 'blur',
+					transform: val => Number(val),
+					message: '必须输入数字'
+				}
+			]
+		},
+		'remark',
+		'specifications',
+		{
+			name: 'typeDictValue',
+			type: 'select',
+			options: [
+				// 动态获取
+				{ label: 'ces', value: 1 },
+				{ label: 'sec', value: 2 }
+			]
+		},
+		{
+			name: 'unitDictValue',
+			type: 'select',
+			options: [
+				// 动态获取
+				{ label: 'h', value: 'h' },
+				{ label: 'l', value: 'l' }
+			]
+		}
+	],
+	operations: [
+		{ name: 'reset', url: true },
+		{ name: 'save', url: 'api/product/add' },
+		{ name: 'update', url: 'api/product/update' }
+	]
+	// extraComponents: [
+	// 	{
+	// 		name: 'CompName',
+	// 		label: 'markdown编辑器',
+	// 		component: () => import('xx.vue')
+	// 	}
+	// ]
+}
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false,
+			addOrUpdateConfigs,
+			showbasedialog: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable,
+		BaseDialog
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		//
+		test() {
+			this.showbasedialog = true
+			this.$nextTick(() => {
+				this.$refs.basedialog.init()
+			})
+		},
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/product/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/product'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/productArrt-add-or-update.vue

@@ -0,0 +1,184 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="编码"></el-input>
+			</el-form-item>
+			<el-form-item label="名称" prop="name">
+				<el-input v-model="dataForm.name" placeholder="名称"></el-input>
+			</el-form-item>
+			<el-form-item label="产品id,关联产品表" prop="productId">
+				<el-input v-model="dataForm.productId" placeholder="产品id,关联产品表"></el-input>
+			</el-form-item>
+			<el-form-item label="属性值" prop="value">
+				<el-input v-model="dataForm.value" placeholder="属性值"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="外部编码，用于对照外部系统的编码" prop="externalCode">
+				<el-input v-model="dataForm.externalCode" placeholder="外部编码，用于对照外部系统的编码"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				code: '',
+				name: '',
+				productId: '',
+				value: '',
+				description: '',
+				externalCode: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				productId: [{ required: true, message: '产品id,关联产品表不能为空', trigger: 'blur' }],
+				value: [{ required: true, message: '属性值不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				externalCode: [{ required: true, message: '外部编码，用于对照外部系统的编码不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/productArrt/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.code = data.producarrt.code
+							this.dataForm.name = data.producarrt.name
+							this.dataForm.productId = data.producarrt.productId
+							this.dataForm.value = data.producarrt.value
+							this.dataForm.description = data.producarrt.description
+							this.dataForm.externalCode = data.producarrt.externalCode
+							this.dataForm.enabled = data.producarrt.enabled
+							this.dataForm.remark = data.producarrt.remark
+							this.dataForm.valid = data.producarrt.valid
+							this.dataForm.creatorId = data.producarrt.creatorId
+							this.dataForm.creatorName = data.producarrt.creatorName
+							this.dataForm.createTime = data.producarrt.createTime
+							this.dataForm.updaterId = data.producarrt.updaterId
+							this.dataForm.updaterName = data.producarrt.updaterName
+							this.dataForm.updateTime = data.producarrt.updateTime
+							this.dataForm.version = data.producarrt.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/productArrt/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							productId: this.dataForm.productId,
+							value: this.dataForm.value,
+							description: this.dataForm.description,
+							externalCode: this.dataForm.externalCode,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/productArrt.vue

@@ -0,0 +1,184 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:producarrt:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
+			<el-table-column prop="productId" header-align="center" align="center" label="产品id,关联产品表"> </el-table-column>
+			<el-table-column prop="value" header-align="center" align="center" label="属性值"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="externalCode" header-align="center" align="center" label="外部编码，用于对照外部系统的编码"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './productArrt-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '属性名称' },
+	{ prop: 'code', name: '属性编码' },
+	{ prop: 'productId', name: '产品id,关联产品表' },
+	{ prop: 'value', name: '属性值' },
+	{ prop: 'description', name: '描述' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'externalCode', name: '外部编码，用于对照外部系统的编码' },
+	// { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
+	// { prop: 'remark', name: '备注' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/productArrt/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/productArrt'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/productionLine.vue

@@ -0,0 +1,186 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:productionline:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
+			<el-table-column prop="factoryId" header-align="center" align="center" label="工厂表ID"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="status" header-align="center" align="center" label="产线状态"> </el-table-column>
+			<el-table-column prop="tvalue" header-align="center" align="center" label="每小时下片数量"> </el-table-column>
+			<el-table-column prop="externalCode" header-align="center" align="center" label="外部系统编码"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './productionLine-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'factoryId', name: '工厂ID' },
+	{ prop: 'name', name: '产线名称' },
+	{ prop: 'code', name: '产线编码' },
+	{ prop: 'status', name: '产线状态' },
+	{ prop: 'description', name: '描述' },
+	{ prop: 'remark', name: '备注' },
+	// { "prop": "tvalue", "name": "每小时下片数量" },
+	// { "prop": "externalCode", "name": "外部系统编码" },
+	// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+	// { "prop": "id", "name": "id" },
+	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+	// { "prop": "creatorId", "name": "创建人" },
+	// { "prop": "creatorName", "name": "创建人姓名" },
+	// { "prop": "updaterId", "name": "更新人" },
+	// { "prop": "updaterName", "name": "更新人姓名" },
+	// { "prop": "updateTime", "name": "更新时间" },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/productionLine/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/productionLine'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/productionLineRecSch.vue

@@ -0,0 +1,165 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:productionlinerecsch:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="productionLineId" header-align="center" align="center" label="产线id"> </el-table-column>
+			<el-table-column prop="inputNum" header-align="center" align="center" label="上一次记录时间至该条记录时间端内上片数量"> </el-table-column>
+			<el-table-column prop="outputNum" header-align="center" align="center" label="上一次记录时间至该条记录时间端内下片数量"> </el-table-column>
+			<el-table-column prop="recordTime" header-align="center" align="center" label="记录时间"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="sumInputNum" header-align="center" align="center" label="该记录时间点的累计上片数量"> </el-table-column>
+			<el-table-column prop="sumOutputNum" header-align="center" align="center" label="该记录时间点的累计下片数量"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './productionLineRecSch-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'id', name: 'ID' },
+	{ prop: 'productionLineId', name: '产线id' },
+	{ prop: 'inputNum', name: '上一次记录时间至该条记录时间端内上片数量' },
+	{ prop: 'outputNum', name: '上一次记录时间至该条记录时间端内下片数量' },
+	{ prop: 'recordTime', name: '记录时间' },
+	{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	{ prop: 'sumInputNum', name: '该记录时间点的累计上片数量' },
+	{ prop: 'sumOutputNum', name: '该记录时间点的累计下片数量' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/productionLineRecSch/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/productionLineRecSch'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/productionline-add-or-update.vue

@@ -0,0 +1,191 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="工厂表ID" prop="factoryId">
+				<el-input v-model="dataForm.factoryId" placeholder="工厂表ID"></el-input>
+			</el-form-item>
+			<el-form-item label="编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="编码"></el-input>
+			</el-form-item>
+			<el-form-item label="名称" prop="name">
+				<el-input v-model="dataForm.name" placeholder="名称"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="产线状态" prop="status">
+				<el-input v-model="dataForm.status" placeholder="产线状态"></el-input>
+			</el-form-item>
+			<el-form-item label="每小时下片数量" prop="tvalue">
+				<el-input v-model="dataForm.tvalue" placeholder="每小时下片数量"></el-input>
+			</el-form-item>
+			<el-form-item label="外部系统编码" prop="externalCode">
+				<el-input v-model="dataForm.externalCode" placeholder="外部系统编码"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				factoryId: '',
+				code: '',
+				name: '',
+				description: '',
+				status: '',
+				tvalue: '',
+				externalCode: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				factoryId: [{ required: true, message: '工厂表ID不能为空', trigger: 'blur' }],
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				status: [{ required: true, message: '产线状态不能为空', trigger: 'blur' }],
+				tvalue: [{ required: true, message: '每小时下片数量不能为空', trigger: 'blur' }],
+				externalCode: [{ required: true, message: '外部系统编码不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/productionLine/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.factoryId = data.productionLine.factoryId
+							this.dataForm.code = data.productionLine.code
+							this.dataForm.name = data.productionLine.name
+							this.dataForm.description = data.productionLine.description
+							this.dataForm.status = data.productionLine.status
+							this.dataForm.tvalue = data.productionLine.tvalue
+							this.dataForm.externalCode = data.productionLine.externalCode
+							this.dataForm.enabled = data.productionLine.enabled
+							this.dataForm.remark = data.productionLine.remark
+							this.dataForm.valid = data.productionLine.valid
+							this.dataForm.creatorId = data.productionLine.creatorId
+							this.dataForm.creatorName = data.productionLine.creatorName
+							this.dataForm.createTime = data.productionLine.createTime
+							this.dataForm.updaterId = data.productionLine.updaterId
+							this.dataForm.updaterName = data.productionLine.updaterName
+							this.dataForm.updateTime = data.productionLine.updateTime
+							this.dataForm.version = data.productionLine.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/productionLine/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							factoryId: this.dataForm.factoryId,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							description: this.dataForm.description,
+							status: this.dataForm.status,
+							tvalue: this.dataForm.tvalue,
+							externalCode: this.dataForm.externalCode,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/productionlinerecsch-add-or-update.vue

@@ -0,0 +1,121 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="产线id" prop="productionLineId">
+				<el-input v-model="dataForm.productionLineId" placeholder="产线id"></el-input>
+			</el-form-item>
+			<el-form-item label="上一次记录时间至该条记录时间端内上片数量" prop="inputNum">
+				<el-input v-model="dataForm.inputNum" placeholder="上一次记录时间至该条记录时间端内上片数量"></el-input>
+			</el-form-item>
+			<el-form-item label="上一次记录时间至该条记录时间端内下片数量" prop="outputNum">
+				<el-input v-model="dataForm.outputNum" placeholder="上一次记录时间至该条记录时间端内下片数量"></el-input>
+			</el-form-item>
+			<el-form-item label="记录时间" prop="recordTime">
+				<el-input v-model="dataForm.recordTime" placeholder="记录时间"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="该记录时间点的累计上片数量" prop="sumInputNum">
+				<el-input v-model="dataForm.sumInputNum" placeholder="该记录时间点的累计上片数量"></el-input>
+			</el-form-item>
+			<el-form-item label="该记录时间点的累计下片数量" prop="sumOutputNum">
+				<el-input v-model="dataForm.sumOutputNum" placeholder="该记录时间点的累计下片数量"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				productionLineId: '',
+				inputNum: '',
+				outputNum: '',
+				recordTime: '',
+				valid: '',
+				sumInputNum: '',
+				sumOutputNum: ''
+			},
+			dataRule: {
+				productionLineId: [{ required: true, message: '产线id不能为空', trigger: 'blur' }],
+				inputNum: [{ required: true, message: '上一次记录时间至该条记录时间端内上片数量不能为空', trigger: 'blur' }],
+				outputNum: [{ required: true, message: '上一次记录时间至该条记录时间端内下片数量不能为空', trigger: 'blur' }],
+				recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				sumInputNum: [{ required: true, message: '该记录时间点的累计上片数量不能为空', trigger: 'blur' }],
+				sumOutputNum: [{ required: true, message: '该记录时间点的累计下片数量不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/productionLineRecSch/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.productionLineId = data.productionLineRecSch.productionLineId
+							this.dataForm.inputNum = data.productionLineRecSch.inputNum
+							this.dataForm.outputNum = data.productionLineRecSch.outputNum
+							this.dataForm.recordTime = data.productionLineRecSch.recordTime
+							this.dataForm.valid = data.productionLineRecSch.valid
+							this.dataForm.sumInputNum = data.productionLineRecSch.sumInputNum
+							this.dataForm.sumOutputNum = data.productionLineRecSch.sumOutputNum
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/productionLineRecSch/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							productionLineId: this.dataForm.productionLineId,
+							inputNum: this.dataForm.inputNum,
+							outputNum: this.dataForm.outputNum,
+							recordTime: this.dataForm.recordTime,
+							valid: this.dataForm.valid,
+							sumInputNum: this.dataForm.sumInputNum,
+							sumOutputNum: this.dataForm.sumOutputNum
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/qualityInspectionDet.vue

@@ -0,0 +1,175 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:qualityinspectiondet:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="typeId" header-align="center" align="center" label="检测类型id"> </el-table-column>
+			<el-table-column prop="content" header-align="center" align="center" label="检测内容"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="检测编码"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './qualityInspectionDet-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'typeId', name: '检测类型id' },
+	{ prop: 'content', name: '检测内容' },
+	{ prop: 'code', name: '检测编码' },
+	{ prop: 'remark', name: '备注' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/qualityInspectionDet/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/qualityInspectionDet'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/qualityInspectionRecord.vue

@@ -0,0 +1,191 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:qualityinspectionrecord:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="inspectionDetId" header-align="center" align="center" label="检测内容id"> </el-table-column>
+			<el-table-column prop="inspectionDetContent" header-align="center" align="center" label="检测内容（设备推送消息时，可能无对应id，只填这个字段）"> </el-table-column>
+			<el-table-column prop="productionId" header-align="center" align="center" label="产线id"> </el-table-column>
+			<el-table-column prop="sectionId" header-align="center" align="center" label="工段id"> </el-table-column>
+			<el-table-column prop="checkPerson" header-align="center" align="center" label="检测人员，可以多个"> </el-table-column>
+			<el-table-column prop="checkTime" header-align="center" align="center" label="检测时间"> </el-table-column>
+			<el-table-column prop="source" header-align="center" align="center" label="来源 1，手动（默认） 2，自动"> </el-table-column>
+			<el-table-column prop="explainText" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './qualityInspectionRecord-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{
+		prop: 'inspectionDetContent',
+		name: '检测内容'
+		// "name": "检测内容（设备推送消息时，可能无对应id，只填这个字段）"
+	},
+	{ prop: 'checkTime', name: '检测时间' },
+	{ prop: 'productionId', name: '产线id' },
+	{ prop: 'sectionId', name: '工段id' },
+	{ prop: 'checkPerson', name: '检测人员' },
+	// { prop: 'checkPerson', name: '检测人员，可以多个' },
+	{ prop: 'source', name: '来源' },
+	// { prop: 'source', name: '来源 1，手动（默认） 2，自动' },
+	{ prop: 'explainText', name: '描述' },
+	{ prop: 'remark', name: '备注' },
+	// { prop: 'inspectionDetId', name: '检测内容id' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/qualityInspectionRecord/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/qualityInspectionRecord'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/qualityInspectionType.vue

@@ -0,0 +1,173 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:qualityinspectiontype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="检测类型名称"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="检测类型编码"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './qualityInspectionType-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '检测类型名称' },
+	{ prop: 'code', name: '检测类型编码' },
+	{ prop: 'remark', name: '备注' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/qualityInspectionType/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/qualityInspectionType'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/qualityinspectiondet-add-or-update.vue

@@ -0,0 +1,157 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="检测类型id" prop="typeId">
+				<el-input v-model="dataForm.typeId" placeholder="检测类型id"></el-input>
+			</el-form-item>
+			<el-form-item label="检测内容" prop="content">
+				<el-input v-model="dataForm.content" placeholder="检测内容"></el-input>
+			</el-form-item>
+			<el-form-item label="检测编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="检测编码"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				typeId: '',
+				content: '',
+				code: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				typeId: [{ required: true, message: '检测类型id不能为空', trigger: 'blur' }],
+				content: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
+				code: [{ required: true, message: '检测编码不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/qualityInspectionDet/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.typeId = data.qualityInspectionDet.typeId
+							this.dataForm.content = data.qualityInspectionDet.content
+							this.dataForm.code = data.qualityInspectionDet.code
+							this.dataForm.remark = data.qualityInspectionDet.remark
+							this.dataForm.valid = data.qualityInspectionDet.valid
+							this.dataForm.creatorId = data.qualityInspectionDet.creatorId
+							this.dataForm.creatorName = data.qualityInspectionDet.creatorName
+							this.dataForm.createTime = data.qualityInspectionDet.createTime
+							this.dataForm.updaterId = data.qualityInspectionDet.updaterId
+							this.dataForm.updaterName = data.qualityInspectionDet.updaterName
+							this.dataForm.updateTime = data.qualityInspectionDet.updateTime
+							this.dataForm.version = data.qualityInspectionDet.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/qualityInspectionDet/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						headers: { 'Content-Type': 'application/json' },
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							typeId: this.dataForm.typeId,
+							content: this.dataForm.content,
+							code: this.dataForm.code,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/qualityinspectionrecord-add-or-update.vue

@@ -0,0 +1,191 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="检测内容id" prop="inspectionDetId">
+				<el-input v-model="dataForm.inspectionDetId" placeholder="检测内容id"></el-input>
+			</el-form-item>
+			<el-form-item label="检测内容（设备推送消息时，可能无对应id，只填这个字段）" prop="inspectionDetContent">
+				<el-input v-model="dataForm.inspectionDetContent" placeholder="检测内容（设备推送消息时，可能无对应id，只填这个字段）"></el-input>
+			</el-form-item>
+			<el-form-item label="产线id" prop="productionId">
+				<el-input v-model="dataForm.productionId" placeholder="产线id"></el-input>
+			</el-form-item>
+			<el-form-item label="工段id" prop="sectionId">
+				<el-input v-model="dataForm.sectionId" placeholder="工段id"></el-input>
+			</el-form-item>
+			<el-form-item label="检测人员，可以多个" prop="checkPerson">
+				<el-input v-model="dataForm.checkPerson" placeholder="检测人员，可以多个"></el-input>
+			</el-form-item>
+			<el-form-item label="检测时间" prop="checkTime">
+				<el-input v-model="dataForm.checkTime" placeholder="检测时间"></el-input>
+			</el-form-item>
+			<el-form-item label="来源 1，手动（默认） 2，自动" prop="source">
+				<el-input v-model="dataForm.source" placeholder="来源 1，手动（默认） 2，自动"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="explainText">
+				<el-input v-model="dataForm.explainText" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				inspectionDetId: '',
+				inspectionDetContent: '',
+				productionId: '',
+				sectionId: '',
+				checkPerson: '',
+				checkTime: '',
+				source: '',
+				explainText: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				inspectionDetId: [{ required: true, message: '检测内容id不能为空', trigger: 'blur' }],
+				inspectionDetContent: [{ required: true, message: '检测内容（设备推送消息时，可能无对应id，只填这个字段）不能为空', trigger: 'blur' }],
+				productionId: [{ required: true, message: '产线id不能为空', trigger: 'blur' }],
+				sectionId: [{ required: true, message: '工段id不能为空', trigger: 'blur' }],
+				checkPerson: [{ required: true, message: '检测人员，可以多个不能为空', trigger: 'blur' }],
+				checkTime: [{ required: true, message: '检测时间不能为空', trigger: 'blur' }],
+				source: [{ required: true, message: '来源 1，手动（默认） 2，自动不能为空', trigger: 'blur' }],
+				explainText: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/qualityInspectionRecord/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.inspectionDetId = data.qualityInspectionRecord.inspectionDetId
+							this.dataForm.inspectionDetContent = data.qualityInspectionRecord.inspectionDetContent
+							this.dataForm.productionId = data.qualityInspectionRecord.productionId
+							this.dataForm.sectionId = data.qualityInspectionRecord.sectionId
+							this.dataForm.checkPerson = data.qualityInspectionRecord.checkPerson
+							this.dataForm.checkTime = data.qualityInspectionRecord.checkTime
+							this.dataForm.source = data.qualityInspectionRecord.source
+							this.dataForm.explainText = data.qualityInspectionRecord.explainText
+							this.dataForm.remark = data.qualityInspectionRecord.remark
+							this.dataForm.valid = data.qualityInspectionRecord.valid
+							this.dataForm.creatorId = data.qualityInspectionRecord.creatorId
+							this.dataForm.creatorName = data.qualityInspectionRecord.creatorName
+							this.dataForm.createTime = data.qualityInspectionRecord.createTime
+							this.dataForm.updaterId = data.qualityInspectionRecord.updaterId
+							this.dataForm.updaterName = data.qualityInspectionRecord.updaterName
+							this.dataForm.updateTime = data.qualityInspectionRecord.updateTime
+							this.dataForm.version = data.qualityInspectionRecord.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/qualityInspectionRecord/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							inspectionDetId: this.dataForm.inspectionDetId,
+							inspectionDetContent: this.dataForm.inspectionDetContent,
+							productionId: this.dataForm.productionId,
+							sectionId: this.dataForm.sectionId,
+							checkPerson: this.dataForm.checkPerson,
+							checkTime: this.dataForm.checkTime,
+							source: this.dataForm.source,
+							explainText: this.dataForm.explainText,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/qualityinspectiontype-add-or-update.vue

@@ -0,0 +1,149 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="检测类型名称" prop="name">
+				<el-input v-model="dataForm.name" placeholder="检测类型名称"></el-input>
+			</el-form-item>
+			<el-form-item label="检测类型编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="检测类型编码"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				name: '',
+				code: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				name: [{ required: true, message: '检测类型名称不能为空', trigger: 'blur' }],
+				code: [{ required: true, message: '检测类型编码不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/qualityInspectionType/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.name = data.qualityInspectionType.name
+							this.dataForm.code = data.qualityInspectionType.code
+							this.dataForm.remark = data.qualityInspectionType.remark
+							this.dataForm.valid = data.qualityInspectionType.valid
+							this.dataForm.creatorId = data.qualityInspectionType.creatorId
+							this.dataForm.creatorName = data.qualityInspectionType.creatorName
+							this.dataForm.createTime = data.qualityInspectionType.createTime
+							this.dataForm.updaterId = data.qualityInspectionType.updaterId
+							this.dataForm.updaterName = data.qualityInspectionType.updaterName
+							this.dataForm.updateTime = data.qualityInspectionType.updateTime
+							this.dataForm.version = data.qualityInspectionType.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/qualityInspectionType/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							name: this.dataForm.name,
+							code: this.dataForm.code,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/reportSheet-add-or-update.vue

@@ -0,0 +1,191 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="分类：关联report_sheet_category" prop="category">
+				<el-input v-model="dataForm.category" placeholder="分类：关联report_sheet_category"></el-input>
+			</el-form-item>
+			<el-form-item label="编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="编码"></el-input>
+			</el-form-item>
+			<el-form-item label="名称" prop="name">
+				<el-input v-model="dataForm.name" placeholder="名称"></el-input>
+			</el-form-item>
+			<el-form-item label="文件名称" prop="fileName">
+				<el-input v-model="dataForm.fileName" placeholder="文件名称"></el-input>
+			</el-form-item>
+			<el-form-item label="链接地址" prop="url">
+				<el-input v-model="dataForm.url" placeholder="链接地址"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+			<el-form-item label="报表内容" prop="content">
+				<el-input v-model="dataForm.content" placeholder="报表内容"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				category: '',
+				code: '',
+				name: '',
+				fileName: '',
+				url: '',
+				description: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: '',
+				content: ''
+			},
+			dataRule: {
+				category: [{ required: true, message: '分类：关联report_sheet_category不能为空', trigger: 'blur' }],
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				fileName: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
+				url: [{ required: true, message: '链接地址不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+				content: [{ required: true, message: '报表内容不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/reportSheet/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.category = data.reporsheet.category
+							this.dataForm.code = data.reporsheet.code
+							this.dataForm.name = data.reporsheet.name
+							this.dataForm.fileName = data.reporsheet.fileName
+							this.dataForm.url = data.reporsheet.url
+							this.dataForm.description = data.reporsheet.description
+							this.dataForm.enabled = data.reporsheet.enabled
+							this.dataForm.remark = data.reporsheet.remark
+							this.dataForm.valid = data.reporsheet.valid
+							this.dataForm.creatorId = data.reporsheet.creatorId
+							this.dataForm.creatorName = data.reporsheet.creatorName
+							this.dataForm.createTime = data.reporsheet.createTime
+							this.dataForm.updaterId = data.reporsheet.updaterId
+							this.dataForm.updaterName = data.reporsheet.updaterName
+							this.dataForm.updateTime = data.reporsheet.updateTime
+							this.dataForm.version = data.reporsheet.version
+							this.dataForm.content = data.reporsheet.content
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/reportSheet/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							category: this.dataForm.category,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							fileName: this.dataForm.fileName,
+							url: this.dataForm.url,
+							description: this.dataForm.description,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version,
+							content: this.dataForm.content
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/reportSheet.vue

@@ -0,0 +1,187 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:reporsheet:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="category" header-align="center" align="center" label="分类：关联report_sheet_category"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
+			<el-table-column prop="fileName" header-align="center" align="center" label="文件名称"> </el-table-column>
+			<el-table-column prop="url" header-align="center" align="center" label="链接地址"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column prop="content" header-align="center" align="center" label="报表内容"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './reportSheet-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '创建时间' },
+	{ prop: 'name', name: '报表名称' },
+	{ prop: 'code', name: '报表编码' },
+	{ prop: 'category', name: '报表分类' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'category', name: '分类：关联report_sheet_category' },
+	{ prop: 'fileName', name: '文件名称' },
+	{ prop: 'url', name: '链接地址' },
+	{ prop: 'description', name: '描述' },
+	{ prop: 'remark', name: '备注' },
+	{ prop: 'content', name: '报表内容' },
+	// { prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/reportSheet/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/reportSheet'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/reportSheetCategory-add-or-update.vue

@@ -0,0 +1,170 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="编码"></el-input>
+			</el-form-item>
+			<el-form-item label="名称" prop="name">
+				<el-input v-model="dataForm.name" placeholder="名称"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="外部编码，用于对照外部系统的编码" prop="externalCode">
+				<el-input v-model="dataForm.externalCode" placeholder="外部编码，用于对照外部系统的编码"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				code: '',
+				name: '',
+				description: '',
+				externalCode: '',
+				enabled: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				externalCode: [{ required: true, message: '外部编码，用于对照外部系统的编码不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/reportSheetCategory/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.code = data.reporsheecategory.code
+							this.dataForm.name = data.reporsheecategory.name
+							this.dataForm.description = data.reporsheecategory.description
+							this.dataForm.externalCode = data.reporsheecategory.externalCode
+							this.dataForm.enabled = data.reporsheecategory.enabled
+							this.dataForm.remark = data.reporsheecategory.remark
+							this.dataForm.valid = data.reporsheecategory.valid
+							this.dataForm.creatorId = data.reporsheecategory.creatorId
+							this.dataForm.creatorName = data.reporsheecategory.creatorName
+							this.dataForm.createTime = data.reporsheecategory.createTime
+							this.dataForm.updaterId = data.reporsheecategory.updaterId
+							this.dataForm.updaterName = data.reporsheecategory.updaterName
+							this.dataForm.updateTime = data.reporsheecategory.updateTime
+							this.dataForm.version = data.reporsheecategory.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/reportSheetCategory/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							description: this.dataForm.description,
+							externalCode: this.dataForm.externalCode,
+							enabled: this.dataForm.enabled,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/reportSheetCategory.vue

@@ -0,0 +1,179 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:reporsheecategory:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="externalCode" header-align="center" align="center" label="外部编码，用于对照外部系统的编码"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './reportSheetCategory-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '分类名称' },
+	{ prop: 'code', name: '分类编码' },
+	// { "prop": "id", "name": "ID" },
+	// { "prop": "description", "name": "描述" },
+	// { "prop": "externalCode", "name": "外部编码，用于对照外部系统的编码" },
+	// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+	// { "prop": "remark", "name": "备注" },
+	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+	// { "prop": "creatorId", "name": "创建人" },
+	// { "prop": "creatorName", "name": "创建人姓名" },
+	// { "prop": "updaterId", "name": "更新人" },
+	// { "prop": "updaterName", "name": "更新人姓名" },
+	// { "prop": "updateTime", "name": "更新时间" },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/reportSheetCategory/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/reportSheetCategory'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/sysfile-add-or-update.vue

@@ -0,0 +1,163 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="文件类型编号" prop="typeCode">
+				<el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input>
+			</el-form-item>
+			<el-form-item label="文件编号" prop="fileCode">
+				<el-input v-model="dataForm.fileCode" placeholder="文件编号"></el-input>
+			</el-form-item>
+			<el-form-item label="文件名称" prop="fileName">
+				<el-input v-model="dataForm.fileName" placeholder="文件名称"></el-input>
+			</el-form-item>
+			<el-form-item label="文件路径URL" prop="fileUrl">
+				<el-input v-model="dataForm.fileUrl" placeholder="文件路径URL"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				typeCode: '',
+				fileCode: '',
+				fileName: '',
+				fileUrl: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				typeCode: [{ required: true, message: '文件类型编号不能为空', trigger: 'blur' }],
+				fileCode: [{ required: true, message: '文件编号不能为空', trigger: 'blur' }],
+				fileName: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
+				fileUrl: [{ required: true, message: '文件路径URL不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/sysFile/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.typeCode = data.sysFile.typeCode
+							this.dataForm.fileCode = data.sysFile.fileCode
+							this.dataForm.fileName = data.sysFile.fileName
+							this.dataForm.fileUrl = data.sysFile.fileUrl
+							this.dataForm.remark = data.sysFile.remark
+							this.dataForm.valid = data.sysFile.valid
+							this.dataForm.creatorId = data.sysFile.creatorId
+							this.dataForm.creatorName = data.sysFile.creatorName
+							this.dataForm.createTime = data.sysFile.createTime
+							this.dataForm.updaterId = data.sysFile.updaterId
+							this.dataForm.updaterName = data.sysFile.updaterName
+							this.dataForm.updateTime = data.sysFile.updateTime
+							this.dataForm.version = data.sysFile.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/sysFile/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							typeCode: this.dataForm.typeCode,
+							fileCode: this.dataForm.fileCode,
+							fileName: this.dataForm.fileName,
+							fileUrl: this.dataForm.fileUrl,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/sysfile.vue

@@ -0,0 +1,175 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:sysfile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="主键，自增"> </el-table-column>
+			<el-table-column prop="typeCode" header-align="center" align="center" label="文件类型编号"> </el-table-column>
+			<el-table-column prop="fileCode" header-align="center" align="center" label="文件编号"> </el-table-column>
+			<el-table-column prop="fileName" header-align="center" align="center" label="文件名称"> </el-table-column>
+			<el-table-column prop="fileUrl" header-align="center" align="center" label="文件路径URL"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './sysFile-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+  { "prop": "id", "name": "主键，自增" },
+  { "prop": "typeCode", "name": "文件类型编号" },
+  { "prop": "fileCode", "name": "文件编号" },
+  { "prop": "fileName", "name": "文件名称" },
+  { "prop": "fileUrl", "name": "文件路径URL" },
+  { "prop": "remark", "name": "备注" },
+  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+  { "prop": "creatorId", "name": "创建人" },
+  { "prop": "creatorName", "name": "创建人姓名" },
+  { "prop": "createTime", "name": "添加时间" },
+  { "prop": "updaterId", "name": "更新人" },
+  { "prop": "updaterName", "name": "更新人姓名" },
+  { "prop": "updateTime", "name": "更新时间" },
+  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/sysFile/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/sysFile'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/sysfileType.vue

@@ -0,0 +1,172 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:sysfiletype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="主键，自增"> </el-table-column>
+			<el-table-column prop="typeCode" header-align="center" align="center" label="文件类型编号"> </el-table-column>
+			<el-table-column prop="typeName" header-align="center" align="center" label="文件类型名称"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './sysFileType-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+  { "prop": "id", "name": "主键，自增" },
+  { "prop": "typeCode", "name": "文件类型编号" },
+  { "prop": "typeName", "name": "文件类型名称" },
+  { "prop": "remark", "name": "备注" },
+  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+  { "prop": "creatorId", "name": "创建人" },
+  { "prop": "creatorName", "name": "创建人姓名" },
+  { "prop": "createTime", "name": "添加时间" },
+  { "prop": "updaterId", "name": "更新人" },
+  { "prop": "updaterName", "name": "更新人姓名" },
+  { "prop": "updateTime", "name": "更新时间" },
+  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+
+export default {
+	data() {
+		return {tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/sysFileType/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/sysFileType'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/sysfiletype-add-or-update.vue

@@ -0,0 +1,149 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="文件类型编号" prop="typeCode">
+				<el-input v-model="dataForm.typeCode" placeholder="文件类型编号"></el-input>
+			</el-form-item>
+			<el-form-item label="文件类型名称" prop="typeName">
+				<el-input v-model="dataForm.typeName" placeholder="文件类型名称"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				typeCode: '',
+				typeName: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				typeCode: [{ required: true, message: '文件类型编号不能为空', trigger: 'blur' }],
+				typeName: [{ required: true, message: '文件类型名称不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/sysFileType/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.typeCode = data.sysFileType.typeCode
+							this.dataForm.typeName = data.sysFileType.typeName
+							this.dataForm.remark = data.sysFileType.remark
+							this.dataForm.valid = data.sysFileType.valid
+							this.dataForm.creatorId = data.sysFileType.creatorId
+							this.dataForm.creatorName = data.sysFileType.creatorName
+							this.dataForm.createTime = data.sysFileType.createTime
+							this.dataForm.updaterId = data.sysFileType.updaterId
+							this.dataForm.updaterName = data.sysFileType.updaterName
+							this.dataForm.updateTime = data.sysFileType.updateTime
+							this.dataForm.version = data.sysFileType.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/sysFileType/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							typeCode: this.dataForm.typeCode,
+							typeName: this.dataForm.typeName,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/workShopSection.vue

@@ -0,0 +1,184 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:workshopsection:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+				
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
+			<el-table-column prop="productionLineId" header-align="center" align="center" label="产线ID"> </el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
+			<el-table-column prop="sort" header-align="center" align="center" label="排序"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column prop="externalCode" header-align="center" align="center" label="外部系统编码"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './workshopSection-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'name', name: '工段名称' },
+	{ prop: 'code', name: '工段编码' },
+	{ prop: 'productionLineId', name: '产线ID' },
+	{ prop: 'remark', name: '备注' },
+	// { "prop": "id", "name": "id" },
+	// { "prop": "description", "name": "描述" },
+	// { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
+	// { "prop": "sort", "name": "排序" },
+	// { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
+	// { "prop": "creatorId", "name": "创建人" },
+	// { "prop": "creatorName", "name": "创建人姓名" },
+	// { "prop": "updaterId", "name": "更新人" },
+	// { "prop": "updaterName", "name": "更新人姓名" },
+	// { "prop": "updateTime", "name": "更新时间" },
+	// { "prop": "version", "name": "版本号" },
+	// { prop: 'externalCode', name: '外部系统编码' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/workshopSection/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/workshopSection'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/workShopSectionEquipment.vue

@@ -0,0 +1,175 @@
+<template>
+	<div class="mod-config">
+		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+			<el-form-item>
+				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+				<el-button v-if="$hasPermission('monitoring:workshopsectionequipment:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
+			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
+			<el-table-column prop="workshopSectionId" header-align="center" align="center" label="工段ID"> </el-table-column>
+			<el-table-column prop="equipmentId" header-align="center" align="center" label="设备ID"> </el-table-column>
+			<el-table-column prop="sort" header-align="center" align="center" label="排序"> </el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
+			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table> -->
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<el-pagination
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+			:current-page="pageIndex"
+			:page-sizes="[10, 20, 50, 100]"
+			:page-size="pageSize"
+			:total="totalPage"
+			layout="total, sizes, prev, pager, next, jumper"
+		>
+		</el-pagination>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './workshopSectionEquipment-add-or-update'
+import BaseTable from '@/components/base-table'
+import TableOperateComponent from '@/components/base-table/components/operationComponent'
+import TableTextComponent from '@/components/base-table/components/detailComponent'
+
+const tableConfigs = [
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'workshopSectionId', name: '工段ID' },
+	{ prop: 'equipmentId', name: '设备ID' },
+	{ prop: 'sort', name: '排序' },
+	{ prop: 'remark', name: '备注' },
+	// { prop: 'id', name: 'ID' },
+	// { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	// { prop: 'creatorId', name: '创建人' },
+	// { prop: 'creatorName', name: '创建人姓名' },
+	// { prop: 'updaterId', name: '更新人' },
+	// { prop: 'updaterName', name: '更新人姓名' },
+	// { prop: 'updateTime', name: '更新时间' },
+	// { prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+]
+
+export default {
+	data() {
+		return {
+			tableConfigs,
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate,
+		BaseTable
+	},
+	activated() {
+		this.getDataList()
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true
+			this.$http({
+				url: this.$http.adornUrl('/monitoring/workshopSectionEquipment/page'),
+				method: 'get',
+				params: this.$http.adornParams({
+					page: this.pageIndex,
+					limit: this.pageSize,
+					key: this.dataForm.key
+				})
+			}).then(({ data }) => {
+				if (data && data.code === 0) {
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
+				} else {
+					this.dataList = []
+					this.totalPage = 0
+				}
+				this.dataListLoading = false
+			})
+		},
+		// 每页数
+		sizeChangeHandle(val) {
+			this.pageSize = val
+			this.pageIndex = 1
+			this.getDataList()
+		},
+		// 当前页
+		currentChangeHandle(val) {
+			this.pageIndex = val
+			this.getDataList()
+		},
+		// 多选
+		selectionChangeHandle(val) {
+			this.dataListSelections = val
+		},
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id)
+			})
+		},
+		// 删除
+		deleteHandle(id) {
+			var ids = id
+				? [id]
+				: this.dataListSelections.map(item => {
+						return item.id
+				  })
+			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$http({
+					url: this.$http.adornUrl('/monitoring/workshopSectionEquipment'),
+					method: 'delete',
+					data: this.$http.adornData(ids, false)
+				}).then(({ data }) => {
+					if (data && data.code === 0) {
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getDataList()
+							}
+						})
+					} else {
+						this.$message.error(data.msg)
+					}
+				})
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/workshopsection-add-or-update.vue

@@ -0,0 +1,184 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="产线ID" prop="productionLineId">
+				<el-input v-model="dataForm.productionLineId" placeholder="产线ID"></el-input>
+			</el-form-item>
+			<el-form-item label="编码" prop="code">
+				<el-input v-model="dataForm.code" placeholder="编码"></el-input>
+			</el-form-item>
+			<el-form-item label="名称" prop="name">
+				<el-input v-model="dataForm.name" placeholder="名称"></el-input>
+			</el-form-item>
+			<el-form-item label="描述" prop="description">
+				<el-input v-model="dataForm.description" placeholder="描述"></el-input>
+			</el-form-item>
+			<el-form-item label="启用状态:0 、停用，1、启用" prop="enabled">
+				<el-input v-model="dataForm.enabled" placeholder="启用状态:0 、停用，1、启用"></el-input>
+			</el-form-item>
+			<el-form-item label="排序" prop="sort">
+				<el-input v-model="dataForm.sort" placeholder="排序"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+			<el-form-item label="外部系统编码" prop="externalCode">
+				<el-input v-model="dataForm.externalCode" placeholder="外部系统编码"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				productionLineId: '',
+				code: '',
+				name: '',
+				description: '',
+				enabled: '',
+				sort: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: '',
+				externalCode: ''
+			},
+			dataRule: {
+				productionLineId: [{ required: true, message: '产线ID不能为空', trigger: 'blur' }],
+				code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+				name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+				description: [{ required: true, message: '描述不能为空', trigger: 'blur' }],
+				enabled: [{ required: true, message: '启用状态:0 、停用，1、启用不能为空', trigger: 'blur' }],
+				sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+				externalCode: [{ required: true, message: '外部系统编码不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/workshopSection/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.productionLineId = data.workshopSection.productionLineId
+							this.dataForm.code = data.workshopSection.code
+							this.dataForm.name = data.workshopSection.name
+							this.dataForm.description = data.workshopSection.description
+							this.dataForm.enabled = data.workshopSection.enabled
+							this.dataForm.sort = data.workshopSection.sort
+							this.dataForm.remark = data.workshopSection.remark
+							this.dataForm.valid = data.workshopSection.valid
+							this.dataForm.creatorId = data.workshopSection.creatorId
+							this.dataForm.creatorName = data.workshopSection.creatorName
+							this.dataForm.createTime = data.workshopSection.createTime
+							this.dataForm.updaterId = data.workshopSection.updaterId
+							this.dataForm.updaterName = data.workshopSection.updaterName
+							this.dataForm.updateTime = data.workshopSection.updateTime
+							this.dataForm.version = data.workshopSection.version
+							this.dataForm.externalCode = data.workshopSection.externalCode
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/workshopSection/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							productionLineId: this.dataForm.productionLineId,
+							code: this.dataForm.code,
+							name: this.dataForm.name,
+							description: this.dataForm.description,
+							enabled: this.dataForm.enabled,
+							sort: this.dataForm.sort,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version,
+							externalCode: this.dataForm.externalCode
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/monitoring/workshopsectionequipment-add-or-update.vue

@@ -0,0 +1,156 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+			<el-form-item label="工段ID" prop="workshopSectionId">
+				<el-input v-model="dataForm.workshopSectionId" placeholder="工段ID"></el-input>
+			</el-form-item>
+			<el-form-item label="设备ID" prop="equipmentId">
+				<el-input v-model="dataForm.equipmentId" placeholder="设备ID"></el-input>
+			</el-form-item>
+			<el-form-item label="排序" prop="sort">
+				<el-input v-model="dataForm.sort" placeholder="排序"></el-input>
+			</el-form-item>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+			</el-form-item>
+			<el-form-item label="删除标志，是否有效:1 可用 0不可用" prop="valid">
+				<el-input v-model="dataForm.valid" placeholder="删除标志，是否有效:1 可用 0不可用"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人" prop="creatorId">
+				<el-input v-model="dataForm.creatorId" placeholder="创建人"></el-input>
+			</el-form-item>
+			<el-form-item label="创建人姓名" prop="creatorName">
+				<el-input v-model="dataForm.creatorName" placeholder="创建人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="创建时间" prop="createTime">
+				<el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人" prop="updaterId">
+				<el-input v-model="dataForm.updaterId" placeholder="更新人"></el-input>
+			</el-form-item>
+			<el-form-item label="更新人姓名" prop="updaterName">
+				<el-input v-model="dataForm.updaterName" placeholder="更新人姓名"></el-input>
+			</el-form-item>
+			<el-form-item label="更新时间" prop="updateTime">
+				<el-input v-model="dataForm.updateTime" placeholder="更新时间"></el-input>
+			</el-form-item>
+			<el-form-item label="版本号" prop="version">
+				<el-input v-model="dataForm.version" placeholder="版本号"></el-input>
+			</el-form-item>
+		</el-form>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: 0,
+				workshopSectionId: '',
+				equipmentId: '',
+				sort: '',
+				remark: '',
+				valid: '',
+				creatorId: '',
+				creatorName: '',
+				createTime: '',
+				updaterId: '',
+				updaterName: '',
+				updateTime: '',
+				version: ''
+			},
+			dataRule: {
+				workshopSectionId: [{ required: true, message: '工段ID不能为空', trigger: 'blur' }],
+				equipmentId: [{ required: true, message: '设备ID不能为空', trigger: 'blur' }],
+				sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
+				remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+				valid: [{ required: true, message: '删除标志，是否有效:1 可用 0不可用不能为空', trigger: 'blur' }],
+				creatorId: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+				creatorName: [{ required: true, message: '创建人姓名不能为空', trigger: 'blur' }],
+				createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+				updaterId: [{ required: true, message: '更新人不能为空', trigger: 'blur' }],
+				updaterName: [{ required: true, message: '更新人姓名不能为空', trigger: 'blur' }],
+				updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
+				version: [{ required: true, message: '版本号不能为空', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || 0
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/workshopSectionEquipment/${this.dataForm.id}`),
+						method: 'get',
+						params: this.$http.adornParams()
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.dataForm.workshopSectionId = data.workshopSectionEquipment.workshopSectionId
+							this.dataForm.equipmentId = data.workshopSectionEquipment.equipmentId
+							this.dataForm.sort = data.workshopSectionEquipment.sort
+							this.dataForm.remark = data.workshopSectionEquipment.remark
+							this.dataForm.valid = data.workshopSectionEquipment.valid
+							this.dataForm.creatorId = data.workshopSectionEquipment.creatorId
+							this.dataForm.creatorName = data.workshopSectionEquipment.creatorName
+							this.dataForm.createTime = data.workshopSectionEquipment.createTime
+							this.dataForm.updaterId = data.workshopSectionEquipment.updaterId
+							this.dataForm.updaterName = data.workshopSectionEquipment.updaterName
+							this.dataForm.updateTime = data.workshopSectionEquipment.updateTime
+							this.dataForm.version = data.workshopSectionEquipment.version
+						}
+					})
+				}
+			})
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate(valid => {
+				if (valid) {
+					this.$http({
+						url: this.$http.adornUrl(`/monitoring/workshopSectionEquipment/${!this.dataForm.id ? '' : this.dataForm.id}`),
+						method: this.dataForm.id ? 'put' : 'post',
+						data: this.$http.adornData({
+							id: this.dataForm.id || undefined,
+							workshopSectionId: this.dataForm.workshopSectionId,
+							equipmentId: this.dataForm.equipmentId,
+							sort: this.dataForm.sort,
+							remark: this.dataForm.remark,
+							valid: this.dataForm.valid,
+							creatorId: this.dataForm.creatorId,
+							creatorName: this.dataForm.creatorName,
+							createTime: this.dataForm.createTime,
+							updaterId: this.dataForm.updaterId,
+							updaterName: this.dataForm.updaterName,
+							updateTime: this.dataForm.updateTime,
+							version: this.dataForm.version
+						})
+					}).then(({ data }) => {
+						if (data && data.code === 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						} else {
+							this.$message.error(data.msg)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>

src/views/modules/oss/oss-config.vue

@@ -1,225 +1,205 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="$t('oss.config')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item :label="$t('oss.type')" size="mini">
-        <el-radio-group v-model="dataForm.type">
-          <el-radio :label="1">{{ $t('oss.type1') }}</el-radio>
-          <el-radio :label="2">{{ $t('oss.type2') }}</el-radio>
-          <el-radio :label="3">{{ $t('oss.type3') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <template v-if="dataForm.type === 1">
-        <el-form-item size="mini">
-          <a href="https://s.qiniu.com/7Rfaym" target="_blank">免费申请(七牛)10GB储存空间</a>
-        </el-form-item>
-        <el-form-item prop="qiniuDomain" :label="$t('oss.qiniuDomain')">
-          <el-input v-model="dataForm.qiniuDomain" :placeholder="$t('oss.qiniuDomainTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="qiniuPrefix" :label="$t('oss.qiniuPrefix')">
-          <el-input v-model="dataForm.qiniuPrefix" :placeholder="$t('oss.qiniuPrefixTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="qiniuAccessKey" :label="$t('oss.qiniuAccessKey')">
-          <el-input v-model="dataForm.qiniuAccessKey" :placeholder="$t('oss.qiniuAccessKeyTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="qiniuSecretKey" :label="$t('oss.qiniuSecretKey')">
-          <el-input v-model="dataForm.qiniuSecretKey" :placeholder="$t('oss.qiniuSecretKeyTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="qiniuBucketName" :label="$t('oss.qiniuBucketName')">
-          <el-input v-model="dataForm.qiniuBucketName" :placeholder="$t('oss.qiniuBucketNameTips')"></el-input>
-        </el-form-item>
-      </template>
-      <template v-else-if="dataForm.type === 2">
-        <el-form-item size="mini">
-          <a href="https://www.aliyun.com/minisite/goods?userCode=y93lfwbg" target="_blank">免费领取阿里云优惠券</a>
-        </el-form-item>
-        <el-form-item prop="aliyunDomain" :label="$t('oss.aliyunDomain')">
-          <el-input v-model="dataForm.aliyunDomain" :placeholder="$t('oss.aliyunDomainTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="aliyunPrefix" :label="$t('oss.aliyunPrefix')">
-          <el-input v-model="dataForm.aliyunPrefix" :placeholder="$t('oss.aliyunPrefixTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="aliyunEndPoint" :label="$t('oss.aliyunEndPoint')">
-          <el-input v-model="dataForm.aliyunEndPoint" :placeholder="$t('oss.aliyunEndPointTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="aliyunAccessKeyId" :label="$t('oss.aliyunAccessKeyId')">
-          <el-input v-model="dataForm.aliyunAccessKeyId" :placeholder="$t('oss.aliyunAccessKeyIdTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="aliyunAccessKeySecret" :label="$t('oss.aliyunAccessKeySecret')">
-          <el-input v-model="dataForm.aliyunAccessKeySecret" :placeholder="$t('oss.aliyunAccessKeySecretTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="aliyunBucketName" :label="$t('oss.aliyunBucketName')">
-          <el-input v-model="dataForm.aliyunBucketName" :placeholder="$t('oss.aliyunBucketNameTips')"></el-input>
-        </el-form-item>
-      </template>
-      <template v-else-if="dataForm.type === 3">
-        <el-form-item size="mini">
-          <a href="https://curl.qcloud.com/zt3xdYbZ" target="_blank">免费领取腾讯云优惠券</a>
-        </el-form-item>
-        <el-form-item prop="qcloudDomain" :label="$t('oss.qcloudDomain')">
-          <el-input v-model="dataForm.qcloudDomain" :placeholder="$t('oss.qcloudDomainTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="qcloudPrefix" :label="$t('oss.qcloudPrefix')">
-          <el-input v-model="dataForm.qcloudPrefix" :placeholder="$t('oss.qcloudPrefixTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="qcloudAppId" :label="$t('oss.qcloudAppId')">
-          <el-input v-model="dataForm.qcloudAppId" :placeholder="$t('oss.qcloudAppIdTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="qcloudSecretId" :label="$t('oss.qcloudSecretId')">
-          <el-input v-model="dataForm.qcloudSecretId" :placeholder="$t('oss.qcloudSecretIdTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="qcloudSecretKey" :label="$t('oss.qcloudSecretKey')">
-          <el-input v-model="dataForm.qcloudSecretKey" :placeholder="$t('oss.qcloudSecretKeyTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="qcloudBucketName" :label="$t('oss.qcloudBucketName')">
-          <el-input v-model="dataForm.qcloudBucketName" :placeholder="$t('oss.qcloudBucketNameTips')"></el-input>
-        </el-form-item>
-        <el-form-item prop="qcloudRegion" :label="$t('oss.qcloudRegion')">
-          <el-select v-model="dataForm.qcloudRegion" clearable :placeholder="$t('oss.qcloudRegionTips')" class="w-percent-100">
-            <el-option value="ap-beijing-1" :label="$t('oss.qcloudRegionBeijing1')"></el-option>
-            <el-option value="ap-beijing" :label="$t('oss.qcloudRegionBeijing')"></el-option>
-            <el-option value="ap-shanghai" :label="$t('oss.qcloudRegionShanghai')"></el-option>
-            <el-option value="ap-guangzhou" :label="$t('oss.qcloudRegionGuangzhou')"></el-option>
-            <el-option value="ap-chengdu" :label="$t('oss.qcloudRegionChengdu')"></el-option>
-            <el-option value="ap-chongqing" :label="$t('oss.qcloudRegionChongqing')"></el-option>
-            <el-option value="ap-singapore" :label="$t('oss.qcloudRegionSingapore')"></el-option>
-            <el-option value="ap-hongkong" :label="$t('oss.qcloudRegionHongkong')"></el-option>
-            <el-option value="na-toronto" :label="$t('oss.qcloudRegionToronto')"></el-option>
-            <el-option value="eu-frankfurt" :label="$t('oss.qcloudRegionFrankfurt')"></el-option>
-          </el-select>
-        </el-form-item>
-      </template>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
+	<el-dialog :visible.sync="visible" :title="$t('oss.config')" :close-on-click-modal="false" :close-on-press-escape="false">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+			<el-form-item :label="$t('oss.type')" size="mini">
+				<el-radio-group v-model="dataForm.type">
+					<el-radio :label="1">{{ $t('oss.type1') }}</el-radio>
+					<el-radio :label="2">{{ $t('oss.type2') }}</el-radio>
+					<el-radio :label="3">{{ $t('oss.type3') }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+			<template v-if="dataForm.type === 1">
+				<el-form-item size="mini">
+					<a href="https://s.qiniu.com/7Rfaym" target="_blank">免费申请(七牛)10GB储存空间</a>
+				</el-form-item>
+				<el-form-item prop="qiniuDomain" :label="$t('oss.qiniuDomain')">
+					<el-input v-model="dataForm.qiniuDomain" :placeholder="$t('oss.qiniuDomainTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="qiniuPrefix" :label="$t('oss.qiniuPrefix')">
+					<el-input v-model="dataForm.qiniuPrefix" :placeholder="$t('oss.qiniuPrefixTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="qiniuAccessKey" :label="$t('oss.qiniuAccessKey')">
+					<el-input v-model="dataForm.qiniuAccessKey" :placeholder="$t('oss.qiniuAccessKeyTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="qiniuSecretKey" :label="$t('oss.qiniuSecretKey')">
+					<el-input v-model="dataForm.qiniuSecretKey" :placeholder="$t('oss.qiniuSecretKeyTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="qiniuBucketName" :label="$t('oss.qiniuBucketName')">
+					<el-input v-model="dataForm.qiniuBucketName" :placeholder="$t('oss.qiniuBucketNameTips')"></el-input>
+				</el-form-item>
+			</template>
+			<template v-else-if="dataForm.type === 2">
+				<el-form-item size="mini">
+					<a href="https://www.aliyun.com/minisite/goods?userCode=y93lfwbg" target="_blank">免费领取阿里云优惠券</a>
+				</el-form-item>
+				<el-form-item prop="aliyunDomain" :label="$t('oss.aliyunDomain')">
+					<el-input v-model="dataForm.aliyunDomain" :placeholder="$t('oss.aliyunDomainTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="aliyunPrefix" :label="$t('oss.aliyunPrefix')">
+					<el-input v-model="dataForm.aliyunPrefix" :placeholder="$t('oss.aliyunPrefixTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="aliyunEndPoint" :label="$t('oss.aliyunEndPoint')">
+					<el-input v-model="dataForm.aliyunEndPoint" :placeholder="$t('oss.aliyunEndPointTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="aliyunAccessKeyId" :label="$t('oss.aliyunAccessKeyId')">
+					<el-input v-model="dataForm.aliyunAccessKeyId" :placeholder="$t('oss.aliyunAccessKeyIdTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="aliyunAccessKeySecret" :label="$t('oss.aliyunAccessKeySecret')">
+					<el-input v-model="dataForm.aliyunAccessKeySecret" :placeholder="$t('oss.aliyunAccessKeySecretTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="aliyunBucketName" :label="$t('oss.aliyunBucketName')">
+					<el-input v-model="dataForm.aliyunBucketName" :placeholder="$t('oss.aliyunBucketNameTips')"></el-input>
+				</el-form-item>
+			</template>
+			<template v-else-if="dataForm.type === 3">
+				<el-form-item size="mini">
+					<a href="https://curl.qcloud.com/zt3xdYbZ" target="_blank">免费领取腾讯云优惠券</a>
+				</el-form-item>
+				<el-form-item prop="qcloudDomain" :label="$t('oss.qcloudDomain')">
+					<el-input v-model="dataForm.qcloudDomain" :placeholder="$t('oss.qcloudDomainTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="qcloudPrefix" :label="$t('oss.qcloudPrefix')">
+					<el-input v-model="dataForm.qcloudPrefix" :placeholder="$t('oss.qcloudPrefixTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="qcloudAppId" :label="$t('oss.qcloudAppId')">
+					<el-input v-model="dataForm.qcloudAppId" :placeholder="$t('oss.qcloudAppIdTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="qcloudSecretId" :label="$t('oss.qcloudSecretId')">
+					<el-input v-model="dataForm.qcloudSecretId" :placeholder="$t('oss.qcloudSecretIdTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="qcloudSecretKey" :label="$t('oss.qcloudSecretKey')">
+					<el-input v-model="dataForm.qcloudSecretKey" :placeholder="$t('oss.qcloudSecretKeyTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="qcloudBucketName" :label="$t('oss.qcloudBucketName')">
+					<el-input v-model="dataForm.qcloudBucketName" :placeholder="$t('oss.qcloudBucketNameTips')"></el-input>
+				</el-form-item>
+				<el-form-item prop="qcloudRegion" :label="$t('oss.qcloudRegion')">
+					<el-select v-model="dataForm.qcloudRegion" clearable :placeholder="$t('oss.qcloudRegionTips')" class="w-percent-100">
+						<el-option value="ap-beijing-1" :label="$t('oss.qcloudRegionBeijing1')"></el-option>
+						<el-option value="ap-beijing" :label="$t('oss.qcloudRegionBeijing')"></el-option>
+						<el-option value="ap-shanghai" :label="$t('oss.qcloudRegionShanghai')"></el-option>
+						<el-option value="ap-guangzhou" :label="$t('oss.qcloudRegionGuangzhou')"></el-option>
+						<el-option value="ap-chengdu" :label="$t('oss.qcloudRegionChengdu')"></el-option>
+						<el-option value="ap-chongqing" :label="$t('oss.qcloudRegionChongqing')"></el-option>
+						<el-option value="ap-singapore" :label="$t('oss.qcloudRegionSingapore')"></el-option>
+						<el-option value="ap-hongkong" :label="$t('oss.qcloudRegionHongkong')"></el-option>
+						<el-option value="na-toronto" :label="$t('oss.qcloudRegionToronto')"></el-option>
+						<el-option value="eu-frankfurt" :label="$t('oss.qcloudRegionFrankfurt')"></el-option>
+					</el-select>
+				</el-form-item>
+			</template>
+		</el-form>
+		<template slot="footer">
+			<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+			<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
 export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        type: 0,
-        qiniuDomain: '',
-        qiniuPrefix: '',
-        qiniuAccessKey: '',
-        qiniuSecretKey: '',
-        qiniuBucketName: '',
-        aliyunDomain: '',
-        aliyunPrefix: '',
-        aliyunEndPoint: '',
-        aliyunAccessKeyId: '',
-        aliyunAccessKeySecret: '',
-        aliyunBucketName: '',
-        qcloudDomain: '',
-        qcloudPrefix: '',
-        qcloudAppId: 0,
-        qcloudSecretId: '',
-        qcloudSecretKey: '',
-        qcloudBucketName: '',
-        qcloudRegion: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        qiniuDomain: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        qiniuAccessKey: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        qiniuSecretKey: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        qiniuBucketName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        aliyunDomain: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        aliyunEndPoint: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        aliyunAccessKeyId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        aliyunAccessKeySecret: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        aliyunBucketName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        qcloudDomain: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        qcloudAppId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        qcloudSecretId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        qcloudSecretKey: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        qcloudBucketName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        qcloudRegion: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  watch: {
-    'dataForm.type' (val) {
-      this.$refs['dataForm'].clearValidate()
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        this.getInfo()
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get('/sys/oss/info').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = res.data
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http.post('/sys/oss', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				type: 0,
+				qiniuDomain: '',
+				qiniuPrefix: '',
+				qiniuAccessKey: '',
+				qiniuSecretKey: '',
+				qiniuBucketName: '',
+				aliyunDomain: '',
+				aliyunPrefix: '',
+				aliyunEndPoint: '',
+				aliyunAccessKeyId: '',
+				aliyunAccessKeySecret: '',
+				aliyunBucketName: '',
+				qcloudDomain: '',
+				qcloudPrefix: '',
+				qcloudAppId: 0,
+				qcloudSecretId: '',
+				qcloudSecretKey: '',
+				qcloudBucketName: '',
+				qcloudRegion: ''
+			}
+		}
+	},
+	computed: {
+		dataRule() {
+			return {
+				qiniuDomain: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				qiniuAccessKey: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				qiniuSecretKey: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				qiniuBucketName: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				aliyunDomain: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				aliyunEndPoint: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				aliyunAccessKeyId: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				aliyunAccessKeySecret: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				aliyunBucketName: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				qcloudDomain: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				qcloudAppId: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				qcloudSecretId: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				qcloudSecretKey: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				qcloudBucketName: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				qcloudRegion: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
+			}
+		}
+	},
+	watch: {
+		'dataForm.type'(val) {
+			this.$refs['dataForm'].clearValidate()
+		}
+	},
+	methods: {
+		init() {
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				this.getInfo()
+			})
+		},
+		// 获取信息
+		getInfo() {
+			this.$http
+				.get(this.$http.adornUrl('/sys/oss/info'))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.dataForm = res.data
+				})
+				.catch(() => {})
+		},
+		// 表单提交
+		dataFormSubmitHandle: debounce(
+			function() {
+				this.$refs['dataForm'].validate(valid => {
+					if (!valid) {
+						return false
+					}
+					this.$http
+						.post(this.$http.adornUrl('/sys/oss'), this.dataForm)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg)
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						})
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
+	}
 }
 </script>

src/views/modules/oss/oss-upload.vue

@@ -1,65 +1,58 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="$t('oss.upload')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-upload
-      :action="url"
-      :file-list="fileList"
-      drag
-      multiple
-      :before-upload="beforeUploadHandle"
-      :on-success="successHandle"
-      class="text-center">
-      <i class="el-icon-upload"></i>
-      <div class="el-upload__text" v-html="$t('upload.text')"></div>
-      <div class="el-upload__tip" slot="tip">{{ $t('upload.tip', { 'format': 'jpg、png、gif' }) }}</div>
-    </el-upload>
-  </el-dialog>
+	<el-dialog :visible.sync="visible" :title="$t('oss.upload')" :close-on-click-modal="false" :close-on-press-escape="false">
+		<el-upload :action="url" :file-list="fileList" drag multiple :before-upload="beforeUploadHandle" :on-success="successHandle" class="text-center">
+			<i class="el-icon-upload"></i>
+			<div class="el-upload__text" v-html="$t('upload.text')"></div>
+			<div class="el-upload__tip" slot="tip">{{ $t('upload.tip', { format: 'jpg、png、gif' }) }}</div>
+		</el-upload>
+	</el-dialog>
 </template>
 
 <script>
 import Cookies from 'js-cookie'
 export default {
-  data () {
-    return {
-      visible: false,
-      url: '',
-      num: 0,
-      fileList: []
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}`
-      this.num = 0
-      this.fileList = []
-    },
-    // 上传之前
-    beforeUploadHandle (file) {
-      if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
-        this.$message.error(this.$t('upload.tip', { 'format': 'jpg、png、gif' }))
-        return false
-      }
-      this.num++
-    },
-    // 上传成功
-    successHandle (res, file, fileList) {
-      if (res.code !== 0) {
-        return this.$message.error(res.msg)
-      }
-      this.fileList = fileList
-      this.num--
-      if (this.num === 0) {
-        this.$message({
-          message: this.$t('prompt.success'),
-          type: 'success',
-          duration: 500,
-          onClose: () => {
-            this.visible = false
-            this.$emit('refreshDataList')
-          }
-        })
-      }
-    }
-  }
+	data() {
+		return {
+			visible: false,
+			url: '',
+			num: 0,
+			fileList: []
+		}
+	},
+	methods: {
+		init() {
+			this.visible = true
+			this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}`
+			this.num = 0
+			this.fileList = []
+		},
+		// 上传之前
+		beforeUploadHandle(file) {
+			if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
+				this.$message.error(this.$t('upload.tip', { format: 'jpg、png、gif' }))
+				return false
+			}
+			this.num++
+		},
+		// 上传成功
+		successHandle(res, file, fileList) {
+			if (res.code !== 0) {
+				return this.$message.error(res.msg)
+			}
+			this.fileList = fileList
+			this.num--
+			if (this.num === 0) {
+				this.$message({
+					message: this.$t('prompt.success'),
+					type: 'success',
+					duration: 500,
+					onClose: () => {
+						this.visible = false
+						this.$emit('refreshDataList')
+					}
+				})
+			}
+		}
+	}
 }
 </script>

src/views/modules/oss/oss.vue

@@ -1,48 +1,43 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-oss__oss">
-      <el-form :inline="true" :model="dataForm">
-        <el-form-item>
-          <el-button type="primary" @click="configHandle()">{{ $t('oss.config') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="uploadHandle()">{{ $t('oss.upload') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="url" :label="$t('oss.url')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('oss.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 云存储配置 -->
-      <config v-if="configVisible" ref="config"></config>
-      <!-- 弹窗, 上传文件 -->
-      <upload v-if="uploadVisible" ref="upload" @refreshDataList="getDataList"></upload>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-oss__oss">
+			<el-form :inline="true" :model="dataForm">
+				<el-form-item>
+					<el-button type="primary" @click="configHandle()">{{ $t('oss.config') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="uploadHandle()">{{ $t('oss.upload') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle" style="width: 100%;">
+				<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+				<el-table-column prop="url" :label="$t('oss.url')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="createDate" :label="$t('oss.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			>
+			</el-pagination>
+			<!-- 弹窗, 云存储配置 -->
+			<config v-if="configVisible" ref="config"></config>
+			<!-- 弹窗, 上传文件 -->
+			<upload v-if="uploadVisible" ref="upload" @refreshDataList="getDataList"></upload>
+		</div>
+	</el-card>
 </template>
 
 <script>
@@ -50,39 +45,39 @@ import mixinViewModule from '@/mixins/view-module'
 import Config from './oss-config'
 import Upload from './oss-upload'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/sys/oss/page',
-        getDataListIsPage: true,
-        deleteURL: '/sys/oss',
-        deleteIsBatch: true
-      },
-      dataForm: {},
-      configVisible: false,
-      uploadVisible: false
-    }
-  },
-  components: {
-    Config,
-    Upload
-  },
-  methods: {
-    // 云存储配置
-    configHandle () {
-      this.configVisible = true
-      this.$nextTick(() => {
-        this.$refs.config.init()
-      })
-    },
-    // 上传文件
-    uploadHandle () {
-      this.uploadVisible = true
-      this.$nextTick(() => {
-        this.$refs.upload.init()
-      })
-    }
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: '/sys/oss/page',
+				getDataListIsPage: true,
+				deleteURL: '/sys/oss',
+				deleteIsBatch: true
+			},
+			dataForm: {},
+			configVisible: false,
+			uploadVisible: false
+		}
+	},
+	components: {
+		Config,
+		Upload
+	},
+	methods: {
+		// 云存储配置
+		configHandle() {
+			this.configVisible = true
+			this.$nextTick(() => {
+				this.$refs.config.init()
+			})
+		},
+		// 上传文件
+		uploadHandle() {
+			this.uploadVisible = true
+			this.$nextTick(() => {
+				this.$refs.upload.init()
+			})
+		}
+	}
 }
 </script>

src/views/modules/sys/dept-add-or-update.vue

@@ -1,154 +1,164 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="name" :label="$t('dept.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('dept.name')"></el-input>
-      </el-form-item>
-      <el-form-item prop="parentName" :label="$t('dept.parentName')" class="dept-list">
-        <el-popover v-model="deptListVisible" ref="deptListPopover" placement="bottom-start" trigger="click">
-          <el-tree
-            :data="deptList"
-            :props="{ label: 'name', children: 'children' }"
-            node-key="id"
-            ref="deptListTree"
-            :highlight-current="true"
-            :expand-on-click-node="false"
-            accordion
-            @current-change="deptListTreeCurrentChangeHandle">
-          </el-tree>
-        </el-popover>
-        <el-input v-model="dataForm.parentName" v-popover:deptListPopover :readonly="true" :placeholder="$t('dept.parentName')">
-          <i
-            v-if="$store.state.user.superAdmin === 1 && dataForm.pid !== '0'"
-            slot="suffix"
-            @click.stop="deptListTreeSetDefaultHandle()"
-            class="el-icon-circle-close el-input__icon">
-          </i>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="sort" :label="$t('dept.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dept.sort')"></el-input-number>
-      </el-form-item>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
+	<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+			<el-form-item prop="name" :label="$t('dept.name')">
+				<el-input v-model="dataForm.name" :placeholder="$t('dept.name')"></el-input>
+			</el-form-item>
+			<el-form-item prop="parentName" :label="$t('dept.parentName')" class="dept-list">
+				<el-popover v-model="deptListVisible" ref="deptListPopover" placement="bottom-start" trigger="click">
+					<el-tree
+						:data="deptList"
+						:props="{ label: 'name', children: 'children' }"
+						node-key="id"
+						ref="deptListTree"
+						:highlight-current="true"
+						:expand-on-click-node="false"
+						accordion
+						@current-change="deptListTreeCurrentChangeHandle"
+					>
+					</el-tree>
+				</el-popover>
+				<el-input v-model="dataForm.parentName" v-popover:deptListPopover :readonly="true" :placeholder="$t('dept.parentName')">
+					<i
+						v-if="$store.state.user.superAdmin === 1 && dataForm.pid !== '0'"
+						slot="suffix"
+						@click.stop="deptListTreeSetDefaultHandle()"
+						class="el-icon-circle-close el-input__icon"
+					>
+					</i>
+				</el-input>
+			</el-form-item>
+			<el-form-item prop="sort" :label="$t('dept.sort')">
+				<el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dept.sort')"></el-input-number>
+			</el-form-item>
+		</el-form>
+		<template slot="footer">
+			<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+			<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
 export default {
-  data () {
-    return {
-      visible: false,
-      deptList: [],
-      deptListVisible: false,
-      dataForm: {
-        id: '',
-        name: '',
-        pid: '',
-        parentName: '',
-        sort: 0
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'change' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        this.getDeptList().then(() => {
-          if (this.dataForm.id) {
-            this.getInfo()
-          } else if (this.$store.state.user.superAdmin === 1) {
-            this.deptListTreeSetDefaultHandle()
-          }
-        })
-      })
-    },
-    // 获取部门列表
-    getDeptList () {
-      return this.$http.get('/sys/dept/list').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.deptList = res.data
-      }).catch(() => {})
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/sys/dept/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-        if (this.dataForm.pid === '0') {
-          return this.deptListTreeSetDefaultHandle()
-        }
-        this.$refs.deptListTree.setCurrentKey(this.dataForm.pid)
-      }).catch(() => {})
-    },
-    // 上级部门树, 设置默认值
-    deptListTreeSetDefaultHandle () {
-      this.dataForm.pid = '0'
-      this.dataForm.parentName = this.$t('dept.parentNameDefault')
-    },
-    // 上级部门树, 选中
-    deptListTreeCurrentChangeHandle (data) {
-      this.dataForm.pid = data.id
-      this.dataForm.parentName = data.name
-      this.deptListVisible = false
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/dept', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
+	data() {
+		return {
+			visible: false,
+			deptList: [],
+			deptListVisible: false,
+			dataForm: {
+				id: '',
+				name: '',
+				pid: '',
+				parentName: '',
+				sort: 0
+			}
+		}
+	},
+	computed: {
+		dataRule() {
+			return {
+				name: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				parentName: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }]
+			}
+		}
+	},
+	methods: {
+		init() {
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				this.getDeptList().then(() => {
+					if (this.dataForm.id) {
+						this.getInfo()
+					} else if (this.$store.state.user.superAdmin === 1) {
+						this.deptListTreeSetDefaultHandle()
+					}
+				})
+			})
+		},
+		// 获取部门列表
+		getDeptList() {
+			return this.$http
+				.get(this.$http.adornUrl('/sys/dept/list'))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.deptList = res.data
+				})
+				.catch(() => {})
+		},
+		// 获取信息
+		getInfo() {
+			this.$http
+				.get(this.$http.adornUrl(`/sys/dept/${this.dataForm.id}`))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.dataForm = {
+						...this.dataForm,
+						...res.data
+					}
+					if (this.dataForm.pid === '0') {
+						return this.deptListTreeSetDefaultHandle()
+					}
+					this.$refs.deptListTree.setCurrentKey(this.dataForm.pid)
+				})
+				.catch(() => {})
+		},
+		// 上级部门树, 设置默认值
+		deptListTreeSetDefaultHandle() {
+			this.dataForm.pid = '0'
+			this.dataForm.parentName = this.$t('dept.parentNameDefault')
+		},
+		// 上级部门树, 选中
+		deptListTreeCurrentChangeHandle(data) {
+			this.dataForm.pid = data.id
+			this.dataForm.parentName = data.name
+			this.deptListVisible = false
+		},
+		// 表单提交
+		dataFormSubmitHandle: debounce(
+			function() {
+				this.$refs['dataForm'].validate(valid => {
+					if (!valid) {
+						return false
+					}
+					this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/dept', this.dataForm)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg)
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						})
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
+	}
 }
 </script>
 
 <style lang="scss">
 .mod-sys__dept {
-  .dept-list {
-    .el-input__inner,
-    .el-input__suffix {
-      cursor: pointer;
-    }
-  }
+	.dept-list {
+		.el-input__inner,
+		.el-input__suffix {
+			cursor: pointer;
+		}
+	}
 }
 </style>

src/views/modules/sys/dept.vue

@@ -1,43 +1,43 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-sys__dept">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">
-        <el-table-column prop="name" :label="$t('dept.name')" header-align="center" min-width="150"></el-table-column>
-        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:dept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__dept">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">
+				<el-table-column prop="name" :label="$t('dept.name')" header-align="center" min-width="150"></el-table-column>
+				<el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button v-if="$hasPermission('sys:dept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<!-- 弹窗, 新增 / 修改 -->
+			<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		</div>
+	</el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './dept-add-or-update'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/sys/dept/list',
-        deleteURL: '/sys/dept'
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: '/sys/dept/list',
+				deleteURL: '/sys/dept'
+			}
+		}
+	},
+	components: {
+		AddOrUpdate
+	}
 }
 </script>

src/views/modules/sys/dict-data-add-or-update.vue

@@ -1,101 +1,104 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="dictValue" :label="$t('dict.dictValue')">
-        <el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')"></el-input>
-      </el-form-item>
-      <el-form-item prop="dictLabel" :label="$t('dict.dictLabel')">
-        <el-input v-model="dataForm.dictLabel" :placeholder="$t('dict.dictLabel')"></el-input>
-      </el-form-item>
-      <el-form-item prop="sort" :label="$t('dict.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
-      </el-form-item>
-      <el-form-item prop="remark" :label="$t('dict.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('dict.remark')"></el-input>
-      </el-form-item>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
+	<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+			<el-form-item prop="dictValue" :label="$t('dict.dictValue')">
+				<el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')"></el-input>
+			</el-form-item>
+			<el-form-item prop="dictLabel" :label="$t('dict.dictLabel')">
+				<el-input v-model="dataForm.dictLabel" :placeholder="$t('dict.dictLabel')"></el-input>
+			</el-form-item>
+			<el-form-item prop="sort" :label="$t('dict.sort')">
+				<el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
+			</el-form-item>
+			<el-form-item prop="remark" :label="$t('dict.remark')">
+				<el-input v-model="dataForm.remark" :placeholder="$t('dict.remark')"></el-input>
+			</el-form-item>
+		</el-form>
+		<template slot="footer">
+			<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+			<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
 export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        dictTypeId: '',
-        dictLabel: '',
-        dictValue: '',
-        sort: 0,
-        remark: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        dictLabel: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        dictValue: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          this.getInfo()
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/sys/dict/data/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/dict/data', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: '',
+				dictTypeId: '',
+				dictLabel: '',
+				dictValue: '',
+				sort: 0,
+				remark: ''
+			}
+		}
+	},
+	computed: {
+		dataRule() {
+			return {
+				dictLabel: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				dictValue: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				sort: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init() {
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.getInfo()
+				}
+			})
+		},
+		// 获取信息
+		getInfo() {
+			this.$http
+				.get(this.$http.adornUrl(`/sys/dict/data/${this.dataForm.id}`))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.dataForm = {
+						...this.dataForm,
+						...res.data
+					}
+				})
+				.catch(() => {})
+		},
+		// 表单提交
+		dataFormSubmitHandle: debounce(
+			function() {
+				this.$refs['dataForm'].validate(valid => {
+					if (!valid) {
+						return false
+					}
+					this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/dict/data', this.dataForm)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg)
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						})
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
+	}
 }
 </script>

src/views/modules/sys/dict-data.vue

@@ -1,96 +1,91 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-sys__dict">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-input v-model="dataForm.dictLabel" :placeholder="$t('dict.dictLabel')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:dict:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:dict:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="dictValue" :label="$t('dict.dictValue')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="dictLabel" :label="$t('dict.dictLabel')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" :label="$t('dict.sort')" sortable="custom" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="remark" :label="$t('dict.remark')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('dict.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column  :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:dict:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:dict:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__dict">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')" clearable></el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-input v-model="dataForm.dictLabel" :placeholder="$t('dict.dictLabel')" clearable></el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:dict:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:dict:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle" style="width: 100%;">
+				<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+				<el-table-column prop="dictValue" :label="$t('dict.dictValue')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="dictLabel" :label="$t('dict.dictLabel')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="sort" :label="$t('dict.sort')" sortable="custom" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="remark" :label="$t('dict.remark')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="createDate" :label="$t('dict.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button v-if="$hasPermission('sys:dict:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button v-if="$hasPermission('sys:dict:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			>
+			</el-pagination>
+			<!-- 弹窗, 新增 / 修改 -->
+			<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		</div>
+	</el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './dict-data-add-or-update'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        createdIsNeed: false,
-        getDataListURL: '/sys/dict/data/page',
-        getDataListIsPage: true,
-        deleteURL: '/sys/dict/data',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        dictTypeId: '0',
-        dictLabel: '',
-        dictValue: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  },
-  created () {
-    this.dataForm.dictTypeId = this.$route.params.dictTypeId || '0'
-    this.getDataList()
-  },
-  methods: {
-    // 新增 / 修改
-    addOrUpdateHandle (id) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.dataForm.id = id
-        this.$refs.addOrUpdate.dataForm.dictTypeId = this.dataForm.dictTypeId
-        this.$refs.addOrUpdate.init()
-      })
-    }
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				createdIsNeed: false,
+				getDataListURL: '/sys/dict/data/page',
+				getDataListIsPage: true,
+				deleteURL: '/sys/dict/data',
+				deleteIsBatch: true
+			},
+			dataForm: {
+				dictTypeId: '0',
+				dictLabel: '',
+				dictValue: ''
+			}
+		}
+	},
+	components: {
+		AddOrUpdate
+	},
+	created() {
+		this.dataForm.dictTypeId = this.$route.params.dictTypeId || '0'
+		this.getDataList()
+	},
+	methods: {
+		// 新增 / 修改
+		addOrUpdateHandle(id) {
+			this.addOrUpdateVisible = true
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.dataForm.id = id
+				this.$refs.addOrUpdate.dataForm.dictTypeId = this.dataForm.dictTypeId
+				this.$refs.addOrUpdate.init()
+			})
+		}
+	}
 }
 </script>

src/views/modules/sys/dict-type-add-or-update.vue

@@ -1,100 +1,103 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="dictName" :label="$t('dict.dictName')">
-        <el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input>
-      </el-form-item>
-      <el-form-item prop="dictType" :label="$t('dict.dictType')">
-        <el-input v-model="dataForm.dictType" :placeholder="$t('dict.dictType')"></el-input>
-      </el-form-item>
-      <el-form-item prop="sort" :label="$t('dict.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
-      </el-form-item>
-      <el-form-item prop="remark" :label="$t('dict.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('dict.remark')"></el-input>
-      </el-form-item>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
+	<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+			<el-form-item prop="dictName" :label="$t('dict.dictName')">
+				<el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input>
+			</el-form-item>
+			<el-form-item prop="dictType" :label="$t('dict.dictType')">
+				<el-input v-model="dataForm.dictType" :placeholder="$t('dict.dictType')"></el-input>
+			</el-form-item>
+			<el-form-item prop="sort" :label="$t('dict.sort')">
+				<el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
+			</el-form-item>
+			<el-form-item prop="remark" :label="$t('dict.remark')">
+				<el-input v-model="dataForm.remark" :placeholder="$t('dict.remark')"></el-input>
+			</el-form-item>
+		</el-form>
+		<template slot="footer">
+			<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+			<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
 export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        dictName: '',
-        dictType: '',
-        sort: 0,
-        remark: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        dictName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        dictType: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          this.getInfo()
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/sys/dict/type/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/dict/type', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: '',
+				dictName: '',
+				dictType: '',
+				sort: 0,
+				remark: ''
+			}
+		}
+	},
+	computed: {
+		dataRule() {
+			return {
+				dictName: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				dictType: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				sort: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init() {
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.getInfo()
+				}
+			})
+		},
+		// 获取信息
+		getInfo() {
+			this.$http
+				.get(this.$http.adornUrl(`/sys/dict/type/${this.dataForm.id}`))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.dataForm = {
+						...this.dataForm,
+						...res.data
+					}
+				})
+				.catch(() => {})
+		},
+		// 表单提交
+		dataFormSubmitHandle: debounce(
+			function() {
+				this.$refs['dataForm'].validate(valid => {
+					if (!valid) {
+						return false
+					}
+					this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/dict/type', this.dataForm)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg)
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						})
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
+	}
 }
 </script>

src/views/modules/sys/dict-type.vue

@@ -1,60 +1,55 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-sys__dict">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-input v-model="dataForm.dictType" :placeholder="$t('dict.dictType')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:dict:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:dict:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="dictName" :label="$t('dict.dictName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="dictType" :label="$t('dict.dictType')" header-align="center" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" @click="childHandle(scope.row)">{{ scope.row.dictType }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="sort" :label="$t('dict.sort')" sortable="custom" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="remark" :label="$t('dict.remark')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('dict.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column  :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:dict:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:dict:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__dict">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')" clearable></el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-input v-model="dataForm.dictType" :placeholder="$t('dict.dictType')" clearable></el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:dict:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:dict:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle" style="width: 100%;">
+				<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+				<el-table-column prop="dictName" :label="$t('dict.dictName')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="dictType" :label="$t('dict.dictType')" header-align="center" align="center">
+					<template slot-scope="scope">
+						<el-button type="text" @click="childHandle(scope.row)">{{ scope.row.dictType }}</el-button>
+					</template>
+				</el-table-column>
+				<el-table-column prop="sort" :label="$t('dict.sort')" sortable="custom" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="remark" :label="$t('dict.remark')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="createDate" :label="$t('dict.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button v-if="$hasPermission('sys:dict:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button v-if="$hasPermission('sys:dict:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			>
+			</el-pagination>
+			<!-- 弹窗, 新增 / 修改 -->
+			<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		</div>
+	</el-card>
 </template>
 
 <script>
@@ -62,40 +57,40 @@ import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './dict-type-add-or-update'
 import { addDynamicRoute } from '@/router'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/sys/dict/type/page',
-        getDataListIsPage: true,
-        deleteURL: '/sys/dict/type',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: '0',
-        dictName: '',
-        dictType: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  },
-  methods: {
-    // 子级
-    childHandle (row) {
-      // 路由参数
-      const routeParams = {
-        routeName: `${this.$route.name}__${row.id}`,
-        title: `${this.$route.meta.title} - ${row.dictType}`,
-        path: 'sys/dict-data',
-        params: {
-          dictTypeId: row.id
-        }
-      }
-      // 动态路由
-      addDynamicRoute(routeParams, this.$router)
-    }
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: '/sys/dict/type/page',
+				getDataListIsPage: true,
+				deleteURL: '/sys/dict/type',
+				deleteIsBatch: true
+			},
+			dataForm: {
+				id: '0',
+				dictName: '',
+				dictType: ''
+			}
+		}
+	},
+	components: {
+		AddOrUpdate
+	},
+	methods: {
+		// 子级
+		childHandle(row) {
+			// 路由参数
+			const routeParams = {
+				routeName: `${this.$route.name}__${row.id}`,
+				title: `${this.$route.meta.title} - ${row.dictType}`,
+				path: 'sys/dict-data',
+				params: {
+					dictTypeId: row.id
+				}
+			}
+			// 动态路由
+			addDynamicRoute(routeParams, this.$router)
+		}
+	}
 }
 </script>

src/views/modules/sys/log-error.vue

@@ -1,65 +1,73 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-sys__log-error">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
-        <el-table-column prop="requestUri" :label="$t('logError.requestUri')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requestMethod" :label="$t('logError.requestMethod')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requestParams" :label="$t('logError.requestParams')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="ip" :label="$t('logError.ip')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userAgent" :label="$t('logError.userAgent')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('logError.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="infoHandle(scope.row.errorInfo)">{{ $t('logError.errorInfo') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__log-error">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
+				<el-table-column prop="requestUri" :label="$t('logError.requestUri')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="requestMethod" :label="$t('logError.requestMethod')" header-align="center" align="center"></el-table-column>
+				<el-table-column
+					prop="requestParams"
+					:label="$t('logError.requestParams')"
+					header-align="center"
+					align="center"
+					width="150"
+					:show-overflow-tooltip="true"
+				></el-table-column>
+				<el-table-column prop="ip" :label="$t('logError.ip')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="userAgent" :label="$t('logError.userAgent')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
+				<el-table-column prop="createDate" :label="$t('logError.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button type="text" size="small" @click="infoHandle(scope.row.errorInfo)">{{ $t('logError.errorInfo') }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			>
+			</el-pagination>
+		</div>
+	</el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/sys/log/error/page',
-        getDataListIsPage: true,
-        exportURL: '/sys/log/error/export'
-      }
-    }
-  },
-  methods: {
-    // 异常信息
-    infoHandle (info) {
-      this.$alert(info, this.$t('logError.errorInfo'), {
-        customClass: 'mod-sys__log-error-view-info'
-      })
-    }
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: '/sys/log/error/page',
+				getDataListIsPage: true,
+				exportURL: '/sys/log/error/export'
+			}
+		}
+	},
+	methods: {
+		// 异常信息
+		infoHandle(info) {
+			this.$alert(info, this.$t('logError.errorInfo'), {
+				customClass: 'mod-sys__log-error-view-info'
+			})
+		}
+	}
 }
 </script>
 
 <style lang="scss">
 .mod-sys__log-error {
-  &-view-info {
-    width: 80%;
-  }
+	&-view-info {
+		width: 80%;
+	}
 }
 </style>

src/views/modules/sys/log-login.vue

@@ -1,71 +1,72 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-sys__log-login">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.creatorName" :placeholder="$t('logLogin.creatorName')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-select v-model="dataForm.status" :placeholder="$t('logLogin.status')" clearable>
-            <el-option :label="$t('logLogin.status0')" :value="0"></el-option>
-            <el-option :label="$t('logLogin.status1')" :value="1"></el-option>
-            <el-option :label="$t('logLogin.status2')" :value="2"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
-        <el-table-column prop="creatorName" :label="$t('logLogin.creatorName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="operation" :label="$t('logLogin.operation')" header-align="center" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.operation === 0 ? $t('logLogin.operation0') : $t('logLogin.operation1') }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="status" :label="$t('logLogin.status')" sortable="custom" header-align="center" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('logLogin.status0') }}</el-tag>
-            <el-tag v-else-if="scope.row.status === 1" size="small" type="success">{{ $t('logLogin.status1') }}</el-tag>
-            <el-tag v-else size="small" type="warning">{{ $t('logLogin.status2') }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="ip" :label="$t('logLogin.ip')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userAgent" :label="$t('logLogin.userAgent')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('logLogin.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__log-login">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-input v-model="dataForm.creatorName" :placeholder="$t('logLogin.creatorName')" clearable></el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-select v-model="dataForm.status" :placeholder="$t('logLogin.status')" clearable>
+						<el-option :label="$t('logLogin.status0')" :value="0"></el-option>
+						<el-option :label="$t('logLogin.status1')" :value="1"></el-option>
+						<el-option :label="$t('logLogin.status2')" :value="2"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
+				<el-table-column prop="creatorName" :label="$t('logLogin.creatorName')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="operation" :label="$t('logLogin.operation')" header-align="center" align="center">
+					<template slot-scope="scope">
+						{{ scope.row.operation === 0 ? $t('logLogin.operation0') : $t('logLogin.operation1') }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="status" :label="$t('logLogin.status')" sortable="custom" header-align="center" align="center">
+					<template slot-scope="scope">
+						<el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('logLogin.status0') }}</el-tag>
+						<el-tag v-else-if="scope.row.status === 1" size="small" type="success">{{ $t('logLogin.status1') }}</el-tag>
+						<el-tag v-else size="small" type="warning">{{ $t('logLogin.status2') }}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="ip" :label="$t('logLogin.ip')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="userAgent" :label="$t('logLogin.userAgent')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
+				<el-table-column prop="createDate" :label="$t('logLogin.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			>
+			</el-pagination>
+		</div>
+	</el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/sys/log/login/page',
-        getDataListIsPage: true,
-        exportURL: '/sys/log/login/export'
-      },
-      dataForm: {
-        creatorName: '',
-        status: ''
-      }
-    }
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: '/sys/log/login/page',
+				getDataListIsPage: true,
+				exportURL: '/sys/log/login/export'
+			},
+			dataForm: {
+				creatorName: '',
+				status: ''
+			}
+		}
+	}
 }
 </script>

src/views/modules/sys/log-operation.vue

@@ -1,69 +1,77 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-sys__log-operation">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-select v-model="dataForm.status" :placeholder="$t('logOperation.status')" clearable>
-            <el-option :label="$t('logOperation.status0')" :value="0"></el-option>
-            <el-option :label="$t('logOperation.status1')" :value="1"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
-        <el-table-column prop="creatorName" :label="$t('logOperation.creatorName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="operation" :label="$t('logOperation.operation')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requestUri" :label="$t('logOperation.requestUri')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requestMethod" :label="$t('logOperation.requestMethod')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requestParams" :label="$t('logOperation.requestParams')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="requestTime" :label="$t('logOperation.requestTime')" sortable="custom" header-align="center" align="center">
-          <template slot-scope="scope">
-            {{ `${scope.row.requestTime}ms` }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="status" :label="$t('logOperation.status')" sortable="custom" header-align="center" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('logOperation.status0') }}</el-tag>
-            <el-tag v-else size="small" type="success">{{ $t('logOperation.status1') }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="ip" :label="$t('logOperation.ip')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userAgent" :label="$t('logOperation.userAgent')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('logOperation.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__log-operation">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-select v-model="dataForm.status" :placeholder="$t('logOperation.status')" clearable>
+						<el-option :label="$t('logOperation.status0')" :value="0"></el-option>
+						<el-option :label="$t('logOperation.status1')" :value="1"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
+				<el-table-column prop="creatorName" :label="$t('logOperation.creatorName')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="operation" :label="$t('logOperation.operation')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="requestUri" :label="$t('logOperation.requestUri')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="requestMethod" :label="$t('logOperation.requestMethod')" header-align="center" align="center"></el-table-column>
+				<el-table-column
+					prop="requestParams"
+					:label="$t('logOperation.requestParams')"
+					header-align="center"
+					align="center"
+					width="150"
+					:show-overflow-tooltip="true"
+				></el-table-column>
+				<el-table-column prop="requestTime" :label="$t('logOperation.requestTime')" sortable="custom" header-align="center" align="center">
+					<template slot-scope="scope">
+						{{ `${scope.row.requestTime}ms` }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="status" :label="$t('logOperation.status')" sortable="custom" header-align="center" align="center">
+					<template slot-scope="scope">
+						<el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('logOperation.status0') }}</el-tag>
+						<el-tag v-else size="small" type="success">{{ $t('logOperation.status1') }}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="ip" :label="$t('logOperation.ip')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="userAgent" :label="$t('logOperation.userAgent')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
+				<el-table-column prop="createDate" :label="$t('logOperation.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			>
+			</el-pagination>
+		</div>
+	</el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/sys/log/operation/page',
-        getDataListIsPage: true,
-        exportURL: '/sys/log/operation/export'
-      },
-      dataForm: {
-        status: ''
-      }
-    }
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: '/sys/log/operation/page',
+				getDataListIsPage: true,
+				exportURL: '/sys/log/operation/export'
+			},
+			dataForm: {
+				status: ''
+			}
+		}
+	}
 }
 </script>

src/views/modules/sys/menu-add-or-update.vue

@@ -1,221 +1,226 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="type" :label="$t('menu.type')" size="mini">
-        <el-radio-group v-model="dataForm.type" :disabled="!!dataForm.id">
-          <el-radio :label="0">{{ $t('menu.type0') }}</el-radio>
-          <el-radio :label="1">{{ $t('menu.type1') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item prop="name" :label="$t('menu.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('menu.name')"></el-input>
-      </el-form-item>
-      <el-form-item prop="parentName" :label="$t('menu.parentName')" class="menu-list">
-        <el-popover v-model="menuListVisible" ref="menuListPopover" placement="bottom-start" trigger="click">
-          <el-tree
-            :data="menuList"
-            :props="{ label: 'name', children: 'children' }"
-            node-key="id"
-            ref="menuListTree"
-            :highlight-current="true"
-            :expand-on-click-node="false"
-            accordion
-            @current-change="menuListTreeCurrentChangeHandle">
-          </el-tree>
-        </el-popover>
-        <el-input v-model="dataForm.parentName" v-popover:menuListPopover :readonly="true" :placeholder="$t('menu.parentName')">
-          <i v-if="dataForm.pid !== '0'" slot="suffix" @click.stop="deptListTreeSetDefaultHandle()" class="el-icon-circle-close el-input__icon"></i>
-        </el-input>
-      </el-form-item>
-      <el-form-item v-if="dataForm.type === 0" prop="url" :label="$t('menu.url')">
-        <el-input v-model="dataForm.url" :placeholder="$t('menu.url')"></el-input>
-      </el-form-item>
-      <el-form-item prop="sort" :label="$t('menu.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('menu.sort')"></el-input-number>
-      </el-form-item>
-      <el-form-item prop="permissions" :label="$t('menu.permissions')">
-        <el-input v-model="dataForm.permissions" :placeholder="$t('menu.permissionsTips')"></el-input>
-      </el-form-item>
-      <el-form-item v-if="dataForm.type === 0" prop="icon" :label="$t('menu.icon')" class="icon-list">
-        <el-popover v-model="iconListVisible" ref="iconListPopover" placement="bottom-start" trigger="click" popper-class="mod-sys__menu-icon-popover">
-          <div class="mod-sys__menu-icon-inner">
-            <div class="mod-sys__menu-icon-list">
-              <el-button
-                v-for="(item, index) in iconList"
-                :key="index"
-                @click="iconListCurrentChangeHandle(item)"
-                :class="{ 'is-active': dataForm.icon === item }">
-                <svg class="icon-svg" aria-hidden="true"><use :xlink:href="`#${item}`"></use></svg>
-              </el-button>
-            </div>
-          </div>
-        </el-popover>
-        <el-input v-model="dataForm.icon" v-popover:iconListPopover :readonly="true" :placeholder="$t('menu.icon')"></el-input>
-      </el-form-item>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
+	<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+			<el-form-item prop="type" :label="$t('menu.type')" size="mini">
+				<el-radio-group v-model="dataForm.type" :disabled="!!dataForm.id">
+					<el-radio :label="0">{{ $t('menu.type0') }}</el-radio>
+					<el-radio :label="1">{{ $t('menu.type1') }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item prop="name" :label="$t('menu.name')">
+				<el-input v-model="dataForm.name" :placeholder="$t('menu.name')"></el-input>
+			</el-form-item>
+			<el-form-item prop="parentName" :label="$t('menu.parentName')" class="menu-list">
+				<el-popover v-model="menuListVisible" ref="menuListPopover" placement="bottom-start" trigger="click">
+					<el-tree
+						:data="menuList"
+						:props="{ label: 'name', children: 'children' }"
+						node-key="id"
+						ref="menuListTree"
+						:highlight-current="true"
+						:expand-on-click-node="false"
+						accordion
+						@current-change="menuListTreeCurrentChangeHandle"
+					>
+					</el-tree>
+				</el-popover>
+				<el-input v-model="dataForm.parentName" v-popover:menuListPopover :readonly="true" :placeholder="$t('menu.parentName')">
+					<i v-if="dataForm.pid !== '0'" slot="suffix" @click.stop="deptListTreeSetDefaultHandle()" class="el-icon-circle-close el-input__icon"></i>
+				</el-input>
+			</el-form-item>
+			<el-form-item v-if="dataForm.type === 0" prop="url" :label="$t('menu.url')">
+				<el-input v-model="dataForm.url" :placeholder="$t('menu.url')"></el-input>
+			</el-form-item>
+			<el-form-item prop="sort" :label="$t('menu.sort')">
+				<el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('menu.sort')"></el-input-number>
+			</el-form-item>
+			<el-form-item prop="permissions" :label="$t('menu.permissions')">
+				<el-input v-model="dataForm.permissions" :placeholder="$t('menu.permissionsTips')"></el-input>
+			</el-form-item>
+			<el-form-item v-if="dataForm.type === 0" prop="icon" :label="$t('menu.icon')" class="icon-list">
+				<el-popover v-model="iconListVisible" ref="iconListPopover" placement="bottom-start" trigger="click" popper-class="mod-sys__menu-icon-popover">
+					<div class="mod-sys__menu-icon-inner">
+						<div class="mod-sys__menu-icon-list">
+							<el-button v-for="(item, index) in iconList" :key="index" @click="iconListCurrentChangeHandle(item)" :class="{ 'is-active': dataForm.icon === item }">
+								<svg class="icon-svg" aria-hidden="true"><use :xlink:href="`#${item}`"></use></svg>
+							</el-button>
+						</div>
+					</div>
+				</el-popover>
+				<el-input v-model="dataForm.icon" v-popover:iconListPopover :readonly="true" :placeholder="$t('menu.icon')"></el-input>
+			</el-form-item>
+		</el-form>
+		<template slot="footer">
+			<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+			<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
 import { getIconList } from '@/utils'
 export default {
-  data () {
-    return {
-      visible: false,
-      menuList: [],
-      menuListVisible: false,
-      iconList: [],
-      iconListVisible: false,
-      dataForm: {
-        id: '',
-        type: 0,
-        name: '',
-        pid: '0',
-        parentName: '',
-        url: '',
-        permissions: '',
-        sort: 0,
-        icon: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'change' }
-        ]
-      }
-    }
-  },
-  watch: {
-    'dataForm.type' (val) {
-      this.$refs['dataForm'].clearValidate()
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        this.iconList = getIconList()
-        this.dataForm.parentName = this.$t('menu.parentNameDefault')
-        this.getMenuList().then(() => {
-          if (this.dataForm.id) {
-            this.getInfo()
-          }
-        })
-      })
-    },
-    // 获取菜单列表
-    getMenuList () {
-      return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.menuList = res.data
-      }).catch(() => {})
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/sys/menu/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-        if (this.dataForm.pid === '0') {
-          return this.deptListTreeSetDefaultHandle()
-        }
-        this.$refs.menuListTree.setCurrentKey(this.dataForm.pid)
-      }).catch(() => {})
-    },
-    // 上级菜单树, 设置默认值
-    deptListTreeSetDefaultHandle () {
-      this.dataForm.pid = '0'
-      this.dataForm.parentName = this.$t('menu.parentNameDefault')
-    },
-    // 上级菜单树, 选中
-    menuListTreeCurrentChangeHandle (data) {
-      this.dataForm.pid = data.id
-      this.dataForm.parentName = data.name
-      this.menuListVisible = false
-    },
-    // 图标, 选中
-    iconListCurrentChangeHandle (icon) {
-      this.dataForm.icon = icon
-      this.iconListVisible = false
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/menu', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
+	data() {
+		return {
+			visible: false,
+			menuList: [],
+			menuListVisible: false,
+			iconList: [],
+			iconListVisible: false,
+			dataForm: {
+				id: '',
+				type: 0,
+				name: '',
+				pid: '0',
+				parentName: '',
+				url: '',
+				permissions: '',
+				sort: 0,
+				icon: ''
+			}
+		}
+	},
+	computed: {
+		dataRule() {
+			return {
+				name: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				parentName: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }]
+			}
+		}
+	},
+	watch: {
+		'dataForm.type'(val) {
+			this.$refs['dataForm'].clearValidate()
+		}
+	},
+	methods: {
+		init() {
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				this.iconList = getIconList()
+				this.dataForm.parentName = this.$t('menu.parentNameDefault')
+				this.getMenuList().then(() => {
+					if (this.dataForm.id) {
+						this.getInfo()
+					}
+				})
+			})
+		},
+		// 获取菜单列表
+		getMenuList() {
+			return this.$http
+				.get(this.$http.adornUrl('/sys/menu/list?type=0'))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.menuList = res.data
+				})
+				.catch(() => {})
+		},
+		// 获取信息
+		getInfo() {
+			this.$http
+				.get(this.$http.adornUrl(`/sys/menu/${this.dataForm.id}`))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.dataForm = {
+						...this.dataForm,
+						...res.data
+					}
+					if (this.dataForm.pid === '0') {
+						return this.deptListTreeSetDefaultHandle()
+					}
+					this.$refs.menuListTree.setCurrentKey(this.dataForm.pid)
+				})
+				.catch(() => {})
+		},
+		// 上级菜单树, 设置默认值
+		deptListTreeSetDefaultHandle() {
+			this.dataForm.pid = '0'
+			this.dataForm.parentName = this.$t('menu.parentNameDefault')
+		},
+		// 上级菜单树, 选中
+		menuListTreeCurrentChangeHandle(data) {
+			this.dataForm.pid = data.id
+			this.dataForm.parentName = data.name
+			this.menuListVisible = false
+		},
+		// 图标, 选中
+		iconListCurrentChangeHandle(icon) {
+			this.dataForm.icon = icon
+			this.iconListVisible = false
+		},
+		// 表单提交
+		dataFormSubmitHandle: debounce(
+			function() {
+				this.$refs['dataForm'].validate(valid => {
+					if (!valid) {
+						return false
+					}
+					this.$http[!this.dataForm.id ? 'post' : 'put'](this.$http.adornUrl('/sys/menu'), this.dataForm)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg)
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						})
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
+	}
 }
 </script>
 
 <style lang="scss">
 .mod-sys__menu {
-  .menu-list,
-  .icon-list {
-    .el-input__inner,
-    .el-input__suffix {
-      cursor: pointer;
-    }
-  }
-  &-icon-popover {
-    width: 458px;
-    overflow: hidden;
-  }
-  &-icon-inner {
-    width: 478px;
-    max-height: 258px;
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-  &-icon-list {
-    width: 458px;
-    padding: 0;
-    margin: -8px 0 0 -8px;
-    > .el-button {
-      padding: 8px;
-      margin: 8px 0 0 8px;
-      > span {
-        display: inline-block;
-        vertical-align: middle;
-        width: 18px;
-        height: 18px;
-        font-size: 18px;
-      }
-    }
-  }
+	.menu-list,
+	.icon-list {
+		.el-input__inner,
+		.el-input__suffix {
+			cursor: pointer;
+		}
+	}
+	&-icon-popover {
+		width: 458px;
+		overflow: hidden;
+	}
+	&-icon-inner {
+		width: 478px;
+		max-height: 258px;
+		overflow-x: hidden;
+		overflow-y: auto;
+	}
+	&-icon-list {
+		width: 458px;
+		padding: 0;
+		margin: -8px 0 0 -8px;
+		> .el-button {
+			padding: 8px;
+			margin: 8px 0 0 8px;
+			> span {
+				display: inline-block;
+				vertical-align: middle;
+				width: 18px;
+				height: 18px;
+				font-size: 18px;
+			}
+		}
+	}
 }
 </style>

src/views/modules/sys/menu.vue

@@ -1,55 +1,55 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-sys__menu">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">
-        <el-table-column prop="name" :label="$t('menu.name')" header-align="center" min-width="150"></el-table-column>
-        <el-table-column prop="icon" :label="$t('menu.icon')" header-align="center" align="center">
-          <template slot-scope="scope">
-            <svg class="icon-svg" aria-hidden="true"><use :xlink:href="`#${scope.row.icon}`"></use></svg>
-          </template>
-        </el-table-column>
-        <el-table-column prop="type" :label="$t('menu.type')" header-align="center" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.type === 0" size="small">{{ $t('menu.type0') }}</el-tag>
-            <el-tag v-else size="small" type="info">{{ $t('menu.type1') }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="sort" :label="$t('menu.sort')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="url" :label="$t('menu.url')" header-align="center" align="center" width="150" :show-overflow-tooltip="true" ></el-table-column>
-        <el-table-column prop="permissions" :label="$t('menu.permissions')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column  :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:menu:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:menu:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__menu">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">
+				<el-table-column prop="name" :label="$t('menu.name')" header-align="center" min-width="150"></el-table-column>
+				<el-table-column prop="icon" :label="$t('menu.icon')" header-align="center" align="center">
+					<template slot-scope="scope">
+						<svg class="icon-svg" aria-hidden="true"><use :xlink:href="`#${scope.row.icon}`"></use></svg>
+					</template>
+				</el-table-column>
+				<el-table-column prop="type" :label="$t('menu.type')" header-align="center" align="center">
+					<template slot-scope="scope">
+						<el-tag v-if="scope.row.type === 0" size="small">{{ $t('menu.type0') }}</el-tag>
+						<el-tag v-else size="small" type="info">{{ $t('menu.type1') }}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="sort" :label="$t('menu.sort')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="url" :label="$t('menu.url')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
+				<el-table-column prop="permissions" :label="$t('menu.permissions')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button v-if="$hasPermission('sys:menu:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button v-if="$hasPermission('sys:menu:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<!-- 弹窗, 新增 / 修改 -->
+			<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		</div>
+	</el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './menu-add-or-update'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/sys/menu/list',
-        deleteURL: '/sys/menu'
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: '/sys/menu/list',
+				deleteURL: '/sys/menu'
+			}
+		}
+	},
+	components: {
+		AddOrUpdate
+	}
 }
 </script>

src/views/modules/sys/params-add-or-update.vue

@@ -1,93 +1,98 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="paramCode" :label="$t('params.paramCode')">
-        <el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')"></el-input>
-      </el-form-item>
-      <el-form-item prop="paramValue" :label="$t('params.paramValue')">
-        <el-input v-model="dataForm.paramValue" :placeholder="$t('params.paramValue')"></el-input>
-      </el-form-item>
-      <el-form-item prop="remark" :label="$t('params.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('params.remark')"></el-input>
-      </el-form-item>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
+	<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+			<el-form-item prop="paramCode" :label="$t('params.paramCode')">
+				<el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')"></el-input>
+			</el-form-item>
+			<el-form-item prop="paramValue" :label="$t('params.paramValue')">
+				<el-input v-model="dataForm.paramValue" :placeholder="$t('params.paramValue')"></el-input>
+			</el-form-item>
+			<el-form-item prop="remark" :label="$t('params.remark')">
+				<el-input v-model="dataForm.remark" :placeholder="$t('params.remark')"></el-input>
+			</el-form-item>
+		</el-form>
+		<template slot="footer">
+			<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+			<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
 export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        paramCode: '',
-        paramValue: '',
-        remark: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        paramCode: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        paramValue: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          this.getInfo()
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/sys/params/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/params', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: '',
+				paramCode: '',
+				paramValue: '',
+				remark: ''
+			}
+		}
+	},
+	computed: {
+		dataRule() {
+			return {
+				paramCode: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				paramValue: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init() {
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				if (this.dataForm.id) {
+					this.getInfo()
+				}
+			})
+		},
+		// 获取信息
+		getInfo() {
+			this.$http
+				.get(this.$http.adornUrl(`/sys/params/${this.dataForm.id}`))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.dataForm = {
+						...this.dataForm,
+						...res.data
+					}
+				})
+				.catch(() => {})
+		},
+		// 表单提交
+		dataFormSubmitHandle: debounce(
+			function() {
+				this.$refs['dataForm'].validate(valid => {
+					if (!valid) {
+						return false
+					}
+					this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/params', this.dataForm)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg)
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						})
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
+	}
 }
 </script>

src/views/modules/sys/params.vue

@@ -1,67 +1,68 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-sys__params">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:params:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:params:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="paramCode" :label="$t('params.paramCode')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="paramValue" :label="$t('params.paramValue')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="remark" :label="$t('params.remark')" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:params:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:params:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__params">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')" clearable></el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:params:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:params:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+				<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+				<el-table-column prop="paramCode" :label="$t('params.paramCode')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="paramValue" :label="$t('params.paramValue')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="remark" :label="$t('params.remark')" header-align="center" align="center"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button v-if="$hasPermission('sys:params:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button v-if="$hasPermission('sys:params:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			>
+			</el-pagination>
+			<!-- 弹窗, 新增 / 修改 -->
+			<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		</div>
+	</el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './params-add-or-update'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/sys/params/page',
-        getDataListIsPage: true,
-        deleteURL: '/sys/params',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        paramCode: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: '/sys/params/page',
+				getDataListIsPage: true,
+				deleteURL: '/sys/params',
+				deleteIsBatch: true
+			},
+			dataForm: {
+				paramCode: ''
+			}
+		}
+	},
+	components: {
+		AddOrUpdate
+	}
 }
 </script>

src/views/modules/sys/role-add-or-update.vue

@@ -1,148 +1,141 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="name" :label="$t('role.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('role.name')"></el-input>
-      </el-form-item>
-      <el-form-item prop="remark" :label="$t('role.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('role.remark')"></el-input>
-      </el-form-item>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item size="mini" :label="$t('role.menuList')">
-            <el-tree
-              :data="menuList"
-              :props="{ label: 'name', children: 'children' }"
-              node-key="id"
-              ref="menuListTree"
-              accordion
-              show-checkbox>
-            </el-tree>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item size="mini" :label="$t('role.deptList')">
-            <el-tree
-              :data="deptList"
-              :props="{ label: 'name', children: 'children' }"
-              node-key="id"
-              ref="deptListTree"
-              accordion
-              show-checkbox>
-            </el-tree>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
+	<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+			<el-form-item prop="name" :label="$t('role.name')">
+				<el-input v-model="dataForm.name" :placeholder="$t('role.name')"></el-input>
+			</el-form-item>
+			<el-form-item prop="remark" :label="$t('role.remark')">
+				<el-input v-model="dataForm.remark" :placeholder="$t('role.remark')"></el-input>
+			</el-form-item>
+			<el-row>
+				<el-col :span="12">
+					<el-form-item size="mini" :label="$t('role.menuList')">
+						<el-tree :data="menuList" :props="{ label: 'name', children: 'children' }" node-key="id" ref="menuListTree" accordion show-checkbox> </el-tree>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item size="mini" :label="$t('role.deptList')">
+						<el-tree :data="deptList" :props="{ label: 'name', children: 'children' }" node-key="id" ref="deptListTree" accordion show-checkbox> </el-tree>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template slot="footer">
+			<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+			<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
 export default {
-  data () {
-    return {
-      visible: false,
-      menuList: [],
-      deptList: [],
-      dataForm: {
-        id: '',
-        name: '',
-        menuIdList: [],
-        deptIdList: [],
-        remark: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        this.$refs.menuListTree.setCheckedKeys([])
-        this.$refs.deptListTree.setCheckedKeys([])
-        Promise.all([
-          this.getMenuList(),
-          this.getDeptList()
-        ]).then(() => {
-          if (this.dataForm.id) {
-            this.getInfo()
-          }
-        })
-      })
-    },
-    // 获取菜单列表
-    getMenuList () {
-      return this.$http.get('/sys/menu/select').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.menuList = res.data
-      }).catch(() => {})
-    },
-    // 获取部门列表
-    getDeptList () {
-      return this.$http.get('/sys/dept/list').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.deptList = res.data
-      }).catch(() => {})
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/sys/role/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-        this.dataForm.menuIdList.forEach(item => this.$refs.menuListTree.setChecked(item, true))
-        this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.dataForm.menuIdList = [
-          ...this.$refs.menuListTree.getHalfCheckedKeys(),
-          ...this.$refs.menuListTree.getCheckedKeys()
-        ]
-        this.dataForm.deptIdList = this.$refs.deptListTree.getCheckedKeys()
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/role', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
+	data() {
+		return {
+			visible: false,
+			menuList: [],
+			deptList: [],
+			dataForm: {
+				id: '',
+				name: '',
+				menuIdList: [],
+				deptIdList: [],
+				remark: ''
+			}
+		}
+	},
+	computed: {
+		dataRule() {
+			return {
+				name: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init() {
+			this.visible = true
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				this.$refs.menuListTree.setCheckedKeys([])
+				this.$refs.deptListTree.setCheckedKeys([])
+				Promise.all([this.getMenuList(), this.getDeptList()]).then(() => {
+					if (this.dataForm.id) {
+						this.getInfo()
+					}
+				})
+			})
+		},
+		// 获取菜单列表
+		getMenuList() {
+			return this.$http
+				.get(this.$http.adornUrl('/sys/menu/select'))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.menuList = res.data
+				})
+				.catch(() => {})
+		},
+		// 获取部门列表
+		getDeptList() {
+			return this.$http
+				.get(this.$http.adornUrl('/sys/dept/list'))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.deptList = res.data
+				})
+				.catch(() => {})
+		},
+		// 获取信息
+		getInfo() {
+			this.$http
+				.get(this.$http.adornUrl(`/sys/role/${this.dataForm.id}`))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.dataForm = {
+						...this.dataForm,
+						...res.data
+					}
+					this.dataForm.menuIdList.forEach(item => this.$refs.menuListTree.setChecked(item, true))
+					this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
+				})
+				.catch(() => {})
+		},
+		// 表单提交
+		dataFormSubmitHandle: debounce(
+			function() {
+				this.$refs['dataForm'].validate(valid => {
+					if (!valid) {
+						return false
+					}
+					this.dataForm.menuIdList = [...this.$refs.menuListTree.getHalfCheckedKeys(), ...this.$refs.menuListTree.getCheckedKeys()]
+					this.dataForm.deptIdList = this.$refs.deptListTree.getCheckedKeys()
+					this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/role', this.dataForm)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg)
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						})
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
+	}
 }
 </script>

src/views/modules/sys/role.vue

@@ -1,73 +1,68 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-sys__role">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.name" :placeholder="$t('role.name')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:role:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="name" :label="$t('role.name')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="remark" :label="$t('role.remark')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('role.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:role:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:role:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__role">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-input v-model="dataForm.name" :placeholder="$t('role.name')" clearable></el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:role:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle" style="width: 100%;">
+				<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+				<el-table-column prop="name" :label="$t('role.name')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="remark" :label="$t('role.remark')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="createDate" :label="$t('role.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button v-if="$hasPermission('sys:role:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button v-if="$hasPermission('sys:role:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			>
+			</el-pagination>
+			<!-- 弹窗, 新增 / 修改 -->
+			<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		</div>
+	</el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './role-add-or-update'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/sys/role/page',
-        getDataListIsPage: true,
-        deleteURL: '/sys/role',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        name: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: '/sys/role/page',
+				getDataListIsPage: true,
+				deleteURL: '/sys/role',
+				deleteIsBatch: true
+			},
+			dataForm: {
+				name: ''
+			}
+		}
+	},
+	components: {
+		AddOrUpdate
+	}
 }
 </script>

src/views/modules/sys/user-add-or-update.vue

@@ -1,212 +1,205 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="username" :label="$t('user.username')">
-        <el-input v-model="dataForm.username" :placeholder="$t('user.username')"></el-input>
-      </el-form-item>
-      <el-form-item prop="deptName" :label="$t('user.deptName')">
-        <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>
-      </el-form-item>
-      <el-form-item prop="password" :label="$t('user.password')" :class="{ 'is-required': !dataForm.id }">
-        <el-input v-model="dataForm.password" type="password" :placeholder="$t('user.password')"></el-input>
-      </el-form-item>
-      <el-form-item prop="confirmPassword" :label="$t('user.confirmPassword')" :class="{ 'is-required': !dataForm.id }">
-        <el-input v-model="dataForm.confirmPassword" type="password" :placeholder="$t('user.confirmPassword')"></el-input>
-      </el-form-item>
-      <el-form-item prop="realName" :label="$t('user.realName')">
-        <el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input>
-      </el-form-item>
-      <el-form-item prop="gender" :label="$t('user.gender')">
-        <ren-radio-group v-model="dataForm.gender" dict-type="gender"></ren-radio-group>
-      </el-form-item>
-      <el-form-item prop="email" :label="$t('user.email')">
-        <el-input v-model="dataForm.email" :placeholder="$t('user.email')"></el-input>
-      </el-form-item>
-      <el-form-item prop="mobile" :label="$t('user.mobile')">
-        <el-input v-model="dataForm.mobile" :placeholder="$t('user.mobile')"></el-input>
-      </el-form-item>
-      <el-form-item prop="roleIdList" :label="$t('user.roleIdList')" class="role-list">
-        <el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')">
-          <el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="status" :label="$t('user.status')" size="mini">
-        <el-radio-group v-model="dataForm.status">
-          <el-radio :label="0">{{ $t('user.status0') }}</el-radio>
-          <el-radio :label="1">{{ $t('user.status1') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
+	<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+		<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+			<el-form-item prop="username" :label="$t('user.username')">
+				<el-input v-model="dataForm.username" :placeholder="$t('user.username')"></el-input>
+			</el-form-item>
+			<el-form-item prop="deptName" :label="$t('user.deptName')">
+				<ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>
+			</el-form-item>
+			<el-form-item prop="password" :label="$t('user.password')" :class="{ 'is-required': !dataForm.id }">
+				<el-input v-model="dataForm.password" type="password" :placeholder="$t('user.password')"></el-input>
+			</el-form-item>
+			<el-form-item prop="confirmPassword" :label="$t('user.confirmPassword')" :class="{ 'is-required': !dataForm.id }">
+				<el-input v-model="dataForm.confirmPassword" type="password" :placeholder="$t('user.confirmPassword')"></el-input>
+			</el-form-item>
+			<el-form-item prop="realName" :label="$t('user.realName')">
+				<el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input>
+			</el-form-item>
+			<el-form-item prop="gender" :label="$t('user.gender')">
+				<ren-radio-group v-model="dataForm.gender" dict-type="gender"></ren-radio-group>
+			</el-form-item>
+			<el-form-item prop="email" :label="$t('user.email')">
+				<el-input v-model="dataForm.email" :placeholder="$t('user.email')"></el-input>
+			</el-form-item>
+			<el-form-item prop="mobile" :label="$t('user.mobile')">
+				<el-input v-model="dataForm.mobile" :placeholder="$t('user.mobile')"></el-input>
+			</el-form-item>
+			<el-form-item prop="roleIdList" :label="$t('user.roleIdList')" class="role-list">
+				<el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')">
+					<el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item prop="status" :label="$t('user.status')" size="mini">
+				<el-radio-group v-model="dataForm.status">
+					<el-radio :label="0">{{ $t('user.status0') }}</el-radio>
+					<el-radio :label="1">{{ $t('user.status1') }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+		</el-form>
+		<template slot="footer">
+			<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+			<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
 import { isEmail, isMobile } from '@/utils/validate'
 export default {
-  data () {
-    return {
-      visible: false,
-      roleList: [],
-      roleIdListDefault: [],
-      dataForm: {
-        id: '',
-        username: '',
-        deptId: '',
-        deptName: '',
-        password: '',
-        confirmPassword: '',
-        realName: '',
-        gender: 0,
-        email: '',
-        mobile: '',
-        roleIdList: [],
-        status: 1
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      var validatePassword = (rule, value, callback) => {
-        if (!this.dataForm.id && !/\S/.test(value)) {
-          return callback(new Error(this.$t('validate.required')))
-        }
-        callback()
-      }
-      var validateConfirmPassword = (rule, value, callback) => {
-        if (!this.dataForm.id && !/\S/.test(value)) {
-          return callback(new Error(this.$t('validate.required')))
-        }
-        if (this.dataForm.password !== value) {
-          return callback(new Error(this.$t('user.validate.confirmPassword')))
-        }
-        callback()
-      }
-      var validateEmail = (rule, value, callback) => {
-        if (value && !isEmail(value)) {
-          return callback(new Error(this.$t('validate.format', { 'attr': this.$t('user.email') })))
-        }
-        callback()
-      }
-      var validateMobile = (rule, value, callback) => {
-        if (value && !isMobile(value)) {
-          return callback(new Error(this.$t('validate.format', { 'attr': this.$t('user.mobile') })))
-        }
-        callback()
-      }
-      return {
-        username: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        deptName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'change' }
-        ],
-        password: [
-          { validator: validatePassword, trigger: 'blur' }
-        ],
-        confirmPassword: [
-          { validator: validateConfirmPassword, trigger: 'blur' }
-        ],
-        realName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        email: [
-          { validator: validateEmail, trigger: 'blur' }
-        ],
-        mobile: [
-          { validator: validateMobile, trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.dataForm.deptId = ''
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        this.roleIdListDefault = []
-        Promise.all([
-          this.getRoleList()
-        ]).then(() => {
-          if (this.dataForm.id) {
-            this.getInfo()
-          }
-        })
-      })
-    },
-    // 获取角色列表
-    getRoleList () {
-      return this.$http.get('/sys/role/list').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.roleList = res.data
-      }).catch(() => {})
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/sys/user/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data,
-          roleIdList: []
-        }
-        // 角色配置, 区分是否为默认角色
-        for (var i = 0; i < res.data.roleIdList.length; i++) {
-          if (this.roleList.filter(item => item.id === res.data.roleIdList[i])[0]) {
-            this.dataForm.roleIdList.push(res.data.roleIdList[i])
-            continue
-          }
-          this.roleIdListDefault.push(res.data.roleIdList[i])
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', {
-          ...this.dataForm,
-          roleIdList: [
-            ...this.dataForm.roleIdList,
-            ...this.roleIdListDefault
-          ]
-        }).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
+	data() {
+		return {
+			visible: false,
+			roleList: [],
+			roleIdListDefault: [],
+			dataForm: {
+				id: '',
+				username: '',
+				deptId: '',
+				deptName: '',
+				password: '',
+				confirmPassword: '',
+				realName: '',
+				gender: 0,
+				email: '',
+				mobile: '',
+				roleIdList: [],
+				status: 1
+			}
+		}
+	},
+	computed: {
+		dataRule() {
+			var validatePassword = (rule, value, callback) => {
+				if (!this.dataForm.id && !/\S/.test(value)) {
+					return callback(new Error(this.$t('validate.required')))
+				}
+				callback()
+			}
+			var validateConfirmPassword = (rule, value, callback) => {
+				if (!this.dataForm.id && !/\S/.test(value)) {
+					return callback(new Error(this.$t('validate.required')))
+				}
+				if (this.dataForm.password !== value) {
+					return callback(new Error(this.$t('user.validate.confirmPassword')))
+				}
+				callback()
+			}
+			var validateEmail = (rule, value, callback) => {
+				if (value && !isEmail(value)) {
+					return callback(new Error(this.$t('validate.format', { attr: this.$t('user.email') })))
+				}
+				callback()
+			}
+			var validateMobile = (rule, value, callback) => {
+				if (value && !isMobile(value)) {
+					return callback(new Error(this.$t('validate.format', { attr: this.$t('user.mobile') })))
+				}
+				callback()
+			}
+			return {
+				username: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				deptName: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }],
+				password: [{ validator: validatePassword, trigger: 'blur' }],
+				confirmPassword: [{ validator: validateConfirmPassword, trigger: 'blur' }],
+				realName: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				email: [{ validator: validateEmail, trigger: 'blur' }],
+				mobile: [{ validator: validateMobile, trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		init() {
+			this.visible = true
+			this.dataForm.deptId = ''
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+				this.roleIdListDefault = []
+				Promise.all([this.getRoleList()]).then(() => {
+					if (this.dataForm.id) {
+						this.getInfo()
+					}
+				})
+			})
+		},
+		// 获取角色列表
+		getRoleList() {
+			return this.$http
+				.get(this.$http.adornUrl('/sys/role/list'))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.roleList = res.data
+				})
+				.catch(() => {})
+		},
+		// 获取信息
+		getInfo() {
+			this.$http
+				.get(this.$http.adornUrl(`/sys/user/${this.dataForm.id}`))
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg)
+					}
+					this.dataForm = {
+						...this.dataForm,
+						...res.data,
+						roleIdList: []
+					}
+					// 角色配置, 区分是否为默认角色
+					for (var i = 0; i < res.data.roleIdList.length; i++) {
+						if (this.roleList.filter(item => item.id === res.data.roleIdList[i])[0]) {
+							this.dataForm.roleIdList.push(res.data.roleIdList[i])
+							continue
+						}
+						this.roleIdListDefault.push(res.data.roleIdList[i])
+					}
+				})
+				.catch(() => {})
+		},
+		// 表单提交
+		dataFormSubmitHandle: debounce(
+			function() {
+				this.$refs['dataForm'].validate(valid => {
+					if (!valid) {
+						return false
+					}
+					this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', {
+						...this.dataForm,
+						roleIdList: [...this.dataForm.roleIdList, ...this.roleIdListDefault]
+					})
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg)
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refreshDataList')
+								}
+							})
+						})
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
+	}
 }
 </script>
 
 <style lang="scss">
 .mod-sys__user {
-  .role-list {
-    .el-select {
-      width: 100%;
-    }
-  }
+	.role-list {
+		.el-select {
+			width: 100%;
+		}
+	}
 }
 </style>

src/views/modules/sys/user.vue

@@ -1,98 +1,93 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-sys__user">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
-        </el-form-item>
-        <el-form-item>
-          <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true"></ren-dept-tree>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:export')" type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center" align="center">
-          <template slot-scope="scope">
-            {{ $getDictLabel("gender", scope.row.gender) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('user.status0') }}</el-tag>
-            <el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-sys__user">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+				<el-form-item>
+					<el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable></el-input>
+				</el-form-item>
+				<el-form-item>
+					<ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
+				</el-form-item>
+				<el-form-item>
+					<ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true"></ren-dept-tree>
+				</el-form-item>
+				<el-form-item>
+					<el-button @click="getDataList()">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button v-if="$hasPermission('sys:user:export')" type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle" style="width: 100%;">
+				<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+				<el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center" align="center">
+					<template slot-scope="scope">
+						{{ $getDictLabel('gender', scope.row.gender) }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center" align="center">
+					<template slot-scope="scope">
+						<el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('user.status0') }}</el-tag>
+						<el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button v-if="$hasPermission('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button v-if="$hasPermission('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			>
+			</el-pagination>
+			<!-- 弹窗, 新增 / 修改 -->
+			<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		</div>
+	</el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './user-add-or-update'
 export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/sys/user/page',
-        getDataListIsPage: true,
-        deleteURL: '/sys/user',
-        deleteIsBatch: true,
-        exportURL: '/sys/user/export'
-      },
-      dataForm: {
-        username: '',
-        deptId: '',
-        gender: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
+	mixins: [mixinViewModule],
+	data() {
+		return {
+			mixinViewModuleOptions: {
+				getDataListURL: '/sys/user/page',
+				getDataListIsPage: true,
+				deleteURL: '/sys/user',
+				deleteIsBatch: true,
+				exportURL: '/sys/user/export'
+			},
+			dataForm: {
+				username: '',
+				deptId: '',
+				gender: ''
+			}
+		}
+	},
+	components: {
+		AddOrUpdate
+	}
 }
 </script>

src/views/pages/404.vue

@@ -1,19 +1,18 @@
 <template>
-  <div class="aui-wrapper aui-page__not-found">
-    <div class="aui-content__wrapper">
-      <div class="aui-content">
-        <h2 class="title">400</h2>
-        <p class="desc" v-html="$t('notFound.desc')"></p>
-        <div class="btn-bar">
-          <el-button @click="$router.go(-1)">{{ $t('notFound.back') }}</el-button>
-          <el-button type="primary" @click="$router.push({ name: 'home' })">{{ $t('notFound.home') }}</el-button>
-        </div>
-      </div>
-    </div>
-  </div>
+	<div class="aui-wrapper aui-page__not-found">
+		<div class="aui-content__wrapper">
+			<div class="aui-content">
+				<h2 class="title">400</h2>
+				<p class="desc" v-html="$t('notFound.desc')"></p>
+				<div class="btn-bar">
+					<el-button @click="$router.go(-1)">{{ $t('notFound.back') }}</el-button>
+					<el-button type="primary" @click="$router.push({ name: 'home' })">{{ $t('notFound.home') }}</el-button>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-export default {
-}
+export default {}
 </script>

src/views/pages/login.vue

@@ -1,28 +1,28 @@
 <template>
-  <div class="aui-wrapper aui-page__login">
-    <div class="aui-content__wrapper">
-      <main class="aui-content">
-        <div class="login-header">
-          <h2 class="login-brand">{{ $t('brand.lg') }}</h2>
-        </div>
-        <div class="login-body">
-          <h3 class="login-title">{{ $t('login.title') }}</h3>
-          <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" status-icon>
-            <el-form-item prop="username">
-              <el-input v-model="dataForm.username" :placeholder="$t('login.username')">
-                <span slot="prefix" class="el-input__icon">
-                  <svg class="icon-svg" aria-hidden="true"><use xlink:href="#icon-user"></use></svg>
-                </span>
-              </el-input>
-            </el-form-item>
-            <el-form-item prop="password">
-              <el-input v-model="dataForm.password" type="password" :placeholder="$t('login.password')">
-                <span slot="prefix" class="el-input__icon">
-                  <svg class="icon-svg" aria-hidden="true"><use xlink:href="#icon-lock"></use></svg>
-                </span>
-              </el-input>
-            </el-form-item>
-            <el-form-item prop="captcha">
+	<div class="aui-wrapper aui-page__login">
+		<div class="aui-content__wrapper">
+			<main class="aui-content">
+				<div class="login-header">
+					<h2 class="login-brand">{{ $t('brand.lg') }}</h2>
+				</div>
+				<div class="login-body">
+					<h3 class="login-title">{{ $t('login.title') }}</h3>
+					<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" status-icon>
+						<el-form-item prop="username">
+							<el-input v-model="dataForm.username" :placeholder="$t('login.username')">
+								<span slot="prefix" class="el-input__icon">
+									<svg class="icon-svg" aria-hidden="true"><use xlink:href="#icon-user"></use></svg>
+								</span>
+							</el-input>
+						</el-form-item>
+						<el-form-item prop="password">
+							<el-input v-model="dataForm.password" type="password" :placeholder="$t('login.password')">
+								<span slot="prefix" class="el-input__icon">
+									<svg class="icon-svg" aria-hidden="true"><use xlink:href="#icon-lock"></use></svg>
+								</span>
+							</el-input>
+						</el-form-item>
+						<!-- <el-form-item prop="captcha">
               <el-row :gutter="20">
                 <el-col :span="14">
                   <el-input v-model="dataForm.captcha" :placeholder="$t('login.captcha')">
@@ -35,79 +35,85 @@
                   <img :src="captchaPath" @click="getCaptcha()">
                 </el-col>
               </el-row>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="dataFormSubmitHandle()" class="w-percent-100">{{ $t('login.title') }}</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="login-footer">
-          <p>
-            <a href="http://demo.open.renren.io/renren-security" target="_blank">{{ $t('login.demo') }}</a>
-          </p>
-          <p><a href="https://www.renren.io/" target="_blank">{{ $t('login.copyright') }}</a>2022 © renren.io</p>
-        </div>
-      </main>
-    </div>
-  </div>
+            </el-form-item> -->
+						<el-form-item>
+							<el-button type="primary" @click="dataFormSubmitHandle()" class="w-percent-100">{{ $t('login.title') }}</el-button>
+						</el-form-item>
+					</el-form>
+				</div>
+				<div class="login-footer">
+					<p>
+						<a href="http://demo.open.renren.io/renren-security" target="_blank">{{ $t('login.demo') }}</a>
+					</p>
+					<p>
+						<a href="https://www.renren.io/" target="_blank">{{ $t('login.copyright') }}</a>
+						2022 © renren.io
+					</p>
+				</div>
+			</main>
+		</div>
+	</div>
 </template>
 
 <script>
 import Cookies from 'js-cookie'
 import debounce from 'lodash/debounce'
-import { getUUID } from '@/utils'
+// import { getUUID } from '@/utils'
 export default {
-  data () {
-    return {
-      captchaPath: '',
-      dataForm: {
-        username: 'admin',
-        password: 'admin',
-        uuid: '',
-        captcha: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        username: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        password: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        captcha: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created () {
-    this.getCaptcha()
-  },
-  methods: {
-    // 获取验证码
-    getCaptcha () {
-      this.dataForm.uuid = getUUID()
-      this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}`
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http.post('/login', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            this.getCaptcha()
-            return this.$message.error(res.msg)
-          }
-          Cookies.set('token', res.data.token)
-          this.$router.replace({ name: 'home' })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
+	data() {
+		return {
+			captchaPath: '',
+			dataForm: {
+				username: 'admin',
+				password: 'admin',
+				uuid: ''
+				// captcha: ''
+			}
+		}
+	},
+	computed: {
+		dataRule() {
+			return {
+				username: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+				password: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
+				// captcha: [
+				//   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+				// ]
+			}
+		}
+	},
+	created() {
+		// this.getCaptcha()
+	},
+	methods: {
+		// 获取验证码
+		getCaptcha() {
+			this.dataForm.uuid = getUUID()
+			this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}`
+		},
+		// 表单提交
+		dataFormSubmitHandle: debounce(
+			function() {
+				this.$refs['dataForm'].validate(valid => {
+					if (!valid) {
+						return false
+					}
+					this.$http
+						.post(this.$http.adornUrl('/login'), this.dataForm)
+						.then(({ data: res }) => {
+							if (res.code !== 200) {
+								// this.getCaptcha()
+								return this.$message.error(res.msg)
+							}
+							Cookies.set('token', res.data.token)
+							this.$router.replace({ name: 'home' })
+						})
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
+	}
 }
 </script>