fix: bug

config/webpack.prod.js

@@ -134,14 +134,12 @@ module.exports = merge(common, {
     }),
     new CopyWebpackPlugin([
       { 
-        from: path.resolve(__dirname, '../src/assets/js/privateConfig.js'), 
-        to:path.resolve(__dirname, '../dist/static/privateConfig.js'),
-        // to: '../dist/static/privateConfig.js' 
+        from: path.resolve(__dirname, '../src/assets/js/urlConfig.js'), 
+        to:path.resolve(__dirname, '../dist/static/urlConfig.js'),
       },
       { 
         from: path.resolve(__dirname, '../src/assets/js/crypto-js.js'), 
         to:path.resolve(__dirname, '../dist/static/crypto-js.js'),
-        // to: '../dist/static/privateConfig.js' 
       },
       { 
         from: path.resolve(__dirname, '../src/assets/js/jquery-1.11.0.min.js'), 

public/index.html

@@ -192,11 +192,10 @@
   <script src="../src/assets/js/echarts.all.js"></script>
   <script src="../src/assets/js/echarts.min.js"></script>
   <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script> -->
-  <script type="text/javascript" src="<%=htmlWebpackPlugin.options.publicPath%>static/privateConfig.js"></script>
   <script type="text/javascript" src="../src/assets/js/crypto-js.js"></script>
-  <script type="text/javascript" src="../src/assets/js/privateConfig.js"></script>
+  <!-- <script type="text/javascript" src="../src/assets/js/urlConfig.js"></script> -->
   <script type="text/javascript" src="<%=htmlWebpackPlugin.options.publicPath%>static/crypto-js.js"></script>
-
+  <script type="text/javascript" src="<%=htmlWebpackPlugin.options.publicPath%>static/urlConfig.js"></script>
   <script type="text/javascript" src="<%=htmlWebpackPlugin.options.publicPath%>static/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="<%=htmlWebpackPlugin.options.publicPath%>static/jquery.numscroll.js"></script>
   <script type="text/javascript" src="<%=htmlWebpackPlugin.options.publicPath%>static/echarts.all.js"></script>

src/assets/js/privateConfig.js

@@ -1,8 +1,8 @@
-window.privateConfig = {
+window.urlConfig = {
   BACKEND_BASE: '', // 后台服务地址
   publicPath: '',
   mock: false,
   CDN_BASE: '',
-  SHOW_WATERMARK:false,//是否显示水印
+  SHOW_WATERMARK:true,//是否显示水印
   IS_SSO_LOGIN: false //是否是采用单点登录方式
 }

src/pages/gvc/view.jsx

@@ -396,7 +396,7 @@ class Gvc extends Component {
       <div className={[styles.gvc_home + ' home_box ']}>
         {/* 水印 */}
         {
-          window.privateConfig && window.privateConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
+          window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
         }
         {/* 右键切换大屏 */}
         <Tooltip placement="bottom" title={"数据运营中心"}>

src/pages/tqcDataVHome/view.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 
  * @Date: 2023-10-25 10:32:44 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2024-01-22 14:26:36
+ * @Last Modified time: 2024-01-22 15:21:55
  */
 /*
  * @Author: dayan_hjm 
@@ -257,7 +257,7 @@ class Home extends Component {
       <div className={"home_box"}>
         {/* 水印 */}
         {
-          window.privateConfig && window.privateConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
+          window.urlConfig && window.urlConfig.SHOW_WATERMARK && <div className={"shuiYin"} style={{ backgroundImage: `url(${$store.app.markSrc})`, backgroundRepeat: 'repeat' }}></div>
         }
         {/* 右键切换大屏 */}
         <Tooltip placement="bottom" title={"产供销价值链"}>

src/utils/request.js

@@ -6,10 +6,10 @@ import { message } from "antd";
 import { useHistory } from "react-router-dom";
 
 let baseUrl = "";
-if (process.env.NODE_ENV === "production" && window.privateConfig && window.privateConfig.BACKEND_BASE) {
-  console.log(window.privateConfig, "window.privateConfig")
+if (process.env.NODE_ENV === "production" && window.urlConfig && window.urlConfig.BACKEND_BASE) {
+  console.log(window.urlConfig, "window.urlConfig")
   //   baseUrl = "//192.168.34.57:8600";
-  baseUrl = window.privateConfig.BACKEND_BASE
+  baseUrl = window.urlConfig.BACKEND_BASE
 }
 
 const instance = axios.create({

src/utils/util.js

@@ -266,7 +266,7 @@ export function setWaterMark(option = {}) {
 
   arr.map((item, index) => {
     ctx.beginPath();
-    draw(item, horizontalWidth / 2 - 30, index * 30 + horizontalWidth / 2 - 30);
+    draw(item, horizontalWidth / 2 - 0, index * 20 + horizontalWidth / 2 - 30);
 
     // ctx.fillText(item, index * 100, index * 100);
     ctx.closePath();