From 8b060b8bf1238598f467d8628f69077146e05a0c Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 4 Aug 2022 15:42:36 +0800
Subject: [PATCH] =?UTF-8?q?add=20prettierrc=20&=20=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierrc                                   |  11 +
 .../ren-dept-tree/src/ren-dept-tree.vue       |   2 +-
 .../ren-region-tree/src/ren-region-tree.vue   |   2 +-
 src/views/main-navbar.vue                     |   2 +-
 src/views/main.vue                            | 214 ++++----
 .../code/equipmenplcconnect-add-or-update.vue | 329 ++++++------
 .../code/equipmenstatuslog-add-or-update.vue  | 393 +++++++--------
 src/views/modules/code/equipment.vue          | 472 ++++++------------
 .../modules/job/schedule-add-or-update.vue    |   2 +-
 src/views/modules/job/schedule-log.vue        |   2 +-
 src/views/modules/oss/oss-config.vue          | 414 ++++++++-------
 src/views/modules/sys/dept-add-or-update.vue  | 292 +++++------
 .../modules/sys/dict-data-add-or-update.vue   | 189 +++----
 .../modules/sys/dict-type-add-or-update.vue   |   2 +-
 src/views/modules/sys/menu-add-or-update.vue  | 419 ++++++++--------
 .../modules/sys/params-add-or-update.vue      |   2 +-
 src/views/modules/sys/role-add-or-update.vue  |   6 +-
 src/views/modules/sys/user-add-or-update.vue  |   4 +-
 18 files changed, 1274 insertions(+), 1483 deletions(-)
 create mode 100644 .prettierrc

diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..fb44611
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,11 @@
+{
+  "singleQuote": true,
+  "tabWidth": 2,
+  "bracketSameLine": true,
+  "embeddedLanguageFormatting": "auto",
+  "printWidth": 180,
+  "quoteProps": "consistent",
+  "trailingComma": "none",
+  "semi": false,
+  "useTabs": true
+}
\ No newline at end of file
diff --git a/src/components/ren-dept-tree/src/ren-dept-tree.vue b/src/components/ren-dept-tree/src/ren-dept-tree.vue
index 461aed1..7c1c7e3 100644
--- a/src/components/ren-dept-tree/src/ren-dept-tree.vue
+++ b/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)
         }
diff --git a/src/components/ren-region-tree/src/ren-region-tree.vue b/src/components/ren-region-tree/src/ren-region-tree.vue
index 9036a24..c99003a 100644
--- a/src/components/ren-region-tree/src/ren-region-tree.vue
+++ b/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)
         }
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 741b933..1d1013c 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -94,7 +94,7 @@ export default {
             return this.$message.error(res.msg)
           }
           clearLoginInfo()
-          this.$router.push({ name: 'login' })
+          this.$router.push({ name: "Login" })
         }).catch(() => {})
       }).catch(() => {})
     }
diff --git a/src/views/main.vue b/src/views/main.vue
index eeb443e..2a223d3 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -1,118 +1,108 @@
 <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>
-import MainNavbar from "./main-navbar";
-import MainSidebar from "./main-sidebar";
-import MainContent from "./main-content";
-import debounce from "lodash/debounce";
+import MainNavbar from './main-navbar'
+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(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(() => {});
-    },
-  },
-};
+	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>
diff --git a/src/views/modules/code/equipmenplcconnect-add-or-update.vue b/src/views/modules/code/equipmenplcconnect-add-or-update.vue
index 72766d2..c7edf67 100644
--- a/src/views/modules/code/equipmenplcconnect-add-or-update.vue
+++ b/src/views/modules/code/equipmenplcconnect-add-or-update.vue
@@ -1,183 +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>
+	<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/equipmenplcconnect/info/${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/equipmenplcconnect/${!this.dataForm.id ? 'save' : 'update'}`),
-              method: '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)
-              }
-            })
-          }
-        })
-      }
-    }
-  }
+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/equipmenplcconnect/info/${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/equipmenplcconnect/${!this.dataForm.id ? 'save' : 'update'}`),
+						method: '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>
diff --git a/src/views/modules/code/equipmenstatuslog-add-or-update.vue b/src/views/modules/code/equipmenstatuslog-add-or-update.vue
index c68898b..739ccc6 100644
--- a/src/views/modules/code/equipmenstatuslog-add-or-update.vue
+++ b/src/views/modules/code/equipmenstatuslog-add-or-update.vue
@@ -1,219 +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>
+	<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/equipmenstatuslog/info/${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/equipmenstatuslog/${!this.dataForm.id ? 'save' : 'update'}`),
-              method: '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)
-              }
-            })
-          }
-        })
-      }
-    }
-  }
+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/equipmenstatuslog/info/${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/equipmenstatuslog/${!this.dataForm.id ? 'save' : 'update'}`),
+						method: '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>
diff --git a/src/views/modules/code/equipment.vue b/src/views/modules/code/equipment.vue
index 7068b13..7bad911 100644
--- a/src/views/modules/code/equipment.vue
+++ b/src/views/modules/code/equipment.vue
@@ -1,314 +1,168 @@
 <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-button v-if="$hasPermission('monitoring:equipment: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="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="enName"
