From 6a26d75dadd32ffdb8afa7e55e8793217c12700b Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 27 十一月 2025 17:50:07 +0800
Subject: [PATCH] 改bug
---
admin/src/views/business/jkVersion.vue | 3
admin/src/components/business/OperaJkVersionWindow.vue | 15 +++-
screen/vite.config.js | 4
screen/src/router/index.js | 146 ++++++++++++++++++++++++------------------------
admin/.env.development | 8 +-
5 files changed, 91 insertions(+), 85 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index aa77cf1..f12a4db 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,15 +1,13 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
-<<<<<<< HEAD
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-VUE_APP_API_URL = 'http://192.168.1.45:10010'
+# VUE_APP_API_URL = 'http://192.168.1.45:10010'
+
+VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
# VUE_APP_API_URL = 'http://127.0.0.1:10010'
-=======
-VUE_APP_API_URL = 'http://127.0.0.1:10010'
->>>>>>> 5e6da22fb6f3b65e4dbf83896ad2a05d6d971432
#key锛�045542fc5f436b75e6c911c5c84ff8cd
#瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c
diff --git a/admin/src/components/business/OperaJkVersionWindow.vue b/admin/src/components/business/OperaJkVersionWindow.vue
index 83a120b..8f708a2 100644
--- a/admin/src/components/business/OperaJkVersionWindow.vue
+++ b/admin/src/components/business/OperaJkVersionWindow.vue
@@ -7,8 +7,11 @@
@confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鐗堟湰鍙�" prop="versionInfo">
- <el-input v-model="form.versionInfo" placeholder="璇疯緭鍏ョ増鏈彿" v-trim/>
+ <el-form-item label="鐗堟湰鍚嶇О" prop="versionInfo">
+ <el-input v-model="form.versionInfo" placeholder="璇疯緭鍏ョ増鏈悕绉�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鐗堟湰鍙�" prop="versionNum">
+ <el-input v-model="form.versionNum" placeholder="璇疯緭鍏ョ増鏈彿" v-trim/>
</el-form-item>
<el-form-item label="瀹夎鍖�" prop="fileUrl">
<div style="width: 100%; height: 1px;"></div>
@@ -60,20 +63,24 @@
fileUrl: '',
content: '',
fileSize: '',
+ versionNum: '',
name: '',
isForce: 1
},
// 楠岃瘉瑙勫垯
rules: {
versionInfo: [
- { required: true, message: '璇疯緭鍏ョ増鏈彿', trigger: 'blur' }
+ { required: true, message: '璇疯緭鍏ョ増鏈悕绉�', trigger: 'blur' }
],
fileUrl: [
{ required: true, message: '璇蜂笂浼犲畨瑁呭寘', trigger: 'blur' }
],
content: [
{ required: true, message: '璇疯緭鍏ユ洿鏂版弿杩�', trigger: 'blur' }
- ]
+ ],
+ versionNum: [
+ { required: true, message: '璇疯緭鍏ョ増鏈彿', trigger: 'blur' }
+ ],
},
fileList: [],
uploadData: {
diff --git a/admin/src/views/business/jkVersion.vue b/admin/src/views/business/jkVersion.vue
index 932d3c6..e71eeea 100644
--- a/admin/src/views/business/jkVersion.vue
+++ b/admin/src/views/business/jkVersion.vue
@@ -28,7 +28,7 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="versionInfo" label="鐗堟湰鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="versionInfo" label="鐗堟湰鍚嶇О" min-width="100px"></el-table-column>
<el-table-column label="骞冲彴绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.type === 0">Android</span>
@@ -36,6 +36,7 @@
</template>
</el-table-column>
<el-table-column prop="content" label="鏇存柊鎻忚堪" min-width="100px"></el-table-column>
+ <el-table-column prop="versionNum" label="鐗堟湰鍙�" min-width="100px"></el-table-column>
<el-table-column prop="name" label="瀹夎鍖�" min-width="100px"></el-table-column>
<el-table-column label="鏂囦欢澶у皬" min-width="100px">
<template slot-scope="{row}">
diff --git a/screen/src/router/index.js b/screen/src/router/index.js
index 5d5f7bd..0b68655 100644
--- a/screen/src/router/index.js
+++ b/screen/src/router/index.js
@@ -10,79 +10,79 @@
},
component: () => import('../views/KeyCabinet.vue')
}
- ,
- {
- path: '/PlatformCall', // 鏈堝彴鍙彿澶у睆
- name: 'PlatformCall',
- meta: {
- title: '瀹夋嘲鐗╂祦鏈堝彴鍙彿澶у睆'
- },
- component: () => import('../views/PlatformCall.vue')
- },
- {
- path: '/EnergyConsum', // 鑳借�楃湅鏉� - 瀹夋嘲鏅烘収鐗╂祦鍥尯-缁胯壊浣庣⒊杩愯惀
- name: 'EnergyConsum',
- meta: {
- title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-缁胯壊浣庣⒊杩愯惀'
- },
- component: () => import('../views/EnergyConsum.vue')
- },
- {
- path: '/LogisticsEfficiency', // 鐗╂祦杩愯璋冨害鐪嬫澘- 璋冨害鑳芥晥
- name: 'LogisticsEfficiency',
- meta: {
- title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-璋冨害鑳芥晥璺熻釜'
- },
- component: () => import('../views/LogisticsEfficiency.vue')
- },
- {
- path: '/SecurityControl', // 瀹夐槻绠℃帶澶у睆 -
- name: 'SecurityControl',
- meta: {
- title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-鏅鸿兘瀹夐槻鐩戞祴'
- },
- component: () => import('../views/SecurityControl.vue')
- },
- {
- path: '/LogisticsCenter', //鍏ㄧ渷鐗╂祦鍦ㄩ��-鐗╂祦涓績
- name: 'LogisticsCenter',
- meta: {
- title: '瀹夊窘涓儫鏁版櫤鎴愬搧绠℃帶'
- },
- component: () => import('../views/LogisticsCenter.vue')
- },
- {
- path: '/FireFighting', //娑堥槻鐩戞帶
- name: 'FireFighting',
- meta: {
- title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-娑堥槻鎬佸娍鐩戞帶'
- },
- component: () => import('../views/FireFighting.vue')
- },
- {
- path: '/FireFighting1', //娑堥槻鐩戞帶
- name: 'FireFighting1',
- meta: {
- title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-娑堥槻鎬佸娍鐩戞帶'
- },
- component: () => import('../views/FireFighting1.vue')
- },
- {
- path: '/TaskEfficiency', //鍦哄唴璋冨害鐪嬫澘 -浣滀笟鑳芥晥
- name: 'TaskEfficiency',
- meta: {
- title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-浣滀笟鏁堣兘缁熺'
- },
- component: () => import('../views/TaskEfficiency.vue')
- },
- {
- path: '/KeyCabinet', // 閽ュ寵鏌滄暟鎹湅鏉�
- name: 'KeyCabinet',
- meta: {
- title: '閽ュ寵鏌滄暟鎹湅鏉�'
- },
- component: () => import('../views/KeyCabinet.vue')
- },
+ // ,
+ // {
+ // path: '/PlatformCall', // 鏈堝彴鍙彿澶у睆
+ // name: 'PlatformCall',
+ // meta: {
+ // title: '瀹夋嘲鐗╂祦鏈堝彴鍙彿澶у睆'
+ // },
+ // component: () => import('../views/PlatformCall.vue')
+ // },
+ // {
+ // path: '/EnergyConsum', // 鑳借�楃湅鏉� - 瀹夋嘲鏅烘収鐗╂祦鍥尯-缁胯壊浣庣⒊杩愯惀
+ // name: 'EnergyConsum',
+ // meta: {
+ // title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-缁胯壊浣庣⒊杩愯惀'
+ // },
+ // component: () => import('../views/EnergyConsum.vue')
+ // },
+ // {
+ // path: '/LogisticsEfficiency', // 鐗╂祦杩愯璋冨害鐪嬫澘- 璋冨害鑳芥晥
+ // name: 'LogisticsEfficiency',
+ // meta: {
+ // title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-璋冨害鑳芥晥璺熻釜'
+ // },
+ // component: () => import('../views/LogisticsEfficiency.vue')
+ // },
+ // {
+ // path: '/SecurityControl', // 瀹夐槻绠℃帶澶у睆 -
+ // name: 'SecurityControl',
+ // meta: {
+ // title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-鏅鸿兘瀹夐槻鐩戞祴'
+ // },
+ // component: () => import('../views/SecurityControl.vue')
+ // },
+ // {
+ // path: '/LogisticsCenter', //鍏ㄧ渷鐗╂祦鍦ㄩ��-鐗╂祦涓績
+ // name: 'LogisticsCenter',
+ // meta: {
+ // title: '瀹夊窘涓儫鏁版櫤鎴愬搧绠℃帶'
+ // },
+ // component: () => import('../views/LogisticsCenter.vue')
+ // },
+ // {
+ // path: '/FireFighting', //娑堥槻鐩戞帶
+ // name: 'FireFighting',
+ // meta: {
+ // title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-娑堥槻鎬佸娍鐩戞帶'
+ // },
+ // component: () => import('../views/FireFighting.vue')
+ // },
+ // {
+ // path: '/FireFighting1', //娑堥槻鐩戞帶
+ // name: 'FireFighting1',
+ // meta: {
+ // title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-娑堥槻鎬佸娍鐩戞帶'
+ // },
+ // component: () => import('../views/FireFighting1.vue')
+ // },
+ // {
+ // path: '/TaskEfficiency', //鍦哄唴璋冨害鐪嬫澘 -浣滀笟鑳芥晥
+ // name: 'TaskEfficiency',
+ // meta: {
+ // title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-浣滀笟鏁堣兘缁熺'
+ // },
+ // component: () => import('../views/TaskEfficiency.vue')
+ // },
+ // {
+ // path: '/KeyCabinet', // 閽ュ寵鏌滄暟鎹湅鏉�
+ // name: 'KeyCabinet',
+ // meta: {
+ // title: '閽ュ寵鏌滄暟鎹湅鏉�'
+ // },
+ // component: () => import('../views/KeyCabinet.vue')
+ // },
]
})
diff --git a/screen/vite.config.js b/screen/vite.config.js
index dcc6f82..8786eff 100644
--- a/screen/vite.config.js
+++ b/screen/vite.config.js
@@ -25,8 +25,8 @@
server: {
proxy: {
"/system_gateway": {
- target: "http://192.168.1.45:10010",
- // target: "http://192.168.0.7",
+ // target: "http://192.168.1.45:10010",
+ target: "http://192.168.0.7/system_gateway",
// target: "http://10.50.250.253:8088/gateway_interface",
// target: "https://atwl.ahzyssl.com/zhyq_interface",
changeOrigin: true,
--
Gitblit v1.9.3