简柏林 / thingskit-scada · Commits

Commit 9bf6ed63276b06ae227139133885fd0f36680abb

Authored by ww
1 parent 66892ba1

fix: 命令下发时禁用TCP设备的服务二次命令编辑

Inline Side-by-side
Showing 2 changed files with 14 additions and 14 deletions
@@ -22,26 +22,26 @@ @@ -22,26 +22,26 @@
22 <meta name="mobile-web-app-capable" content="yes"> 22 <meta name="mobile-web-app-capable" content="yes">
23 <meta name="theme-color" content="#d89000"> 23 <meta name="theme-color" content="#d89000">
24 24
25 - <link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1679478216446"> 25 + <link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1681890411146">
26 26
27 <!-- load configure file --> 27 <!-- load configure file -->
28 - <script src="./js/config/config.js?v=1679478216446"></script> 28 + <script src="./js/config/config.js?v=1681890411146"></script>
29 29
30 <!-- crypto-js --> 30 <!-- crypto-js -->
31 - <script src="./js/plugin/crypto-js/crypto-js.js?v=1679478216446"></script> 31 + <script src="./js/plugin/crypto-js/crypto-js.js?v=1681890411146"></script>
32 32
33 <!-- storage persistent --> 33 <!-- storage persistent -->
34 - <script src="./js/const/persistentStorage.js?v=1679478216446"></script> 34 + <script src="./js/const/persistentStorage.js?v=1681890411146"></script>
35 <!-- Global const --> 35 <!-- Global const -->
36 - <script src="./js/const/const.js?v=1679478216446"></script> 36 + <script src="./js/const/const.js?v=1681890411146"></script>
37 37
38 <!-- Axios --> 38 <!-- Axios -->
39 - <script src="./js/plugin/axios/axios.min.js?v=1679478216446"></script>  
40 - <script src="./js/plugin/axios/DefHttp.js?v=1679478216446"></script>  
41 - <script src="./js/api/index.js?v=1679478216446"></script> 39 + <script src="./js/plugin/axios/axios.min.js?v=1681890411146"></script>
  40 + <script src="./js/plugin/axios/DefHttp.js?v=1681890411146"></script>
  41 + <script src="./js/api/index.js?v=1681890411146"></script>
42 42
43 <!-- load script --> 43 <!-- load script -->
44 - <script src="./js/config/loadScript.js?v=1679478216446"></script> 44 + <script src="./js/config/loadScript.js?v=1681890411146"></script>
45 45
46 <!-- act editor --> 46 <!-- act editor -->
47 <!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/ace.js"></script> --> 47 <!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/ace.js"></script> -->
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 <!-- <script src="https://vjs.zencdn.net/7.10.2/video.min.js"></script> --> 54 <!-- <script src="https://vjs.zencdn.net/7.10.2/video.min.js"></script> -->
55 <!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/video.min.js"></script> --> 55 <!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/video.min.js"></script> -->
56 56
57 - <script src="./js/plugin/layui/layui.js?v=1679478216446"></script> 57 + <script src="./js/plugin/layui/layui.js?v=1681890411146"></script>
58 <!-- <link rel="stylesheet" href="https://cdnjs.loli.net/ajax/libs/layui/2.6.8/css/layui.min.css" 58 <!-- <link rel="stylesheet" href="https://cdnjs.loli.net/ajax/libs/layui/2.6.8/css/layui.min.css"
59 integrity="sha512-iQBJbsNHXUcgEIgWThd2dr8tOdKPvICwqjPEZYY81z3eMya44A5MiAqfWSCh+Ee1YzNYkdrI982Qhwgr8LEYOQ==" 59 integrity="sha512-iQBJbsNHXUcgEIgWThd2dr8tOdKPvICwqjPEZYY81z3eMya44A5MiAqfWSCh+Ee1YzNYkdrI982Qhwgr8LEYOQ=="
60 crossorigin="anonymous" referrerpolicy="no-referrer" /> 60 crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 crossorigin="anonymous" referrerpolicy="no-referrer"></script> --> 63 crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
64 64
65 <!-- 引入修改样式 --> 65 <!-- 引入修改样式 -->
66 - <link rel="stylesheet" href="./styles/formatChange.css?v=1679478216446"> 66 + <link rel="stylesheet" href="./styles/formatChange.css?v=1681890411146">
67 67
68 <script type="text/javascript"> 68 <script type="text/javascript">
69 /** 69 /**
@@ -306,7 +306,7 @@ @@ -306,7 +306,7 @@
306 var supportedDomain = (hostName.substring(hostName.length - 8, hostName.length) === '.draw.io') || 306 var supportedDomain = (hostName.substring(hostName.length - 8, hostName.length) === '.draw.io') ||
307 (hostName.substring(hostName.length - 13, hostName.length) === '.diagrams.net'); 307 (hostName.substring(hostName.length - 13, hostName.length) === '.diagrams.net');
308 308
309 - const releaseVersion = '1679478216446' 309 + const releaseVersion = '1681890411146'
310 const appMinSrc = Enable_OSS ? `${OSS_Prefix}app.min.js?v=${releaseVersion}` : `js/app.min.js?v=${releaseVersion}` 310 const appMinSrc = Enable_OSS ? `${OSS_Prefix}app.min.js?v=${releaseVersion}` : `js/app.min.js?v=${releaseVersion}`
311 function loadAppJS() { 311 function loadAppJS() {
312 mxscript(appMinSrc, function () { 312 mxscript(appMinSrc, function () {
@@ -15071,7 +15071,7 @@ class HandleDataInteraction { @@ -15071,7 +15071,7 @@ class HandleDataInteraction {
15071 <div class="layui-form-item"> 15071 <div class="layui-form-item">
15072 <label class="layui-form-label" style="width: 120px;">自定义下发值</label> 15072 <label class="layui-form-label" style="width: 120px;">自定义下发值</label>
15073 <div class="layui-input-block" style="margin-left: 150px;"> 15073 <div class="layui-input-block" style="margin-left: 150px;">
15074 - <input type="text" name="${enumActionEl.SERVICE_TCP_COMMAND}" lay-verify="required" autocomplete="off" placeholder="请输入下发值" class="layui-input"> 15074 + <input type="text" name="${enumActionEl.SERVICE_TCP_COMMAND}" lay-verify="required" autocomplete="off" disabled placeholder="请输入下发值" class="layui-input">
15075 </div> 15075 </div>
15076 </div> 15076 </div>
15077 </div> 15077 </div>
@@ -15235,7 +15235,7 @@ class HandleDataInteraction { @@ -15235,7 +15235,7 @@ class HandleDataInteraction {
15235 } 15235 }
15236 } else { 15236 } else {
15237 if (isTCP) { 15237 if (isTCP) {
15238 - value = data[enumActionEl.SERVICE_TCP_COMMAND] 15238 + value = content.serviceCommand
15239 const validate = new Validate([ 15239 const validate = new Validate([
15240 { value, required: true, message: '下发值是必填项' }, 15240 { value, required: true, message: '下发值是必填项' },
15241 ]) 15241 ])