From dc21acf2cd6629abeff5e5c077c90623e2e89cae Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 23 五月 2024 14:42:09 +0800
Subject: [PATCH] ''
---
admin/src/assets/style/variables.scss | 18 +-
admin/src/views/statistics/platformRecord.vue | 130 ++++++++++++++
admin/src/components/common/CommonHeader.vue | 62 +++++-
admin/src/components/common/tagsview.vue | 6
admin/src/views/business/approvalConfiguration.vue | 76 +++++--
admin/src/views/statistics/platformStatic.vue | 108 ++++++++++++
admin/src/views/system/InterfaceLog.vue | 120 +++++++++++++
7 files changed, 468 insertions(+), 52 deletions(-)
diff --git a/admin/src/assets/style/variables.scss b/admin/src/assets/style/variables.scss
index f740783..a123481 100644
--- a/admin/src/assets/style/variables.scss
+++ b/admin/src/assets/style/variables.scss
@@ -1,17 +1,17 @@
-// 涓昏壊璋�
-$primary-color: #279BAA;
-$primaryColor: #279BAA;
-$primary-title-start-color: #3582ff;
-$primary-title-color: #216EcE;
-$primary-color-sel: #2cbbd1;
-$primary-color-hover: #1562e2;
-$icon-background-color: #1e7985;
// $primary-color: #216EEE;
// $primary-title-start-color: #3582ff;
// $primary-title-color: #216EcE;
-// $primary-color-sel: #0046c6;
+// $primary-color-sel: #0f52cf;
// $primary-color-hover: #1562e2;
// $icon-background-color: #0d5ada;
+// 涓昏壊璋�
+$primary-color: #2080f7;
+$primaryColor: #2080f7;
+$primary-title-start-color: #3582ff;
+$primary-title-color: #216EcE;
+$primary-color-sel: #1659ac;
+$primary-color-hover: #1562e2;
+$icon-background-color: #186acf;
//鑿滃崟鎮诞鑹诧細
$menu-hover-color: rgba(33, 110, 238, 0.10);
// 澶撮儴楂樺害
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index e3389e2..7855c29 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -2,17 +2,25 @@
<div class="common-header">
<div class="header">
<div class="logo">
- <div>{{title}}</div>
+ <div>{{ title }}</div>
<!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
</div>
<div class="user">
<el-dropdown v-if="isLogined" trigger="click">
<span class="el-dropdown-link">
<!-- <img v-if="userInfo != null" :src="userInfo.avatar == null ? `${require('@/assets/avatar/man.png')}` : userInfo.avatar" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i> -->
- <img v-if="userInfo != null" style="width: 30px !important;" src="@/assets/avatar/man.png" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i>
+ <img
+ v-if="userInfo != null"
+ style="width: 30px !important"
+ src="@/assets/avatar/man.png"
+ alt=""
+ />{{ userInfo | displayName
+ }}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item @click.native="changePwd">淇敼瀵嗙爜</el-dropdown-item>
+ <el-dropdown-item @click.native="changePwd"
+ >淇敼瀵嗙爜</el-dropdown-item
+ >
<el-dropdown-item @click.native="logout">閫�鍑虹櫥褰�</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -25,15 +33,37 @@
@confirm="confirmChangePwd"
@close="visible.changePwd = false"
>
- <el-form :model="changePwdData.form" ref="changePwdDataForm" :rules="changePwdData.rules">
+ <el-form
+ :model="changePwdData.form"
+ ref="changePwdDataForm"
+ :rules="changePwdData.rules"
+ >
<el-form-item label="鍘熷瀵嗙爜" prop="oldPwd" required>
- <el-input v-model="changePwdData.form.oldPwd" type="password" placeholder="璇疯緭鍏ュ師濮嬪瘑鐮�" maxlength="30" show-password></el-input>
+ <el-input
+ v-model="changePwdData.form.oldPwd"
+ type="password"
+ placeholder="璇疯緭鍏ュ師濮嬪瘑鐮�"
+ maxlength="30"
+ show-password
+ ></el-input>
</el-form-item>
<el-form-item label="鏂板瘑鐮�" prop="newPwd" required>
- <el-input v-model="changePwdData.form.newPwd" type="password" placeholder="璇疯緭鍏ユ柊瀵嗙爜" maxlength="30" show-password></el-input>
+ <el-input
+ v-model="changePwdData.form.newPwd"
+ type="password"
+ placeholder="璇疯緭鍏ユ柊瀵嗙爜"
+ maxlength="30"
+ show-password
+ ></el-input>
</el-form-item>
<el-form-item label="纭鏂板瘑鐮�" prop="confirmPwd" required>
- <el-input v-model="changePwdData.form.confirmPwd" type="password" placeholder="璇峰啀娆¤緭鍏ユ柊瀵嗙爜" maxlength="30" show-password></el-input>
+ <el-input
+ v-model="changePwdData.form.confirmPwd"
+ type="password"
+ placeholder="璇峰啀娆¤緭鍏ユ柊瀵嗙爜"
+ maxlength="30"
+ show-password
+ ></el-input>
</el-form-item>
</el-form>
</GlobalAlertWindow>
@@ -53,7 +83,7 @@
default: true
}
},
- data () {
+ data() {
return {
title: process.env.VUE_APP_TITLE,
visible: {
@@ -94,7 +124,7 @@
},
filters: {
// 灞曠ず鍚嶇О
- displayName (userInfo) {
+ displayName(userInfo) {
if (userInfo == null) {
return ''
}
@@ -107,14 +137,14 @@
methods: {
...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo']),
// 淇敼瀵嗙爜
- changePwd () {
+ changePwd() {
this.visible.changePwd = true
this.$nextTick(() => {
this.$refs.changePwdDataForm.resetFields()
})
},
// 纭畾淇敼瀵嗙爜
- confirmChangePwd () {
+ confirmChangePwd() {
if (this.isWorking.changePwd) {
return
}
@@ -146,7 +176,7 @@
})
},
// 閫�鍑虹櫥褰�
- logout () {
+ logout() {
logout()
.then(() => {
this.clearUserInfo()
@@ -165,7 +195,7 @@
<style scoped lang="scss">
@import "@/assets/style/variables.scss";
.common-header {
- background-color: #4d99a8;
+ background-color: #2080f7;
}
.header {
overflow: hidden;
@@ -175,7 +205,7 @@
justify-content: space-between;
.logo {
- background: url('../../assets/images/top_ic_chilun@2x.png') no-repeat;
+ background: url("../../assets/images/top_ic_chilun@2x.png") no-repeat;
box-sizing: border-box;
min-width: 280px;
height: 70px;
@@ -197,7 +227,7 @@
box-sizing: border-box;
height: 70px;
padding-right: 25px;
- background: url('../../assets/images/top_ic_bolang@2x.png') no-repeat;
+ background: url("../../assets/images/top_ic_bolang@2x.png") no-repeat;
flex-shrink: 0;
text-align: right;
.el-dropdown {
@@ -216,7 +246,7 @@
.el-dropdown-menu {
width: 140px;
.el-dropdown-menu__item:hover {
- background: #E3EDFB;
+ background: #e3edfb;
color: $primary-color;
}
}
diff --git a/admin/src/components/common/tagsview.vue b/admin/src/components/common/tagsview.vue
index 67df70f..8d654bc 100644
--- a/admin/src/components/common/tagsview.vue
+++ b/admin/src/components/common/tagsview.vue
@@ -194,7 +194,7 @@
color: #666;
cursor: pointer;
&:hover {
- color: #4d99a8;
+ color: #2080f7;
}
}
@@ -236,8 +236,8 @@
}
//鏍囩楂樹寒
.active {
- color: #4d99a8;
- border-bottom: 2px solid #4d99a8;
+ color: #2080f7;
+ border-bottom: 2px solid #2080f7;
}
//鍙抽敭鑿滃崟鏍峰紡
.contextmenu {
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index b7367c3..f7f134f 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -1,10 +1,6 @@
<template>
<TableLayout>
<template v-slot:table-wrap>
- <el-tabs v-model="activeName">
- <el-tab-pane label="鏅�氳瀹�" name="first"></el-tab-pane>
- <el-tab-pane label="鏂藉伐璁垮" name="second"></el-tab-pane>
- </el-tabs>
<div class="config">
<div class="config_list">
<div class="config_list_head">
@@ -22,21 +18,29 @@
<div class="line"></div>
<img src="@/assets/images/peizhi_ar@2x.png" alt="" />
</div>
- <div
- class="item yellow"
- :class="{ active: activeSel === 'one' }"
- @click="flowClick('one')"
- >
- <div class="head">瀹℃壒浜�</div>
- <div class="content">
- <div>琚浜�</div>
- <i class="el-icon-arrow-right"></i>
+ <template v-for="(item, index) in apprList">
+ <div
+ class="item yellow"
+ :class="{ active: item.active }"
+ @click="flowClick(index)"
+ :key="index"
+ >
+ <div class="head">瀹℃壒浜�</div>
+ <div class="content">
+ <div>琚浜�</div>
+ <i class="el-icon-arrow-right"></i>
+ </div>
</div>
- </div>
- <div class="arrows">
- <div class="line"></div>
- <img src="@/assets/images/peizhi_ar@2x.png" alt="" />
- </div>
+ <div class="arrows" :key="index">
+ <div class="line"></div>
+ <img src="@/assets/images/peizhi_ar@2x.png" alt="" />
+ <i
+ v-if="apprList.length - 1 === index"
+ @click="handleAddAppr()"
+ class="el-icon-circle-plus add"
+ ></i>
+ </div>
+ </template>
<template v-if="false">
<div
class="item yellow"
@@ -135,7 +139,12 @@
</div>
<div class="df_ac mt10">
<span class="mr20">閫夋嫨淇敼椤�</span>
- <el-select v-model="param.list" collapse-tags multiple placeholder="璇烽�夋嫨,澶氶��">
+ <el-select
+ v-model="param.list"
+ collapse-tags
+ multiple
+ placeholder="璇烽�夋嫨,澶氶��"
+ >
<el-option
v-for="item in options"
:key="item.value"
@@ -189,16 +198,17 @@
},
data () {
return {
+ apprList: [
+ { name: '', active: false },
+ { name: '', active: false }
+ ],
value: '',
radio: 0,
radio1: 0,
checked: '',
- checkList: [],
param: {},
- activeSel: 'one',
- activeName: 'first',
isShowTransfer: false,
fromData: [
{
@@ -255,8 +265,17 @@
}
},
methods: {
- flowClick (val) {
- this.activeSel = val
+ flowClick (i) {
+ this.apprList.forEach((item, index) => {
+ if (i === index) {
+ item.active = true
+ } else {
+ item.active = false
+ }
+ })
+ },
+ handleAddAppr () {
+ this.apprList.push({ name: '', active: false })
},
selStaff () {
@@ -326,11 +345,20 @@
display: flex;
flex-direction: column;
align-items: center;
+ position: relative;
.line {
width: 1px;
height: 60px;
background-color: #ccc;
}
+ .add {
+ font-size: 40px;
+ color: #2080f7;
+ position: absolute;
+ cursor: pointer;
+ z-index: 999;
+ top: 10px;
+ }
img {
width: 12px;
}
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index e69de29..4053fb3 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/admin/src/views/statistics/platformRecord.vue
@@ -0,0 +1,130 @@
+<template>
+ <div class="main_app">
+ <QueryForm
+ v-model="filters"
+ :query-form-config="queryFormConfig"
+ @handleQuery="getList(1)"
+ @clear="clear"
+ />
+ <el-table v-loading="loading" :data="list" stripe>
+ <el-table-column
+ prop="name"
+ label="鏈堝彴鍚嶇О"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="鏈堝彴缁�"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="杞﹀墠鐗岀収鍙�"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="杞﹀悗鐗岀収鍙�"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="浣滀笟寮�濮�"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="浣滀笟缁撴潫"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="浣滀笟鏃堕暱"
+ min-width="100"
+ show-overflow-tooltip
+ /><el-table-column
+ prop="name"
+ label="杩愯緭鍗曞彿/鍚堝悓鍙�"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="getList"
+ :pagination="pagination"
+ />
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/common/Pagination'
+import QueryForm from '@/components/common/QueryForm'
+export default {
+ components: {
+ Pagination,
+ QueryForm
+ },
+ data () {
+ return {
+ loading: false,
+ pagination: {
+ capacity: 10,
+ page: 1
+ },
+ filters: {},
+ list: [],
+ total: 0,
+ queryFormConfig: {
+ formItems: [
+ {
+ filed: 'aaaa',
+ type: 'input',
+ label: '鏈堝彴鍚嶇О'
+ },
+ {
+ filed: 'bbb',
+ type: 'select',
+ label: '鏈堝彴缁�',
+ options: []
+ },
+ {
+ filed: 'aaaa',
+ type: 'input',
+ label: '杞︾墝鍙�'
+ },
+ {
+ filed: 'selDate',
+ type: 'daterange',
+ label: '鏃ユ湡'
+ }
+ ],
+ online: true
+ }
+ }
+ },
+ methods: {
+ handleSub () {
+ this.$refs.ruleForm.validate((valid) => {
+ if (valid) {
+ alert('submit!')
+ }
+ })
+ },
+ getList (page) { },
+ clear () { },
+ handleSizeChange (capacity) {
+ this.pagination.capacity = capacity
+ }
+ }
+}
+</script>
+
+<style>
+</style>
diff --git a/admin/src/views/statistics/platformStatic.vue b/admin/src/views/statistics/platformStatic.vue
index e69de29..4e69412 100644
--- a/admin/src/views/statistics/platformStatic.vue
+++ b/admin/src/views/statistics/platformStatic.vue
@@ -0,0 +1,108 @@
+<template>
+ <div class="main_app">
+ <QueryForm
+ v-model="filters"
+ :query-form-config="queryFormConfig"
+ @handleQuery="getList(1)"
+ @clear="clear"
+ />
+ <el-table v-loading="loading" :data="list" stripe>
+ <el-table-column
+ prop="name"
+ label="鏈堝彴鍚嶇О"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="鏈堝彴缁�"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="鍋滈潬娆℃暟(娆�)"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="宸ヤ綔鏃堕暱"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="鏈堝彴浣跨敤鐜�"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="getList"
+ :pagination="pagination"
+ />
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/common/Pagination'
+import QueryForm from '@/components/common/QueryForm'
+export default {
+ components: {
+ Pagination,
+ QueryForm
+ },
+ data () {
+ return {
+ loading: false,
+ pagination: {
+ capacity: 10,
+ page: 1
+ },
+ filters: {},
+ list: [],
+ total: 0,
+ queryFormConfig: {
+ formItems: [
+ {
+ filed: 'aaaa',
+ type: 'input',
+ label: '鏈堝彴鍚嶇О'
+ },
+ {
+ filed: 'bbb',
+ type: 'select',
+ label: '鏈堝彴缁�',
+ options: []
+ },
+ {
+ filed: 'selDate',
+ type: 'daterange',
+ label: '閫夋嫨鏃堕棿'
+ }
+ ],
+ online: true
+ }
+ }
+ },
+ methods: {
+ handleSub () {
+ this.$refs.ruleForm.validate((valid) => {
+ if (valid) {
+ alert('submit!')
+ }
+ })
+ },
+ getList (page) { },
+ clear () { },
+ handleSizeChange (capacity) {
+ this.pagination.capacity = capacity
+ }
+ }
+}
+</script>
+
+<style>
+</style>
diff --git a/admin/src/views/system/InterfaceLog.vue b/admin/src/views/system/InterfaceLog.vue
new file mode 100644
index 0000000..15e1431
--- /dev/null
+++ b/admin/src/views/system/InterfaceLog.vue
@@ -0,0 +1,120 @@
+<template>
+ <div class="main_app">
+ <QueryForm
+ v-model="filters"
+ :query-form-config="queryFormConfig"
+ @handleQuery="getList(1)"
+ @clear="clear"
+ />
+ <el-table v-loading="loading" :data="list" stripe>
+ <el-table-column
+ prop="name"
+ label="鎺ュ彛鍚嶇О"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="鍦板潃淇℃伅"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="绫诲瀷"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="骞冲彴"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="璇锋眰鍙傛暟"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="鐩稿簲鍙傛暟"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ prop="name"
+ label="鍒涘缓鏃堕棿"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="getList"
+ :pagination="pagination"
+ />
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/common/Pagination'
+import QueryForm from '@/components/common/QueryForm'
+export default {
+ components: {
+ Pagination,
+ QueryForm
+ },
+ data() {
+ return {
+ loading: false,
+ pagination: {
+ capacity: 10,
+ page: 1
+ },
+ filters: {},
+ list: [],
+ total: 0,
+ queryFormConfig: {
+ formItems: [
+ {
+ filed: 'aaaa',
+ type: 'input',
+ label: '鎺ュ彛鍚嶇О'
+ },
+ {
+ filed: 'bbb',
+ type: 'select',
+ label: '绫诲瀷',
+ options: []
+ },
+ {
+ filed: 'selDate',
+ type: 'daterange',
+ label: '鏃ユ湡'
+ }
+ ],
+ online: true
+ }
+ }
+ },
+ methods: {
+ handleSub() {
+ this.$refs.ruleForm.validate((valid) => {
+ if (valid) {
+ alert('submit!')
+ }
+ })
+ },
+ getList(page) { },
+ clear() { },
+ handleSizeChange(capacity) {
+ this.pagination.capacity = capacity
+ }
+ }
+}
+</script>
+
+<style>
+</style>
--
Gitblit v1.9.3