From 34e9605033b51eed37a3c7e1df4e4a2f394c9ab0 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期二, 13 九月 2022 10:42:16 +0800
Subject: [PATCH] 问题修改
---
src/views/device/equipment/index.vue | 3 +
src/views/system/role/index.vue | 6 ++
src/views/basics/rules/index.vue | 28 +++++++++----
src/views/basics/template/index.vue | 26 +++++++++----
src/views/basics/manual/index.vue | 22 ++++++++---
5 files changed, 60 insertions(+), 25 deletions(-)
diff --git a/src/views/basics/manual/index.vue b/src/views/basics/manual/index.vue
index 572870c..4f2342d 100644
--- a/src/views/basics/manual/index.vue
+++ b/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: {},
diff --git a/src/views/basics/rules/index.vue b/src/views/basics/rules/index.vue
index 7a5803d..7b6b14b 100644
--- a/src/views/basics/rules/index.vue
+++ b/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: {},
diff --git a/src/views/basics/template/index.vue b/src/views/basics/template/index.vue
index 6fe6f5b..4111efa 100644
--- a/src/views/basics/template/index.vue
+++ b/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: {},
diff --git a/src/views/device/equipment/index.vue b/src/views/device/equipment/index.vue
index 479b0a8..09cbcb2 100644
--- a/src/views/device/equipment/index.vue
+++ b/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
})
},
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 0e8c5b1..f601658 100644
--- a/src/views/system/role/index.vue
+++ b/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" />
--
Gitblit v1.9.1