Merge remote-tracking branch 'origin/master' into master

src/layout/components/AppMain.vue

@@ -47,7 +47,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
   .fixed-header {
-    // padding-right: 15px;
+    padding-right: 15px;
   }
 }
 </style>

src/views/mesCenter/msgConfig.vue

@@ -63,7 +63,7 @@
                   v-hasPermi="['zt:messageConfigList:update']"
                   type="text"
                   size="mini"
-                  style="color: #49cec9"
+                  style="color: #25B86E"
                   @click="handleEdit(scope.row)"
                 >修改</el-button>
                 <el-button v-hasPermi="['zt:messageConfig:delete']" type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button>

src/views/mobileIntegrated/appManage.vue

@@ -111,7 +111,7 @@
                   v-hasPermi="['zt:application:update']"
                   type="text"
                   size="mini"
-                  style="color: #49cec9"
+                  style="color: #25B86E"
                   @click="handleEdit(scope.$index, scope.row)"
                 >修改</el-button>
                 <el-switch

src/views/system/dept/index.vue

@@ -78,7 +78,7 @@
             v-hasPermi="['sys:dept:update']"
             size="mini"
             type="text"
-            style="color: #49cec9"
+            style="color: #25B86E"
             @click="handleUpdate(scope.row)"
           >修改</el-button>
           <el-button

src/views/system/deptManage/index.vue

@@ -556,7 +556,7 @@ export default {
                color: #409eff;
              }
              .green {
-               color: #49cec9;
+               color: #25B86E;
              }
            }
          }

src/views/system/dict/data.vue

@@ -120,7 +120,7 @@
               v-hasPermi="['sys:dictConfig:edit']"
               size="mini"
               type="text"
-              style="color: #49cec9"
+              style="color: #25B86E"
               @click="handleUpdate(scope.row)"
             >修改</el-button>
             <el-button
@@ -157,12 +157,9 @@
           <el-input-number v-model="form.dictSort" style="width: 100%" controls-position="right" :min="0" />
         </el-form-item>
         <el-form-item label="参数状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in statusOptions.filter(item => { return item.dictValue })"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{ dict.dictLabel }}</el-radio>
+          <el-radio-group v-model="form.flag">
+            <el-radio v-model="form.flag" :label="'1'">启用</el-radio>
+            <el-radio v-model="form.flag" :label="'0'">停用</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
@@ -234,7 +231,16 @@ export default {
       // 是否显示弹出层
       open: false,
       // 状态数据字典
-      statusOptions: [],
+      statusOptions: [
+        {
+          dictLabel: '启用',
+          dictValue: '1'
+        },
+        {
+          dictLabel: '停用',
+          dictValue: '0'
+        }
+      ],
       // 类型数据字典
       typeOptions: [],
       // 查询参数
@@ -268,9 +274,9 @@ export default {
     const dictId = this.$route.params && this.$route.params.dictId
     this.getType(dictId)
     this.getTypeList()
-    this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
-      this.statusOptions = response.data
-    })
+    // this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
+    //   this.statusOptions = response.data
+    // })
   },
   methods: {
     // 状态

src/views/system/dict/index.vue

@@ -152,7 +152,7 @@
               v-hasPermi="['sys:dict:edit']"
               size="mini"
               type="text"
-              style="color: #49cec9"
+              style="color: #25B86E"
               @click="handleUpdate(scope.row)"
             >修改</el-button>
             <el-button
@@ -182,8 +182,8 @@
           <el-input v-model.trim="form.dictType" :maxlength="30" show-word-limit placeholder="请输入字典类型" />
         </el-form-item>
         <el-form-item label="状态" prop="flag">
-          <el-radio v-model="radio" label="1">启用</el-radio>
-          <el-radio v-model="radio" label="0">停用</el-radio>
+          <el-radio v-model="form.flag" :label="'1'">启用</el-radio>
+          <el-radio v-model="form.flag" :label="'0'">停用</el-radio>
 <!--          <el-radio-group v-model="form.flag">-->
 <!--            <el-radio-->
 <!--              v-for="dict in statusOptions"-->

src/views/system/menu/index.vue

 <template>
-  <div class="app-container">
+  <div class="app-container-menu">
     <el-form style="padding: 0 0 0 10px" :inline="true">
       <el-form-item label="菜单名称">
         <el-input
@@ -87,7 +87,7 @@
               v-hasPermi="['sys:menu:update']"
               size="mini"
               type="text"
-              style="color: #49cec9"
+              style="color: #25B86E"
               @click="handleUpdate(scope.row)"
             >修改</el-button>
             <el-switch
@@ -191,8 +191,8 @@
           <el-col :span="12" style="margin-right: 1px">
             <el-form-item v-if="form.menuType !== 'F'" label="是否外链">
               <el-radio-group v-model="form.isFrame">
-                <el-radio label="0">是</el-radio>
-                <el-radio label="1">否</el-radio>
+                <el-radio :label="0">是</el-radio>
+                <el-radio :label="1">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -582,7 +582,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.app-container {
+.app-container-menu {
   font-size: 18px;
   padding: 0;
   .placeholder{

src/views/system/post/index.vue

@@ -131,7 +131,7 @@
               v-hasPermi="['sys:post:edit']"
               size="mini"
               type="text"
-              style="color: #49cec9"
+              style="color: #25B86E"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
             >修改</el-button>

src/views/system/role/index.vue

 <template>
-  <div class="app-container">
+  <div class="app-container-role">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
       <el-form-item label="角色名称" prop="roleName">
         <el-input
@@ -106,7 +106,7 @@
               v-hasPermi="['sys:role:update']"
               size="mini"
               type="text"
-              style="color: #49cec9"
+              style="color: #25B86E"
               @click="handleUpdate(scope.row)"
             >修改</el-button>
             <el-button
@@ -134,7 +134,7 @@
       @pagination="getList"
     />
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :close-on-click-modal="false" title="角色信息" :visible.sync="open" width="550px" append-to-body destroy-on-close>
+    <el-dialog :close-on-click-modal="false" title="角色信息" :visible.sync="open" width="550px" :append-to-body="false" destroy-on-close>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入角色名称" />
@@ -180,7 +180,7 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :close-on-click-modal="false" class="roleDialog" title="数据权限信息" :visible.sync="openDataScope" width="900px" append-to-body>
+    <el-dialog :close-on-click-modal="false" class="roleDialog" title="数据权限信息" :visible.sync="openDataScope" width="900px" :append-to-body="false">
       <el-row>
         <el-col style="width: 49%">
           <el-form ref="form" :model="form" :rules="rules" label-width="70px">
@@ -529,6 +529,10 @@ export default {
               this.menuOptionDataIdList.push(item.id)
             })
           }
+          const list = document.querySelectorAll('.el-tree-node__label')
+          list.forEach(item => {
+            item.title = item.innerText
+          })
         })
       }
     },
