8.31 to 3

This commit is contained in:
yezhenman 2022-08-31 18:15:46 +08:00
parent 34ef9cc394
commit 6c78e29bd9
9 changed files with 45 additions and 26 deletions

View File

@ -1 +1 @@
#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block{margin-top:30px} #nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-425fd889]{margin-top:30px}[data-v-425fd889] .el-card__body{padding:0}

View File

@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-01b147f1.cec86515.css" rel="prefetch"><link href="css/chunk-0ab08886.0080a3bb.css" rel="prefetch"><link href="css/chunk-19797d59.4a709612.css" rel="prefetch"><link href="css/chunk-1c56d4e4.a81ac70a.css" rel="prefetch"><link href="css/chunk-2a2235b7.1a0ea8f6.css" rel="prefetch"><link href="css/chunk-33e29a08.9142830e.css" rel="prefetch"><link href="css/chunk-3bcfd210.9c27e2c9.css" rel="prefetch"><link href="css/chunk-4546fe72.3bcd502b.css" rel="prefetch"><link href="css/chunk-5e1711e0.d4b94e52.css" rel="prefetch"><link href="css/chunk-6ddd112d.0080a3bb.css" rel="prefetch"><link href="css/chunk-7c135f6b.b66e0a3d.css" rel="prefetch"><link href="js/chunk-01b147f1.411ddf4a.js" rel="prefetch"><link href="js/chunk-0ab08886.47a1307b.js" rel="prefetch"><link href="js/chunk-19797d59.521ebbb8.js" rel="prefetch"><link href="js/chunk-1c56d4e4.ceee754d.js" rel="prefetch"><link href="js/chunk-2a2235b7.b4b58aba.js" rel="prefetch"><link href="js/chunk-33e29a08.03cb9098.js" rel="prefetch"><link href="js/chunk-3bcfd210.374395ff.js" rel="prefetch"><link href="js/chunk-4546fe72.955bc949.js" rel="prefetch"><link href="js/chunk-5e1711e0.4eafce54.js" rel="prefetch"><link href="js/chunk-6ddd112d.abfd98d4.js" rel="prefetch"><link href="js/chunk-7c135f6b.7b5f30c1.js" rel="prefetch"><link href="css/app.62fa08a2.css" rel="preload" as="style"><link href="css/chunk-vendors.a6a7f90c.css" rel="preload" as="style"><link href="js/app.7feda7dd.js" rel="preload" as="script"><link href="js/chunk-vendors.dc4080e5.js" rel="preload" as="script"><link href="css/chunk-vendors.a6a7f90c.css" rel="stylesheet"><link href="css/app.62fa08a2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.dc4080e5.js"></script><script src="js/app.7feda7dd.js"></script></body></html> <!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-01b147f1.cec86515.css" rel="prefetch"><link href="css/chunk-0ab08886.0080a3bb.css" rel="prefetch"><link href="css/chunk-19797d59.4a709612.css" rel="prefetch"><link href="css/chunk-1c56d4e4.a81ac70a.css" rel="prefetch"><link href="css/chunk-2a2235b7.1a0ea8f6.css" rel="prefetch"><link href="css/chunk-33e29a08.9142830e.css" rel="prefetch"><link href="css/chunk-3bcfd210.9c27e2c9.css" rel="prefetch"><link href="css/chunk-4546fe72.3bcd502b.css" rel="prefetch"><link href="css/chunk-5e1711e0.d4b94e52.css" rel="prefetch"><link href="css/chunk-7c135f6b.b66e0a3d.css" rel="prefetch"><link href="css/chunk-f365c476.a2321795.css" rel="prefetch"><link href="js/chunk-01b147f1.411ddf4a.js" rel="prefetch"><link href="js/chunk-0ab08886.47a1307b.js" rel="prefetch"><link href="js/chunk-19797d59.521ebbb8.js" rel="prefetch"><link href="js/chunk-1c56d4e4.ceee754d.js" rel="prefetch"><link href="js/chunk-2a2235b7.b4b58aba.js" rel="prefetch"><link href="js/chunk-33e29a08.03cb9098.js" rel="prefetch"><link href="js/chunk-3bcfd210.374395ff.js" rel="prefetch"><link href="js/chunk-4546fe72.955bc949.js" rel="prefetch"><link href="js/chunk-5e1711e0.4eafce54.js" rel="prefetch"><link href="js/chunk-7c135f6b.7b5f30c1.js" rel="prefetch"><link href="js/chunk-f365c476.68b0060c.js" rel="prefetch"><link href="css/app.62fa08a2.css" rel="preload" as="style"><link href="css/chunk-vendors.a6a7f90c.css" rel="preload" as="style"><link href="js/app.10562a88.js" rel="preload" as="script"><link href="js/chunk-vendors.dc4080e5.js" rel="preload" as="script"><link href="css/chunk-vendors.a6a7f90c.css" rel="stylesheet"><link href="css/app.62fa08a2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.dc4080e5.js"></script><script src="js/app.10562a88.js"></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -34,7 +34,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间"> <el-form-item label="时间:">
<el-date-picker v-model="value1" type="datetimerange" range-separator="-" start-placeholder="" <el-date-picker v-model="value1" type="datetimerange" range-separator="-" start-placeholder=""
end-placeholder="止" value-format="yyyy-MM-dd HH:mm:ss"> end-placeholder="止" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker> </el-date-picker>
@ -49,23 +49,39 @@
<!-- 表格 --> <!-- 表格 -->
<el-card style="margin-top: 30px" class="box-card"> <el-card style="margin-top: 30px" class="box-card">
<el-table :data="tableData" border style="width: 100%"> <el-table :data="tableData" border style="width: 100%">
<el-table-column prop="id" label="序号" width="80"> </el-table-column> <el-table-column prop="id" label="序号" width="75"> </el-table-column>
<el-table-column prop="module" label="模块" width="80"> </el-table-column> <el-table-column prop="module" label="模块" width="70"> </el-table-column>
<el-table-column prop="action" label="操作" width="80"> </el-table-column> <el-table-column prop="action" label="操作" width="70"> </el-table-column>
<el-table-column prop="target_type" label="目标类型"> </el-table-column> <el-table-column prop="target_type" label="目标类型" width="100"> </el-table-column>
<el-table-column prop="target_id" label="目标ID" width="80"> </el-table-column> <el-table-column prop="target_id" label="目标ID" width="70"> </el-table-column>
<el-table-column prop="target_field" label="类别"> </el-table-column> <el-table-column prop="target_field" label="类别" width="100"> </el-table-column>
<el-table-column prop="before_update" label="操作前"> </el-table-column> <el-table-column label="操作前">
<el-table-column prop="after_update" label="操作后"> </el-table-column>
<el-table-column label="信息" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="overflow-x: scroll;height: 50px;white-space: nowrap;"> <div style="height:45px">
{{scope.row.before_update}}
</div>
</template>
</el-table-column>
<el-table-column label="操作后">
<template slot-scope="scope">
<div style="height:45px">
{{scope.row.after_update}}
</div>
</template>
</el-table-column>
<el-table-column label="信息" width="300">
<template slot-scope="scope">
<div style="overflow-x: hidden;white-space: nowrap;">
{{scope.row.message}} {{scope.row.message}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="user.name" label="操作人"> </el-table-column> <el-table-column prop="user.name" label="操作人" width="120"></el-table-column>
<el-table-column prop="created_at" label="操作时间"> </el-table-column> <el-table-column label="操作时间" width="100">
<template slot-scope="scope">
<p>{{scope.row.created_at}}</p>
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
@ -312,8 +328,8 @@
target_id: this.$route.query.id?this.$route.query.id:'', target_id: this.$route.query.id?this.$route.query.id:'',
target_field: this.form.targetField?this.form.targetField:'', target_field: this.form.targetField?this.form.targetField:'',
user_id: this.form.userId, user_id: this.form.userId,
startTime: this.value1[0]?this.value1[0]:'', start_time: this.value1[0]?this.value1[0]:'',
endTime: this.value1[1]?this.value1[1]:'', end_time: this.value1[1]?this.value1[1]:'',
}; };
recordList(queryData).then((res) => { recordList(queryData).then((res) => {
@ -341,8 +357,11 @@
}; };
</script> </script>
<style> <style scoped>
.block { .block {
margin-top: 30px; margin-top: 30px;
} }
::v-deep .el-card__body {
padding: 0;
}
</style> </style>