liuchengxin
2022-01-07 f8e7dc84f30df6dbac5d32ce84a85c7d804f0f9d
代码提交
12个文件已修改
262 ■■■■ 已修改文件
src/assets/styles/index.scss 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/layout/components/Navbar.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basics/manufacturer/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basics/school/index.vue 85 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/device/batch/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/device/equipment/index.vue 79 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/device/peripheralUnit/index.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/dept/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/dict/data.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/dict/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/role/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/user/index.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/styles/index.scss
@@ -189,3 +189,7 @@
.multiselect--active {
  z-index: 1000 !important;
}
.del-btn {
  color: #ff0000;
}
src/layout/components/Navbar.vue
@@ -6,16 +6,16 @@
    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
    <div class="right-menu">
      <template v-if="device!=='mobile'">
        <search id="header-search" class="right-menu-item" />
      <!--<template v-if="device!=='mobile'">-->
        <!--<search id="header-search" class="right-menu-item" />-->
        <screenfull id="screenfull" class="right-menu-item hover-effect" />
        <!--<screenfull id="screenfull" class="right-menu-item hover-effect" />-->
        <el-tooltip content="布局大小" effect="dark" placement="bottom">
          <size-select id="size-select" class="right-menu-item hover-effect" />
        </el-tooltip>
        <!--<el-tooltip content="布局大小" effect="dark" placement="bottom">-->
          <!--<size-select id="size-select" class="right-menu-item hover-effect" />-->
        <!--</el-tooltip>-->
      </template>
      <!--</template>-->
      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
        <div class="avatar-wrapper">
@@ -26,9 +26,9 @@
          <router-link to="/user/profile">
            <el-dropdown-item>个人中心</el-dropdown-item>
          </router-link>
          <el-dropdown-item @click.native="setting = true">
            <span>布局设置</span>
          </el-dropdown-item>
          <!--<el-dropdown-item @click.native="setting = true">-->
            <!--<span>布局设置</span>-->
          <!--</el-dropdown-item>-->
          <el-dropdown-item divided @click.native="logout">
            <span>退出登录</span>
          </el-dropdown-item>
src/views/basics/manufacturer/index.vue
@@ -114,6 +114,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:manufacturer:remove']"
          >删除</el-button>