@@ -794,7 +798,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .app-container {
+  .app-container-role {
     font-size: 18px;
     padding: 0;
 
@@ -819,3 +823,12 @@ export default {
     width: 4px;
   }
 </style>
+<style lang="scss">
+  .app-container-role {
+    .el-tree-node__label {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+</style>

src/views/system/user/index.vue

@@ -165,7 +165,7 @@
                 v-hasPermi="['sys:user:update']"
                 size="mini"
                 type="text"
-                style="color: #49cec9"
+                style="color: #25B86E"
                 @click="handleUpdate(scope.row)"
               >修改</el-button>
               <el-button
@@ -321,7 +321,7 @@
         <div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="upload.open = false">取 消</el-button>
+        <el-button @click="upload.open = false, fileList = []">取 消</el-button>
         <el-button :loading="importLoading" type="primary" @click="submitFileForm">确 定</el-button>
       </div>
     </el-dialog>
@@ -970,6 +970,7 @@ export default {
     handleImport() {
       this.upload.title = '用户导入'
       this.upload.open = true
+      this.fileList = []
     },
     /** 下载模板操作 */
     importTemplate() {
@@ -996,6 +997,7 @@ export default {
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
       this.$alert(response.msg, '导入结果', { dangerouslyUseHTMLString: true })
+      this.fileList = []
       this.getList()
     },
     // 提交上传文件
@@ -1009,7 +1011,7 @@ export default {
         this.upload.open = true
       } else { // 根据后台需求数据格式
         var formData = new FormData() // 当前为空
-        formData.append('file', this.fileList)
+        formData.append('file', this.fileList[0])
         importExcel(formData).then(res => {
           if (res.code === 200) {
             if (res.data.filename === null) {
@@ -1038,8 +1040,8 @@ export default {
             this.$message.info('上传超时,请重新上传')
             this.importLoading = false
           }
+          this.importLoading = false
         }).catch(err => {
-          this.$message.success(err.message)
           this.importLoading = false
         })
       }
@@ -1048,7 +1050,7 @@ export default {
       if (fileList.length > 1) {
         fileList.splice(0, 1)
       }
-      this.fileList = fileList[0].raw
+      this.fileList = [fileList[0].raw]
     },
     handleRemove(file, fileList) {
       this.fileList = []

src/views/workflow/group/index.vue

@@ -93,7 +93,7 @@
                   v-hasPermi="['zt:workflowGroup:update']"
                   type="text"
                   size="mini"
-                  style="color: #49cec9"
+                  style="color: #25B86E"
                   @click="handleEdit(scope.$index, scope.row)"
                 >修改</el-button>
                 <el-button v-hasPermi="['zt:workflowGroup:delete']" type="text" size="mini" @click="handleDelete(scope.$index, scope.row)">删除</el-button>