试题管理

src/views/contentManagement/banner/index.vue

+<template>
+  <div>
+    banner管理
+  </div>
+</template>
+<script>
+export default {
+  name: 'Index'
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/courseInformation/classManagement/index.vue

@@ -21,8 +21,8 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="适用岗位" prop="value">
-          <el-select v-model="queryParams.value" placeholder="适用岗位" clearable>
+        <el-form-item label="岗位分类" prop="value">
+          <el-select v-model="queryParams.value" placeholder="岗位分类" clearable>
             <el-option
               v-for="item in valueOptions"
               :key="item.value"
@@ -31,8 +31,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="技术方向" prop="teDirection">
-          <el-select v-model="queryParams.teDirection" placeholder="技术方向" clearable>
+        <el-form-item label="技术分类" prop="teDirection">
+          <el-select v-model="queryParams.teDirection" placeholder="技术分类" clearable>
             <el-option
               v-for="item in courseDirection"
               :key="item.value"
@@ -95,7 +95,7 @@
       <div class="tableTitle">开课管理列表</div>
       <el-table v-loading="loading" border :data="dateList">
         <el-table-column type="index" label="序号" width="90" />
-        <el-table-column label="单位" prop="roleName" :show-overflow-tooltip="true">
+        <el-table-column label="单位名称" prop="roleName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.unitName || '-' }}
           </template>
@@ -105,12 +105,12 @@
             {{ scope.row.lessonName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="适用岗位" prop="roleSort" :show-overflow-tooltip="true">
+        <el-table-column label="岗位分类" prop="roleSort" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>后端开发</span>
           </template>
         </el-table-column>
-        <el-table-column label="技术方向" prop="value" :show-overflow-tooltip="true">
+        <el-table-column label="技术分类" prop="value" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.teDirection || '-' }}
           </template>

src/views/courseInformation/feedback/index.vue

@@ -7,8 +7,8 @@
             v-for="item in feedbackTypes"
             :key="item.businessId"
             :label="item.dictLabel"
-            :value="item.businessId">
-          </el-option>
+            :value="item.businessId"
+          />
         </el-select>
       </el-form-item>
       <el-form-item prop="title">
@@ -29,48 +29,61 @@
           size="small"
         />
       </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          value-format="yyyy-MM-dd"
+          v-model="submissionTime"
+          @change="handleTimeChange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="提交开始日期"
+          end-placeholder="提交结束日期"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           :class="commonField.queryClass"
           :type="commonField.typePrimary"
           :icon="commonField.queryIcon"
           :size="commonField.smallSize"
-          @click="handleQuery">查询
+          @click="handleQuery"
+        >查询
         </el-button>
         <el-button
           :class="commonField.resetClass"
           :icon="commonField.resetIcon"
           :size="commonField.smallSize"
-          @click="resetQuery">重置
+          @click="resetQuery"
+        >重置
         </el-button>
       </el-form-item>
-<!--      <div style="float: right">-->
-<!--        <el-form-item>-->
-<!--          <el-button-->
-<!--            :class="commonField.addClass"-->
-<!--            :type="commonField.typePrimary"-->
-<!--            :icon="commonField.addIcon"-->
-<!--            :size="commonField.smallSize"-->
-<!--            @click="handleAdd">新增-->
-<!--          </el-button>-->
-<!--          <el-button-->
-<!--            :class="commonField.exportClass"-->
-<!--            :type="commonField.typeSuccess"-->
-<!--            :icon="commonField.exportIcon"-->
-<!--            :size="commonField.smallSize"-->
-<!--            @click="handleExport">导出-->
-<!--          </el-button>-->
-<!--        </el-form-item>-->
-<!--      </div>-->
+      <!--      <div style="float: right">-->
+      <!--        <el-form-item>-->
+      <!--          <el-button-->
+      <!--            :class="commonField.addClass"-->
+      <!--            :type="commonField.typePrimary"-->
+      <!--            :icon="commonField.addIcon"-->
+      <!--            :size="commonField.smallSize"-->
+      <!--            @click="handleAdd">新增-->
+      <!--          </el-button>-->
+      <!--          <el-button-->
+      <!--            :class="commonField.exportClass"-->
+      <!--            :type="commonField.typeSuccess"-->
+      <!--            :icon="commonField.exportIcon"-->
+      <!--            :size="commonField.smallSize"-->
+      <!--            @click="handleExport">导出-->
+      <!--          </el-button>-->
+      <!--        </el-form-item>-->
+      <!--      </div>-->
     </el-form>
-    <div class="placeholder"/>
+    <div class="placeholder" />
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">意见反馈列表</div>
       <el-table v-loading="loading" border :data="cmsFeedbackList">
-        <el-table-column type="index" label="序号" width="55" align="center"/>
+        <el-table-column type="index" label="序号" width="55" align="center" />
         <el-table-column label="反馈类型" prop="feedbackType" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-<!--            {{ scope.row.feedbackType || '-' }}-->
+            <!--            {{ scope.row.feedbackType || '-' }}-->
             {{ feedbackTypeMap[scope.row.feedbackType] || '-' }}
           </template>
         </el-table-column>
@@ -89,27 +102,27 @@
             {{ scope.row.submissionTime || '-' }}
           </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="remarks" :show-overflow-tooltip="true">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.remarks || '-' }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>-->
