zhulizhen hace 5 años
padre
commit
d05fa0d16f

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 12722 - 0
package-lock.json


+ 2 - 2
src/api/doBusiness/business.js

@@ -1,7 +1,7 @@
 import httputils from '@/api/httputils'
 export function queryHours({postParams}) {
-    return httputils.postJson(`/duoduo-service/transfer/chiller/business/hours/query?projectId=Pj1101010001`, postParams)
+    return httputils.postJson(`/duoduo-service/transfer/chiller/business/hours/query?projectId=Pj4419000005`, postParams)
 }
 export function updateHours({postParams}) {
-    return httputils.postJson(`/duoduo-service/transfer/chiller/business/hours/update?projectId=Pj1101010001`, postParams)
+    return httputils.postJson(`/duoduo-service/transfer/chiller/business/hours/update?projectId=Pj4419000005`, postParams)
 }

+ 13 - 0
src/api/startegy/strategy.js

@@ -0,0 +1,13 @@
+import httputils from '@/api/httputils'
+//查询当日天气
+export function queryWeather({getParams}) {
+    return httputils.getJson(`/duoduo-service/transfer/chiller/command/queryWeather?projectId=Pj4419000005`, getParams)
+}
+//查询当前运行策略
+export function queryCommand({postParams}) {
+    return httputils.postJson(`/duoduo-service/transfer/chiller/command/query?projectId=Pj4419000005`, postParams)
+}
+//查询当日运行策略列表
+export function queryCommand({postParams}) {
+    return httputils.postJson(`/duoduo-service/transfer/chiller/command/query?projectId=Pj4419000005`, postParams)
+}

+ 4 - 4
src/views/audit/auditTable.vue

@@ -4,14 +4,14 @@
       <el-table-column prop="title" label width="105"></el-table-column>
       <el-table-column prop="name" label="冷机开启台数" align="center" width="55"></el-table-column>
       <el-table-column prop="province" label="冷机出水温度" align="center" width="55"></el-table-column>
-      <el-table-column prop="city" label="冷冻泵台数" align="center" width="60"></el-table-column>
+      <el-table-column prop="city" label="冷冻泵台数" align="center" width=""></el-table-column>
       <el-table-column prop="address" label="冷冻泵频率" align="center" width="65"></el-table-column>
-      <el-table-column prop="zip" label="冷却泵台数" align="center" width="60"></el-table-column>
+      <el-table-column prop="zip" label="冷却泵台数" align="center" width=""></el-table-column>
       <el-table-column prop="zip" label="冷却泵频率" align="center" width="65"></el-table-column>
-      <el-table-column prop="zip" label="冷却塔台数" align="center" width="60"></el-table-column>
+      <el-table-column prop="zip" label="冷却塔台数" align="center" width=""></el-table-column>
       <el-table-column prop="zip" label="冷却塔频率" align="center" width="65"></el-table-column>
       <el-table-column prop="zip" label="室内平均温度" align="center" width="55"></el-table-column>
-      <el-table-column prop="hign" label="室内最高温度" align="center" width="60"></el-table-column>
+      <el-table-column prop="hign" label="室内最高温度" align="center" width=""></el-table-column>
       <el-table-column prop="load" label="冷机负载率" align="center" width="55"></el-table-column>
     </el-table>
   </div>

+ 4 - 2
src/views/audit/index.vue

@@ -285,6 +285,7 @@ export default {
   .appeal-right {
     flex: 1;
     position: relative;
+    padding-right:20px;
     .detailContainer {
       min-width: 762px;
       padding: 0 100px;
@@ -358,7 +359,7 @@ export default {
         }
         span:nth-of-type(3) {
           textarea {
-            width: 762px;
+            width:100%;
             height: 64px;
             border-radius: 4px;
             border: 1px solid rgba(195, 199, 203, 1);
@@ -379,6 +380,7 @@ export default {
       position: absolute;
       bottom: 0px;
       padding: 16px 32px;
+      box-sizing: border-box;
       .opinion-title {
         height: 24px;
         font-size: 16px;
@@ -391,7 +393,7 @@ export default {
         display: flex;
         align-items: center;
         input {
-          width: 697px;
+          width: 70%;
           height: 32px;
           background: rgba(255, 255, 255, 1);
           border-radius: 4px;

+ 2 - 2
src/views/doBusiness/index.vue

@@ -50,7 +50,7 @@ export default {
       let params = {
         postParams:{
           criteria:{
-            projectId:'Pj1101010001',
+            projectId:'Pj4419000005',
             date:'201902'
           }
         }
@@ -62,7 +62,7 @@ export default {
     setHours(){
       let params = {
         postParams:{
-          projectId:'Pj1101010001',
+          projectId:'Pj4419000005',
           date:'201902',
           openTime:'080000',
           endTime:'220000'

+ 4 - 2
src/views/evaluate/evIndoorTemperature.vue

@@ -7,7 +7,7 @@
       <i class="icon4"></i>室内温度满足率
       <i class="icon5"></i>节能率
     </div>
-    <div id="pCharts2" style="width: 100%;height: 100%;"></div>
+    <div id="pCharts2" style="width: 100%;height: 100%;margin-top:20px;"></div>
   </div>
 </template>
 
@@ -34,7 +34,8 @@ export default {
           }
         },
         grid: {
-          right: "20%"
+          right: "5%",
+          left:"5%"
         },
         xAxis: [
           {
@@ -279,6 +280,7 @@ export default {
   font-size: 12px;
   color: #000000;
   text-align:center;
+  margin-top: 20px;
   .icon1{
     display: inline-block;
     width:12px;

+ 1 - 1
src/views/evaluate/index.vue

@@ -203,7 +203,7 @@ export default {
       border-radius: 6px;
       border: 1px solid rgba(238, 238, 238, 1);
       margin-right: 12px;
-
+      flex:1;
       .ev-top {
         margin: 0;
         height: 24px;

+ 2 - 2
src/views/main/index.vue

@@ -112,7 +112,7 @@ export default {
       ],
       options: [
         {
-          value: "Pj1101010001",
+          value: "Pj4419000005",
           label: "嘉铭东枫产业园产业园"
         },
         {
@@ -124,7 +124,7 @@ export default {
       weather: "",
       temperatureIn: "", // 室内
       temperatureOut: "", // 室外
-      value: "Pj1101010001"
+      value: "Pj4419000005"
     };
   },
   props: ["headText"],

+ 5 - 1
src/views/strategy/animationBox.vue

@@ -181,7 +181,7 @@ export default {
         justify-content:space-between;
         margin-top: 20px;
         .an-box-1{
-            min-width:544px;
+            flex:1;
             border:1px dashed #ccc;
             padding-top: 30px;
             padding-left: 24px;
@@ -203,6 +203,10 @@ export default {
     .an-bottom{
         margin-top: 45px;
         display: flex;
+        #leftLine,#rightLine{
+            flex:1;
+        }
+
     }
 }
 </style>

+ 2 - 2
src/views/strategy/index.vue

@@ -133,8 +133,8 @@ export default {
     }
   }
   .starte-right {
-    margin-right: 315px;
-    padding-left: 34px;
+    margin-right: 30px;
+    flex: 1;
     .starte-right-title {
       height: 74px;
       line-height: 74px;

+ 1 - 1
src/views/strategy/waterUnit.vue

@@ -67,7 +67,7 @@ export default {
       display: flex;
       justify-content: space-between;
       .strate-right-box-1{
-        min-width: 264px;
+        flex:1;
         border-radius:6px;
         border:1px solid rgba(238,238,238,1);
         margin-right:18px;