修改界面

industry-admin/.env.development

@@ -3,4 +3,4 @@ ENV = 'development'
 
 # base api
  VUE_APP_BASE_API = 'http://localhost:8081'
-#VUE_APP_BASE_API = 'http://192.168.1.253:8081'
+# VUE_APP_BASE_API = 'http://192.168.1.253:8081'

industry-admin/src/components/CommonTable/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-table ref="table" :height="tableHight" :data="tableData" border :stripe="true" style="width: 100%"
+    <el-table ref="table" :data="tableData" :stripe="true" style="width: 100%"
         @selection-change="handleSelectionChange" row-key="id"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
         <el-table-column align="center" v-if="isShowCheckbox" type="selection" width="55" fixed></el-table-column>

industry-admin/src/styles/element-ui.scss

@@ -53,6 +53,9 @@
   position: relative;
   margin: 0 auto;
 }
+.el-dialog__header{
+  text-align: center;
+}
 
 // refine element ui upload
 .upload-container {

industry-admin/src/styles/index.scss

@@ -14,7 +14,7 @@ body {
 }
 
 label {
-  font-weight: 700;
+  font-weight: 400;
 }
 
 html {

industry-admin/src/views/report/reportTable/downloadReportType.vue

@@ -0,0 +1,36 @@
+<template>
+    <!-- 报表下载类型选择 -->
+    <el-dialog title="选择下载类型" width="500px" center v-dialog-drag v-if="visible" :before-close="dialogClose"
+        :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true">
+        <div style="text-align: center">
+            <el-radio v-model="downloadType" label="1">Excel</el-radio>
+            <el-radio v-model="downloadType" label="2">PDF</el-radio>
+        </div>
+        <div style="text-align: center; margin-top: 40px">
+            <el-button type="primary" @click="downloadReportEvent">确定</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { showAlertMsgWin, getNowFormatDate, showLoading, } from "@/utils/cqcy";
+export default {
+
+    data() {
+        return {
+            visible: false,
+            downloadType: "1"
+        }
+    },
+    methods: {
+        /** 关闭弹出层 */
+        dialogClose() {
+            this.visible = false
+        },
+        /** 下载报表事件 */
+        downloadReportEvent() {
+            this.$emit('downloadReportEvent', this.downloadType)
+        }
+    }
+}
+</script>

industry-admin/src/views/report/reportTable/reportDetail.vue

@@ -2,14 +2,22 @@
   <div class="sy-content">
     <el-row>
       <el-col :span="12">
-        报表名称：
+        <div class="breadcrumb-content">
+          <div class="breadcrumb-head"></div>
+          <div aria-label="Breadcrumb" role="navigation" class="el-breadcrumb"><!---->
+            <span class="el-breadcrumb__item" aria-current="page">
+              <span role="link" class="el-breadcrumb__inner">{{reportTableName}}</span>
+              <i class="el-breadcrumb__separator el-icon-arrow-right"></i>
+            </span>
+          </div>
+        </div>
       </el-col>
       <el-col :span="12">
         <!-- 操作按钮 -->
         <el-row class="czBtns" type="flex" justify="end">
           <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-download" size="small"
-                       @click="downloadReport">下载</el-button>
+<!--            <el-button type="primary" icon="el-icon-download" size="small"-->
+<!--                       @click="downloadReport">下载</el-button>-->
           </el-col>
           <el-col :span="1.5" style="margin-left: 15px">
             <el-button type="primary" size="small" icon="el-icon-printer" @click="printReport">
@@ -28,13 +36,20 @@
         </div>
       </el-col>
     </el-row>
+    <!-- 选择下载类型弹出层 -->
+    <DownloadReportType ref="downloadReportType" @downloadReportEvent=downloadReportEvent></DownloadReportType>
   </div>
 </template>
 
 <script>
+import DownloadReportType from './downloadReportType.vue'
 import { getToken } from '@/utils/auth'
 
-export default {
+export default
+{
+  components: {
+    DownloadReportType
+  },
     watch: {
         '$route.query.t': {
             handler(now, old) {
@@ -50,11 +65,22 @@ export default {
     data() {
         return {
             reportId: this.$route.query.id,
+            reportTableName:this.$route.query.reportname,
             type:'',
+            reportInterval:3,
             iframeSrc: process.env.VUE_APP_BASE_API + '/reportSheet/report-history.html',
         }
     },
-    methods: {
+    created() {
+      //this.pollingReportData()
+    },
+  methods: {
+      /** 轮询更新报表数据 */
+      pollingReportData() {
+        setInterval(() => {
+          this.sendToken()
+        }, that.reportInterval * 1000);
+      },
         sendToken() {
             const _this = this
             _this.sendMsg({
@@ -77,11 +103,18 @@ export default {
             document.getElementById('myIframe').contentWindow.postMessage(msg, '*')
         },
       downloadReport(){
+        this.$refs.downloadReportType.visible = true
+      },
+      /** 下载报表事件 */
+      downloadReportEvent(downloadType) {
 
       },
       printReport(){
         this.type="print"
         this.sendToken();
+        // this.sendMsg({
+        //   cmd: 'print',
+        // })
       },
     },
     destroyed() {
@@ -92,3 +125,13 @@ export default {
 
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+.breadcrumb-head {
+  width: 5px;
+  height: 15px;
+  background: #275da2;
+  margin-right: 10px;
+  float: left;
+}
+</style>
+

industry-admin/src/views/report/runConfig/index.vue

@@ -243,7 +243,7 @@ export default {
         reportNameClick(data) {
             this.$router.push({
                 path: '/reportTable/reportDetail'
-                , query: { id: data.id }
+                , query: { id: data.id,reportname:data.reportTableName}
             })
         },
         /** 运行记录 */

industry-admin/src/views/report/runConfig/runRecord.vue

@@ -113,7 +113,10 @@ export default {
         reportNameClick(data) {
             this.$router.push({
                 path: '/reportTable/reportDetail'
-                , query: { id: data.id }
+                , query: {
+                  id: data.id,
+                  reportname:data.reportTableName
+              }
             })
         },
         /** 获取运行记录报表 */

industry-admin/src/views/report/runConfig/timeConfig.vue

@@ -70,7 +70,7 @@
                     </el-col>
                 </el-row>
             </el-form>
-            <div slot="footer">
+            <div slot="footer" style="text-align: right">
                 <el-button v-if="reportForm.runState == 0" size="mini" type="primary" @click="saveReportConfig" style="margin-top: 20px">确定</el-button>
                 <el-button size="mini" @click="dialogClose" style="margin-top: 20px">取消</el-button>
             </div>

industry-admin/src/views/report/tableTemplate/index.vue

@@ -84,7 +84,8 @@ export default {
         const loading = showLoading(this, '加载中，请稍候···')
         const task = setInterval(() => {
             loading.close()
-        }, 200)
+        }, 200);
+        this.pollingReportData()
     },
     components: {
         CommonTable
@@ -160,8 +161,9 @@ export default {
         }
     },
     methods: {
-      load() {
 
+      load() {
+            console.log(this.reportId)
             const _this = this
       const files = localStorage.getItem('IMPORT_FILES_JSON')
             _this.sendMsg({
@@ -330,13 +332,6 @@ export default {
           this.reportId = this.chooseReportData.id;
           this.type = 'export';
           this.load();
-          // this.$router.push({
-          //   path: '/tableTemplate/templateDetail'
-          //   , query: {
-          //     id: this.chooseReportData.id,
-          //     type: 'export'
-          //   }
-          // })
         },
         /** 新增报表设计 */
         addTableTemplateEvent() {

industry-admin/src/views/source/dataQuery/index.vue

@@ -56,7 +56,7 @@
                         </el-col>
                         <el-col :xl="5">
                             <el-form-item label="数据项" prop="itemListTitile">
-                                <el-input :title="chartForm.itemListTitile" v-model="chartForm.itemListTitile" disabled
+                                <el-input :title="chartForm.itemListTitile" v-model="chartForm.itemListTitile" readonly
                                     placeholder="请选择数据项" maxlength="10" style="width: 200px;">
                                     <el-button size="mini" type="primary" slot="append" icon="el-icon-search"
                                         @click="chooseItemEvent">选择</el-button>

industry-admin/src/views/source/dataSource/index.vue

@@ -127,7 +127,7 @@
           </el-form-item>
         </el-form>
         <div slot='footer'>
-          <el-button type="warning" size="mini" @click='testConnectHandle()'>连接测试</el-button>
+          <el-button type="primary" size="mini" @click='testConnectHandle()'>连接测试</el-button>
           <el-button type="primary" size="mini" @click='confirmHandle()'>保存</el-button>
           <el-button @click='handleConfigClose' size="mini">取消</el-button>
         </div>

industry-admin/src/views/source/itemGroup/itemChoose.vue

@@ -12,7 +12,7 @@
                     <el-input type="textarea" v-model="itemGroupForm.groupDescribe" placeholder="请输入备注"
                         maxlength="100"></el-input>
                 </el-form-item>
-                <el-divider content-position="left">请选择数据源</el-divider>
+                <el-divider content-position="left">请选择数据源1</el-divider>
                 <div class="cy-line">
                     <el-form-item prop="dataSourceId">
                         <el-select v-model="itemGroupForm.dataSourceId" filterable placeholder="请选择数据源"

industry-admin/src/views/system/auth/index.vue

@@ -5,7 +5,7 @@
         <!-- 表单查询 -->
         <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
           <el-form-item label="" prop="permissionName">
-            <el-input v-model="queryParams.permissionName" prefix-icon="el-icon-search" placeholder="请输入权限名称" clear />
+            <el-input v-model="queryParams.permissionName" prefix-icon="el-icon-search" placeholder="请输入名称" clear />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="small" @click="handelSearch">搜索</el-button>
@@ -23,7 +23,7 @@
       <el-col :span="24">
 
         <!-- 表格数据信息 -->
-        <el-table height="62vh" v-loading="loading" :data="authList" border stripe header-row-class-name="headBackground">
+        <el-table v-loading="loading" :data="authList" stripe header-row-class-name="headBackground">
           <el-table-column width="50" align="center" label="序号">
             <template slot-scope="scope">
               {{ (queryParams.page - 1) * queryParams.limit + scope.$index + 1 }}
@@ -31,12 +31,12 @@
           </el-table-column>
           <el-table-column
             key="permissionName"
-            label="权限名称"
+            label="名称"
             align="center"
             prop="permissionName"
             show-overflow-tooltip
           />
-          <el-table-column key="permissionUrl" label="权限路径" align="center" prop="permissionUrl" />
+          <el-table-column key="permissionUrl" label="路径" align="center" prop="permissionUrl" />
           <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)">修改
@@ -64,15 +64,15 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col>
-            <el-form-item label="权限名称" prop="permissionName">
-              <el-input v-model.trim="form.permissionName" placeholder="请输入权限名称" />
+            <el-form-item label="名称" prop="permissionName">
+              <el-input v-model.trim="form.permissionName" placeholder="请输入名称" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col>
-            <el-form-item label="权限路径" prop="permissionUrl">
-              <el-input v-model.trim="form.permissionUrl" placeholder="请输入权限路径" />
+            <el-form-item label="路径" prop="permissionUrl">
+              <el-input v-model.trim="form.permissionUrl" placeholder="请输入路径" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -92,7 +92,7 @@ export default {
     const valitatorUrl = (rule, value, callback) => {
       var reg = /^([A-Za-z/]*)$/
       if (!value) {
-        callback(new Error('权限路径不能为空'))
+        callback(new Error('路径不能为空'))
       }
       if (!(reg.test(value))) {
         callback(new Error('只能输入斜杠和英文'))
@@ -127,7 +127,7 @@ export default {
       // 表单验证
       rules: {
         permissionName: [
-          { required: true, message: '权限名称不能为空', trigger: 'blur' }
+          { required: true, message: '名称不能为空', trigger: 'blur' }
         ],
         permissionUrl: [
           { required: true, trigger: 'blur', validator: valitatorUrl }
@@ -165,7 +165,7 @@ export default {
     handelAdd() {
       this.reset()
       this.dialogVisible = true
-      this.title = '添加权限'
+      this.title = '新增权限'
     },
     /** 修改按钮 */
     handelEdit(id) {
@@ -206,7 +206,7 @@ export default {
     handelSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.title === '添加权限') {
+          if (this.title === '新增权限') {
             addAuthList(this.form).then(res => {
               if (res.code === 200) {
                 this.$message({

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

@@ -14,7 +14,7 @@
               <el-input
                 v-model="queryParams.departmentName"
                 prefix-icon="el-icon-search"
-                placeholder="请输入部门名称"
+                placeholder="请输入名称"
                 clear
               />
             </el-form-item>
@@ -56,11 +56,11 @@
         <el-col :span="24">
 
           <!-- 表格数据信息 -->
-          <el-table height="62vh"
+          <el-table
+
             ref="table"
             :data="mulData"
             row-key="id"
-            border
             header-row-class-name="headBackground"
             @select="select"
             @select-all="selectAll"
@@ -68,13 +68,13 @@
           >
             <el-table-column type="selection" align="left" />
             <el-table-column
-              label="部门名称"
+              label="名称"
               prop="departmentName"
               show-overflow-tooltip
               header-align="left"
             />
             <el-table-column
-              label="部门描述"
+              label="描述"
               prop="departmentDescribe"
               show-overflow-tooltip
               align="left"
@@ -157,23 +157,23 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="部门名称" prop="departmentName">
+              <el-form-item label="名称" prop="departmentName">
                 <el-input
                   v-model.trim="form.departmentName"
                   maxlength="15"
                   clearable
-                  placeholder="请输入部门名称"
+                  placeholder="请输入名称"
                 />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="部门描述" prop="departmentDescribe">
+              <el-form-item label="描述" prop="departmentDescribe">
                 <el-input
                   v-model.trim="form.departmentDescribe"
                   clearable
-                  placeholder="请输入部门描述"
+                  placeholder="请输入描述"
                 />
               </el-form-item>
             </el-col>
@@ -329,7 +329,7 @@ export default {
     handelAdd() {
       this.dialogVisible = true
       this.key++
-      this.title = '添加部门'
+      this.title = '新增部门'
       this.getOptionsList()
       this.reset()
     },
@@ -446,7 +446,7 @@ export default {
     handelSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.title === '添加部门') {
+          if (this.title === '新增部门') {
             addDept(this.form).then((res) => {
               if (res.code === 200) {
                 this.$message({

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

@@ -5,7 +5,7 @@
         <!-- 表单查询 -->
         <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
           <el-form-item label="" prop="dictKey">
-            <el-input v-model="queryParams.dictKey" prefix-icon="el-icon-search" placeholder="请输入字典名称" clear />
+            <el-input v-model="queryParams.dictKey" prefix-icon="el-icon-search" placeholder="请输入名称" clear />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="small" @click="handelSearch">搜索</el-button>
@@ -36,15 +36,14 @@
           ref="table"
           :data="mulData"
           row-key="id"
-          border
           header-row-class-name="headBackground"
           @select="select"
           @select-all="selectAll"
           @selection-change="selectChange"
         >
           <el-table-column type="selection" align="left" />
-          <el-table-column label="字典名称" prop="dictKey" show-overflow-tooltip header-align="left" />
-          <el-table-column label="字典值" prop="dictValue" show-overflow-tooltip align="left" />
+          <el-table-column label="名称" prop="dictKey" show-overflow-tooltip header-align="left" />
+          <el-table-column label="值" prop="dictValue" show-overflow-tooltip align="left" />
           <el-table-column label="排序号" prop="sortNum" show-overflow- align="left" width=100 />
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
             <template slot-scope="scope">
@@ -86,15 +85,15 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="字典名称" prop="dictKey">
-              <el-input v-model.trim="form.dictKey" maxlength="15" clearable placeholder="请输入字典名称" />
+            <el-form-item label="名称" prop="dictKey">
+              <el-input v-model.trim="form.dictKey" maxlength="15" clearable placeholder="请输入名称" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="字典值" prop="dictValue">
-              <el-input v-model.trim="form.dictValue" maxlength="15" clearable placeholder="请输入字典值" />
+            <el-form-item label="值" prop="dictValue">
+              <el-input v-model.trim="form.dictValue" maxlength="15" clearable placeholder="请输入值" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -246,7 +245,7 @@ export default {
     handelAdd() {
       this.dialogVisible = true
       this.key++
-      this.title = '添加字典'
+      this.title = '新增字典'
       this.reset()
       this.getDictListByType()
     },
@@ -341,7 +340,7 @@ export default {
     handelSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.title === '添加字典') {
+          if (this.title === '新增字典') {
             addDict(this.form).then(res => {
               if (res.code === 200) {
                 this.$message({

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

@@ -6,7 +6,7 @@
           <!-- 表单查询 -->
           <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
             <el-form-item label="" prop="description">
-              <el-input v-model="queryParams.description" prefix-icon="el-icon-search" placeholder="请输入字典描述" clear />
+              <el-input v-model="queryParams.description" prefix-icon="el-icon-search" placeholder="请输入描述" clear />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="small" @click="handelSearch">搜索</el-button>
@@ -34,20 +34,19 @@
 
 
           <!-- 表格数据信息 -->
-          <el-table height="62vh"
+          <el-table
             ref="dictTable"
             v-loading="loading"
             :data="dictList"
             row-key="id"
-            border
             stripe
             header-row-class-name="headBackground"
             @selection-change="handleSelectionChange"
           >
             <el-table-column type="selection" width="50" align="left" />
-            <el-table-column key="description" label="字典描述" align="left" prop="description" show-overflow-tooltip />
-            <el-table-column key="dictKeyType" label="字典类型" align="left" prop="dictKeyType" show-overflow-tooltip />
-            <el-table-column key="dictKeyValue" label="字典值" align="left" prop="dictKeyValue" show-overflow-tooltip />
+            <el-table-column key="description" label="描述" align="left" prop="description" show-overflow-tooltip />
+            <el-table-column key="dictKeyType" label="类型" align="left" prop="dictKeyType" show-overflow-tooltip />
+            <el-table-column key="dictKeyValue" label="值" align="left" prop="dictKeyValue" show-overflow-tooltip />
             <!--<el-table-column key="sortNum" label="排序号" align="left" prop="sortNum" />-->
             <el-table-column label="操作" align="left" width="250" class-name="small-padding fixed-width">
               <template slot-scope="scope">
@@ -88,13 +87,13 @@
         :close-on-click-modal="false"
       >
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="字典描述" prop="description">
+          <el-form-item label="描述" prop="description">
             <el-input v-model.trim="form.description" maxlength="15" clearable placeholder="请输入字典描述" />
           </el-form-item>
-          <el-form-item label="字典类型" prop="dictKeyType">
+          <el-form-item label="类型" prop="dictKeyType">
             <el-input v-model.trim="form.dictKeyType" maxlength="20" clearable placeholder="请输入字典类型" />
           </el-form-item>
-          <el-form-item label="字典值" prop="dictKeyValue">
+          <el-form-item label="值" prop="dictKeyValue">
             <el-input v-model.trim="form.dictKeyValue" maxlength="20" clearable placeholder="请输入字典值" />
           </el-form-item>
           <el-form-item label="排序号" prop="sortNum">
@@ -218,7 +217,7 @@ export default {
     handelAdd() {
       this.reset()
       this.dialogVisible = true
-      this.title = '添加字典'
+      this.title = '新增字典'
     },
     /** 修改按钮 */
     handelEdit(row) {
@@ -295,7 +294,7 @@ export default {
     handelSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.title === '添加字典') {
+          if (this.title === '新增字典') {
             addDictType(this.form).then(res => {
               if (res.code === 200) {
                 this.$message({

industry-admin/src/views/system/log/index.vue

@@ -55,7 +55,7 @@
           </el-col>
         </el-row>
         <!-- 表格数据信息 -->
-        <el-table height="62vh" v-loading="loading" :data="logList" border stripe header-row-class-name="headBackground">
+        <el-table v-loading="loading" :data="logList" stripe header-row-class-name="headBackground">
           <el-table-column width="100" align="center" label="序号">
             <template slot-scope="scope">
               {{ (queryParams.page - 1) * queryParams.limit + scope.$index + 1 }}

industry-admin/src/views/system/menu/index.vue

@@ -30,17 +30,16 @@
       <el-row>
         <el-col :span="24">
           <!-- 表格数据信息 -->
-          <el-table height="62vh"
+          <el-table
             ref="table"
             v-loading="loading"
             :data="menuList"
             row-key="id"
-            border
             stripe
             header-row-class-name="headBackground"
           >
-            <el-table-column key="menuName" label="菜单名称" header-align="left" prop="menuName" show-overflow-tooltip />
-            <el-table-column key="menuIcon" label="菜单图标" prop="menuIcon" align="left" show-overflow-tooltip />
+            <el-table-column key="menuName" label="名称" header-align="left" prop="menuName" show-overflow-tooltip />
+            <el-table-column key="menuIcon" label="图标" prop="menuIcon" align="left" show-overflow-tooltip />
             <el-table-column key="menuUrl" label="路由地址" prop="menuUrl" align="left" show-overflow-tooltip />
             <el-table-column key="sortNum" label="排序号" prop="sortNum" align="center" width="100" show-overflow-tooltip />
             <el-table-column key="hidden" label="显示状态" prop="hidden" align="left" width="100" show-overflow-tooltip>
@@ -119,13 +118,13 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="菜单图标" prop="menuIcon">
-                <el-input v-model.trim="form.menuIcon" placeholder="请输入菜单图标" />
+              <el-form-item label="图标" prop="menuIcon">
+                <el-input v-model.trim="form.menuIcon" placeholder="请输入图标" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="菜单名称" prop="menuName">
-                <el-input v-model.trim="form.menuName" placeholder="请输入菜单名称" maxlength="10" />
+              <el-form-item label="名称" prop="menuName">
+                <el-input v-model.trim="form.menuName" placeholder="请输入名称" maxlength="10" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -308,7 +307,7 @@ export default {
     /** 新增按钮 */
     handelAdd() {
       this.dialogVisible = true
-      this.title = '添加菜单'
+      this.title = '新增菜单'
       this.key++
       this.reset()
       this.getOptionsList()
@@ -357,7 +356,7 @@ export default {
     handelSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.title === '添加菜单') {
+          if (this.title === '新增菜单') {
             this.form.parentId = this.form.parentId || 0
             addtMenuList(this.form).then((res) => {
               if (res.code === 200) {

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

@@ -2,7 +2,7 @@
   <div>
     <el-row :gutter="10" class="mb8 czBtns" style="float: right;">
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-plus" size="small" @click="handelAdd">添加菜单接口权限</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handelAdd">新增菜单接口权限</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -28,8 +28,8 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="left" />
-      <el-table-column label="权限名称" prop="permissionName" :show-overflow-tooltip="true" align="left" />
-      <el-table-column label="权限路径" prop="permissionUrl" :show-overflow-tooltip="true" align="left" />
+      <el-table-column label="名称" prop="permissionName" :show-overflow-tooltip="true" align="left" />
+      <el-table-column label="路径" prop="permissionUrl" :show-overflow-tooltip="true" align="left" />
       <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

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

@@ -11,11 +11,11 @@
 
     <!-- 表单查询 -->
     <el-form ref="queryForm" :model="allAuthQuery" :inline="true" size="small">
-      <el-form-item label="权限名称" prop="permissionName">
-        <el-input v-model="allAuthQuery.permissionName" placeholder="请输入权限名称" clear />
+      <el-form-item label="名称" prop="permissionName">
+        <el-input v-model="allAuthQuery.permissionName" placeholder="请输入名称" clear />
       </el-form-item>
-      <el-form-item label="权限路径" prop="permissionUrl">
-        <el-input v-model="allAuthQuery.permissionUrl" placeholder="请输入权限路径" clear />
+      <el-form-item label="路径" prop="permissionUrl">
+        <el-input v-model="allAuthQuery.permissionUrl" placeholder="请输入路径" clear />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handelSearch">搜索</el-button>
@@ -48,8 +48,8 @@
       @selection-change="handelAddMenuAuth"
     >
       <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
-      <el-table-column label="权限名称" prop="permissionName" :show-overflow-tooltip="true" align="center" />
-      <el-table-column label="权限路径" prop="permissionUrl" :show-overflow-tooltip="true" align="center" />
+      <el-table-column label="名称" prop="permissionName" :show-overflow-tooltip="true" align="center" />
+      <el-table-column label="路径" prop="permissionUrl" :show-overflow-tooltip="true" align="center" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

industry-admin/src/views/system/monitor/index.vue

@@ -15,7 +15,7 @@
             <el-input
               v-model="queryParams.monitorName"
               prefix-icon="el-icon-search"
-              placeholder="请输入监控名称"
+              placeholder="请输入名称"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -103,7 +103,6 @@
           v-loading="loading"
           :data="monitorList"
           stripe
-          border
           header-row-class-name="headBackground"
           @selection-change="handleSelectionChange"
         >
@@ -117,7 +116,7 @@
           />
           <el-table-column
             key="monitorName"
-            label="监控名称"
+            label="名称"
             align="left"
             prop="monitorName"
             :show-overflow-tooltip="true"
@@ -173,7 +172,7 @@
           <el-table-column
             label="操作"
             align="left"
-            width="250"
+            width="300"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
@@ -224,10 +223,10 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row style="margin-bottom: 5px">
           <el-col>
-            <el-form-item label="监控名称" prop="monitorName">
+            <el-form-item label="名称" prop="monitorName">
               <el-input
                 v-model.trim="form.monitorName"
-                placeholder="请输入监控名称"
+                placeholder="请输入名称"
                 maxlength="20"
                 style="width: 360px"
                 minlength="2"
@@ -638,7 +637,7 @@ export default {
         conectSettingId: this.monitorConectSetting.conectSettingId
       }
       this.open = true
-      this.title = '添加监控'
+      this.title = '新增监控'
     },
     /** 表单提交 */
     submitForm() {

industry-admin/src/views/system/role/index.vue

@@ -15,7 +15,7 @@
             <el-form-item label="" prop="roleName">
               <el-input
                 v-model="queryParams.roleName"
-                placeholder="请输入角色名称"
+                placeholder="请输入名称"
                 prefix-icon="el-icon-search"
                 clearable
                 @keyup.enter.native="handleQuery"
@@ -50,18 +50,17 @@
       <el-row v-if="$route.meta.showRole">
         <el-col>
           <!-- 表格数据信息 -->
-          <el-table height="62vh"
+          <el-table
             ref="roleTable"
             v-loading="loading"
             :data="roleList"
-            border
             stripe
             header-row-class-name="headBackground"
             @selection-change="handleSelectionChange"
           >
             <el-table-column type="selection" width="50" align="left" />
-            <el-table-column v-if="false" key="id" label="角色编号" align="left" prop="id" />
-            <el-table-column key="roleName" label="角色名称" align="left" prop="roleName" :show-overflow-tooltip="true" />
+            <el-table-column v-if="false" key="id" label="编号" align="left" prop="id" />
+            <el-table-column key="roleName" label="名称" align="left" prop="roleName" :show-overflow-tooltip="true" />
             <el-table-column key="roleCode" label="权限字符" align="left" prop="roleCode" :show-overflow-tooltip="true" />
             <el-table-column label="操作" align="left" width="400" class-name="small-padding fixed-width">
               <template v-if="scope.row.userId !== 1" slot-scope="scope">
@@ -106,7 +105,7 @@
           <el-row>
             <el-col>
               <el-form-item label="角色名称" prop="roleName">
-                <el-input v-model="form.roleName" placeholder="请输入角色名称" maxlength="20" />
+                <el-input v-model="form.roleName" placeholder="请输入名称" maxlength="20" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -138,7 +137,7 @@ export default {
     const validatePass = (rule, value, callback) => {
       var reg = /^[^\s]{2,20}$/
       if (!(reg.test(value))) {
-        callback(new Error('角色名称长度必须介于 2 和 20 之间 不能有空格'))
+        callback(new Error('名称长度必须介于 2 和 20 之间 不能有空格'))
       }
       callback()
     }
@@ -172,7 +171,7 @@ export default {
       // 表单校验
       rules: {
         roleName: [
-          { required: true, message: '角色名称不能为空', trigger: 'blur' },
+          { required: true, message: '名称不能为空', trigger: 'blur' },
           { validator: validatePass, trigger: 'blur' }
         ],
         roleCode: [
@@ -315,7 +314,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = '添加角色'
+      this.title = '新增角色'
     },
     /** 表单提交 */
     submitForm() {

industry-admin/src/views/system/role/role-auth.vue

@@ -6,7 +6,7 @@
           <el-form-item label="" prop="userName">
             <el-input
               v-model="queryParams.userName"
-              placeholder="请输入用户名"
+              placeholder="请输入名称"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -71,12 +71,12 @@
     >
       <el-table-column type="selection" width="55" align="left" />
       <el-table-column
-        label="用户名"
+        label="名称"
         prop="userName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="用户状态"
+        label="状态"
         prop="state"
         :show-overflow-tooltip="true"
       >
@@ -85,7 +85,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="用户类型"
+        label="类型"
         prop="userType"
         :show-overflow-tooltip="true"
       >

industry-admin/src/views/system/role/role-menu.vue

@@ -2,7 +2,7 @@
   <div>
     <el-row :gutter="10" class="mb8 czBtns" style="float:right">
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-plus" size="small" @click="handelAdd">添加菜单权限</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handelAdd">新增菜单权限</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -31,9 +31,9 @@
       @selection-change="selectChange"
     >
       <el-table-column type="selection" align="left" />
-      <el-table-column label="菜单名称" prop="menuName" show-overflow-tooltip header-align="left" />
-      <el-table-column label="菜单图标" prop="menuIcon" show-overflow-tooltip align="left" />
-      <el-table-column label="菜单路径" prop="menuUrl" show-overflow- align="left" />
+      <el-table-column label="名称" prop="menuName" show-overflow-tooltip header-align="left" />
+      <el-table-column label="图标" prop="menuIcon" show-overflow-tooltip align="left" />
+      <el-table-column label="路径" prop="menuUrl" show-overflow- align="left" />
       <el-table-column label="更新时间" prop="updateTime" show-overflow-tooltip align="left">
         <template slot-scope="scope">
           {{

industry-admin/src/views/system/role/role-menuSelect.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 授权用户 -->
   <el-dialog
-    title="添加菜单权限"
+    title="新增菜单权限"
     width="1200px"
     :visible.sync="dialogVisible"
     :close-on-click-modal="false"
@@ -33,20 +33,20 @@
     >
       <el-table-column type="selection" align="left" />
       <el-table-column
-        label="菜单名称"
+        label="名称"
         prop="menuName"
         show-overflow-tooltip
         header-align="left"
         width="200"
       />
       <el-table-column
-        label="菜单图标"
+        label="图标"
         prop="menuIcon"
         show-overflow-tooltip
         align="left"
       />
       <el-table-column
-        label="菜单路径"
+        label="路径"
         prop="menuUrl"
         show-overflow-
         align="left"

industry-admin/src/views/system/staff/index.vue

@@ -37,7 +37,7 @@
 
                 <!-- 数据组表格信息 -->
                 <CommonTable ref="staffTable" :tableHeaderTitle="tableHeaderTitle" :tableData="tableData"
-                    :isShowCheckbox="isShowCheckbox" :isShowIndex="isShowIndex" :tableHight="tableHight"
+                    :isShowCheckbox="isShowCheckbox" :isShowIndex="isShowIndex"
                     :tableOperate="tableOperate" @receiveCheckedData="receiveCheckedData"
                     @updateStaffEvent="updateStaffEvent" @delStaffEvent="delStaffEvent">
                 </CommonTable>
@@ -85,7 +85,6 @@ export default {
             //表格参数
             isShowCheckbox: false,
             isShowIndex: false,
-            tableHight: '63vh',
             tableHeaderTitle: [
                 {
                     propName: "jobNum",

industry-admin/src/views/system/user/delet-user.vue

@@ -23,29 +23,27 @@
         v-loading="loading"
         :data="tableData"
         stripe
-        border
         header-row-class-name="headBackground"
-        max-height="450"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column
           v-if="false"
           key="userId"
-          label="用户编号"
+          label="编号"
           align="left"
           prop="userId"
         />
         <el-table-column
           key="userName"
-          label="用户名"
+          label="名称"
           align="left"
           prop="userName"
           :show-overflow-tooltip="true"
         />
         <el-table-column
           key="state"
-          label="用户状态"
+          label="状态"
           align="left"
           prop="state"
           :show-overflow-tooltip="true"
@@ -56,7 +54,7 @@
         </el-table-column>
         <el-table-column
           key="userType"
-          label="用户类型"
+          label="类型"
           align="left"
           prop="userType"
           :show-overflow-tooltip="true"

industry-admin/src/views/system/user/index.vue

@@ -17,7 +17,7 @@
             <el-form-item label="" prop="userName">
               <el-input
                 v-model="queryParams.userName"
-                placeholder="请输入用户名"
+                placeholder="请输入名称"
                 prefix-icon="el-icon-search"
                 clearable
                 @keyup.enter.native="handleQuery"
@@ -80,7 +80,7 @@
               <el-form-item label="" prop="state">
                 <el-select
                   v-model="queryParams.state"
-                  placeholder="用户状态"
+                  placeholder="状态"
                   clearable
                   style="width: 100px"
                 >
@@ -95,7 +95,7 @@
               <el-form-item label="" prop="userType">
                 <el-select
                   v-model="queryParams.userType"
-                  placeholder="用户类型"
+                  placeholder="类型"
                   clearable
                   style="width: 100px"
                 >
@@ -117,12 +117,11 @@
 
 
         <!-- 表格数据信息 -->
-        <el-table height="62vh"
+        <el-table
           ref="userTable"
           v-loading="loading"
           :data="userList"
           stripe
-          border
           header-row-class-name="headBackground"
           @selection-change="handleSelectionChange"
         >
@@ -130,20 +129,20 @@
           <el-table-column
             v-if="false"
             key="userId"
-            label="用户编号"
+            label="编号"
             align="left"
             prop="userId"
           />
           <el-table-column
             key="userName"
-            label="用户名"
+            label="名称"
             align="left"
             prop="userName"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             key="state"
-            label="用户状态"
+            label="状态"
             align="left"
             prop="state"
             :show-overflow-tooltip="true"
@@ -154,7 +153,7 @@
           </el-table-column>
           <el-table-column
             key="userType"
-            label="用户类型"
+            label="类型"
             align="left"
             prop="userType"
             :show-overflow-tooltip="true"
@@ -222,11 +221,11 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row style="margin-bottom: 5px">
           <el-col>
-            <el-form-item label="用户名" prop="userName">
+            <el-form-item label="名称" prop="userName">
               <el-input
                 v-if="form.userId == undefined"
                 v-model.trim="form.userName"
-                placeholder="请输入用户名"
+                placeholder="请输入名称"
                 maxlength="20"
                 style="width: 360px"
                 minlength="2"
@@ -234,7 +233,7 @@
               <el-input
                 v-else
                 v-model.trim="form.userName"
-                placeholder="请输入用户名"
+                placeholder="请输入名称"
                 maxlength="20"
                 minlength="2"
                 disabled
@@ -247,13 +246,13 @@
           <el-col>
             <el-form-item
               v-if="form.userId == undefined"
-              label="用户密码"
+              label="密码"
               prop="password"
             >
               <el-input
                 ref="password"
                 v-model.trim="form.password"
-                placeholder="请输入用户密码"
+                placeholder="请输入密码"
                 :type="passwordType"
                 maxlength="20"
                 auto-complete="new-password"
@@ -269,8 +268,8 @@
         </el-row>
         <el-row style="margin-bottom: 5px">
           <el-col>
-            <el-form-item label="用户类型" prop="userType">
-              <el-select v-model="form.userType" placeholder="请选择用户类型" style="width: 360px">
+            <el-form-item label="类型" prop="userType">
+              <el-select v-model="form.userType" placeholder="请选择类型" style="width: 360px">
                 <el-option
                   v-for="dict in userType"
                   :key="dict.value"
@@ -281,7 +280,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.userId != undefined" label="用户状态">
+            <el-form-item v-if="form.userId != undefined" label="状态">
               <el-radio-group v-model="form.state">
                 <el-radio
                   v-for="dict in userStatus"
@@ -297,7 +296,7 @@
             <el-form-item label="所属角色" prop="roleList">
               <el-select
                 v-model="form.roleList"
-                placeholder="请选择用户角色"
+                placeholder="请选择角色"
                 multiple
                 style="width: 360px"
               >
@@ -437,25 +436,25 @@ export default {
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: '用户名不能为空', trigger: 'blur' },
+          { required: true, message: '名称不能为空', trigger: 'blur' },
           {
             min: 2,
             max: 20,
-            message: '用户名长度必须介于 2 和 20 之间',
+            message: '名称长度必须介于 2 和 20 之间',
             trigger: 'blur'
           },
           {
             pattern: /^[^\s]*$/,
-            message: '用户名不能有空格',
+            message: '名称不能有空格',
             trigger: 'blur'
           }
         ],
         password: [
-          { required: true, message: '用户密码不能为空', trigger: 'blur' },
+          { required: true, message: '密码不能为空', trigger: 'blur' },
           { validator: validatePass, trigger: 'blur' }
         ],
         userType: [
-          { required: true, message: '请选择用户类型', trigger: 'change' }
+          { required: true, message: '请选择类型', trigger: 'change' }
         ]
       },
       passwordType: 'password'
@@ -691,7 +690,7 @@ export default {
       this.form.userType = this.userType[0].value
       this.open = true
       this.passwordType = 'password'
-      this.title = '添加用户'
+      this.title = '新增用户'
       this.isDisabled = false
       this.getRoleList()
       this.getDeptList()