Browse Source

首页更改

dev
0.0 2 years ago
parent
commit
e217d9a468
  1. BIN
      public/static/excle/废旧物资库表导入模板_1669801633970.xlsx
  2. BIN
      public/static/excle/用户信息导入模板.xlsx
  3. BIN
      public/static/excle/电缆模板_1669802180197.xlsx
  4. BIN
      public/static/excle/账外导入模板_1672371645321.xlsx
  5. 15
      src/mixins/JeecgListMixin.js
  6. 18
      src/views/dashboard/HomePage.vue
  7. 2
      src/views/system/UserList.vue
  8. 2
      src/views/waste/ProcessWasteList.vue
  9. 2
      src/views/waste/ProcessWasteListCable.vue
  10. 2
      src/views/wastematerials/ProcessWasteMaterialsList.vue

BIN
public/static/excle/废旧物资库表导入模板_1669801633970.xlsx

Binary file not shown.

BIN
public/static/excle/用户信息导入模板.xlsx

Binary file not shown.

BIN
public/static/excle/电缆模板_1669802180197.xlsx

Binary file not shown.

BIN
public/static/excle/账外导入模板_1672371645321.xlsx

Binary file not shown.

15
src/mixins/JeecgListMixin.js

@ -273,21 +273,6 @@ 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(",")
}

18
src/views/dashboard/HomePage.vue

@ -42,7 +42,7 @@
<!--登录日志-->
<a-card id="log" style="width: 33%; height: 100%;padding-bottom: 10px;" :body-style="{height: '95%', overflow:'hidden'}">
<div style="height: 40px;font-weight: 600; font-size: 16px;line-height: 40px">
登录日志
公司制度
</div>
<div id="logDiv" style="height: 250px;overflow-y: auto;margin: 0 0 0 0;" @scroll="heightScroll()">
<a-table
@ -330,15 +330,13 @@ export default {
//
loginList(){
let param = Object.assign({} );
getAction(this.url.lists,param).then((res) => {
if (res.success) {
console.log("resnew")
console.log(res.result)
this.loading = false
this.loginLogs = res.result.records
}
})
// let param = Object.assign({} );
// getAction(this.url.lists,param).then((res) => {
// if (res.success) {
// this.loading = false
// this.loginLogs = res.result.records
// }
// })
},

2
src/views/system/UserList.vue

@ -93,7 +93,7 @@
<div class="table-operator" style="border-top: 5px">
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'user:add'">添加用户</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('用户信息导入模板')">用户信息导入模板</a-button>
<a-button type="primary" icon="download" @click="downloadText('/static/excle/用户信息导入模板.xlsx','用户信息导入模板.xlsx')">用户信息导入模板</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>

2
src/views/waste/ProcessWasteList.vue

@ -57,7 +57,7 @@
<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="downloadFile('http://182.92.73.21:9090/file/temp/废旧物资库表导入模板_1669801633970.xls')">报废导入模板</a-button>
<a-button type="primary" icon="download" @click="downloadText('/static/excle/废旧物资库表导入模板_1669801633970.xlsx','报废导入模板.xlsx')">报废导入模板</a-button>
<a-button @click="handleInto" type="primary">电缆</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">

2
src/views/waste/ProcessWasteListCable.vue

@ -55,7 +55,7 @@
<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="downloadFile('http://182.92.73.21:9090/file/temp/电缆模板_1669802180197.xls')">电缆导入模板</a-button>
<a-button type="primary" icon="download" @click="downloadText('/static/excle/电缆模板_1669802180197.xlsx','电缆模板.xlsx')">电缆导入模板</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>

2
src/views/wastematerials/ProcessWasteMaterialsList.vue

@ -44,7 +44,7 @@
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import" v-has="'wastematerials:import'">导入</a-button>
</a-upload>
<a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/账外导入模板_1672371645321.xlsx')" v-has="'wastematerials:import'">帐外导入模板</a-button>
<a-button type="primary" icon="download" @click="downloadText('/static/excle/账外导入模板_1672371645321.xlsx','账外导入模板.xlsx')">帐外导入模板</a-button>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0" v-has="'wastematerials:delete'">

Loading…
Cancel
Save