@@ -321,7 +322,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除厂商编号为"' + ids + '"的数据项?').then(() => {
      this.$modal.confirm('是否确认删除?').then(() => {
        this.loading = true;
        return delManufacturer(ids);
      }).then(() => {
src/views/basics/school/index.vue
@@ -19,47 +19,47 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="省份" prop="provinceCode">
        <el-select v-model="queryParams.provinceCode" placeholder="请选择省份" clearable size="small"
                   @change="provinceQueryChange">
          <el-option
            v-for="item in provinceList"
            :key="item.provinceCode"
            :label="item.provinceName"
            :value="item.provinceCode"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="城市" prop="cityCode">
        <el-select v-model="queryParams.cityCode" placeholder="请选择省份" clearable size="small">
          <el-option
            v-for="item in cityList"
            :key="item.cityCode"
            :label="item.cityName"
            :value="item.cityCode"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="办学层次" prop="schoolRunLevel">
        <el-select v-model="queryParams.schoolRunLevel" placeholder="请选择办学层次" clearable size="small">
          <el-option
            v-for="dict in dict.type.DICT105"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="学科范围" prop="disciplineScope">
        <el-select v-model="queryParams.disciplineScope" placeholder="请选择学科范围" clearable size="small">
          <el-option
            v-for="dict in dict.type.DICT106"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <!--<el-form-item label="省份" prop="provinceCode">-->
        <!--<el-select v-model="queryParams.provinceCode" placeholder="请选择省份" clearable size="small"-->
                   <!--@change="provinceQueryChange">-->
          <!--<el-option-->
            <!--v-for="item in provinceList"-->
            <!--:key="item.provinceCode"-->
            <!--:label="item.provinceName"-->
            <!--:value="item.provinceCode"-->
          <!--/>-->
        <!--</el-select>-->
      <!--</el-form-item>-->
      <!--<el-form-item label="城市" prop="cityCode">-->
        <!--<el-select v-model="queryParams.cityCode" placeholder="请选择省份" clearable size="small">-->
          <!--<el-option-->
            <!--v-for="item in cityList"-->
            <!--:key="item.cityCode"-->
            <!--:label="item.cityName"-->
            <!--:value="item.cityCode"-->
          <!--/>-->
        <!--</el-select>-->
      <!--</el-form-item>-->
      <!--<el-form-item label="办学层次" prop="schoolRunLevel">-->
        <!--<el-select v-model="queryParams.schoolRunLevel" placeholder="请选择办学层次" clearable size="small">-->
          <!--<el-option-->
            <!--v-for="dict in dict.type.DICT105"-->
            <!--:key="dict.value"-->
            <!--:label="dict.label"-->
            <!--:value="dict.value"-->
          <!--/>-->
        <!--</el-select>-->
      <!--</el-form-item>-->
      <!--<el-form-item label="学科范围" prop="disciplineScope">-->
        <!--<el-select v-model="queryParams.disciplineScope" placeholder="请选择学科范围" clearable size="small">-->
          <!--<el-option-->
            <!--v-for="dict in dict.type.DICT106"-->
            <!--:key="dict.value"-->
            <!--:label="dict.label"-->
            <!--:value="dict.value"-->
          <!--/>-->
        <!--</el-select>-->
      <!--</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>
@@ -151,6 +151,7 @@
          <el-button
            size="mini"
            type="text"
            class="del-btn"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:school:remove']"
@@ -413,7 +414,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除学校编号为"' + ids + '"的数据项?').then(() => {
      this.$modal.confirm('是否确认删除?').then(() => {
        this.loading = true;
        return delSchool(ids);
      }).then(() => {
src/views/device/batch/index.vue
@@ -100,6 +100,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:batch:remove']"
          >删除</el-button>
@@ -301,7 +302,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除生产批次编号为"' + ids + '"的数据项?').then(() => {
      this.$modal.confirm('是否确认删除?').then(() => {
        this.loading = true;
        return delBatch(ids);
      }).then(() => {
src/views/device/equipment/index.vue
@@ -20,15 +20,15 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="软件版本" prop="edition">
        <el-input
          v-model="queryParams.edition"
          placeholder="请输入软件版本"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <!--<el-form-item label="软件版本" prop="edition">-->
        <!--<el-input-->
          <!--v-model="queryParams.edition"-->
          <!--placeholder="请输入软件版本"-->
          <!--clearable-->
          <!--size="small"-->
          <!--@keyup.enter.native="handleQuery"-->
        <!--/>-->
      <!--</el-form-item>-->
      <el-form-item label="学校名称" prop="schoolId">
        <el-select v-model="queryParams.schoolId" placeholder="请选择学校名称" clearable size="small">
          <el-option
@@ -48,35 +48,35 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="β网络ID" prop="networkId">
        <el-input
          v-model="queryParams.networkId"
          placeholder="请输入β网络ID"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="β工作频段" prop="frequencyBand">
        <el-select v-model="queryParams.frequencyBand" placeholder="请选择β工作频段" clearable size="small">
          <el-option
            v-for="dict in dict.type.DICT102"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="在用状态" prop="useStatus">
        <el-select v-model="queryParams.useStatus" placeholder="请选择在用状态" clearable size="small">
          <el-option
            v-for="dict in dict.type.DICT104"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <!--<el-form-item label="β网络ID" prop="networkId">-->
        <!--<el-input-->
          <!--v-model="queryParams.networkId"-->
          <!--placeholder="请输入β网络ID"-->
          <!--clearable-->
          <!--size="small"-->
          <!--@keyup.enter.native="handleQuery"-->
        <!--/>-->
      <!--</el-form-item>-->
      <!--<el-form-item label="β工作频段" prop="frequencyBand">-->
        <!--<el-select v-model="queryParams.frequencyBand" placeholder="请选择β工作频段" clearable size="small">-->
          <!--<el-option-->
            <!--v-for="dict in dict.type.DICT102"-->
            <!--:key="dict.value"-->
            <!--:label="dict.label"-->
            <!--:value="dict.value"-->
          <!--/>-->
        <!--</el-select>-->
      <!--</el-form-item>-->
      <!--<el-form-item label="在用状态" prop="useStatus">-->
        <!--<el-select v-model="queryParams.useStatus" placeholder="请选择在用状态" clearable size="small">-->
          <!--<el-option-->
            <!--v-for="dict in dict.type.DICT104"-->
            <!--:key="dict.value"-->
            <!--:label="dict.label"-->
            <!--:value="dict.value"-->
          <!--/>-->
        <!--</el-select>-->
      <!--</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>
@@ -174,6 +174,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:equipment:remove']"
          >删除
@@ -495,7 +496,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除智控设备编号为"' + ids + '"的数据项?').then(() => {
      this.$modal.confirm('是否确认删?').then(() => {
        this.loading = true;
        return delEquipment(ids);
      }).then(() => {
src/views/device/peripheralUnit/index.vue
@@ -129,7 +129,7 @@
          <dict-tag :options="dict.type.DICT103" :value="scope.row.baudRate"/>
        </template>
      </el-table-column>
      <el-table-column label="读数指令" align="center" prop="readInstruction"/>
      <el-table-column label="读数指令" align="center" width="180" prop="readInstruction"/>
      <el-table-column label="回数长度" align="center" prop="loopLength"/>
      <el-table-column label="功能描述" align="center" prop="description"/>
      <el-table-column label="操作" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
@@ -137,7 +137,7 @@
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            icon="el-icon-view"
            @click="handleInfo(scope.row)"
            v-hasPermi="['oa:peripheralUnit:info']"
          >查看
@@ -153,17 +153,18 @@
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:peripheralUnit:remove']"
          >删除
            icon="el-icon-document"
            @click="handleUpload(scope.row)"
          >附件
          </el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleUpload(scope.row)"
          >附件
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:peripheralUnit:remove']"
          >删除
          </el-button>
        </template>
      </el-table-column>
@@ -305,7 +306,8 @@
          {required: true, message: "外设代码不能为空", trigger: "blur"}
        ],
        name: [
          {required: true, message: "外设名称不能为空", trigger: "blur"}
          {required: true, message: "外设名称不能为空", trigger: "blur"},
          {max: 32, message: '最多输入32中文字符', trigger: 'blur' }
        ],
        model: [
          {required: true, message: "规格型号不能为空", trigger: "blur"}
@@ -462,7 +464,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除外设单元编号为"' + ids + '"的数据项?').then(() => {
      this.$modal.confirm('是否确认删除?').then(() => {
        this.loading = true;
        return delPeripheralUnit(ids);
      }).then(() => {
src/views/system/dept/index.vue
@@ -105,6 +105,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:dept:remove']"
          >删除
@@ -201,7 +202,7 @@
      title="机构成员"
      :visible.sync="drawer"
      direction="rtl"
      size="50%">
      size="500px">
      <el-table :data="userTable">
        <el-table-column property="nickName" label="姓名" width="150"></el-table-column>
        <el-table-column property="phonenumber" label="电话" width="200"></el-table-column>
@@ -417,7 +418,7 @@
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function () {
      this.$modal.confirm('是否确认删除?').then(function () {
        return delDept(row.deptId);
      }).then(() => {
        this.getList();
src/views/system/dict/data.vue
@@ -65,6 +65,7 @@
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          class="del-btn"
          @click="handleDelete"
          v-hasPermi="['system:dict:remove']"
        >删除</el-button>
@@ -126,6 +127,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:dict:remove']"
          >删除</el-button>
@@ -382,7 +384,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const dictCodes = row.dictCode || this.ids;
      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?').then(function() {
      this.$modal.confirm('是否确认删除?').then(function() {
        return delData(dictCodes);
      }).then(() => {
        this.getList();
src/views/system/dict/index.vue
@@ -146,6 +146,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:dict:remove']"
          >删除</el-button>
@@ -326,7 +327,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const dictIds = row.dictId || this.ids;
      this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项?').then(function() {
      this.$modal.confirm('是否确认删除?').then(function() {
        return delType(dictIds);
      }).then(() => {
        this.getList();
src/views/system/role/index.vue
@@ -104,8 +104,8 @@
    <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="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
      <el-table-column label="角色编号" prop="roleKey" :show-overflow-tooltip="true" width="150" />
      <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" />
      <el-table-column label="状态" align="center" width="150">
        <template slot-scope="scope">
@@ -135,6 +135,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
@@ -600,7 +601,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const roleIds = row.roleId || this.ids;
      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?').then(function() {
      this.$modal.confirm('是否确认删除?').then(function() {
        return delRole(roleIds);
      }).then(() => {
        this.getList();
src/views/system/user/index.vue
@@ -64,18 +64,18 @@
              />
            </el-select>
          </el-form-item>
          <el-form-item label="创建时间">
            <el-date-picker
              v-model="dateRange"
              size="small"
              style="width: 240px"
              value-format="yyyy-MM-dd"
              type="daterange"
              range-separator="-"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
            ></el-date-picker>
          </el-form-item>
          <!--<el-form-item label="创建时间">-->
            <!--<el-date-picker-->
              <!--v-model="dateRange"-->
              <!--size="small"-->
              <!--style="width: 240px"-->
              <!--value-format="yyyy-MM-dd"-->
              <!--type="daterange"-->
              <!--range-separator="-"-->
              <!--start-placeholder="开始日期"-->
              <!--end-placeholder="结束日期"-->
            <!--&gt;</el-date-picker>-->
          <!--</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>
@@ -179,6 +179,7 @@
                size="mini"
                type="text"
                icon="el-icon-delete"
                class="del-btn"
                @click="handleDelete(scope.row)"
                v-hasPermi="['system:user:remove']"
              >删除</el-button>
@@ -677,7 +678,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const userIds = row.userId || this.ids;
      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项?').then(function() {
      this.$modal.confirm('是否确认删除?').then(function() {
        return delUser(userIds);
      }).then(() => {
        this.getList();