diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index b0ef730..0df14a9 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -101,7 +101,7 @@ export const JeecgListMixin = {
       }
       var params = this.getQueryParams();//查询条件
       this.loading = true;
-      // console.log(params)
+       console.log("params>>>>>>",params)
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
           //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
@@ -140,7 +140,6 @@ export const JeecgListMixin = {
         sqp['superQueryParams']=encodeURI(this.superQueryParams)
         sqp['superQueryMatchType'] = this.superQueryMatchType
       }
-      console.log("sqp>>>>>>>>",sqp)
       var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
       param.field = this.getQueryField();
       param.pageNo = this.ipagination.current;
@@ -270,10 +269,25 @@ export const JeecgListMixin = {
         fileName = "导出文件"
       }
       let param = this.getQueryParams();
+      if (fileName ==="电缆"){
+        param.materialName = "电缆"
+      }
+      if (fileName ==="废旧物资库表"){
+        param.materialName = "废旧物资库表"
+      }
+      // if (fileName ==="电缆模板"){
+      //   param.materialName = "电缆模板"
+      // }
+      // if (fileName ==="废旧物资库表导入模板"){
+      //   param.materialName = "废旧物资库表导入模板"
+      // }
+      if (fileName ==="用户信息导入模板"){
+        param.realname = "用户信息导入模板"
+      }
       if(this.selectedRowKeys && this.selectedRowKeys.length>0){
         param['selections'] = this.selectedRowKeys.join(",")
       }
-      console.log("导出参数",param)
+      console.log("导出参数>>>>>>>>>>",param)
       downFile(this.url.exportXlsUrl,param).then((data)=>{
         if (!data) {
           this.$message.warning("文件下载失败")
diff --git a/src/views/modules/oss/OSSFileList.vue b/src/views/modules/oss/OSSFileList.vue
index 511d2ea..0266717 100644
--- a/src/views/modules/oss/OSSFileList.vue
+++ b/src/views/modules/oss/OSSFileList.vue
@@ -6,12 +6,19 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
             <a-form-item label="文件名称">
-              <a-input placeholder="请输入文件名称" v-model="queryParam.fileName"></a-input>
+              <a-input placeholder="请输入文件名称" v-model="queryParam.name"></a-input>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
-            <a-form-item label="文件地址">
-              <a-input placeholder="请输入文件地址" v-model="queryParam.url"></a-input>
+            <a-form-item label="上传人">
+              <a-input placeholder="上传人" v-model="queryParam.createBy"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="类型">
+              <a-select v-model="queryParam.fileType" placeholder="请选择文件类型"  >
+              <a-select-option v-for="(item,index) in typeId" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -25,36 +32,36 @@
     </div>
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <!--      <a-button type="primary" icon="download" @click="handleExportXls('文件列表')">导出</a-button>-->
-      <a-upload
-          name="file"
-          :multiple="false"
-          :action="uploadAction"
-          :headers="tokenHeader"
-          :showUploadList="false"
-          :beforeUpload="beforeUpload"
-          @change="handleChange">
-        <a-button>
-          <a-icon type="upload"/>
-          OSS文件上传
-        </a-button>
-      </a-upload>
+<!--    <div class="table-operator">-->
+<!--      &lt;!&ndash;      <a-button type="primary" icon="download" @click="handleExportXls('文件列表')">导出</a-button>&ndash;&gt;-->
+<!--      <a-upload-->
+<!--          name="file"-->
+<!--          :multiple="false"-->
+<!--          :action="uploadAction"-->
+<!--          :headers="tokenHeader"-->
+<!--          :showUploadList="false"-->
+<!--          :beforeUpload="beforeUpload"-->
+<!--          @change="handleChange">-->
+<!--        <a-button>-->
+<!--          <a-icon type="upload"/>-->
+<!--          OSS文件上传-->
+<!--        </a-button>-->
+<!--      </a-upload>-->
 
-      <a-upload
-        name="file"
-        :multiple="false"
-        :action="minioUploadAction"
-        :headers="tokenHeader"
-        :showUploadList="false"
-        :beforeUpload="beforeUpload"
-        @change="handleChange">
-        <a-button>
-          <a-icon type="upload"/>
-          MINIO文件上传
-        </a-button>
-      </a-upload>
-    </div>
+<!--      <a-upload-->
+<!--        name="file"-->
+<!--        :multiple="false"-->
+<!--        :action="minioUploadAction"-->
+<!--        :headers="tokenHeader"-->
+<!--        :showUploadList="false"-->
+<!--        :beforeUpload="beforeUpload"-->
+<!--        @change="handleChange">-->
+<!--        <a-button>-->
+<!--          <a-icon type="upload"/>-->
+<!--          MINIO文件上传-->
+<!--        </a-button>-->
+<!--      </a-upload>-->
+<!--    </div>-->
 
     <!-- table区域-begin -->
     <div>
@@ -74,13 +81,14 @@
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
-          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
           <a @click="handlePreview(record)">预览</a>
-          <a-divider type="vertical"/>
-          <a @click="ossDelete(record.id)">删除</a>
+                    <a-divider type="vertical"/>
+          <a @click="downloadFile(record.url)">下载</a>
+
+<!--          <a @click="ossDelete(record.id)">删除</a>-->
         </span>
 
       </a-table>
@@ -91,13 +99,23 @@
 
 <script>
   import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import { getAction } from '@api/manage'
 
   export default {
     name: "OSSFileList",
     mixins: [JeecgListMixin],
     data() {
       return {
+        typeId :[{
+          value: 'image',
+          label: '图片'
+        },
+          {
+            value: 'application',
+            label: '文档'
+          }],
         description: '文件列表',
+        superFieldList:[],
         // 表头
         columns: [
           {
@@ -113,16 +131,45 @@
           {
             title: '文件名称',
             align: "center",
-            dataIndex: 'fileName'
+            width:400,
+            dataIndex: 'name'
+          },
+          {
+            title: '上传人',
+            align: "center",
+            dataIndex: 'createBy'
+          },
+          {
+            title:'上传时间',
+            align:"center",
+            default:'--',
+            width:150,
+            dataIndex: 'createTime'
+          },
+          // {
+          //   title: '文件格式',
+          //   align: "center",
+          //   width:150,
+          //   default:'--',
+          //   dataIndex: 'fileType'
+          // },
+          {
+            title: '文件大小(kb)',
+            align: "center",
+            default:'--',
+            width:100,
+            dataIndex: 'size'
           },
           {
             title: '文件地址',
             align: "center",
+            width:600,
             dataIndex: 'url'
           },
           {
             title: '操作',
             dataIndex: 'action',
+            width:100,
             align: "center",
             scopedSlots: {customRender: 'action'},
           }
@@ -134,6 +181,10 @@
           minioUpload: "/sys/upload/uploadMinio"
         }
       }
+
+    },
+    created() {
+      this.getSuperFieldList();
     },
     computed: {
       uploadAction() {
@@ -186,7 +237,20 @@
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(record.url)
           window.open(url, '_blank')
         }
-      }
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'文件名称',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'fileType',text:'文件格式',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'size',text:'文件大小',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'url',text:'文件地址',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'createBy',text:'上传人',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'date',value:'createTime',text:'上传时间',dictTable:'', dictText:'', dictCode:''})
+        this.superFieldList = fieldList
+      },
+      getRake(){
+        this.typeId = [];
+      },
     }
   }
 </script>
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 2db8443..4dce41e 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -8,10 +8,10 @@
           <a-row style="margin-left: 14px">
             <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
             <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
-            <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
-            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-              <a-button type="primary" icon="import">导入</a-button>
-            </a-upload>
+<!--            <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>-->
+<!--            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--              <a-button type="primary" icon="import">导入</a-button>-->
+<!--            </a-upload>-->
             <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
             <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
           </a-row>
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index 8862ae3..e35a64c 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -33,10 +33,10 @@
         <div class="table-operator" style="margin: 5px 0 10px 2px">
           <a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button>
           <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
-          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-            <a-button type="primary" icon="import">导入</a-button>
-          </a-upload>
-          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>
+<!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--            <a-button type="primary" icon="import">导入</a-button>-->
+<!--          </a-upload>-->
+<!--          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>-->
         </div>
 
         <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
diff --git a/src/views/system/SysPositionList.vue b/src/views/system/SysPositionList.vue
index 7a7cafa..8e63597 100644
--- a/src/views/system/SysPositionList.vue
+++ b/src/views/system/SysPositionList.vue
@@ -39,11 +39,11 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('职务表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('职务表')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
+<!--                @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel">
@@ -75,7 +75,6 @@
         :pagination="ipagination"
         :loading="loading"
         :scroll="{x: false, y: 460 }"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index feef877..22aea1f 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -93,6 +93,7 @@
     <div class="table-operator" style="border-top: 5px">
       <a-button @click="handleAdd" type="primary" icon="plus">添加用户</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('用户信息导入模板')">导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
diff --git a/src/views/system/modules/SysPositionModal.vue b/src/views/system/modules/SysPositionModal.vue
index 086d5e1..0991a33 100644
--- a/src/views/system/modules/SysPositionModal.vue
+++ b/src/views/system/modules/SysPositionModal.vue
@@ -103,7 +103,7 @@
               }
             ]
           },
-          name: { rules: [{ required: true, message: '请输入职务名称' }] },
+          name: { rules: [{ required: true, message: '请输入职务名称' },{validator: this.titleTest}] },
           postRank: { rules: [{ required: true, message: '请选择职级' }] },
         },
         url: {
@@ -116,6 +116,15 @@
     created() {
     },
     methods: {
+      titleTest (rule, value, callback) {
+        // const title= /^[\u0391-\uFFE5A-Za-z]+$/
+        const title= /^[\a-\z\A-\Z0-9\u4e00-\u9fe5]+$/
+        if (!title.test(value)) {
+          callback(new Error('标题只能输入中文、数字和英文'))
+        }else{
+          callback()
+        }
+      },
       add() {
         this.edit({})
       },
diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue
index 3b61092..f942eb0 100644
--- a/src/views/waste/ProcessWasteList.vue
+++ b/src/views/waste/ProcessWasteList.vue
@@ -50,6 +50,7 @@
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('废旧物资库表')">导出</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('废旧物资库表导入模板')">导入模板</a-button>-->
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -79,7 +80,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
         <template slot="htmlSlot" slot-scope="text">
diff --git a/src/views/waste/ProcessWasteListCable.vue b/src/views/waste/ProcessWasteListCable.vue
index 485017b..21907e6 100644
--- a/src/views/waste/ProcessWasteListCable.vue
+++ b/src/views/waste/ProcessWasteListCable.vue
@@ -52,6 +52,7 @@
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('电缆')">导出</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('电缆模板')">导入模板</a-button>-->
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -79,7 +80,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
         <template slot="htmlSlot" slot-scope="text">
@@ -274,6 +274,8 @@
         fieldList.push({type:'string',value:'scrappedBecause',text:'报废原因',dictCode:''})
         fieldList.push({type:'sel_search',value:'affiliation',text:'所属单位',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'date',value:'scrapDate',text:'报废日期'})
+        fieldList.push({type:'String',value:'nowLength',text:'现长度(米)'})
+        fieldList.push({type:'String',value:'originalLength',text:'原长度(米)'})
         this.superFieldList = fieldList
       }
     }