Merge branch '1.0' of http://gitlab.91isoft.com:90/zhangbotao/tea-resources-web into 1.0

src/views/contentManagement/banner/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
 
-      <el-form-item label="名称" prop="bannerName">
+      <el-form-item label="名称:" prop="bannerName">
         <el-input
           v-model.trim="queryParams.bannerName"
           placeholder="请输入名称"
@@ -12,7 +12,7 @@
           style="width: 150px"
         />
       </el-form-item>
-      <el-form-item label="链接地址" prop="linkUrl">
+      <el-form-item label="链接地址:" prop="linkUrl">
         <el-input
           v-model.trim="queryParams.linkUrl"
           placeholder="请输入链接地址"

src/views/contentManagement/centralCase/index.vue

@@ -4,10 +4,10 @@
     <div v-show="showSwitch.courseContent" class="courseContent">
       <div class="search" style="border-bottom: 14px solid #f4f4f4">
         <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-          <el-form-item label="标题" prop="title">
+          <el-form-item label="标题:" prop="title">
             <el-input v-model.trim="queryParams.title" placeholder="请输入标题" :maxlength="15" style="margin-right: 15px" />
           </el-form-item>
-          <el-form-item label="案例单位" prop="unit">
+          <el-form-item label="案例单位:" prop="unit">
             <el-input v-model.trim="queryParams.unit" placeholder="请输入案例单位" :maxlength="15" style="margin-right: 15px" />
           </el-form-item>
           <el-form-item>

src/views/contentManagement/competitionSupport/index.vue

 <template>
   <div class="app-container">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-      <el-form-item label="大赛时间">
+      <el-form-item label="大赛时间:">
         <el-date-picker
           v-model="dateRange"
           size="small"

src/views/contentManagement/developmentCourse/index.vue

 <template>
   <div class="app-container">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-      <el-form-item label="标题" prop="title">
+      <el-form-item label="标题:" prop="title">
         <el-input
           v-model.trim="queryParams.title"
           placeholder="请输入标题"
@@ -11,7 +11,7 @@
           style="width: 150px"
         />
       </el-form-item>
-      <el-form-item label="正文" prop="text">
+      <el-form-item label="正文:" prop="text">
         <el-input
           v-model.trim="queryParams.text"
           placeholder="请输入正文"
@@ -22,7 +22,7 @@
           style="width: 150px"
         />
       </el-form-item>
-      <el-form-item label="时间">
+      <el-form-item label="时间:">
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -35,7 +35,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="状态" prop="flag">
+      <el-form-item label="状态:" prop="flag">
         <el-select v-model="queryParams.flag" placeholder="请选择状态" clearable size="small">
           <el-option
             v-for="dict in statusOptions"

src/views/contentManagement/newsInformation/index.vue

@@ -4,7 +4,7 @@
     <div v-show="showSwitch.courseContent" class="courseContent">
       <div class="search" style="border-bottom: 14px solid #f4f4f4">
         <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-          <el-form-item label="发布状态" prop="flag">
+          <el-form-item label="发布状态:" prop="flag">
             <!--            发布状态下拉框-->
             <el-select v-model="queryParams.flag" placeholder="请选择发布状态">
               <el-option
@@ -15,7 +15,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="发布日期" prop="releaseDate">
+          <el-form-item label="发布日期:" prop="releaseDate">
             <el-date-picker
               v-model="dateRange"
               value-format="yyyy-MM-dd"

src/views/courseInformation/courseManagement/courseCatalogues.vue

@@ -19,7 +19,7 @@
         <!--弹出层-->
         <el-dialog title="添加章" :visible.sync="viewSwitch.chapterForm" @open="setCurrentForm('chapterForm')" @close="formClear">
           <el-form ref="chapterForm" :model="chapterForm" :rules="formRulesChapter">