-<!--          </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="remarks" :show-overflow-tooltip="true">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.remarks || '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="操作" class-name="small-padding fixed-width" width="130px">
           <template slot-scope="scope">
             <el-button
@@ -146,16 +159,16 @@
               v-for="item in feedbackTypes"
               :key="item.businessId"
               :label="item.dictLabel"
-              :value="item.businessId.toString()">
-            </el-option>
+              :value="item.businessId.toString()"
+            />
           </el-select>
-<!--          <el-input v-model.trim="form.feedbackType" show-word-limit :maxlength="64" placeholder="请输入反馈类型"/>-->
+          <!--          <el-input v-model.trim="form.feedbackType" show-word-limit :maxlength="64" placeholder="请输入反馈类型"/>-->
         </el-form-item>
         <el-form-item label="标题" prop="title">
-          <el-input v-model.trim="form.title" :disabled="isDisable" show-word-limit :maxlength="255" placeholder="请输入标题"/>
+          <el-input v-model.trim="form.title" :disabled="isDisable" show-word-limit :maxlength="255" placeholder="请输入标题" />
         </el-form-item>
         <el-form-item label="联系方式" prop="contact">
-          <el-input v-model.trim="form.contact" :disabled="isDisable" show-word-limit placeholder="请输入联系方式"/>
+          <el-input v-model.trim="form.contact" :disabled="isDisable" show-word-limit placeholder="请输入联系方式" />
         </el-form-item>
 
         <el-form-item label="状态">
@@ -165,8 +178,14 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model.trim="form.remarks" :disabled="isDisable" maxlength="200" show-word-limit type="textarea"
-                    placeholder="请输入内容"/>
+          <el-input
+            v-model.trim="form.remarks"
+            :disabled="isDisable"
+            maxlength="200"
+            show-word-limit
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -214,15 +233,18 @@ export default {
           dictValue: '0'
         }
       ],
-      //表单是否禁用
-      isDisable:false,
+      // 表单是否禁用
+      isDisable: false,
+      submissionTime: null,
       // 查询参数
       queryParams: {
         page: 1,
         rows: 10,
-        feedbackType: undefined,
-        title: undefined,
-        contact: undefined,
+        feedbackType: null,
+        title: null,
+        contact: null,
+        beginTime: '',
+        endTime: '',
         flag: ''
       },
       feedbackTypes: [],
@@ -231,13 +253,13 @@ export default {
       // 表单校验
       rules: {
         feedbackType: [
-          {required: true, message: '请输入反馈类型', trigger: 'blur'}
+          { required: true, message: '请输入反馈类型', trigger: 'blur' }
         ],
         title: [
-          {required: true, message: '请输入标题', trigger: 'blur'}
+          { required: true, message: '请输入标题', trigger: 'blur' }
         ],
         contact: [
-          {required: true, message: '请输入联系方式', trigger: 'blur'}
+          { required: true, message: '请输入联系方式', trigger: 'blur' }
         ]
       }
     }
@@ -248,18 +270,28 @@ export default {
     },
     // 创建一个映射对象，用于快速查找反馈类型的显示值
     feedbackTypeMap() {
-      const map = {};
+      const map = {}
       this.feedbackTypes.forEach(item => {
-        map[item.businessId] = item.dictLabel;
-      });
-      return map;
-    },
+        map[item.businessId] = item.dictLabel
+      })
+      return map
+    }
   },
   created() {
     this.getList() // 列表查询
     this.getFeedbackTypes()
   },
   methods: {
+    handleTimeChange(value) {
+      console.log('value',value)
+      if (value && value !== '' && value.length > 0) {
+        this.queryParams.beginTime = value[0] + ' 00:00:00'
+        this.queryParams.endTime = value[1] + ' 23:59:59'
+      } else {
+        this.queryParams.beginTime = ''
+        this.queryParams.endTime = ''
+      }
+    },
     /** 查询意见反馈列表 */
     getList() {
       this.loading = true
@@ -313,7 +345,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.isDisable=false
+      this.isDisable = false
       this.reset()
       this.open = true
       this.title = '添加意见反馈'
@@ -343,19 +375,19 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function () {
+      }).then(function() {
         return updateCmsFeedback(row)
       }).then(() => {
         this.$message({
           message: text + '成功',
           type: 'success'
         })
-      }).catch(function () {
+      }).catch(function() {
         row.flag = row.flag === '0' ? '1' : '0'
       })
     },
     /** 提交按钮 */
-    submitForm: function () {
+    submitForm: function() {
       // this.open=falsethis.reset()
 
       this.$refs['form'].validate(valid => {
@@ -383,7 +415,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function () {
+      }).then(function() {
         return delCmsFeedback(id)
       }).then(() => {
         this.getList()
@@ -391,7 +423,7 @@ export default {
           message: '删除成功',
           type: 'success'
         })
-      }).catch(function () {
+      }).catch(function() {
       })
     },
     /** 导出按钮操作 */
@@ -401,7 +433,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function () {
+      }).then(function() {
         return exportCmsFeedback(queryParams).then(response => {
           const blob = new Blob([response])
           const downloadElement = document.createElement('a')

src/views/courseInformation/tryoutApplication/index.vue

+<template>
+  <div>试用申请</div>
+</template>
+
+<script>
+export default {
+  name: 'Index'
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/courseInformation/tryoutCommencement/index.vue

+<template>
+  <div>
+    试用开课
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index'
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/courseInformation/unitManagement/index.vue

@@ -22,6 +22,16 @@
             style="width: 200px"
           />
         </el-form-item>
+        <el-form-item prop="unitName" label="单位管理员账号">
+          <el-input
+            v-model="queryParams.unitNumber"
+            placeholder="单位管理员账号"
+            clearable
+            :maxlength="255"
+            size="small"
+            style="width: 200px"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button
             :class="commonField.queryClass"
@@ -64,26 +74,36 @@
             {{ scope.row.unitName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="单位管理员"  width="150" prop="unitNumber" :show-overflow-tooltip="true">
+        <!--        <el-table-column label="单位管理员"  width="150" prop="unitNumber" :show-overflow-tooltip="true">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.unitNumber || '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="单位管理员账号" width="150" prop="unitNumber" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.unitNumber || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="出口ip" width="200" prop="exitId" :show-overflow-tooltip="true">
+        <!--        <el-table-column label="备注" width="520" prop="exitId" :show-overflow-tooltip="true">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.exitId || '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column> -->
+        <el-table-column label="备注" width="520" prop="remarks" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.exitId || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" label="创建人" prop="createDate" width="160">
-          <template slot-scope="scope">
-            <span>{{ scope.row.creteName || '-' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" label="创建时间" prop="createDate" width="160">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createDate }}</span>
+            {{ scope.row.remarks || '-' }}
           </template>
         </el-table-column>
+        <!--        <el-table-column :show-overflow-tooltip="true" label="创建人" prop="createDate" width="160">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ scope.row.creteName || '-' }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column :show-overflow-tooltip="true" label="创建时间" prop="createDate" width="160">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ scope.row.createDate }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column width="70" label="状态" prop="flag">
           <template slot-scope="scope">
             <el-switch
@@ -149,6 +169,15 @@
         <el-form-item label="出口Ip" prop="exitId">
           <el-input v-model.trim="form.exitId" :maxlength="255" placeholder="请输入出口ip" />
         </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input
+            v-model.trim="form.remarks"
+            type="textarea"
+            :rows="4"
+            :maxlength="255"
+            placeholder="请输入备注"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button class="cancelBtn" @click="cancel">取 消</el-button>

src/views/system/role/index.vue

@@ -13,16 +13,6 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="权限字符" prop="roleKey">
-          <el-input
-            v-model="queryParams.roleKey"
-            placeholder="请输入权限字符"
-            clearable
-            size="small"
-            style="width: 150px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
         <el-form-item label="角色状态" prop="flag">
           <el-select
             v-model="queryParams.flag"
@@ -83,23 +73,13 @@
     <div style="padding:5px 10px">
       <div class="tableTitle">角色管理列表</div>
       <el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
-        <el-table-column type="index" label="序号" width="90" />
-        <el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true">
+        <el-table-column type="index" label="角色编号" width="120" />
+        <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.roleName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="权限字符" prop="roleKey">
-          <template slot-scope="scope">
-            {{ scope.row.roleKey || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="显示顺序" prop="roleSort">
-          <template slot-scope="scope">
-            {{ scope.row.roleSort || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="状态" align="center" width="100">
+        <el-table-column label="角色状态" align="center" width="100">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.flag"
@@ -114,6 +94,11 @@
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="更新时间" :show-overflow-tooltip="true" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
           <template slot-scope="scope">
             <!--              //修改-->

src/views/system/user/index.vue

@@ -89,22 +89,32 @@
           :data="userList"
         >
           <el-table-column type="index" label="序号" width="90" />
+<!--          <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="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">
+          <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="username" :show-overflow-tooltip="true">&ndash;&gt;-->
+            <!--            <template slot-scope="scope">-->
+            <!--              {{ scope.row.username || '-' }}-->
+            <!--            </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">
+          <el-table-column width="120" label="用户状态" prop="flag">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.flag"
@@ -115,6 +125,11 @@
               />
             </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>