修改bug

src/views/contentManagement/banner/index.vue

@@ -151,7 +151,7 @@
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
         <el-form-item label="分类" prop="type">
 <!--          <el-input v-model.trim="form.type" show-word-limit :maxlength="32" placeholder="请输入类型" />-->
-          <el-select v-model.trim="form.type" show-word-limit  placeholder="请输入类型" style="width: 70%">
+          <el-select v-model.trim="form.type" show-word-limit  placeholder="请输入类型" style="width: 100%">
             <el-option label="课程资源" value="0" />
             <el-option label="其他资源" value="1" />
           </el-select>
@@ -161,15 +161,15 @@
         </el-form-item>
         <el-form-item label="图片" prop="bannerPicture">
           <el-upload
-            :show-file-list="false"
-            list-type="picture-card"
+            class="avatar-uploader"
             action="#"
             :http-request="handleUpload"
+            :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
-            :on-remove="handleRemove"
           >
-            <img v-if="form.url" :src="form.url" style="height: 150px;width: 150px">
+            <!--                <img v-if="imageUrl" :src="imageUrl" style="height: 200px;width: 200px">-->
+            <img v-if="imageUrl" :src="imageUrl" style="height: 200px;width: 200px">
             <i v-else class="el-icon-plus avatar-uploader-icon" />
           </el-upload>
 
@@ -178,7 +178,7 @@
           <el-input v-model.trim="form.linkUrl" show-word-limit :maxlength="255" placeholder="请输入链接地址" />
         </el-form-item>
         <el-form-item label="排序" prop="weight">
-          <el-input-number v-model.trim="form.weight" controls-position="right" :min="0" />
+          <el-input-number v-model.trim="form.weight" style="width: 100%" controls-position="right" :min="0" />
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.flag">
@@ -248,6 +248,7 @@ export default {
         linkUrl: undefined,
         flag: ''
       },
+      showImg: false,
       imagUrl: '',
       // 表单参数
       form: {},
