唐耀东
2022-09-13 34e9605033b51eed37a3c7e1df4e4a2f394c9ab0
问题修改
5个文件已修改
85 ■■■■ 已修改文件
src/views/basics/manual/index.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basics/rules/index.vue 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basics/template/index.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/device/equipment/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/role/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basics/manual/index.vue
@@ -1,11 +1,20 @@
<template>
  <div class="app-container">
    <!--    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">-->
    <!--      <el-form-item>-->
    <!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
    <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
    <!--      </el-form-item>-->
    <!--    </el-form>-->
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="手册名称" prop="manual">
        <el-input
          v-model="queryParams.manual"
          placeholder="请输入手册名称"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
@@ -205,6 +214,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        manual: undefined,
      },
      // 表单参数
      form: {},
src/views/basics/rules/index.vue
@@ -1,11 +1,20 @@
<template>
  <div class="app-container">
    <!--    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">-->
    <!--      <el-form-item>-->
    <!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
    <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
    <!--      </el-form-item>-->
    <!--    </el-form>-->
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="规章制度" prop="rules">
        <el-input
          v-model="queryParams.rules"
          placeholder="请输入规章制度"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
@@ -62,14 +71,14 @@
          <el-link v-else type="primary">{{ scope.row.rules }}</el-link>
        </template>
      </el-table-column>
      <el-table-column label="发布版本" align="left" prop="versionCode" width="100"/>
      <el-table-column label="修订日期" align="left" prop="reviseTime" width="100">
      <el-table-column label="发布版本" align="center" prop="versionCode"/>
      <el-table-column label="修订日期" align="center" prop="reviseTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.reviseTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <!--      <el-table-column label="附件" align="center" prop="fileUrl" />-->
      <el-table-column label="发布时间" align="left" prop="createTime" width="100">
      <el-table-column label="发布时间" align="center" prop="createTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
        </template>
@@ -193,6 +202,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        rules: undefined,
      },
      // 表单参数
      form: {},
src/views/basics/template/index.vue
@@ -1,11 +1,20 @@
<template>
  <div class="app-container">
    <!--    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">-->
    <!--      <el-form-item>-->
    <!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
    <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
    <!--      </el-form-item>-->
    <!--    </el-form>-->
        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label="模板名称" prop="templateName">
            <el-input
              v-model="queryParams.templateName"
              placeholder="请输入模板名称"
              clearable
              size="small"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
@@ -142,7 +151,7 @@
          </el-date-picker>
        </el-form-item>
        <el-form-item label="附件">
          <minio-upload v-model="form.fileUrl" :limit="1" :fileType="[`pdf`, 'xls', 'xlsx', 'ppt', 'pptx']"></minio-upload>
          <minio-upload v-model="form.fileUrl" :limit="1" :fileType="[`pdf`, 'xls', 'xlsx', 'ppt', 'pptx','doc','docx']"></minio-upload>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -158,7 +167,7 @@
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="附件">
          <!--          <fileUpload v-model="form.fileUrl" :limit="1" :fileType="[`pdf`]"/>-->
          <minio-upload v-model="form.fileUrl" :limit="1" :fileType="[`pdf`, 'xls', 'xlsx', 'ppt', 'pptx']"></minio-upload>
          <minio-upload v-model="form.fileUrl" :limit="1" :fileType="[`pdf`, 'xls', 'xlsx', 'ppt', 'pptx','doc','docx']"></minio-upload>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -202,6 +211,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        templateName: undefined,
      },
      // 表单参数
      form: {},
src/views/device/equipment/index.vue
@@ -357,7 +357,7 @@
  },
  created() {
    this.getList();
    //this.getSchool()
    this.getSchool()
    this.getBatch()
  },
  methods: {
@@ -374,6 +374,7 @@
    // 学校
    getSchool() {
      listSchool().then(res => {
        console.log(res.data)
        this.querySchoolList = res.data
      })
    },
src/views/system/role/index.vue
@@ -103,7 +103,11 @@
    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="角色编号" prop="roleId" width="150" />
      <el-table-column label="序号" width="150">
        <template slot-scope="scope">
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" min-width="150" />
      <el-table-column label="角色编号" prop="roleKey" :show-overflow-tooltip="true" min-width="150" />
      <el-table-column label="显示顺序" prop="roleSort" width="150" />