Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/monitor/errorLog/index.vue
#	src/views/monitor/operLog/index.vue

src/router/index.js

@@ -81,21 +81,21 @@ export const constantRoutes = [
       meta: { title: '修改密码', icon: 'dashboard' }
     }]
   },
-  {
-    path: '/formManage',
-    component: Layout,
-    name: 'formManage',
-    redirect: '/formManage/imgForm',
-    meta: { title: '表单管理', icon: 'dashboard' },
-    showFather: 'true',
-    children: [{
-      path: '/formManage/imgForm',
-      name: 'imgForm',
-      component: () => import('@/views/formManage/imgForm'),
-      meta: { title: '图片菜单', icon: 'dashboard' }
-    }
-    ]
-  },
+  // {
+  //   path: '/formManage',
+  //   component: Layout,
+  //   name: 'formManage',
+  //   redirect: '/formManage/imgForm',
+  //   meta: { title: '表单管理', icon: 'dashboard' },
+  //   showFather: 'true',
+  //   children: [{
+  //     path: '/formManage/imgForm',
+  //     name: 'imgForm',
+  //     component: () => import('@/views/formManage/imgForm'),
+  //     meta: { title: '图片菜单', icon: 'dashboard' }
+  //   }
+  //   ]
+  // },
   {
     path: '/onlyOffice',
     component: (resolve) => require(['@/views/onlyOffice.vue'], resolve),

src/views/monitor/errorLog/index.vue

@@ -295,7 +295,7 @@ export default {
     getList() {
       this.loading = true
       list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        if (response.rows !== undefined){
+        if (response.rows !== undefined) {
           this.list = response.rows.map(item => {
             const title = item.title
             if (title) {

src/views/monitor/operLog/index.vue

@@ -340,21 +340,21 @@ export default {
     getList() {
       this.loading = true
       list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          if (response.rows !== undefined) {
-            this.list = response.rows.map(item => {
-              const title = item.title
-              if (title) {
-                const temp = title.split('-')
-                const systemMode = temp.filter((item, index) => { return index < temp.length - 1 }).join('-')
-                item.systemMode = systemMode
-                item.optionName = temp[temp.length - 1]
-              } else {
-                item.systemMode = undefined
-                item.optionName = undefined
-              }
-              return item
-            })
-          }
+        if (response.rows !== undefined) {
+          this.list = response.rows.map(item => {
+            const title = item.title
+            if (title) {
+              const temp = title.split('-')
+              const systemMode = temp.filter((item, index) => { return index < temp.length - 1 }).join('-')
+              item.systemMode = systemMode
+              item.optionName = temp[temp.length - 1]
+            } else {
+              item.systemMode = undefined
+              item.optionName = undefined
+            }
+            return item
+          })
+        }
         this.total = response.total
         this.loading = false
       }

src/views/system/menu/index.vue

@@ -257,7 +257,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div  slot="footer" class="dialog-footer">
         <el-button class="cancelBtn" @click="cancel">取 消</el-button>
         <el-button class="submitBtn" type="primary" @click="submitForm">确 定</el-button>
       </div>
@@ -447,7 +447,7 @@ export default {
         isProcess: '1',
         flag: '0'
       }
-      this.resetForm('form')
+      // this.resetForm('form')
     },
     /** 查询按钮操作 */
     handleQuery() {

vue.config.js

@@ -61,7 +61,8 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://49.232.167.247:20014/`,
         // target: `http://192.168.10.185:8084/`,
-        target: `http://106.3.97.198:20062/`,
+        // target: `http://106.3.97.198:20062/`,
+        target: `http://localhost:8082/`,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }