Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi-admin/src/utils/request.js

@@ -14,7 +14,7 @@ export const isRelogin = {
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // create an axios instance
 const service = axios.create({
-  baseURL: 'http://192.168.1.226:8081', // url = base url + request url
+  baseURL: 'http://182.92.7.210:8081', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 30000 // request timeout
 })

chuanyi-admin/src/views/system/dept/index.vue

@@ -3,17 +3,44 @@
     <el-row>
       <el-col :span="24">
         <!-- 表单查询 -->
-        <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
-          <el-form-item label="部门名称" prop="departmentName">
-            <el-input v-model="queryParams.departmentName" placeholder="请输入部门名称" clear />
+        <el-form
+          ref="queryForm"
+          :model="queryParams"
+          :inline="true"
+          size="small"
+        >
+          <el-form-item
+            label="部门名称"
+            prop="departmentName"
+          >
+            <el-input
+              v-model="queryParams.departmentName"
+              placeholder="请输入部门名称"
+              clear
+            />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handelSearch">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="handelReset">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handelSearch"
+            >搜索</el-button>
+            <el-button
+              icon="el-icon-refresh"
+              size="mini"
+              @click="handelReset"
+            >重置</el-button>
           </el-form-item>
         </el-form>
 
-        <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="handelAdd">新增</el-button>
+        <el-button
+          size="mini"
+          icon="el-icon-plus"
+          type="primary"
+          plain
+          @click="handelAdd"
+        >新增</el-button>
         <el-button
           type="danger"
           plain
@@ -24,18 +51,68 @@
         >批量删除</el-button>
 
         <!-- 表格数据信息 -->
-        <el-table v-loading="loading" :data="deptList" row-key="id" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column key="departmentName" label="部门名称" align="center" prop="departmentName" />
-          <el-table-column key="departmentDescribe" label="部门描述" align="center" prop="departmentDescribe" />
-          <el-table-column key="departmentNum" label="排序号" align="center" prop="departmentNum" />
-          <el-table-column key="updateTime" label="更新时间" align="center" prop="updateTime" />
-          <el-table-column key="createTime" label="创建时间" align="center" prop="createTime" />
-          <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
+        <el-table
+          v-loading="loading"
+          :data="deptList"
+          row-key="id"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="50"
+            align="center"
+          />
+          <el-table-column
+            key="departmentName"
+            label="部门名称"
+            align="center"
+            prop="departmentName"
+          />
+          <el-table-column
+            key="departmentDescribe"
+            label="部门描述"
+            align="center"
+            prop="departmentDescribe"
+          />
+          <el-table-column
+            key="departmentNum"
+            label="排序号"
+            align="center"
+            prop="departmentNum"
+          />
+          <el-table-column
+            key="updateTime"
+            label="更新时间"
+            align="center"
+            prop="updateTime"
+          />
+          <el-table-column
+            key="createTime"
+            label="创建时间"
+            align="center"
+            prop="createTime"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="250"
+            class-name="small-padding fixed-width"
+          >
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handelEdit(scope.row.id)">修改
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handelEdit(scope.row.id)"
+              >修改
               </el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" :disabled="!multiple" @click="handelDel(scope.row.id)">删除
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                :disabled="!multiple"
+                @click="handelDel(scope.row.id)"
+              >删除
               </el-button>
             </template>
           </el-table-column>
@@ -54,30 +131,64 @@
     </el-row>
 
     <!-- 弹出框 -->
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="35%">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="35%"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+      >
         <el-row>
           <el-col :span="24">
-            <el-form-item label="上级部门" prop="parentId">
-              <selectTree v-model="form.parentId" :options="options" placeholder="请选择上级部门" :key-name="keyName" />
+            <el-form-item
+              label="上级部门"
+              prop="parentId"
+            >
+              <selectTree
+                v-model="form.parentId"
+                :options="options"
+                placeholder="请选择上级部门"
+                :key-name="keyName"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="部门名称" prop="departmentName">
-              <el-input v-model="form.departmentName" clearable placeholder="请输入部门名称" />
+            <el-form-item
+              label="部门名称"
+              prop="departmentName"
+            >
+              <el-input
+                v-model="form.departmentName"
+                clearable
+                placeholder="请输入部门名称"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="部门描述" prop="departmentDescribe">
-              <el-input v-model="form.departmentDescribe" clearable placeholder="请输入部门描述" />
+            <el-form-item
+              label="部门描述"
+              prop="departmentDescribe"
+            >
+              <el-input
+                v-model="form.departmentDescribe"
+                clearable
+                placeholder="请输入部门描述"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="显示排序" prop="departmentNum">
+            <el-form-item
+              label="显示排序"
+              prop="departmentNum"
+            >
               <el-input-number
                 v-model="form.departmentNum"
                 placeholder="0"
@@ -89,8 +200,14 @@
           </el-col>
         </el-row>
       </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handelSubmit('form')">确 定</el-button>
+      <span
+        slot="footer"
+        class="dialog-footer"
+      >
+        <el-button
+          type="primary"
+          @click="handelSubmit('form')"
+        >确 定</el-button>
         <el-button @click="handelCancel('form')">取 消</el-button>
       </span>
     </el-dialog>
@@ -105,7 +222,7 @@ export default {
   data() {
     return {
       // 遮罩层
-      loading: false,
+      loading: true,
       // 查询参数
       queryParams: {
         page: 1,
@@ -157,6 +274,7 @@ export default {
           this.deptList = this.$utils.toArrayTree(data.departmentList)
           this.total = data.count
           this.getOptionsList()
+          this.loading = false
         }
       })
     },
@@ -291,5 +409,4 @@ export default {
 </script>
 
 <style lang="scss" rel="stylesheet/scss" scoped>
-
 </style>

chuanyi-admin/src/views/system/dict/dict-detail.vue

@@ -4,11 +4,11 @@
       <el-col :span="24">
         <!-- 表单查询 -->
         <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
-          <el-form-item label="字典名称" prop="dictValue">
-            <el-input v-model="queryParams.dictValue" placeholder="请输入字典名称" clear />
+          <el-form-item label="字典名称" prop="dictKey">
+            <el-input v-model="queryParams.dictKey" placeholder="请输入字典名称" clear />
           </el-form-item>
-          <el-form-item label="字典值" prop="dictKey">
-            <el-input v-model="queryParams.dictKey" placeholder="请输入字典值" clear />
+          <el-form-item label="字典值" prop="dictValue">
+            <el-input v-model="queryParams.dictValue" placeholder="请输入字典值" clear />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handelSearch">搜索</el-button>
@@ -79,15 +79,15 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="字典名称" prop="dictValue">
-              <el-input v-model="form.dictValue" clearable placeholder="请输入字典名称" />
+            <el-form-item label="字典名称" prop="dictKey">
+              <el-input v-model="form.dictKey" clearable placeholder="请输入字典名称" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="字典值" prop="dictKey">
-              <el-input v-model="form.dictKey" clearable placeholder="请输入字典值" />
+            <el-form-item label="字典值" prop="dictValue">
+              <el-input v-model="form.dictValue" clearable placeholder="请输入字典值" />
             </el-form-item>
           </el-col>
           <el-col :span="12">

chuanyi-admin/src/views/system/dict/index.vue

@@ -3,20 +3,54 @@
     <el-row>
       <el-col :span="24">
         <!-- 表单查询 -->
-        <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
-          <el-form-item label="字典名称" prop="description">
-            <el-input v-model="queryParams.description" placeholder="请输入字典名称" clear />
+        <el-form
+          ref="queryForm"
+          :model="queryParams"
+          :inline="true"
+          size="small"
+        >
+          <el-form-item
+            label="字典描述"
+            prop="description"
+          >
+            <el-input
+              v-model="queryParams.description"
+              placeholder="请输入字典描述"
+              clear
+            />
           </el-form-item>
-          <el-form-item label="字典值" prop="dictKeyType">
-            <el-input v-model="queryParams.dictKeyType" placeholder="请输入字典值" clear />
+          <el-form-item
+            label="字典类型"
+            prop="dictKeyType"
+          >
+            <el-input
+              v-model="queryParams.dictKeyType"
+              placeholder="请输入字典类型"
+              clear
+            />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handelSearch">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="handelReset">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handelSearch"
+            >搜索</el-button>
+            <el-button
+              icon="el-icon-refresh"
+              size="mini"
+              @click="handelReset"
+            >重置</el-button>
           </el-form-item>
         </el-form>
 
-        <el-button size="mini" icon="el-icon-plus" type="primary" plain @click="handelAdd">新增</el-button>
+        <el-button
+          size="mini"
+          icon="el-icon-plus"
+          type="primary"
+          plain
+          @click="handelAdd"
+        >新增</el-button>
         <el-button
           type="danger"
           plain
@@ -27,18 +61,61 @@
         >批量删除</el-button>
 
         <!-- 表格数据信息 -->
-        <el-table v-loading="loading" :data="dictList" row-key="id" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column key="description" label="字典名称" align="center" prop="description" />
-          <el-table-column key="dictKeyType" label="字典值" align="center" prop="dictKeyType">
+        <el-table
+          v-loading="loading"
+          :data="dictList"
+          row-key="id"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="50"
+            align="center"
+          />
+          <el-table-column
+            key="description"
+            label="字典描述"
+            align="center"
+            prop="description"
+          />
+          <el-table-column
+            key="dictKeyType"
+            label="字典类型"
+            align="center"
+            prop="dictKeyType"
+          />
+          <el-table-column
+            key="dictKeyValue"
+            label="字典值"
+            align="center"
+            prop="dictKeyValue"
+          >
             <template slot-scope="scope">
-              <el-link type="primary" @click="hendelTo(scope.row)">{{ scope.row.dictKeyType }}</el-link>
+              <el-link
+                type="primary"
+                @click="hendelTo(scope.row)"
+              >{{ scope.row.dictKeyValue }}</el-link>
             </template>
           </el-table-column>
-          <el-table-column key="sortNum" label="排序号" align="center" prop="sortNum" />
-          <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
+          <el-table-column
+            key="sortNum"
+            label="排序号"
+            align="center"
+            prop="sortNum"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="250"
+            class-name="small-padding fixed-width"
+          >
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handelEdit(scope.row)">修改
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handelEdit(scope.row)"
+              >修改
               </el-button>
               <el-button
                 size="mini"
@@ -65,35 +142,81 @@
     </el-row>
 
     <!-- 弹出框 -->
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="35%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="35%"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+      >
         <el-row>
           <el-col :span="12">
-            <el-form-item label="字典描述" prop="description">
-              <el-input v-model="form.description" clearable placeholder="请输入字典名称" />
+            <el-form-item
+              label="字典描述"
+              prop="description"
+            >
+              <el-input
+                v-model="form.description"
+                clearable
+                placeholder="请输入字典描述"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="字典类型" prop="dictKeyValue">
-              <el-input v-model="form.dictKeyValue" clearable placeholder="请输入字典名称" />
+            <el-form-item
+              label="字典类型"
+              prop="dictKeyType"
+            >
+              <el-input
+                v-model="form.dictKeyType"
+                clearable
+                placeholder="请输入字典类型"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="字典值" prop="dictKeyType">
-              <el-input v-model="form.dictKeyType" clearable placeholder="请输入字典值" />
+            <el-form-item
+              label="字典值"
+              prop="dictKeyValue"
+            >
+              <el-input
+                v-model="form.dictKeyValue"
+                clearable
+                placeholder="请输入字典值"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="显示排序" prop="sortNum">
-              <el-input-number v-model="form.sortNum" placeholder="0" controls-position="right" :min="1" :max="10" />
+            <el-form-item
+              label="显示排序"
+              prop="sortNum"
+            >
+              <el-input-number
+                v-model="form.sortNum"
+                placeholder="0"
+                controls-position="right"
+                :min="1"
+                :max="10"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handelSubmit('form')">确 定</el-button>
+      <span
+        slot="footer"
+        class="dialog-footer"
+      >
+        <el-button
+          type="primary"
+          @click="handelSubmit('form')"
+        >确 定</el-button>
         <el-button @click="handelCancel('form')">取 消</el-button>
       </span>
     </el-dialog>
@@ -106,7 +229,7 @@ export default {
   data() {
     return {
       // 遮罩层
-      loading: false,
+      loading: true,
       // 查询参数
       queryParams: {
         page: 1,
@@ -129,9 +252,12 @@ export default {
       // 表单验证
       rules: {
         description: [
-          { required: true, message: '字典名称不能为空', trigger: 'blur' }
+          { required: true, message: '字典描述不能为空', trigger: 'blur' }
         ],
         dictKeyType: [
+          { required: true, message: '字典类型不能为空', trigger: 'blur' }
+        ],
+        dictKeyValue: [
           { required: true, message: '字典值不能为空', trigger: 'blur' }
         ],
         sortNum: [
@@ -156,6 +282,7 @@ export default {
         const data = res.data
         this.dictList = data.dictTypes
         this.total = data.count
+        this.loading = false
       })
     },
     /** 搜索 */
@@ -179,6 +306,7 @@ export default {
       this.form = row
       this.dialogVisible = true
       this.title = '修改字典'
+      this.reset()
     },
     /** 表格多选 */
     handleSelectionChange(val) {
@@ -281,5 +409,4 @@ export default {
 </script>
 
 <style lang="scss" rel="stylesheet/scss" scoped>
-
 </style>

chuanyi-admin/src/views/system/menu/menu-auth.vue

@@ -63,7 +63,7 @@ export default {
   data() {
     return {
       // 遮罩层
-      loading: false,
+      loading: true,
       // 非多个禁用
       multiple: true,
       // 总条数

chuanyi-admin/src/views/system/menu/menu-dist.vue

@@ -14,7 +14,7 @@
           批量分配</el-button>
       </el-col>
     </el-row>
-    <el-table ref="multipleTable" :data="addMenuAuthList" row-key="id" @selection-change="handelAddMenuAuth">
+    <el-table ref="multipleTable" v-loading="loading" :data="addMenuAuthList" row-key="id" @selection-change="handelAddMenuAuth">
       <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
       <el-table-column label="接口名称" prop="permissionUrl" :show-overflow-tooltip="true" align="center" />
       <el-table-column label="备注" prop="permissionName" :show-overflow-tooltip="true" align="center" />
@@ -64,7 +64,9 @@ export default {
       // 添加菜单权限按钮禁用
       distribution: true,
       // 开关弹框
-      dialogVisible: false
+      dialogVisible: false,
+      // 加载状态
+      loading: true
     }
   },
   created() {
@@ -79,6 +81,7 @@ export default {
         const data = res.data
         this.addMenuAuthList = data.permissionList
         this.addTotal = data.count
+        this.loading = false
       })
     },
     /** 添加菜单权限多选框选中数据 */

chuanyi-admin/src/views/system/role/user-auth.vue

@@ -79,7 +79,7 @@ export default {
   data() {
     return {
       // 遮罩层
-      loading: false,
+      loading: true,
       // 选中用户组
       userIds: [],
       // 非多个禁用

chuanyi-admin/src/views/system/role/user-menu.vue

@@ -1,8 +1,17 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10" class="mb8">
+    <el-row
+      :gutter="10"
+      class="mb8"
+    >
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handelAdd">添加菜单</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handelAdd"
+        >添加菜单</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -16,18 +25,57 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-close" size="mini" @click="handleClose">关闭</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-close"
+          size="mini"
+          @click="handleClose"
+        >关闭</el-button>
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="menuList" row-key="id" @selection-change="handelDelDist">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="菜单名称" prop="menuName" :show-overflow-tooltip="true" />
-      <el-table-column label="菜单图标" prop="menuIcon" :show-overflow-tooltip="true" />
-      <el-table-column label="菜单路径" prop="menuUrl" :show-overflow-tooltip="true" />
-      <el-table-column label="更新时间" prop="updateTime" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" prop="createTime" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+    <el-table
+      v-loading="loading"
+      :data="menuList"
+      row-key="id"
+      @selection-change="handelDelDist"
+    >
+      <el-table-column
+        type="selection"
+        width="55"
+        align="center"
+      />
+      <el-table-column
+        label="菜单名称"
+        prop="menuName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="菜单图标"
+        prop="menuIcon"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="菜单路径"
+        prop="menuUrl"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="更新时间"
+        prop="updateTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="创建时间"
+        prop="createTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             type="danger"
@@ -42,19 +90,55 @@
       </el-table-column>
     </el-table>
 
-    <el-dialog title="分配菜单" :visible.sync="dialogVisible" width="35%">
+    <el-dialog
+      title="分配菜单"
+      :visible.sync="dialogVisible"
+      width="35%"
+    >
       <el-row>
         <el-col>
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" :disabled="distribution" @click="handleDel">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            :disabled="distribution"
+            @click="handleDel"
+          >
             批量分配</el-button>
         </el-col>
       </el-row>
-      <el-table :data="addMenuList" row-key="id" @selection-change="handelAddDist">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="菜单名称" prop="menuName" :show-overflow-tooltip="true" />
-        <el-table-column label="菜单图标" prop="menuIcon" :show-overflow-tooltip="true" />
-        <el-table-column label="菜单路径" prop="menuUrl" :show-overflow-tooltip="true" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table
+        v-loading="distLoading"
+        :data="addMenuList"
+        row-key="id"
+        @selection-change="handelAddDist"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"
+        />
+        <el-table-column
+          label="菜单名称"
+          prop="menuName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="菜单图标"
+          prop="menuIcon"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="菜单路径"
+          prop="menuUrl"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+        >
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -80,6 +164,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      // 弹出框表格加载状态
+      distLoading: true,
       // 分配菜单参数
       distObj: {
         id: this.$route.params.userId,
@@ -123,6 +209,7 @@ export default {
       getMenuListTree().then(res => {
         const data = res.data
         this.addMenuList = data
+        this.distLoading = false
       })
     },
     /** 返回按钮 */