-        header-align="center"
-        align="center"
-        label="英文名称">
-      </el-table-column>
-      <el-table-column
-        prop="abbr"
-        header-align="center"
-        align="center"
-        label="缩写">
-      </el-table-column>
-      <el-table-column
-        prop="enterTime"
-        header-align="center"
-        align="center"
-        label="进厂日期">
-      </el-table-column>
-      <el-table-column
-        prop="productionTime"
-        header-align="center"
-        align="center"
-        label="生产日期">
-      </el-table-column>
-      <el-table-column
-        prop="equipmentTypeId"
-        header-align="center"
-        align="center"
-        label="设备类型，关联设备类型表">
-      </el-table-column>
-      <el-table-column
-        prop="groupId"
-        header-align="center"
-        align="center"
-        label="分组id （关联 T_EQUIPMENT_GROUP）">
-      </el-table-column>
-      <el-table-column
-        prop="dataType"
-        header-align="center"
-        align="center"
-        label="0:无类别，1:上片数据设备，2:下片数据设备">
-      </el-table-column>
-      <el-table-column
-        prop="tvalue"
-        header-align="center"
-        align="center"
-        label="每小时生产数量">
-      </el-table-column>
-      <el-table-column
-        prop="processingTime"
-        header-align="center"
-        align="center"
-        label="单件加工时间 s/件">
-      </el-table-column>
-      <el-table-column
-        prop="manufacturer"
-        header-align="center"
-        align="center"
-        label="制造商">
-      </el-table-column>
-      <el-table-column
-        prop="spec"
-        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
-        prop="externalCodeStatis"
-        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>
-    <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>
+	<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-button v-if="$hasPermission('monitoring:equipment: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="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="enName" header-align="center" align="center" label="英文名称"> </el-table-column>
+			<el-table-column prop="abbr" header-align="center" align="center" label="缩写"> </el-table-column>
+			<el-table-column prop="enterTime" header-align="center" align="center" label="进厂日期"> </el-table-column>
+			<el-table-column prop="productionTime" header-align="center" align="center" label="生产日期"> </el-table-column>
+			<el-table-column prop="equipmentTypeId" header-align="center" align="center" label="设备类型，关联设备类型表"> </el-table-column>
+			<el-table-column prop="groupId" header-align="center" align="center" label="分组id （关联 T_EQUIPMENT_GROUP）"> </el-table-column>
+			<el-table-column prop="dataType" header-align="center" align="center" label="0:无类别，1:上片数据设备，2:下片数据设备"> </el-table-column>
+			<el-table-column prop="tvalue" header-align="center" align="center" label="每小时生产数量"> </el-table-column>
+			<el-table-column prop="processingTime" header-align="center" align="center" label="单件加工时间 s/件"> </el-table-column>
+			<el-table-column prop="manufacturer" header-align="center" align="center" label="制造商"> </el-table-column>
+			<el-table-column prop="spec" 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 prop="externalCodeStatis" 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>
+		<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'
-  export default {
-    data () {
-      return {
-        dataForm: {
-          key: ''
-        },
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false
-      }
-    },
-    components: {
-      AddOrUpdate
-    },
-    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.list
-            this.totalPage = 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/delete'),
-            method: 'post',
-            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)
-            }
-          })
-        })
-      }
-    }
-  }
+import AddOrUpdate from './equipment-add-or-update'
+export default {
+	data() {
+		return {
+			dataForm: {
+				key: ''
+			},
+			dataList: [],
+			pageIndex: 1,
+			pageSize: 10,
+			totalPage: 0,
+			dataListLoading: false,
+			dataListSelections: [],
+			addOrUpdateVisible: false
+		}
+	},
+	components: {
+		AddOrUpdate
+	},
+	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.list
+					this.totalPage = 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/delete'),
+					method: 'post',
+					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>
diff --git a/src/views/modules/job/schedule-add-or-update.vue b/src/views/modules/job/schedule-add-or-update.vue
index 5808308..d036ef3 100644
--- a/src/views/modules/job/schedule-add-or-update.vue
+++ b/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)
         }
diff --git a/src/views/modules/job/schedule-log.vue b/src/views/modules/job/schedule-log.vue
index 11a7f30..bf6b2c2 100644
--- a/src/views/modules/job/schedule-log.vue
+++ b/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)
         }
diff --git a/src/views/modules/oss/oss-config.vue b/src/views/modules/oss/oss-config.vue
index bc53d5a..cfdf0bf 100644
--- a/src/views/modules/oss/oss-config.vue
+++ b/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>
diff --git a/src/views/modules/sys/dept-add-or-update.vue b/src/views/modules/sys/dept-add-or-update.vue
index 33c0de8..09c78ea 100644
--- a/src/views/modules/sys/dept-add-or-update.vue
+++ b/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>
diff --git a/src/views/modules/sys/dict-data-add-or-update.vue b/src/views/modules/sys/dict-data-add-or-update.vue
index 96a3f34..a5ff947 100644
--- a/src/views/modules/sys/dict-data-add-or-update.vue
+++ b/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>
diff --git a/src/views/modules/sys/dict-type-add-or-update.vue b/src/views/modules/sys/dict-type-add-or-update.vue
index 8ef034b..98a16a4 100644
--- a/src/views/modules/sys/dict-type-add-or-update.vue
+++ b/src/views/modules/sys/dict-type-add-or-update.vue
@@ -63,7 +63,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/sys/dict/type/${this.dataForm.id}`).then(({ data: res }) => {
+      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)
         }
diff --git a/src/views/modules/sys/menu-add-or-update.vue b/src/views/modules/sys/menu-add-or-update.vue
index 104b3b8..1cb2bbd 100644
--- a/src/views/modules/sys/menu-add-or-update.vue
+++ b/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']('/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>
diff --git a/src/views/modules/sys/params-add-or-update.vue b/src/views/modules/sys/params-add-or-update.vue
index df61ea8..52517ff 100644
--- a/src/views/modules/sys/params-add-or-update.vue
+++ b/src/views/modules/sys/params-add-or-update.vue
@@ -56,7 +56,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/sys/params/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(this.$http.adornUrl(`/sys/params/${this.dataForm.id}`)).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index 9e25109..3ee4646 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -86,7 +86,7 @@ export default {
     },
     // 获取菜单列表
     getMenuList () {
-      return this.$http.get('/sys/menu/select').then(({ data: res }) => {
+      return this.$http.get(this.$http.adornUrl('/sys/menu/select')).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -95,7 +95,7 @@ export default {
     },
     // 获取部门列表
     getDeptList () {
-      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)
         }
@@ -104,7 +104,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/sys/role/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(this.$http.adornUrl(`/sys/role/${this.dataForm.id}`)).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index b76c369..884e119 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -141,7 +141,7 @@ export default {
     },
     // 获取角色列表
     getRoleList () {
-      return this.$http.get('/sys/role/list').then(({ data: res }) => {
+      return this.$http.get(this.$http.adornUrl('/sys/role/list')).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -150,7 +150,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/sys/user/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(this.$http.adornUrl(`/sys/user/${this.dataForm.id}`)).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }