Home Explore Help
Register Sign In
wanghai
/
tysw_dpweb
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

部分模块调整

liangluogis 8 months ago
parent
6364f707f9
commit
c2892186cd
6 changed files with 187 additions and 12 deletions
Split View Show Diff Stats
  1. 1 1
      src/configure.ts
  2. 94 0
      src/index copy.html
  3. 1 1
      src/login/login.js
  4. 53 1
      src/widgets/Warning/Widget.ts
  5. 6 5
      src/widgets/WaterStatus/Widget.html
  6. 32 4
      src/widgets/WaterStatus/Widget.ts

+ 1 - 1
src/configure.ts
View File 

@@ -30,7 +30,7 @@ var AppX = {
 
         "userId":"",//用户id
 
         
         // "apiRoot": "http://221.182.8.141:4111", //本地环境
 
-        "apiRoot": "http://192.168.2.231:4111", //本地环境
 
+        "apiRoot": "http://192.168.2.6:21010", //本地环境
 
         // "extApiRoot":"http://47.116.133.57/JinTangWDWebApp/api",//水力模型接口配置(本地地址)       
         // "apiRoot": "http://xrty.vipgz4.idcfengye.com",
 
         // "apiRoot": "http://192.168.100.204:1111",//客户环境

+ 94 - 0
src/index copy.html
View File 

@@ -0,0 +1,94 @@
 
+<!DOCTYPE html>
 
+<html style="overflow: auto;">
 
+
 
+<head>
 
+    <meta charset="utf-8" />
 
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
+    <title></title>
 
+    <!-- 客户环境 -->
 
+    <!-- <link rel="stylesheet" href="http://192.168.100.204:8099/arcgis_js_api/library/4.16/esri/css/main.css"> -->
 
+    <!-- <link rel="stylesheet" href="http://118.24.21.156:8099/arcgis_js_api/library/4.16/esri/css/main.css"> -->
 
+    <!-- 本地环境 -->
 
+    <!-- <link rel="stylesheet" href="http://221.182.8.141:3308/arcgis_js_api/v416/arcgis_js_api/library/4.16/esri/css/main.css"> -->
 
+    <link rel="stylesheet" href="http://192.168.2.238:3308/arcgis_js_api/v416/arcgis_js_api/library/4.16/esri/css/main.css">
 
+    <link href="css/style.css" rel="stylesheet" />
 
+    <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
 
+    <link rel="stylesheet" href="vendor/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css">
 
+    <link rel="stylesheet" href="vendor/select2/css/select2.min.css">
 
+    <link rel="stylesheet" href="vendor/bootstrap-fileinput/fileinput.min.css">
 
+    <link rel="stylesheet" href="vendor/jquery-jedate/jedate/skin/jedate.css">
 
+    <link rel="stylesheet" href="vendor/ztree/css/zTreeStyle/zTreeStyle.css"/>
 
+    <link rel="stylesheet" href="vendor/messenger/css/messenger.css">
 
+    <link rel="stylesheet" href="vendor/messenger/css/messenger-theme-future.css">
 
+    <link rel="stylesheet" href="./vendor/bootstrap-select/css/bootstrap-select.min.css">
 
+    <link rel="stylesheet" href="./vendor/multiselect/css/bootstrap-multiselect.css" type="text/css" />
 
+    <link href="vendor/jquery-viewer/css/viewer.css" rel="stylesheet" />
 
+    <link rel="stylesheet" href="vendor/animatecss/animate.css" />
 
+    <link rel="stylesheet" href="vendor/toflyUI/toflyUI.css" type="text/css" />
 
+    <link rel="stylesheet" type="text/css" href="vendor/jquery-slider/css/slider.css"/>
 
+    <link rel="stylesheet" type="text/css" href="vendor/jquery-pagination/pagination.css"/>
 
+    <link rel="stylesheet" type="text/css" href="vendor/jquery-datatables/css/jquery.dataTables.min.css"/>
 
+    <!-- <link rel="stylesheet" type="text/css" href="vendor/bootstrap-datatables/css/dataTables.bootstrap.min.css"/> -->
 
+</head>
 
+<!-- style="background-color: #000;" -->
 
+<body>
 
+    <div class="body">
 
+        <div id="mainContainer"></div>
 
+    </div>
 
+    <div class='loginAgain'>
 
+    </div>
 
+    <script src="vendor/mxClient/mxClient.js"></script>
 
+    <script src="vendor/js-csv-encoding/js/encoding-indexes.min.js"></script>
 
+    <script src="vendor/js-csv-encoding/js/encoding.min.js"></script>
 
+    <script src="vendor/cookie/js/cookie.min.js"></script>
 
+    <script src="vendor/jquery/js/jquery.min.js"></script>
 
+    <script src="vendor/jquery-pagination/jquery.pagination.js"></script>
 
+    <script src="vendor/jquery-datatables/js/jquery.dataTables.min.js"></script>
 
+    <script src="vendor/jquery-slider/js/slider.js"></script>
 
+    <script type="text/javascript" src="/vendor/js-security/sha1.js"></script>
 
+    <script src="vendor/jquery-ui/js/jquery-ui.min.js"></script>
 
+    <script src="vendor/jquery-jedate/jedate/jedate.min.js"></script>
 
+    <!-- <script src="vendor/ztree/js/jquery.ztree.core.min.js"></script>
 
+    <script src="vendor/ztree/js/jquery.ztree.excheck.min.js"></script> -->
 
+
 
+    
+    <script src="vendor/jquery-treetable/jquery.treetable.js"></script>
 
+    <script src="vendor/jquery-ztree-3.5.37/js/jquery.ztree.core.min.js"></script>
 
+    <script src="vendor/jquery-ztree-3.5.37/js/jquery.ztree.excheck.min.js"></script>
 
+    <script src="vendor/jquery-ztree-3.5.37/js/jquery.ztree.exedit.min.js"></script>
 
+    
+    <script src="vendor/my97datepicker/WdatePicker.js"></script>
 
+    <script src="vendor/lodash/js/lodash.min.js"></script>
 
+    <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
 
+    <script src="vendor/bootstrap-datetimepicker/js/bootstrap-datetimepicker.js"></script>
 
+    <script src="vendor/bootstrap-datetimepicker/js/bootstrap-datetimepicker.zh-CN.js"></script>
 
+    <script src="./vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
 
+    <script type="text/javascript" src="./vendor/multiselect/js/bootstrap-multiselect.js"></script>
 
+    <script src="vendor/select2/js/select2.min.js"></script>
 
+    <script src="vendor/echarts/js/echarts.min.js"></script>
 
+    <script src="vendor/echarts/js/echart.Theme.js"></script>
 
+    <script src='vendor/project/proj4.js'></script>
 
+    <script src="vendor/echarts/theme/macarons.js"></script>
 
+    <script src="vendor/toflyUI/toflyUI.js"></script> 
+    <script src="vendor/jquery-viewer/js/viewer.js"></script>
 
+    <script src="vendor/liMarquee/jquery.liMarquee.js"></script>
 
+    <script src="vendor/bootstrap-fileinput/fileinput.min.js"></script>
 
+    <script src="vendor/bootstrap-fileinput/zh.js"></script>
 
+    <script type="text/javascript" src="vendor/crypto-js/crypto-js.js"></script>
 
+    <!-- 客户环境 -->
 
+    <!-- <script src="http://192.168.100.204:8099/arcgis_js_api/library/4.16/dojo/dojo.js"></script> -->
 
+    <!-- <script src="http://118.24.21.156:8099/arcgis_js_api/library/4.16/dojo/dojo.js"></script> -->
 
+    <!-- 本地环境 -->
 
+    <!-- <script src="http://221.182.8.141:3308/arcgis_js_api/v416/arcgis_js_api/library/4.16/dojo/dojo.js"></script> -->
 
+    <script src="http://192.168.2.238:3308/arcgis_js_api/v416/arcgis_js_api/library/4.16/dojo/dojo.js"></script>
 
+    <script>
 
+        require(["./main.js", "dojo/domReady!"]);
 
+    </script>
 
+    <!-- <div style="width: 100%; height: 100%; position: absolute;z-index:0;">
 
+        <canvas id="backgroundCanvans" width="480" height="270" style="filter: blur(2px);"></canvas>
 
+        <div style="background-image:url(/images/backGroundLight.png); width: 100%; height: 100%;background-size: 100% 100%; position: absolute;z-index: 1;"></div>
 
+        <div style="background:radial-gradient(#fff0 , #161721); width: 100%; height: 100%;position: absolute;mix-blend-mode: multiply;z-index: 2;"></div>
 
+    </div> -->
 
+</body>
 
+
 
+</html>

+ 1 - 1
src/login/login.js
View File 

@@ -1,5 +1,5 @@
 
 /* CONFIGURE START */
 
-var HOST_NAME = "192.168.2.231:4111";//本地环境
 
+var HOST_NAME = "192.168.2.6:21010";//本地环境
 
 // var HOST_NAME = "192.168.100.204:1111";//客户环境
 
 // var HOST_NAME = "221.182.8.141:4111";
 
 SYS_ADDR = location.href.trim().toLowerCase().replace(/login\/+$/, ""),

+ 53 - 1
src/widgets/Warning/Widget.ts
View File 

@@ -198,6 +198,47 @@ class Warning extends BaseWidget {
 
     }else{
 
       typeSelect.value='';
 
     }
 
+    $('#widget-Warning-more').off('click','.widget-Warning-more-query-dataDelete').on('click','.widget-Warning-more-query-dataDelete',e=>{
 
+      let id=$(e.currentTarget).data('id');
 
+      var url = this.config.requestURL.deleteInfo
 
+      $.ajax({  //结果
 
+        url: this.AppX.appConfig.apiRoot + url[1], type: url[0],
 
+        data:{ids:id},
 
+        success: (res) => {
 
+          if(res.code == 1) {
 
+            $('#widget-Warning-more-query').trigger('click');
 
+            // debugger
 
+            // var sum = 0, legend = []
 
+            // var data = [];
 
+            // res.result.forEach(e=>{
 
+            //   if(e){
 
+            //     sum += e.sum, legend.push(e.typename || '未知');
 
+            //     data.push({
 
+            //       name: e.typename || '未知',
 
+            //       value: e.sum
 
+            //     })
 
+            //   }
 
+            // })
 
+            // this.chart.setOption({
 
+            //   title: { id: 'warring', text: sum > 0 ? '报警总数' : '暂无报警', subtext: sum },       
+            //   legend: { id: 'warring', data: legend },         
+            //   series: [{ id: 'warring', data: data}]
 
+            // });
 
+            // this.chart.off('click');
 
+            // this.chart.on("click",param=>{
 
+            //   this.selectTypeInit=param.name;
 
+            //   if(this.selectTypeInit){
 
+            //     this.openPopup();
 
+            //   }
 
+            // });
 
+          } else {
 
+            this.toast.Show('消除失败' + res.message)
 
+            console.error(res)
 
+          }
 
+        },
 
+        error: (e) => console.error(e)
 
+      })
 
+    });
 
     var statesSelect = document.getElementById('widget-Warning-more-warringStates') as HTMLSelectElement
 
     statesSelect.innerHTML = 
       '<option value="0">全部</option>' + 
@@ -217,10 +258,14 @@ class Warning extends BaseWidget {
 
     var queryBotton = document.getElementById('widget-Warning-more-query');
 
     var typeIndex = {}
 
     warringTypeList.map(e => (e?(typeIndex[e.warnType] = e.typeName):''));
 
+
 
     (queryBotton.onclick = this.popupDiv['TF_BottonPopup'].trueCallBack = () => {
 
         $(tableDiv).dataTable().fnDestroy()
 
         tableBody.innerHTML = ''
 
         loading.style.display = ''
 
+        // if(statesSelect.value=='3'){
 
+        //   $('widget-Warning-more-table-delete').show();
 
+        // }else
 
         queryOptions = [typeSelect.value, statesSelect.value, (date1[0] as HTMLInputElement).value, (date2[0] as HTMLInputElement).value]
 
         let dataTableTemp=$(tableDiv).dataTable({
 
         language: {
 
@@ -307,6 +352,13 @@ class Warning extends BaseWidget {
 
                         item.rowId="<span class='itcdDomTempt' data-itcd='"+index+"'>"+(index+1)+"</span>";
 
                         item.warnTypeName=(typeIndex[item.warnType] || '-');
 
                         item.level=1;
 
+                      
+                        if(!item.confirmTime){
 
+                          item.dataDelete="<button class='widget-Warning-more-query-dataDelete btn btn-default tf-botton' data-id='"+item.id+"'>消除</button>"
 
+                        }else{
 
+                          item.dataDelete="<button disabled='true'  class='btn btn-default tf-botton'>消除</button>"
 
+                        }
 
+                        
                         item.address= (item.address || '-');
 
                         item.notes=(item.notes || '-');
 
                         tempData.push(item)
 
@@ -321,7 +373,7 @@ class Warning extends BaseWidget {
 
                 }
 
               }
 
           },
 
-          columns: [{'data':'rowId'},{'data':'warnTypeName'},{'data':'realVal'},{'data':'address'},{'data':'stationName'},{'data':'scadaTime'},{'data':'intervalTime'},{'data':'notes'}],
 
+          columns: [{'data':'rowId'},{'data':'warnTypeName'},{'data':'realVal'},{'data':'address'},{'data':'stationName'},{'data':'scadaTime'},{'data':'intervalTime'},{'data':'notes'},{'data':'dataDelete'}],
 
         })
 
         var view = this.AppX.runtimeConfig.view
 
         view.TF_warringLoad();

+ 6 - 5
src/widgets/WaterStatus/Widget.html
View File 

@@ -20,7 +20,8 @@
 
                 </div>
 
             </div>
 
             <div class="item_text">
 
-                <span>加压站(kwh/km³)</span>
 
+                <!-- <span>加压站(kwh/km³)</span> -->
 
+                <span>生产总电耗(kwh/km³)</span>
 
             </div>
 
         </div>
 
         <!-- <div class="item_sc" data="all" style="width: 8.4%;"> -->
 
@@ -61,9 +62,9 @@
 
                     <span class="box_item_unit">kwh/km³</span>
 
                 </div>
 
                 <div class="box_item" style="width: 25%;">
 
-                    <span class="box_item_title">PAC</span>
 
+                    <span class="box_item_title">PAC单耗</span>
 
                     <span class="box_item_value" type="widget-waterstatus-yh" data="pac_one" reData="pacone">-</span>
 
-                    <span class="box_item_unit">kg</span>
 
+                    <span class="box_item_unit">kg/km³</span>
 
                 </div>
 
                 <div class="box_item" style="width: 25%;">
 
                     <span class="box_item_title">食盐</span>
 
@@ -121,9 +122,9 @@
 
                     <span class="box_item_unit">kwh/km³</span>
 
                 </div>
 
                 <div class="box_item">
 
-                    <span class="box_item_title">PAC</span>
 
+                    <span class="box_item_title">PAC单耗</span>
 
                     <span class="box_item_value" type="widget-waterstatus-yh" data="pac_two" reData="pactwo">-</span>
 
-                    <span class="box_item_unit">kg</span>
 
+                    <span class="box_item_unit">kg/km³</span>
 
                 </div>
 
                 <div class="box_item">
 
                     <span class="box_item_title">次钠</span>

+ 32 - 4
src/widgets/WaterStatus/Widget.ts
View File 

@@ -105,17 +105,45 @@ class WaterStatus extends BaseWidget {
 
 
             var dayOneTemp = res.value || { zslOne: u }
 
             var dayTwoTemp = res.value || { zslTwo: u }
 
-            var sta = this.valueIsNotEmpty(res.stationPower)
 
+            var sta = this.valueIsNotEmpty(res.stationPower);
 
+            if(res.getdata){
 
+              let currentTempData=res.getdata.find(e=>{return e.dataType=="0"});
 
+              if(dayOneTemp){
 
+                dayOneTemp.zslOne=currentTempData.getValue;
 
+              }
 
+              let currentTempData2= res.getdata.find(e=>{return e.dataType=="1"});
 
+              if(dayTwoTemp){
 
+                dayTwoTemp.zslTwo=currentTempData2.getValue;
 
+              }
 
+              let currentTempData7= res.getdata.find(e=>{return e.dataType=="9"});
 
+              if(currentTempData7){
 
+                sta=this.valueIsNotEmpty(currentTempData7.getValue);
 
+              }
 
+            }
 
             var hourOne = res.hourWaterOne || { qsl: u, gsl: u }
 
             var hourTwo = res.hourWaterTwo || { qsl: u, gsl: u }
 
             var scada = res.realTime as Array<any> || [];
 
             // var value = res.value || { pacone: u, pactwo: u, syone: u, yltwo: u, dhone: u, dhtwo:  u }
 
             var value = res.value || { pacone: u, pactwo: u, syone: u, cnTwo: u, dhone: u, dhtwo:  u }
 
-            var year = res.waterVolume || { gsltotal: u, ssltotal: u }
 
+            var year = res.waterVolume || { gsltotal: u, ssltotal: u };
 
+            if(res.getdata){
 
+              let currentTempData=res.getdata.find(e=>{return e.dataType=="3"});
 
+              if(value&&currentTempData){
 
+                value.pacone=currentTempData.getValue;
 
+              }
 
+              let currentTempData3= res.getdata.find(e=>{return e.dataType=="7"});
 
+              if(value&&currentTempData3){
 
+                value.dhone=currentTempData3.getValue;
 
+              }
 
+              let currentTempData4= res.getdata.find(e=>{return e.dataType=="8"});
 
+              if(value&&currentTempData4){
 
+                value.dhtwo=currentTempData4.getValue;
 
+              }
 
+            }
 
             // value.oneDayQsl=parseFloat(dayOneTemp.zslOne)*10000;
 
             // value.twoDayQsl=parseFloat(dayTwoTemp.zslTwo)*10000;
 
-            value.oneDayQsl = dayOneTemp.zslOne?((parseFloat(dayOneTemp.zslOne) * 10000).toFixed(0)):"-";
 
-            value.twoDayQsl =dayTwoTemp.zslTwo?((parseFloat(dayTwoTemp.zslTwo) * 10000).toFixed(0)):"-"; 
+            value.oneDayQsl = dayOneTemp.zslOne?((parseFloat(dayOneTemp.zslOne)).toFixed(0)):"-";
 
+            value.twoDayQsl =dayTwoTemp.zslTwo?((parseFloat(dayTwoTemp.zslTwo)).toFixed(0)):"-"; 
             listDiv.jyz.innerHTML = sta
 
             for(var i=0,ii=scada.length;i<ii;i++) {
 
               var ds = scada[i]