@@ -313,18 +314,20 @@ export default {
       formData.append('file', file.file)
       formData.append('temp', 'CmsBanner')
       uploadPublic(formData).then(res => {
+        console.log('url',res.data.url)
+        this.imageUrl = res.data.url
+        this.showImg = true
         this.form.bannerPicture = res.data.businessId
-        this.form.url = res.data.url
       })
     },
     handleAvatarSuccess(res, file) {
       console.log('res', res)
-      this.imageUrl = URL.createObjectURL(file.raw)
-      this.form.bannerPicture = res.data.businessId
-      this.form.url = res.data.url
+      // this.imageUrl = URL.createObjectURL(file.raw)
+      // this.form.bannerPicture = res.data.businessId
+      // this.form.url = res.data.url
     },
     beforeAvatarUpload(file) {
-      this.file = file
+      // this.file = file
     },
 
     step(index) {
@@ -395,7 +398,7 @@ export default {
       const id = row.businessId
       getCmsBanner(id).then(response => {
         this.form = response.data
-        this.form.url = this.imagePath + response.data.url
+        this.imageUrl = this.imagePath + response.data.url
         this.open = true
         this.title = '修改banner'
       })
@@ -481,6 +484,27 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+  border: 1px solid #dcdfe6;
+}
   .app-container {
     font-size: 18px;
     padding: 0;

src/views/contentManagement/centralCase/index.vue

@@ -31,6 +31,7 @@
             <el-form-item>
               <!--          //新增按钮-->
               <el-button
+                v-has-permi="hasAddPerm"
                 :class="commonField.addClass"
                 :type="commonField.typePrimary"
                 :icon="commonField.addIcon"
@@ -81,6 +82,7 @@
           <el-table-column label="操作" width="120">
             <template slot-scope="scope">
               <el-button
+                v-has-permi="hasUpdatePerm"
                 :class="commonField.updateClass"
                 :type="commonField.typeParent"
                 :size="commonField.size"
@@ -120,6 +122,8 @@ export default {
   // },
   data() {
     return {
+      hasAddPerm: ['sys:contentNewssInformation:add'],
+      hasUpdatePerm: ['sys:contentNewssInformation:update'],
       imageSrc: require('@/assets/image/test.png'),
       imagePath: 'http://49.232.167.247:20020/teaServer/',
       // 显示开关
@@ -292,7 +296,7 @@ export default {
     handleUpdate(row) {
       console.log('我是修改')
       this.$router.push({
-        path: '/contentManagement/centralCase/info/index',
+        path: '/contentManagement/centralCase/info/update',
         query: {
           isOperation: '2',
           bussinessId: row.businessId

src/views/contentManagement/competitionSupport/index.vue

@@ -65,7 +65,7 @@
         </el-table-column>
         <el-table-column label="大赛时间" prop="contestDate" :show-overflow-tooltip="true" width="170px">
           <template slot-scope="scope">
-            <span>{{ scope.row.contestDate | transformDateByFormat('YYYY-MM-DD hh:mm') }}</span>
+            <span>{{ scope.row.contestDate | transformDateByFormat('YYYY-MM-DD') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="大赛描述" prop="contestDiscribe" :show-overflow-tooltip="true">
@@ -152,7 +152,6 @@
               <el-upload
                 class="avatar-uploader"
                 action="#"
-                v-model="form.contestPicture"
                 :http-request="handleUpload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess"
@@ -164,20 +163,25 @@
               </el-upload>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="排序" prop="weight">
-              <el-input-number v-model="form.weight" controls-position="right" @change="handleChange" :min="1" :max="10" placeholder="请输入排序"  style="width: 100%"/>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row>
-
-          <el-form-item label="状态">
-            <el-radio-group v-model="form.flag">
-              <el-radio label="1">启用</el-radio>
-              <el-radio label="0">停用</el-radio>
-            </el-radio-group>
-          </el-form-item>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="排序" prop="weight">
+                <el-input-number v-model="form.weight" controls-position="right" @change="handleChange" :min="1" :max="10" placeholder="请输入排序"  style="width: 100%"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+         <el-row>
+           <el-col :span="12">
+             <el-form-item label="状态">
+               <el-radio-group v-model="form.flag">
+                 <el-radio label="1">启用</el-radio>
+                 <el-radio label="0">停用</el-radio>
+               </el-radio-group>
+             </el-form-item>
+           </el-col>
+         </el-row>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/contentManagement/newsInformation/index.vue

@@ -47,6 +47,7 @@
             <el-form-item>
               <!--          //新增按钮-->
               <el-button
+                v-has-permi="hasAddPerm"
                 :class="commonField.addClass"
                 :type="commonField.typePrimary"
                 :icon="commonField.addIcon"
@@ -54,13 +55,13 @@
                 @click="handleAdd"
               >{{ commonField.addName }}</el-button>
               <!--          //新增按钮-->
-              <el-button
-                :class="commonField.addClass"
-                :type="commonField.typePrimary"
-                :icon="commonField.addIcon"
-                :size="commonField.smallSize"
-                @click="handleExamination"
-              >{{ "跳转考试临时" }}</el-button>
+<!--              <el-button-->
+<!--                :class="commonField.addClass"-->
+<!--                :type="commonField.typePrimary"-->
+<!--                :icon="commonField.addIcon"-->
+<!--                :size="commonField.smallSize"-->
+<!--                @click="handleExamination"-->
+<!--              >{{ "跳转考核临时" }}</el-button>-->
             </el-form-item>
           </div>
         </el-form>
@@ -128,12 +129,14 @@
           <el-table-column align="center" label="操作" width="150">
             <template slot-scope="scope">
               <el-button
+                v-has-permi="hasDetailPerm"
                 :class="commonField.updateClass"
                 :type="commonField.typeParent"
                 :size="commonField.size"
                 @click="handleView(scope.row)"
               >查看</el-button>
               <el-button
+                v-has-permi="hasUpdatePerm"
                 :class="commonField.updateClass"
                 :type="commonField.typeParent"
                 :size="commonField.size"
@@ -178,6 +181,9 @@ export default {
   // },
   data() {
     return {
+      hasAddPerm: ['sys:contentNewsInformation:add'],
+      hasUpdatePerm: ['sys:contentNewsInformation:update'],
+      hasDetailPerm: ['sys:contentNewsInformation:query'],
       imageSrc: require('@/assets/image/test.png'),
       imagePath: 'http://49.232.167.247:20020/teaServer/',
       // 显示开关
@@ -415,7 +421,7 @@ export default {
     handleUpdate(row) {
       console.log('我是修改')
       this.$router.push({
-        path: '/contentManagement/newsInformation/info/index',
+        path: '/contentManagement/centralCase/info/update',
         query: {
           isOperation: '2',
           bussinessId: row.businessId
@@ -447,7 +453,7 @@ export default {
      **/
     handleView(row) {
       this.$router.push({
-        path: '/contentManagement/newsInformation/info/index',
+        path: '/contentManagement/newsInformation/info/detail',
         query: {
           isOperation: '3',
           bussinessId: row.businessId

src/views/courseInformation/courseManagement/index.vue

@@ -122,6 +122,7 @@
             <el-form-item>
               <!--          //新增按钮-->
               <el-button
+                v-has-permi="hasAddPerm"
                 :class="commonField.addClass"
                 :type="commonField.typePrimary"
                 :icon="commonField.addIcon"
@@ -532,6 +533,9 @@ export default {
       }
     }
     return {
+      hasAddPerm: ['sys:lesson:add'],
+      hasUpdatePerm: ['sys:lesson:update'],
+      hasDetailPerm: ['sys:lesson:detail'],
       flag: '1',
       HTTPApi: process.env.VUE_APP_BASE_APIS,
       // interfaceUrl:"http://"+url.apiIP+":"+url.apiPORT+url.apiPrefix, // API服务访问的URL

src/views/courseInformation/feedback/index.vue

@@ -126,6 +126,7 @@
         <el-table-column label="操作" class-name="small-padding fixed-width" width="130px">
           <template slot-scope="scope">
             <el-button
+              v-has-permi="hasDetailPerm"
               :class="commonField.updateClass"
               :type="commonField.typeParent"
               :size="commonField.size"
@@ -212,6 +213,7 @@ export default {
   name: 'CmsFeedback',
   data() {
     return {
+      hasDetailPerm: ['sys:feedBack:detail'],
       // 遮罩层
       loading: true,
       // 总条数

src/views/courseInformation/lecturerManagement/index.vue

@@ -129,10 +129,10 @@
     <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-input v-model.trim="form.name" placeholder="请输入讲师姓名" />
+          <el-input v-model.trim="form.name" :maxlength="20" placeholder="请输入讲师姓名" />
         </el-form-item>
         <el-form-item label="头衔" prop="title">
-          <el-input v-model.trim="form.title" placeholder="请输入讲师头衔" />
+          <el-input v-model.trim="form.title" :maxlength="100" placeholder="请输入讲师头衔" />
         </el-form-item>
         <el-form-item label="简介" prop="details">
           <el-input

src/views/system/user/index.vue

@@ -13,11 +13,11 @@
           />
         </el-form-item>
         <el-form-item label="所属单位" prop="belongDeptId">
-          <el-select v-model="queryParams.belongDeptId" filterable placeholder="请选择"  style="width: 150px">
+          <el-select v-model="queryParams.belongDeptId" filterable placeholder="请选择" style="width: 150px">
             <el-option
               v-for="(item,index) in deptList"
               :key="index"
-              :label="item.deptName"
+              :label="item.unitName"
               :value="item.businessId"
             />
           </el-select>
@@ -33,7 +33,7 @@
           />
         </el-form-item>
         <el-form-item label="角色" prop="roleId">
-          <el-select v-model="queryParams.roleId" placeholder="请选择"  style="width: 150px">
+          <el-select v-model="queryParams.roleId" placeholder="请选择" style="width: 150px">
             <el-option
               v-for="item in options"
               :key="item.businessId"
@@ -114,102 +114,102 @@
       </el-form>
     </div>
     <div style="padding:5px 10px">
-        <div class="tableTitle">用户管理列表</div>
-        <el-table
-          v-loading="loading"
-          style="padding-right: 10px"
-          :data="userList"
+      <div class="tableTitle">用户管理列表</div>
+      <el-table
+        v-loading="loading"
+        style="padding-right: 10px"
+        :data="userList"
+      >
+        <el-table-column type="index" label="序号" width="90" />
+        <el-table-column label="用户类型" prop="identity" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span v-if="scope.row.identity === 1">管理员</span>
+            <span v-if="scope.row.identity === 2">单位用户</span>
+            <span v-if="scope.row.identity === 3">个人用户</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="登录名" prop="username" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.username || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="用户姓名" prop="userType" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.name || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="所属单位" prop="deptName" :show-overflow-tooltip="true">-->
+          <template slot-scope="scope">
+            {{ scope.row.deptName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="手机号" prop="phone" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.phone || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column width="120" label="用户状态" prop="flag">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.flag"
+              class="switchDisabledStyle"
+              inactive-value="0"
+              active-value="1"
+              @click.native="handleStatusChange(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="角色" prop="phone" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.roleNames || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" label="创建时间" prop="createDate" width="160">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          width="200"
+          class-name="small-padding fixed-width"
         >
-          <el-table-column type="index" label="序号" width="90" />
-          <el-table-column label="用户类型" prop="identity" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-             <span v-if="scope.row.identity === 1">管理员</span>
-             <span v-if="scope.row.identity === 2">单位用户</span>
-             <span v-if="scope.row.identity === 3">个人用户</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="登录名" prop="username" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              {{ scope.row.username || '-' }}
-            </template>
-          </el-table-column>
-          <el-table-column label="用户姓名" prop="userType" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              {{ scope.row.name || '-' }}
-            </template>
-          </el-table-column>
-          <el-table-column label="所属单位" prop="deptName" :show-overflow-tooltip="true">-->
-            <template slot-scope="scope">
-              {{ scope.row.deptName || '-' }}
-            </template>
-          </el-table-column>
-          <el-table-column label="手机号" prop="phone" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              {{ scope.row.phone || '-' }}
-            </template>
-          </el-table-column>
-          <el-table-column width="120" label="用户状态" prop="flag">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.flag"
-                class="switchDisabledStyle"
-                inactive-value="0"
-                active-value="1"
-                @click.native="handleStatusChange(scope.row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="角色" prop="phone" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              {{ scope.row.roleNames || '-' }}
-            </template>
-          </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" label="创建时间" prop="createDate" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            width="200"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="scope">
-              <!--              //修改-->
-              <el-button
-                v-hasPermi="hasUpdatePerm"
-                :class="commonField.updateClass"
-                :type="commonField.typeParent"
-                :size="commonField.size"
-                @click="handleUpdate(scope.row)"
-              >{{ commonField.updateName }}</el-button>
-              <!--              //重置密码-->
-              <el-button
-                v-hasPermi="hasResetPerm"
-                :class="commonField.resetPasClass"
-                :type="commonField.typeParent"
-                :size="commonField.size"
-                @click="handleResetPwd(scope.row)"
-              >{{ commonField.resetPassword }}</el-button>
-              <!--              //删除-->
-              <el-button
-                v-if="scope.row.businessId !== 1"
-                v-hasPermi="hasDelPerm"
-                :class="commonField.delClass"
-                :type="commonField.typeParent"
-                :size="commonField.size"
-                @click="handleDelete(scope.row)"
-              >{{ commonField.deleteName }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.rows"
-          @pagination="getList"
-        />
+          <template slot-scope="scope">
+            <!--              //修改-->
+            <el-button
+              v-hasPermi="hasUpdatePerm"
+              :class="commonField.updateClass"
+              :type="commonField.typeParent"
+              :size="commonField.size"
+              @click="handleUpdate(scope.row)"
+            >{{ commonField.updateName }}</el-button>
+            <!--              //重置密码-->
+            <el-button
+              v-hasPermi="hasResetPerm"
+              :class="commonField.resetPasClass"
+              :type="commonField.typeParent"
+              :size="commonField.size"
+              @click="handleResetPwd(scope.row)"
+            >{{ commonField.resetPassword }}</el-button>
+            <!--              //删除-->
+            <el-button
+              v-if="scope.row.businessId !== 1"
+              v-hasPermi="hasDelPerm"
+              :class="commonField.delClass"
+              :type="commonField.typeParent"
+              :size="commonField.size"
+              @click="handleDelete(scope.row)"
+            >{{ commonField.deleteName }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.rows"
+        @pagination="getList"
+      />
     </div>
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
@@ -217,7 +217,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="用户类型" prop="identity">
-              <el-select v-model="form.identity" placeholder="请选择用户类型" style="width: 100%" >
+              <el-select v-model="form.identity" placeholder="请选择用户类型" style="width: 100%">
                 <el-option
                   v-for="(item,index) in userTypeList"
                   :key="index"
@@ -243,12 +243,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="form.name" placeholder="请输入用户名称" />
+              <el-input v-model.trim="form.name" maxlength="50" placeholder="请输入用户名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" />
+              <el-input v-model="form.nickName" maxlength="50" placeholder="请输入用户昵称" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -301,14 +301,14 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="所属单位" prop="postId">
-              <treeSelect
-                v-model="form.deptId"
-                :disable-branch-nodes="true"
-                :options="deptChildren"
-                :show-count="true"
-                placeholder="请选择所属单位"
-                @input="changeValue"
-              />
+              <el-select v-model="form.deptId" filterable placeholder="所属单位" style="width: 100%">
+                <el-option
+                  v-for="(item,index) in deptList"
+                  :key="index"
+                  :label="item.unitName"
+                  :value="item.businessId"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -329,7 +329,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
+              <el-input v-model="form.remarks" maxlength="200" type="textarea" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -451,6 +451,7 @@ import { getListRole } from '@/api/system/role'
 import { getDataCache, setDataCache } from '@/assets/js/filterData'
 import commonField from '@/utils/commonField'
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
+import { listUnitAll } from '@/api/sysUnit'
 export default {
   name: 'User',
   components: { TreeSelect, ElImageViewer },
@@ -594,8 +595,11 @@ export default {
       },
       // 表单校验
       rules: {
+        identity: [{ required: true, message: '请选择用户类型', trigger: 'blur' }],
         username: [
-          { required: true, message: '请输入登录名', trigger: 'blur' }
+          { required: true, message: '请输入登录名', trigger: 'blur' },
+          { pattern: /^[a-zA-Z0-9]*$/, message: '请输入数字,英文或数字和英文的组合', trigger: 'blur' }
+
         ],
         nickName: [
           { required: false, message: '请输入用户昵称', trigger: 'blur' },
@@ -677,9 +681,19 @@ export default {
     // })
   },
   methods: {
+    // 校验登录名
+    validateInput(rule, value, callback) {
+      // 利用正则表达式校验输入是否为只有英文字符、只有数字或英文和数字的组合
+      const reg = /^[a-zA-Z]*$|^\d*$|^[a-zA-Z0-9]*$/
+      if (value && !reg.test(value)) {
+        callback(new Error('请输入只有英文字符、只有数字或英文和数字的组合'))
+      } else {
+        callback()
+      }
+    },
     // 获取所有部门信息
     getDeptList() {
-      listAllDept().then(res => {
+      listUnitAll().then(res => {
         if (res.code === 200) {
           this.deptList = res.data
         }