fix:删除无用代码

unify_api/modules/shidianu/service/IntergratePipe.py

@@ -5,10 +5,7 @@ from unify_api.modules.shidianu.service.electricProportion import \
     electricProportion
 import os
 import pandas as pd
-import matplotlib.pyplot as plt
 
-plt.rcParams['font.sans-serif'] = ['SimHei']
-plt.rcParams['axes.unicode_minus'] = False
 illegalConfig_hold = 2500
 highPowerEquip_hold = 3000
 
@@ -70,6 +67,7 @@ def hisPieceFind(params, each_data):
     return resultDict, power_pa, day_time
 
 
+<<<<<<< HEAD
 def addLabels(sid="sid", aircondRunStages="", electroRunStages="",
               heaterRunStages="", refrigRunStages="", timeOrder="",
               actionOrder="", power="", timeAll=""):
@@ -99,3 +97,5 @@ def addLabels(sid="sid", aircondRunStages="", electroRunStages="",
     x = [each.split(" ")[1][:-3] for each in timeAll]
     plt.show()
     return 0
+=======
+>>>>>>> master

unify_api/modules/shidianu/service/highPower.py

 import pandas as pd
-import numpy as np
-import os
-import matplotlib.pyplot as plt
-
-
-# def quancalcu(sid, key="a"):
-#     staspath = os.path.join(
-#         "C:\\Users\\TTT\\PycharmProjects\\electdecomp\\venv\\realTimePowerDecomp\\statisVars",
-#         sid, key[1] + ".csv")
-#     data = pd.read_csv(staspath)
-#     data.columns = ["time1", "powerjump", "time2", "powerbig"]
-#     bigpowers = data["powerbig"]
-#     quanter = np.quantile(bigpowers, 0.9)
-#     return quanter
 
 
 def likesEquip(time):

unify_api/modules/zhiwei_u/fault_foreast/read_dev_data-1.py

@@ -5,7 +5,6 @@ import os
 import sys
 import base64
 import struct
-import matplotlib.pyplot as plt
 import pandas as pd
 import re
 import zlib

unify_api/modules/zhiwei_u/fault_foreast/read_dev_data.py

@@ -5,11 +5,6 @@ import os
 import sys
 import base64
 import struct
-import matplotlib.pyplot as plt
-import pandas as pd
-import re
-import zlib
-import pandas as pd
 
 def read_json_file(file_name):
     '''just read config of poll'''