From b545acd5def7b4024c0b8dfbf14c3f45bc873698 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 03 十二月 2025 09:35:24 +0800
Subject: [PATCH] 优化
---
admin/src/components/business/OperaJkCabinetWindow.vue | 42 ++++++++++++++++++++
screen/src/views/KeyCabinet.vue | 24 ++++++------
admin/src/components/business/OperaCategoryJkBannerWindow.vue | 2 +
screen/index.html | 2
screen/vite.config.js | 3 +
admin/.env.production | 4 +
screen/src/router/index.js | 2
7 files changed, 62 insertions(+), 17 deletions(-)
diff --git a/admin/.env.production b/admin/.env.production
index 03aa2d2..c94f8af 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -1,7 +1,9 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
+# VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
+
+VUE_APP_API_URL = 'http://10.49.152.112/system_gateway'
VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
diff --git a/admin/src/components/business/OperaCategoryJkBannerWindow.vue b/admin/src/components/business/OperaCategoryJkBannerWindow.vue
index 5002b13..a625bf0 100644
--- a/admin/src/components/business/OperaCategoryJkBannerWindow.vue
+++ b/admin/src/components/business/OperaCategoryJkBannerWindow.vue
@@ -70,6 +70,8 @@
},
open (title, target) {
this.title = title
+ this.form.imgurlFull = ''
+ this.form.imgurl = ''
this.visible = true
// 鏂板缓缁勭粐
if (target == null) {
diff --git a/admin/src/components/business/OperaJkCabinetWindow.vue b/admin/src/components/business/OperaJkCabinetWindow.vue
index 19370db..7551c59 100644
--- a/admin/src/components/business/OperaJkCabinetWindow.vue
+++ b/admin/src/components/business/OperaJkCabinetWindow.vue
@@ -82,6 +82,20 @@
:inactive-value="1">
</el-switch>
</el-form-item>
+ <el-form-item label="婵�娲绘枃浠�" prop="activateFile">
+ <el-upload
+ accept=".zip"
+ class="upload-demo"
+ :action="base"
+ :limit="1"
+ :data="{ folder: 'activate' }"
+ :file-list="fileList"
+ :on-success="getFile"
+ :on-remove="removeFile">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">鍙兘涓婁紶zip鏂囦欢</div>
+ </el-upload>
+ </el-form-item>
<h3 style="margin: 20px 0;">鏌滅粍淇℃伅</h3>
<el-form-item label="鎺掑垪" prop="rowNum">
<div style="width: 100%; display: flex; align-items: center;">
@@ -137,6 +151,8 @@
}
};
return {
+ base: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload',
+ fileList: [],
// 琛ㄥ崟鏁版嵁
form: {
id: null,
@@ -160,7 +176,8 @@
noPrefix: '',
noLength: '',
noIndex: '',
- sortType: 0
+ sortType: 0,
+ activateFile: null
},
// 楠岃瘉瑙勫垯
rules: {
@@ -220,6 +237,13 @@
for (const key in this.form) {
this.form[key] = res[key]
}
+ if (res.activateFile) {
+ this.fileList = [{
+ name: res.activateFile.name,
+ url: res.activateFile.fileurlFull,
+ ...res.activateFile
+ }]
+ }
this.visible = true
})
})
@@ -268,6 +292,22 @@
this.form.noIndex = ''
this.form.sortType = 0
}
+ },
+ getFile(response) {
+ this.fileList = [{
+ name: response.data.originname,
+ fileurl: response.data.imgaddr,
+ ...response.data
+ }]
+ this.form.activateFile = {
+ name: response.data.originname,
+ fileurl: response.data.imgaddr,
+ ...response.data
+ }
+ },
+ removeFile() {
+ this.form.activateFile = null
+ this.fileList = []
}
}
}
diff --git a/screen/index.html b/screen/index.html
index d510228..149058e 100644
--- a/screen/index.html
+++ b/screen/index.html
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>瀹夋嘲鏅烘収鐗╂祦鍥尯绯荤粺</title>
+ <title>椹瀺灞辩儫鑽変笁浜や竴灏佹櫤鑳芥煖</title>
</head>
<body>
<div id="app"></div>
diff --git a/screen/src/router/index.js b/screen/src/router/index.js
index 0b68655..10b975f 100644
--- a/screen/src/router/index.js
+++ b/screen/src/router/index.js
@@ -6,7 +6,7 @@
{
path: '/',
meta: {
- title: '閽ュ寵鏌滄暟鎹湅鏉�'
+ title: '椹瀺灞辩儫鑽変笁浜や竴灏佹櫤鑳芥煖'
},
component: () => import('../views/KeyCabinet.vue')
}
diff --git a/screen/src/views/KeyCabinet.vue b/screen/src/views/KeyCabinet.vue
index 0737ca9..96ac713 100644
--- a/screen/src/views/KeyCabinet.vue
+++ b/screen/src/views/KeyCabinet.vue
@@ -4,7 +4,7 @@
<img src="@/assets/images/bg.png" class="main_bg" alt="" />
<div class="main_header">
<img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
- <div class="title">閽ュ寵鏌滄暟鎹湅鏉�</div>
+ <div class="title">涓変氦涓�灏佹櫤鑳芥煖</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
<span class="week">{{ week }}</span>
@@ -176,9 +176,9 @@
</div>
<div class="car_static">
<div class="echart_wrap">
- <div class="pie_text">
- <div class="fs30"><strong>30</strong></div>
- <div style="font-size: 15px; color: rgba(255,255,255,0.8); font-weight: 400;">鍏ュ簱鎬婚噺</div>
+ <div class="pie_text" v-if="fenbu">
+ <div class="fs30"><strong>{{fenbu.alcoholNum + fenbu.unCloseNum + fenbu.timeOutNum}}</strong></div>
+ <div style="font-size: 15px; color: rgba(255,255,255,0.8); font-weight: 400;">鍛婅鎬婚噺</div>
</div>
<div class="echart1" id="echart1"></div>
</div>
@@ -195,14 +195,14 @@
<div class="icon" :style="{ background: `linear-gradient(270deg, ${colors[1].color1} 0%, ${colors[1].color2} 100%)` }"></div>
<div class="text">鏌滈棬鏈叧鍛婅</div>
</div>
- <div class="num" :style="{ color: '#FEAF01' }">{{fenbu.timeOutNum}}娆★綔{{fenbu.timeOutNumPct}}%</div>
+ <div class="num" :style="{ color: '#FEAF01' }">{{fenbu.unCloseNum}}娆★綔{{fenbu.unCloseNumPct}}%</div>
</div>
<div class="item1">
<div class="line">
<div class="icon" :style="{ background: `linear-gradient(270deg, ${colors[2].color1} 0%, ${colors[2].color2} 100%)` }"></div>
<div class="text">瓒呮椂鏈繕鍛婅</div>
</div>
- <div class="num" :style="{ color: '#28F0C4' }">{{fenbu.unCloseNum}}娆★綔{{fenbu.unCloseNumPct}}%</div>
+ <div class="num" :style="{ color: '#28F0C4' }">{{fenbu.timeOutNum}}娆★綔{{fenbu.timeOutNumPct}}%</div>
</div>
</div>
</div>
@@ -350,10 +350,10 @@
fenbu.value = {
...res.data,
alcoholNumPct: calculatePercentage(res.data.alcoholNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum]),
- timeOutNumPct: calculatePercentage(res.data.timeOutNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum]),
- unCloseNumPct: calculatePercentage(res.data.unCloseNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum])
+ unCloseNumPct: calculatePercentage(res.data.unCloseNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum]),
+ timeOutNumPct: calculatePercentage(res.data.timeOutNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum])
}
- dataList5.value = [res.data.alcoholNum, res.data.timeOutNum, res.data.unCloseNum]
+ dataList5.value = [res.data.alcoholNum, res.data.unCloseNum, res.data.timeOutNum]
nextTick(() => {
initEchart1()
})
@@ -626,12 +626,12 @@
<div style="display: flex; align-items: center;margin-top: 4px;">
<div style="width: 12px;height: 12px;background: linear-gradient(to bottom, #50afd3, #1d4861);border-radius: 50%;margin-right: 12px;"></div>
<div style="color: #FFFFFF;font-size: 14px;font-weight: 400;">棰嗗彇锛�</div>
- <div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[0].data}涓�</div>
+ <div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[0].data}娆�</div>
</div>
<div style="display: flex; align-items: center;margin-top: 4px;">
<div style="width: 12px;height: 12px;background: linear-gradient(to bottom, rgb(255,184,0), rgba(255, 138, 0, 0.20));border-radius: 50%;margin-right: 12px;"></div>
<div style="color: #FFFFFF;font-size: 14px;font-weight: 400;">褰掕繕锛�</div>
- <div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[1].data}涓�</div>
+ <div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[1].data}娆�</div>
</div>
</div>
`;
@@ -647,7 +647,7 @@
},
yAxis: {
type: 'value',
- name: '鍗曚綅锛氫釜',
+ name: '鍗曚綅锛氭',
minInterval: 1,
axisLabel: {
color: '#D2E0FF',
diff --git a/screen/vite.config.js b/screen/vite.config.js
index 9b20cd3..ce3a8a3 100644
--- a/screen/vite.config.js
+++ b/screen/vite.config.js
@@ -25,7 +25,8 @@
server: {
proxy: {
"/system_gateway": {
- target: "http://192.168.1.45:10010",
+ // target: "http://192.168.1.45:10010",
+ target: "http://10.49.152.112/system_gateway",
// target: "http://192.168.0.7/system_gateway",
// target: "http://10.50.250.253:8088/gateway_interface",
// target: "https://atwl.ahzyssl.com/zhyq_interface",
--
Gitblit v1.9.3