From 15eda57297979bed2071e4dc165f656182f2eead Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 27 五月 2025 19:15:35 +0800
Subject: [PATCH] 优化页面
---
igds-dzhwk-web/src/main/resources/static/dzhwk/recir/recir-control-pfc.js | 4 +-
igds-dzhwk-web/src/main/resources/application.yml | 1
igds-dzhwk-web/src/main/resources/static/dzhwk/pest/pest-check.js | 8 ++--
igds-dzhwk-web/src/main/resources/application-dev.yml | 25 ++++++++++++
igds-dzhwk-web/src/main/resources/templates/dzhwk/index.html | 1
igds-dzhwk-web/src/main/resources/static/dzhwk/grain/grain-check1.js | 8 ++--
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/data/DzhwkConfigData.java | 18 +++++++++
igds-dzhwk-web/src/main/resources/static/dzhwk/verb/verb-control-pfc.js | 4 +-
igds-dzhwk-web/src/main/resources/static/dzhwk/grain/grain-export.js | 2
igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java | 9 ++++
igds-dzhwk-web/src/main/resources/static/dzhwk/gas/gas-check.js | 6 +-
igds-dzhwk-web/src/main/resources/application-pro.yml | 25 ++++++++++++
igds-dzhwk-web/src/main/resources/static/dzhwk/n2/n2-control.js | 4 +-
13 files changed, 95 insertions(+), 20 deletions(-)
diff --git a/igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/data/DzhwkConfigData.java b/igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/data/DzhwkConfigData.java
new file mode 100644
index 0000000..bb365a2
--- /dev/null
+++ b/igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/data/DzhwkConfigData.java
@@ -0,0 +1,18 @@
+package com.fzzy.igds.dzhwk.data;
+
+import com.ruoyi.common.config.FrameworkConfig;
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+/**
+ * 绯荤粺涓厤缃枃浠朵腑閰嶇疆绯荤粺鍙傛暟
+ */
+@Component
+@Data
+public class DzhwkConfigData extends FrameworkConfig {
+ /**
+ * 瑙嗛閰嶇疆
+ */
+ private String dzhwkVideo;
+
+}
diff --git a/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java b/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java
index 3afd12d..dd9df54 100644
--- a/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java
+++ b/igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java
@@ -1,5 +1,6 @@
package com.fzzy.igds.dzhwk.controller;
+import com.fzzy.igds.dzhwk.data.DzhwkConfigData;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@@ -7,6 +8,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -18,6 +20,9 @@
public class WebController {
private static final String prefix = "dzhwk/";
+
+ @Resource
+ private DzhwkConfigData dzhwkConfigData;
/**
* 閿佸睆
@@ -38,6 +43,10 @@
@RequestMapping("/index")
public String index(ModelMap view) {
view.put("flag", "index");
+
+ String videoUrl = dzhwkConfigData.getDzhwkVideo().replace(dzhwkConfigData.getProfile(),"/profile/");
+ view.put("videoUrl", videoUrl);
+ view.put("imgUrl", "/profile/IMG/5303/SECURITY/aerial-5303_001-0.png");
return prefix + "index";
}
diff --git a/igds-dzhwk-web/src/main/resources/application-dev.yml b/igds-dzhwk-web/src/main/resources/application-dev.yml
index 5dd1d57..039a335 100644
--- a/igds-dzhwk-web/src/main/resources/application-dev.yml
+++ b/igds-dzhwk-web/src/main/resources/application-dev.yml
@@ -105,4 +105,27 @@
hibernate:
jdbc:
batch_size: 500
- batch_versioned_data: true
\ No newline at end of file
+ batch_versioned_data: true
+
+#绯荤粺鏋舵瀯閰嶇疆
+framework:
+ companyId: "1000"
+ # 鍚嶇О
+ name: igds-dzhwk
+ # 鐗堟湰
+ version: v1.0.0
+ # 鐗堟潈骞翠唤
+ copyrightYear: 2024
+ pubKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCD+0EDvobeBBOp5P0ax8jjEWdyNjHhGLviKMNrqAdAZfYMJdq0bv2LTzijBB/7bQcjdeN+HFyNKXOsTeCgnHUaGPs++B5lLgc3PqxfP4QlhYpHebDnWfJ4WIy49nzGNGwaUETx0bYHxPWpIZCzAVoPa0rVISb9L6JX2p3SmRe4/QIDAQAB
+ # 瀹炰緥婕旂ず寮�鍏�
+ demoEnabled: false
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
+ profile: D:/IGDS/FILE/
+ # 鑾峰彇ip鍦板潃寮�鍏�
+ addressEnabled: false
+ support: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�
+ email: business@fzzygf.com
+ phone: 400-627-1116
+ website: http://www.fzzygf.com
+ address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
+ dzhwk-video: D:/IGDS/FILE/VIDEO/3d.mp4
\ No newline at end of file
diff --git a/igds-dzhwk-web/src/main/resources/application-pro.yml b/igds-dzhwk-web/src/main/resources/application-pro.yml
index a8f122a..de0512a 100644
--- a/igds-dzhwk-web/src/main/resources/application-pro.yml
+++ b/igds-dzhwk-web/src/main/resources/application-pro.yml
@@ -102,4 +102,27 @@
hibernate:
jdbc:
batch_size: 500
- batch_versioned_data: true
\ No newline at end of file
+ batch_versioned_data: true
+
+#绯荤粺鏋舵瀯閰嶇疆
+framework:
+ companyId: "1000"
+ # 鍚嶇О
+ name: igds-dzhwk
+ # 鐗堟湰
+ version: v1.0.0
+ # 鐗堟潈骞翠唤
+ copyrightYear: 2024
+ pubKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCD+0EDvobeBBOp5P0ax8jjEWdyNjHhGLviKMNrqAdAZfYMJdq0bv2LTzijBB/7bQcjdeN+HFyNKXOsTeCgnHUaGPs++B5lLgc3PqxfP4QlhYpHebDnWfJ4WIy49nzGNGwaUETx0bYHxPWpIZCzAVoPa0rVISb9L6JX2p3SmRe4/QIDAQAB
+ # 瀹炰緥婕旂ず寮�鍏�
+ demoEnabled: false
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
+ profile: D:/IGDS/FILE/
+ # 鑾峰彇ip鍦板潃寮�鍏�
+ addressEnabled: false
+ support: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�
+ email: business@fzzygf.com
+ phone: 400-627-1116
+ website: http://www.fzzygf.com
+ address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
+ dzhwk-video: D:/IGDS/FILE/VIDEO/涓夌淮婕旂ず瑙嗛.mp4
\ No newline at end of file
diff --git a/igds-dzhwk-web/src/main/resources/application.yml b/igds-dzhwk-web/src/main/resources/application.yml
index 851768b..25db5f3 100644
--- a/igds-dzhwk-web/src/main/resources/application.yml
+++ b/igds-dzhwk-web/src/main/resources/application.yml
@@ -98,6 +98,7 @@
phone: 400-627-1116
website: http://www.fzzygf.com
address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
+ dzhwk-video: D:/IGDS/FILE/VIDEO/3d.mp4
# 鏃ュ織閰嶇疆
diff --git a/igds-dzhwk-web/src/main/resources/static/dzhwk/gas/gas-check.js b/igds-dzhwk-web/src/main/resources/static/dzhwk/gas/gas-check.js
index 51ee4f6..39c442d 100644
--- a/igds-dzhwk-web/src/main/resources/static/dzhwk/gas/gas-check.js
+++ b/igds-dzhwk-web/src/main/resources/static/dzhwk/gas/gas-check.js
@@ -85,7 +85,7 @@
// 鍗曚粨鎵撳嵃
function printSingle() {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
layer.msg("寮�濮嬬敓鎴愭墦鍗版ā鐗堚�︹��");
var html = builderModel(curData,dept);
@@ -95,7 +95,7 @@
// 鎵归噺鎵撳嵃
function printBatch() {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
// 棣栧厛鍘婚櫎涔嬪墠鐨勯�夋嫨
var name;
@@ -452,7 +452,7 @@
// 姘斾綋閲囬泦鐨勫叆鍙ｆ柟娉曪紝type=1,琛ㄧず鏁翠粨閲囬泦锛泃ype=2,琛ㄧず閫夋嫨閲囬泦锛宼ype=3琛ㄧず澶氫粨閲囬泦
function checkStart(type) {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
checkType = $("input[name='type']:checked").val();
if(!checkType){
diff --git a/igds-dzhwk-web/src/main/resources/static/dzhwk/grain/grain-check1.js b/igds-dzhwk-web/src/main/resources/static/dzhwk/grain/grain-check1.js
index c726e03..48c69b1 100644
--- a/igds-dzhwk-web/src/main/resources/static/dzhwk/grain/grain-check1.js
+++ b/igds-dzhwk-web/src/main/resources/static/dzhwk/grain/grain-check1.js
@@ -328,7 +328,7 @@
// 绮儏瀵规瘮
function compare() {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
if (!depotId) {
layer.msg("璇峰厛閫夋嫨浠撳簱鈥︹��");
@@ -595,7 +595,7 @@
// 鍗曚釜绮儏妫�娴�
function checkGrain() {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
if (!depotId) {
layer.msg("璇峰厛閫夋嫨浠撳簱锛�");
@@ -626,7 +626,7 @@
// 鎵归噺绮儏閲囬泦
function checkGrainBatch() {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
$('#batchCheckSelect input').each(function () {
$(this).prop("checked", false);
@@ -724,7 +724,7 @@
var iframeOrderIndex = 0;
function showOrderProgress() {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
var domId = "#layui-layer-iframe" + iframeOrderIndex;
if ($(domId).length == 0) {
diff --git a/igds-dzhwk-web/src/main/resources/static/dzhwk/grain/grain-export.js b/igds-dzhwk-web/src/main/resources/static/dzhwk/grain/grain-export.js
index b5740bd..9d86ad0 100644
--- a/igds-dzhwk-web/src/main/resources/static/dzhwk/grain/grain-export.js
+++ b/igds-dzhwk-web/src/main/resources/static/dzhwk/grain/grain-export.js
@@ -1,6 +1,6 @@
// 绮儏鎵归噺瀵煎嚭EXCEL
function exportBatch() {
- layer.msg("鏆傛湭寮�鏀撅紒");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
// 寮瑰嚭閫夋嫨妗�
layer.open({
diff --git a/igds-dzhwk-web/src/main/resources/static/dzhwk/n2/n2-control.js b/igds-dzhwk-web/src/main/resources/static/dzhwk/n2/n2-control.js
index 4c18d6a..4888569 100644
--- a/igds-dzhwk-web/src/main/resources/static/dzhwk/n2/n2-control.js
+++ b/igds-dzhwk-web/src/main/resources/static/dzhwk/n2/n2-control.js
@@ -241,7 +241,7 @@
* @param modeTag
*/
function doExe(modeTag) {
- layer.msg("鏆傛湭瀵规帴璁惧锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
depotId = $("#depotId").val();
if (!depotId) {
@@ -308,7 +308,7 @@
//寮瑰嚭鍒舵爱鏈烘帶鍒剁獥鍙�,鐩存帴鐢ㄤ竴涓柊椤甸潰
function showMacControl() {
- layer.msg("鏆傛湭瀵规帴璁惧锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
layer.open({
type: 2,
diff --git a/igds-dzhwk-web/src/main/resources/static/dzhwk/pest/pest-check.js b/igds-dzhwk-web/src/main/resources/static/dzhwk/pest/pest-check.js
index 4f1b7d9..088e145 100644
--- a/igds-dzhwk-web/src/main/resources/static/dzhwk/pest/pest-check.js
+++ b/igds-dzhwk-web/src/main/resources/static/dzhwk/pest/pest-check.js
@@ -80,7 +80,7 @@
// 鍗曚粨鎵撳嵃
function printSingle() {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
layer.msg("寮�濮嬬敓鎴愭墦鍗版ā鐗堚�︹��");
var html = builderModel(curData,dept);
@@ -90,7 +90,7 @@
// 鎵归噺鎵撳嵃
function printBatch() {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
// 棣栧厛鍘婚櫎涔嬪墠鐨勯�夋嫨
var name;
@@ -437,7 +437,7 @@
// 姘斾綋閲囬泦鐨勫叆鍙ｆ柟娉曪紝type=1,琛ㄧず鏁翠粨閲囬泦锛泃ype=2,琛ㄧず閫夋嫨閲囬泦锛宼ype=3琛ㄧず澶氫粨閲囬泦
function checkStart(type) {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
if (3 == type) {
checkBatch();
@@ -731,7 +731,7 @@
};
function gasChart() {
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
layer.msg("鍔熻兘鏆傛湭寮�鏀锯�︹��");
};
\ No newline at end of file
diff --git a/igds-dzhwk-web/src/main/resources/static/dzhwk/recir/recir-control-pfc.js b/igds-dzhwk-web/src/main/resources/static/dzhwk/recir/recir-control-pfc.js
index 778f128..7d9aa8a 100644
--- a/igds-dzhwk-web/src/main/resources/static/dzhwk/recir/recir-control-pfc.js
+++ b/igds-dzhwk-web/src/main/resources/static/dzhwk/recir/recir-control-pfc.js
@@ -220,7 +220,7 @@
// 鎵嬪姩鎵ц锛屽悓鏃舵洿鏂扮姸鎬�
function toCut(target) {
if(target == "03" || target == "04"){
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
}
toCutExe(target, true);
@@ -293,7 +293,7 @@
content: $('#tempControl'),
btn: ['纭畾鎵ц', '鍙栨秷鎿嶄綔'],
yes: function () {
- layer.msg("鏆傛湭瀵规帴璁惧");
+ layer.msg("褰撳墠鍗忚鏈鎺�");
return;
toExecute();
layer.closeAll();
diff --git a/igds-dzhwk-web/src/main/resources/static/dzhwk/verb/verb-control-pfc.js b/igds-dzhwk-web/src/main/resources/static/dzhwk/verb/verb-control-pfc.js
index e8d8e80..7bf135f 100644
--- a/igds-dzhwk-web/src/main/resources/static/dzhwk/verb/verb-control-pfc.js
+++ b/igds-dzhwk-web/src/main/resources/static/dzhwk/verb/verb-control-pfc.js
@@ -225,7 +225,7 @@
// 鎵嬪姩鎵ц锛屽悓鏃舵洿鏂扮姸鎬�
function toCut(target) {
if(target == "03" || target == "04"){
- layer.msg("鏆傛湭瀵规帴锛�");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
}
toCutExe(target, true);
@@ -385,7 +385,7 @@
// 鏍规嵁鎿嶄綔鐩爣鐘舵�佸拰閫夋嫨鐨勮澶囪繘琛屾墽琛�-鐩爣鐘舵��
function toExecute(targetStatus) {
- layer.msg("鏆傛湭瀵规帴璁惧");
+ layer.msg("褰撳墠鍗忚鏈鎺ワ紒");
return;
var batchTag = false;
if ("W_OPEN_ALL" == targetStatus) {
diff --git a/igds-dzhwk-web/src/main/resources/templates/dzhwk/index.html b/igds-dzhwk-web/src/main/resources/templates/dzhwk/index.html
index 2f4edd0..868723c 100644
--- a/igds-dzhwk-web/src/main/resources/templates/dzhwk/index.html
+++ b/igds-dzhwk-web/src/main/resources/templates/dzhwk/index.html
@@ -108,6 +108,7 @@
<li class="li1">
<div class="con">
<div class="videobox">
+<!-- <video th:src="${videoUrl}" class="img"-->
<video src="http://player.alicdn.com/video/aliyunmedia.mp4" class="img"
poster="/img/dzhwk/imgl4.jpg" muted preload controls
webkit-playsinline="true" playsinline="true">鎮ㄧ殑娴忚鍣ㄤ笉鏀寔video鏍囩
--
Gitblit v1.9.3