-            <el-form-item label="章标题" :label-width="formLabelWidth" prop="text">
+            <el-form-item label="章标题:" :label-width="formLabelWidth" prop="text">
               <el-input v-model.trim="chapterForm.text" auto-complete="off" placeholder="最多输入50个字符" :maxlength="50" />
             </el-form-item>
           </el-form>

src/views/courseInformation/courseManagement/index.vue

@@ -4,11 +4,11 @@
     <div v-show="showSwitch.courseContent" class="courseContent">
       <div class="search" style="border-bottom: 14px solid #f4f4f4">
         <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-          <el-form-item label="课程名称" prop="lessonName">
+          <el-form-item label="课程名称:" prop="lessonName">
             <el-input v-model.trim="queryParams.lessonName" placeholder="课程名称" :maxlength="15" style="width: 200px" />
           </el-form-item>
           <!--          课程类型-->
-          <el-form-item label="课程类型" prop="lessonType">
+          <el-form-item label="课程类型:" prop="lessonType">
             <el-select v-model="queryParams.lessonType" placeholder="课程类型" clearable>
               <el-option
                 v-for="item in lessonTypeOptions"
@@ -19,7 +19,7 @@
             </el-select>
           </el-form-item>
           <!--          课程方案-->
-          <el-form-item label="企业课程方案" prop="classPlan">
+          <el-form-item label="企业课程方案:" prop="classPlan">
             <el-select v-model="queryParams.classPlan" class="selectWidth" placeholder="课程方案" clearable>
               <el-option
                 v-for="item in coursePlanOptions"
@@ -29,7 +29,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="岗位分类" prop="jobClassify">
+          <el-form-item label="岗位分类:" prop="jobClassify">
             <el-select v-model="queryParams.jobClassify" placeholder="岗位分类" clearable>
               <el-option
                 v-for="item in valueOptions"
@@ -39,7 +39,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="企业技术分类" prop="tecClassify">
+          <el-form-item label="企业技术分类:" prop="tecClassify">
             <el-select v-model="queryParams.tecClassify" placeholder="技术分类" clearable>
               <el-option
                 v-for="item in courseDirection"
@@ -49,7 +49,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="院校课程方案" prop="classPlanSchool">
+          <el-form-item label="院校课程方案:" prop="classPlanSchool">
             <el-select v-model="queryParams.classPlanSchool" class="selectWidth" placeholder="院校课程方案" clearable>
               <el-option
                 v-for="item in coursePlanOptions"
@@ -59,7 +59,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="院校技术分类" prop="tecClassifySchool">
+          <el-form-item label="院校技术分类:" prop="tecClassifySchool">
             <el-select v-model="queryParams.tecClassifySchool" placeholder="院校技术分类" clearable>
               <el-option
                 v-for="item in courseDirection"
@@ -69,7 +69,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="难度等级" prop="difficultyClassify">
+          <el-form-item label="难度等级:" prop="difficultyClassify">
             <el-select v-model="queryParams.difficultyClassify" placeholder="难度等级" clearable>
               <el-option
                 v-for="item in difficultyOptions"
@@ -79,7 +79,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="课程讲师" prop="lessonTeaName">
+          <el-form-item label="课程讲师:" prop="lessonTeaName">
             <el-select v-model="queryParams.lessonTeaName" placeholder="课程讲师" clearable>
               <el-option
                 v-for="(item,index) in teacherOptions"
@@ -89,7 +89,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="课程状态" prop="flag">
+          <el-form-item label="课程状态:" prop="flag">
             <el-select v-model="queryParams.flag" placeholder="课程状态" clearable>
               <el-option
                 v-for="item in courseStatus"
@@ -100,7 +100,7 @@
             </el-select>
           </el-form-item>
           <!--          首页显示-->
-          <el-form-item label="首页显示" prop="homeDisplay">
+          <el-form-item label="首页显示:" prop="homeDisplay">
             <el-select v-model="queryParams.homeDisplay" placeholder="首页显示" clearable>
               <el-option
                 v-for="item in homeDisplayList"
@@ -111,7 +111,7 @@
             </el-select>
           </el-form-item>
           <!--          精品课-->
-          <el-form-item label="精品课" prop="entQualityLesson">
+          <el-form-item label="精品课:" prop="entQualityLesson">
             <el-select v-model="queryParams.qualityLesson" placeholder="精品课" clearable>
               <el-option
                 v-for="(item,index) in entQualityLessonList"

src/views/courseInformation/examinationCompany/index.vue

+
+<template>
+  <div class="app-container">
+    <!--    标题-->
+    <div class="examinationTitle">
+      <span>岗位分类：{{ name }}</span>
+      <span class="title-right">题库难度：{{name}}</span>
+    </div>
+    <examination-paper :bussiness-id="courseId" />
+  </div>
+</template>
+<script >
+
+import ExaminationPaper from '@/views/courseInformation/examinationCompany/examinationPaper.vue'
+import { updateBLesson } from '@/api/courseManagement/indexApi'
+
+export default {
+  name: 'ExaminationManagement',
+  components: {
+    ExaminationPaper
+  },
+  // 向子组件QuestionManagement传递参数bussinessId
+  data() {
+    return {
+      activeName: 'ExaminationPaper',
+      courseId: null,
+      bussinessId: '', // 业务id
+      name: '', // 课程名称
+      passingGrade: '', // 及格分数
+      id: null
+    }
+  },
+  // mounted() {
+  //   // 接受路由传递的参数
+  //   this.courseId = this.$route.query.bussinessId
+  //   this.name = this.$route.query.name
+  // },
+  created() {
+    // 接受路由传递的参数
+    // this.courseId = this.$route.query.businessId
+    this.courseId = this.$route.query.courseId
+    console.log('this.courseId', this.courseId)
+    this.id = this.$route.query.courseId
+    this.name = this.$route.query.name
+    this.passingGrade = this.$route.query.passingGrade
+    console.log(this.id, this.name, this.passingGrade)
+  },
+  methods: {
+    tabClick() {
+      // 在tab切换时更新bussinessId
+      console.log('name', this.name)
+    },
+    handleGradeChange(grade) {
+      if (grade) {
+        const form = {
+          businessId: this.id,
+          passingGrade: grade
+        }
+        updateBLesson(form).then(res => {
+          if (res.code === 200) {
+            this.$message({
+              message: '保存成功',
+              type: 'success'
+            })
+          } else {
+            this.$message({
+              message: '保存失败',
+              type: 'error'
+            })
+          }
+        })
+      } else {
+        this.$message.error('请输入正确分数')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  padding: 0 20px 20px 20px;
+  margin-top: -20px;
+
+  .examinationTitle {
+    font-size: 25px;
+    font-weight: bold;
+    margin: 20px 20px 20px 0;
+    white-space: nowrap;
+    .title-right{
+      margin-left: 20px;
+    }
+  }
+  .score{
+    margin-left: 5px;
+    font-size: 18px;
+    font-weight:normal;
+
+  }
+  .score>>>.el-input__inner{
+    width: 100px;
+    border-top: 0;
+    border-right: 0;
+    border-left: 0;
+  }
+}
+</style>

src/views/courseInformation/lecturerManagement/index.vue

 <template>
   <div class="app-container">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-      <el-form-item label="姓名" prop="name">
+      <el-form-item label="姓名:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入讲师姓名"
@@ -10,9 +10,9 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="头衔" prop="details">
+      <el-form-item label="头衔:" prop="title">
         <el-input
-          v-model.trim="queryParams.details"
+          v-model.trim="queryParams.title"
           placeholder="请输入头衔"
           clearable
           :maxlength="255"
@@ -127,7 +127,7 @@
     <!-- 添加或修改讲师信息表配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
-        <el-form-item label="姓名:" prop="name" >
+        <el-form-item label="姓名:" prop="name">
           <el-input v-model.trim="form.name" :maxlength="20" placeholder="请输入讲师姓名" />
         </el-form-item>
         <el-form-item label="头衔:" prop="title">
@@ -186,7 +186,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button class="cancelBtn" @click="cancel">取 消</el-button>
-        <el-button class="submitBtn" type="primary" @click="submitForm">确 定</el-button>
+        <el-button :loading="subLoding" class="submitBtn" type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -211,6 +211,8 @@ export default {
   components: { MyCropper },
   data() {
     return {
+      // 提交loading
+      subLoding: false,
       // 遮罩层
       loading: true,
       // 总条数
@@ -220,7 +222,6 @@ export default {
       cmsLecturerList: [],
       fileUpload: '/dev-api/common/fileUpload?file=' + this.file + '&temp=' + 'lecturerManagement',
 
-
       imageUrl: '',
       // 弹出层标题
       title: '',
@@ -433,6 +434,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function() {
+      this.subLoding = true
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.businessId !== undefined) {
@@ -440,14 +442,22 @@ export default {
               this.msgSuccess('修改成功')
               this.open = false
               this.getList()
+              this.subLoding = false
+            }).catch(() => {
+              this.subLoding = false
             })
           } else {
             addCmsLecturer(this.form).then(response => {
               this.msgSuccess('新增成功')
               this.open = false
               this.getList()
+              this.subLoding = false
+            }).catch(() => {
+              this.subLoding = false
             })
           }
+        }else{
+          this.subLoding = false
         }
       })
     },

src/views/courseInformation/tryoutApplication/index.vue

@@ -5,22 +5,22 @@
       <div class="search" style="border-bottom: 14px solid #f4f4f4">
         <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
 
-          <el-form-item label="申请人">
+          <el-form-item label="申请人:">
             <el-input v-model.trim="queryParams.type" placeholder="请输入申请人姓名,登录名,手机号" clearable />
           </el-form-item>
           <!--          处理单位-->
-          <el-form-item label="申请单位">
+          <el-form-item label="申请单位:">
             <el-input v-model.trim="queryParams.applicantUnitName" placeholder="请输入申请单位" clearable />
           </el-form-item>
           <!--          状态-->
-          <el-form-item label="处理状态">
+          <el-form-item label="处理状态:">
             <el-select v-model="queryParams.flag" placeholder="请选择状处理状态" clearable>
               <el-option label="未处理" value="0" />
               <el-option label="已处理" value="1" />
             </el-select>
           </el-form-item>
           <!--          备注-->
-          <el-form-item label="备注">
+          <el-form-item label="备注:">
             <el-input v-model.trim="queryParams.remarks" placeholder="请输入备注" clearable />
           </el-form-item>
           <el-form-item>

src/views/courseInformation/tryoutCommencement/index.vue

@@ -5,7 +5,7 @@
       <div class="search" style="border-bottom: 14px solid #f4f4f4">
         <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
           <!--          开课类型-->
-          <el-form-item label="开课类型" prop="isPay">
+          <el-form-item label="开课类型:" prop="isPay">
             <el-select v-model="queryParams.isPay" placeholder="开课类型" clearable>
               <el-option
                 v-for="item in [{label:'试用',value:0},{label:'付费',value:1}]"
@@ -15,7 +15,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="课程名称" prop="lessonName">
+          <el-form-item label="课程名称:" prop="lessonName">
             <el-input
               v-model.trim="queryParams.lessonName"
               placeholder="课程名称"
@@ -23,7 +23,7 @@
               size="small"
             />
           </el-form-item>
-          <el-form-item label="岗位分类" prop="value">
+          <el-form-item label="岗位分类:" prop="value">
             <el-select v-model="queryParams.jobClassification" placeholder="岗位分类" clearable>
               <el-option
                 v-for="item in valueOptions"
@@ -33,7 +33,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="技术分类" prop="teDirection">
+          <el-form-item label="技术分类:" prop="teDirection">
             <el-select v-model="queryParams.technicalClassification" placeholder="技术分类" clearable>
               <el-option
                 v-for="item in courseDirection"
@@ -44,7 +44,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="开始日期">
+          <el-form-item label="开始日期:">
             <el-date-picker
               v-model="dateRangeBegin"
               size="small"
@@ -56,7 +56,7 @@
               end-placeholder="结束"
             />
           </el-form-item>
-          <el-form-item label="结束日期">
+          <el-form-item label="结束日期:">
             <el-date-picker
               v-model="dateRangeEnd"
               size="small"
@@ -681,13 +681,13 @@
           <div v-if="showLesson">
             <el-form :model="form" :inline="true" label-position="right" label-width="80">
               <el-form-item
-                label="课程名称"
+                label="课程名称:"
                 prop="lessonName"
               >
                 <el-input v-model.trim="form.lessonName" clearable style="width: 200px" placeholder="请选择课程名称" />
               </el-form-item>
               <el-form-item
-                label="课程类型"
+                label="课程类型:"
                 prop="lessonType"
               >
                 <el-select
@@ -706,7 +706,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="难度等级" prop="teDirection">
+              <el-form-item label="难度等级:" prop="teDirection">
                 <el-select v-model="form.difficultyClassify" clearable style="width: 200px" filterable placeholder="难度等级" clearable>
                   <el-option
                     v-for="item in difficultyOptions"

src/views/courseInformation/unitManagement/index.vue

@@ -2,7 +2,7 @@
   <div class="unitManagement_module">
     <div class="search" style="border-bottom: 14px solid #f4f4f4">
       <el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true">
-        <el-form-item prop="unitType" label="单位类型">
+        <el-form-item prop="unitType" label="单位类型:">
           <el-select v-model="queryParams.unitType" clearable placeholder="单位类型">
             <el-option
               v-for="(item,index) in unitTypeList"
@@ -12,7 +12,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item prop="unitName" label="单位名称">
+        <el-form-item prop="unitName" label="单位名称:">
           <el-input
             v-model.trim="queryParams.unitName"
             placeholder="单位名称"
@@ -22,7 +22,7 @@
             style="width: 200px"
           />
         </el-form-item>
-        <el-form-item prop="username" label="单位管理员账号">
+        <el-form-item prop="username" label="单位管理员账号:">
           <el-input
             v-model.trim="queryParams.username"
             placeholder="单位管理员账号"
@@ -266,7 +266,7 @@ export default {
       },
       // 表单校验
       rules: {
-        unitType: [{ required: true, message: '请选择单位类型', trigger: 'blur' }],
+        unitType: [{ required: true, message: '请选择单位类型', trigger: 'change' }],
         unitName: [{ required: true, message: '请输入单位名称', trigger: 'blur' }]
       }
     }

src/views/monitor/loginInfo/index.vue

@@ -2,7 +2,7 @@
   <div class="loginInfo-manage">
     <div class="search" style="border-bottom: 14px solid #f4f4f4">
       <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="auto">
-        <el-form-item label="用户名称" prop="userName">
+        <el-form-item label="用户名称:" prop="userName">
           <el-input
             v-model.trim="queryParams.username"
             placeholder="请输入用户名称"
@@ -13,7 +13,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="登录时间" prop="loginTime">
+        <el-form-item label="登录时间:" prop="loginTime">
           <el-date-picker
             v-model="queryParams.loginTime"
             type="month"

src/views/monitor/operLog/index.vue

@@ -2,7 +2,7 @@
   <div class="operlog-manage">
     <div class="search" style="border-bottom: 14px solid #f4f4f4">
       <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="auto">
-        <el-form-item label="系统模块" prop="title">
+        <el-form-item label="系统模块:" prop="title">
           <el-input
             v-model.trim="queryParams.title"
             placeholder="请输入系统模块"
@@ -13,7 +13,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="用户名称" prop="operName">
+        <el-form-item label="用户名称:" prop="operName">
           <el-input
             v-model.trim="queryParams.operName"
             style="width: 170px"
@@ -24,7 +24,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="操作月份" prop="operTime">
+        <el-form-item label="操作月份:" prop="operTime">
           <el-date-picker
             v-model="queryParams.operTime"
             type="month"

src/views/reSetPsw.vue

@@ -10,7 +10,7 @@
     >
       <el-form-item
         prop="oldPass"
-        label="旧密码"
+        label="旧密码:"
       >
         <el-input
           v-model="pwdList.oldPass"
@@ -20,7 +20,7 @@
       </el-form-item>
       <el-form-item
         prop="pass"
-        label="新密码"
+        label="新密码:"
       >
         <el-input
           v-model="pwdList.pass"
@@ -30,7 +30,7 @@
       </el-form-item>
       <el-form-item
         prop="checkPass"
-        label="确认密码"
+        label="确认密码:"
       >
         <el-input
           v-model="pwdList.checkPass"

src/views/system/dict/data.vue

@@ -2,7 +2,7 @@
   <div class="dictData-manage">
     <div class="search" style="border-bottom: 14px solid #f4f4f4">
       <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-        <el-form-item label="字典名称" prop="dictType">
+        <el-form-item label="字典名称:" prop="dictType">
           <el-select v-model="queryParams.dictType" disabled placeholder="请选择字典名称" clearable size="small">
             <el-option
               v-for="item in typeOptions"
@@ -12,7 +12,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="字典标签" prop="dictLabel">
+        <el-form-item label="字典标签:" prop="dictLabel">
           <el-input
             v-model.trim="queryParams.dictLabel"
             placeholder="请输入字典标签"
@@ -22,7 +22,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="状态" prop="flag">
+        <el-form-item label="状态:" prop="flag">
           <el-select v-model="queryParams.flag" placeholder="数据状态" clearable size="small">
             <el-option
               v-for="dict in statusOptions"
@@ -124,19 +124,19 @@
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
-        <el-form-item label="字典类型">
+        <el-form-item label="字典类型:">
           <el-input v-model.trim="form.dictType" :disabled="true" show-word-limit maxlength="30" placeholder="请输入字典类型" />
         </el-form-item>
-        <el-form-item label="参数标签" prop="dictLabel">
+        <el-form-item label="参数标签:" prop="dictLabel">
           <el-input v-model.trim="form.dictLabel" show-word-limit maxlength="30" placeholder="请输入参数标签" />
         </el-form-item>
-        <el-form-item label="参数键值" prop="dictValue">
+        <el-form-item label="参数键值:" prop="dictValue">
           <el-input v-model.trim="form.dictValue" show-word-limit maxlength="300" placeholder="请输入参数键值" />
         </el-form-item>
-        <el-form-item label="参数排序" prop="dictSort">
+        <el-form-item label="参数排序:" prop="dictSort">
           <el-input-number v-model="form.dictSort" style="width: 100%" controls-position="right" :min="0" />
         </el-form-item>
-        <el-form-item label="备注" prop="remarks">
+        <el-form-item label="备注:" prop="remarks">
           <el-input v-model.trim="form.remarks" type="textarea" show-word-limit maxlength="200" placeholder="请输入内容" />
         </el-form-item>
       </el-form>

src/views/system/dict/index.vue

@@ -2,7 +2,7 @@
   <div class="dict-manage">
     <div class="search" style="border-bottom: 14px solid #f4f4f4">
       <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="auto">
-        <el-form-item label="字典名称" prop="dictName">
+        <el-form-item label="字典名称:" prop="dictName">
           <el-input
             v-model.trim="queryParams.dictName"
             placeholder="请输入字典名称"
@@ -13,7 +13,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="字典类型" prop="dictType">
+        <el-form-item label="字典类型:" prop="dictType">
           <el-input
             v-model.trim="queryParams.dictType"
             placeholder="请输入字典类型"
@@ -24,7 +24,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="创建时间">
+        <el-form-item label="创建时间:">
           <el-date-picker
             v-model="dateRange"
             size="small"
@@ -150,15 +150,15 @@
       @pagination="getList"
     />
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog title="字典信息" :visible.sync="open" width="500px" append-to-body @close="reset">
+    <el-dialog title="字典信息:" :visible.sync="open" width="500px" append-to-body @close="reset">
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
-        <el-form-item label="字典名称" prop="dictName">
+        <el-form-item label="字典名称:" prop="dictName">
           <el-input v-model.trim="form.dictName" :maxlength="30" placeholder="请输入字典名称" />
         </el-form-item>
-        <el-form-item label="字典类型" prop="dictType">
+        <el-form-item label="字典类型:" prop="dictType">
           <el-input v-model.trim="form.dictType" :maxlength="30" placeholder="请输入字典类型" />
         </el-form-item>
-        <el-form-item label="父字典名称">
+        <el-form-item label="父字典名称:">
           <el-select v-model="form.parentId" style="width: 100%" clearable placeholder="请选择父字典类型" @clear="setRules" @change="getOptions">
             <el-option
               v-for="item in options"
@@ -182,7 +182,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="备注" prop="remarks">
+        <el-form-item label="备注:" prop="remarks">
           <el-input v-model.trim="form.remarks" maxlength="200" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>

src/views/system/menu/index.vue

@@ -2,7 +2,7 @@
   <div class="menu-manage">
     <div class="search" style="border-bottom: 14px solid #f4f4f4">
       <el-form style="padding: 0 0 0 10px" :inline="true">
-        <el-form-item label="菜单名称">
+        <el-form-item label="菜单名称:">
           <el-input
             v-model.trim="queryParams.menuName"
             placeholder="请输入菜单名称"
@@ -132,7 +132,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="上级菜单" prop="parentId">
+            <el-form-item label="上级菜单:" prop="parentId">
               <treeSelect
 
                 v-model="form.parentId"
@@ -141,13 +141,13 @@
                 :options="menuOptions"
                 :normalizer="normalizer"
                 :show-count="true"
-                placeholder="选择上级菜单"
+                placeholder="选择上级菜单:"
                 style="width: 95%"
               />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="菜单类型" prop="menuType">
+            <el-form-item label="菜单类型:" prop="menuType">
               <el-radio-group v-model="form.menuType">
                 <el-radio label="M">目录</el-radio>
                 <el-radio label="C">菜单</el-radio>
@@ -156,7 +156,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item v-if="form.menuType !== 'F'" label="菜单图标">
+            <el-form-item v-if="form.menuType !== 'F'" label="菜单图标:">
               <el-popover
                 placement="bottom-start"
                 width="460"
@@ -178,22 +178,22 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="菜单名称" prop="menuName">
+            <el-form-item label="菜单名称:" prop="menuName">
               <el-input v-model.trim="form.menuName" show-word-limit maxlength="20" placeholder="请输入菜单名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="菜单排序" prop="orderNum">
+            <el-form-item label="菜单排序:" prop="orderNum">
               <el-input-number v-model="form.orderNum" style="width: 88%" controls-position="right" :min="0" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item v-if="form.menuType !== 'M'" label="权限标识">
+            <el-form-item v-if="form.menuType !== 'M'" label="权限标识:">
               <el-input v-model.trim="form.perms" style="width: 95%" show-word-limit maxlength="50" placeholder="请权限标识" />
             </el-form-item>
           </el-col>
           <el-col :span="12" style="margin-right: 1px">
-            <el-form-item v-if="form.menuType !== 'F'" label="是否外链">
+            <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>
@@ -201,7 +201,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" style="margin-right: -1px">
-            <el-form-item v-if="form.menuType !== 'F'" label="是工作流">
+            <el-form-item v-if="form.menuType !== 'F'" label="是工作流:">
               <el-radio-group v-model="form.isProcess">
                 <el-radio label="0">是</el-radio>
                 <el-radio label="1">否</el-radio>
@@ -209,7 +209,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'F'" label="显示状态">
+            <el-form-item v-if="form.menuType !== 'F'" label="显示状态:">
               <el-radio-group v-model="form.visible">
                 <el-radio label="1">显示</el-radio>
                 <el-radio label="0">隐藏</el-radio>
@@ -217,7 +217,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'F'" label="菜单状态">
+            <el-form-item v-if="form.menuType !== 'F'" label="菜单状态:">
               <el-radio-group v-model="form.flag">
                 <el-radio label="1">启用</el-radio>
                 <el-radio label="0">停用</el-radio>
@@ -225,12 +225,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" style="width: 100%;">
-            <el-form-item v-if="form.menuType !== 'F'" label="路由地址" prop="path">
+            <el-form-item v-if="form.menuType !== 'F'" label="路由地址:" prop="path">
               <el-input v-model.trim="form.path" style="width: 95%" show-word-limit maxlength="100" placeholder="请输入路由地址" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'F' && form.isProcess==='0'" label="工作流">
+            <el-form-item v-if="form.menuType !== 'F' && form.isProcess==='0'" label="工作流:">
               <el-select v-model="form.processId" clearable placeholder="请选择工作流">
                 <el-option
                   v-for="item in workFlows"
@@ -242,7 +242,7 @@
             </el-form-item>
           </el-col>
           <el-col v-if="form.menuType === 'C'" :span="12">
-            <el-form-item label="组件路径" prop="component">
+            <el-form-item label="组件路径:" prop="component">
               <el-input v-model.trim="form.component" show-word-limit maxlength="100" placeholder="请输入组件路径" />
             </el-form-item>
           </el-col>

src/views/system/role/index.vue

@@ -2,7 +2,7 @@
   <div class="role-manage">
     <div class="search" style="border-bottom: 14px solid #f4f4f4">
       <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-        <el-form-item label="角色名称" prop="roleName">
+        <el-form-item label="角色名称:" prop="roleName">
           <el-input
             v-model.trim="queryParams.roleName"
             placeholder="请输入角色名称"
@@ -13,7 +13,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="角色状态" prop="flag">
+        <el-form-item label="角色状态:" prop="flag">
           <el-select
             v-model="queryParams.flag"
             placeholder="请选择角色状态"
@@ -140,20 +140,20 @@
     <!-- 添加或修改角色配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="auto">
-        <el-form-item label="名称" prop="roleName">
+        <el-form-item label="名称:" prop="roleName">
           <el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入角色名称" />
         </el-form-item>
-        <el-form-item label="权限字符" prop="roleKey">
+        <el-form-item label="权限字符:" prop="roleKey">
           <el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入权限字符" />
         </el-form-item>
-        <el-form-item label="排序" prop="roleSort">
+        <el-form-item label="排序:" prop="roleSort">
           <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" />
         </el-form-item>
-        <el-form-item label="状态">
+        <el-form-item label="状态:">
           <el-radio v-model="form.flag" label="1">启用</el-radio>
           <el-radio v-model="form.flag" label="0">停用</el-radio>
         </el-form-item>
-        <el-form-item label="菜单权限" prop="menuIds">
+        <el-form-item label="菜单权限:" prop="menuIds">
           <el-tree
             ref="menu"
             :check-strictly="true"
@@ -166,7 +166,7 @@
             @check="handleCheck"
           />
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="备注:">
           <el-input v-model.trim="form.remarks" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>