2 Commits ca9c345b2f ... cab8c54c25

Author SHA1 Message Date
  maohu cab8c54c25 资质验证修订,服务器去重 1 day ago
  maohu 9347214ed1 资质验证修订,服务器去重 1 day ago
2 changed files with 461 additions and 404 deletions
  1. 459 403
      Functions/QTMain.py
  2. 2 1
      Functions/QtFunctions/findServerWidget.py

+ 459 - 403
Functions/QTMain.py

@@ -1382,8 +1382,8 @@ class MainWidget(QWidget, Ui_Form):
                 self.peolpleonChange_text = self.lineEdit_people.text()
                 self.changeonChange_text = self.lineEdit_change.text()
                 self.logonChange_text = self.lineEdit_log.text()
-                if (self.doubleclickLockUpdate==0 and res =="ok" and self.flightsum % 20 == 0) or\
-                        (self.doubleclickLockUpdate==0 and datestr =="4" and self.flightsum % 20 == 0):
+                if (self.doubleclickLockUpdate==0 and res =="ok" and self.flightsum % 60 == 0) or\
+                        (self.doubleclickLockUpdate==0 and datestr =="4" and self.flightsum % 20 == 0):   #现在由服务器刷新三天航班所以间隔拉大,超过3min请求。服务器是1分半
                     #print(datetime.datetime.now(),"开始数据库刷新", self.vin)
                     th1 = QThread()
                     self.sortTableWidgetDispalyThread1 = SortdisplaySever.sortdisplaySever("sortTableWidgetDispaly", self.ipinfo,
@@ -1397,7 +1397,7 @@ class MainWidget(QWidget, Ui_Form):
                     if datestr !="4":
                         ip = "http://"+self.ipinfo+"/static/updateVin/" + self.displayMode + "/%s" % datestr
                         self.vin = requests.get(url=ip, timeout=30).json()["返回值"]
-                        #print(datetime.datetime.now(),"更新刷新",self.vin)
+                        print(datetime.datetime.now(),"更新刷新",self.vin)
                 elif self.doubleclickLockUpdate==0 and res !="ok":
                     #print(datetime.datetime.now(),"开始读取刷新", self.vin)
                     th1234 = QThread()
@@ -1412,7 +1412,7 @@ class MainWidget(QWidget, Ui_Form):
                     self.flightsum = 0
                     ip = "http://"+self.ipinfo+"/static/getVin/"+ self.displayMode + "/%s" % datestr
                     self.vin = requests.get(url=ip, timeout=30).json()["返回值"]
-                    #print(datetime.datetime.now(),"仅仅读取",self.vin)
+                    print(datetime.datetime.now(),"仅仅读取",self.vin)
                 '''
                 else:
                     th11111 = QThread()
@@ -1669,7 +1669,7 @@ class MainWidget(QWidget, Ui_Form):
                             ipp = "http://" + str(self.ipinfo) + "/static/maintainAuthCheck/%s/%s" % (text, auttype)
                             try:
                                 res = requests.get(url=ipp, timeout=30).json()
-                                if res["返回值"] == "fail":
+                                if res["返回值"] == "notpass":
                                     self.tableWidgetFlight.setItem(int(row), column,QTableWidgetItem(str(self.olditem)))
                                     self.tableWidgetFlight.item(int(row), column).setBackground(QColor(self.color))
                                     self.tableWidgetFlight.item(int(row), column).setTextAlignment(Qt.AlignmentFlag.AlignCenter)
@@ -1698,7 +1698,7 @@ class MainWidget(QWidget, Ui_Form):
                             ipp = "http://" + str(self.ipinfo) + "/static/maintainAuthCheck/%s/%s" % (text, "CZQW")
                             try:
                                 res = requests.get(url=ipp, timeout=30).json()
-                                if res["返回值"] == "fail":
+                                if res["返回值"] == "notpass":
                                     self.tableWidgetFlight.setItem(int(row), column,QTableWidgetItem(str(self.olditem)))
                                     self.tableWidgetFlight.item(int(row), column).setBackground(QColor(self.color))
                                     self.tableWidgetFlight.item(int(row), column).setTextAlignment(Qt.AlignmentFlag.AlignCenter)
@@ -2017,20 +2017,33 @@ class MainWidget(QWidget, Ui_Form):
         res = self.severpostData_nomeassge("dingdong", data=dict_dingdong)["返回值"]
         return res
 
-    def getRiskData(self,bay,flighttype,acno):
+    def getRiskData(self,bay,flighttype,acno,actype):
         if "送" in flighttype or flighttype == "航前":
             type="出港提示"
         else:
             type = "进港提示"
         res=""
         try:
-            ip = "http://" + str(self.ipinfo) + "/static/getRiskData/" + "%s/" % bay + "%s/" % type + "%s" % acno
+            ip = "http://" + str(self.ipinfo) + "/static/getRiskData/" + "%s/" % bay + "%s/" % type + "%s/" % acno + "%s" % actype
             res=requests.get(url=ip, timeout=30).json()["返回值"]
         except Exception as e:
             app_logger.log_error(e)
             QMessageBox.warning(self, "风险提示失效", "风险提示推送功能失效请联系管理员!")
         return res
-
+    def maintainAuthCheck(self,names,type):
+        if self.maintainAuthCheckSts == 1:
+            ipp = "http://" + str(self.ipinfo) + "/static/maintainAuthCheck/%s/%s" % (names,type)
+            res = requests.get(url=ipp, timeout=30).json()
+            if res["返回值"] == "ok":
+                return True
+            elif res["返回值"] == "notpass":
+                self.show_waring("人员资质不符合",f"{res['未通过人员']}人员不符合资质授权,请核对后再操作!",True)
+                return False
+            else:
+                self.show_waring("人员资质不符合" , f"人员资质系统判断失效,请联系管理员!",True)
+                return False
+        else:
+            return True
     def generateMenu(self, pos):
         if int(self.authority) < 3 and self.displayMode =="A":
             try:
@@ -2061,8 +2074,23 @@ class MainWidget(QWidget, Ui_Form):
                     #colnum = self.tableWidgetFlight.columnCount()
                     # print(colnum)
 
+
+
                     acno = self.tableWidgetFlight.item(rowIndex, 3).text()
                     flightno = self.tableWidgetFlight.item(rowIndex, 9).text()
+                    actype= self.tableWidgetFlight.item(rowIndex, 5).text()
+                    engtype = self.tableWidgetFlight.item(rowIndex , 7).text()
+                    if "A3" in actype and engtype[ 0 :3 ] == "LEA" :
+                        auttype = "ALEAP"
+                    elif "A3" in actype and engtype[ 0 :3 ] != "LEA" :
+                        auttype = "ACSC"
+                    elif "737NG" in actype :
+                        auttype = "737NG"
+                    elif "737MAX" in actype :
+                        auttype = "737MAX"
+                    else :
+                        auttype = "ALL"
+
                     #首先去掉!,准备再次派工通知操作
                     qw1 = self.tableWidgetFlight.item(rowIndex, 23).text().replace("!", "")
                     qw2 = self.tableWidgetFlight.item(rowIndex, 25).text().replace("!", "")
@@ -2096,36 +2124,46 @@ class MainWidget(QWidget, Ui_Form):
                                    "工4": g2_1,
                                    "放行": fx_1
                                    }
+                    parts = [ ]
+                    for item in [ qw1 , qw2 , g1 , g2 ] :
+                        if item :  # 检查是否非空(空字符串、None等会被视为False)
+                            parts.append(item)
+
+                    # 用逗号连接非空值
+                    qwstr = ",".join(parts)
                     # print(dict_people)
                     if action == item1:
-                        if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(self.tableWidgetFlight.item(rowIndex, 53).text()) and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "" :
-                            empNos = self.severpostData_nomeassge("get_empNos", dict_people)
-                            # print(empNos)
-                            if empNos["code"] != "fail":
-                                res=self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["WXempNos"],"WX",empNos["date"],empNos["bc"])
-                                if res == "ok":
+                        if self.maintainAuthCheck(qwstr,"CZQW"):
+                            if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(self.tableWidgetFlight.item(rowIndex, 53).text()) and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "" :
+                                empNos = self.severpostData_nomeassge("get_empNos", dict_people)
+                                # print(empNos)
+                                if empNos["code"] != "fail":
+                                    res=self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["WXempNos"],"WX",empNos["date"],empNos["bc"])
+                                    if res == "ok":
+                                        try:
+                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                            requests.get(url=ip, timeout=30).json()
+                                        except Exception as e:
+                                            app_logger.log_error(e)
+                                            QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                        self.show_info("成功提示", "派工成功!")
+                                    else:
+                                        app_logger.log_error("派工失败")
+                                        app_logger.log_error(res)
+                                        self.show_waring("派工错误", f"%s中存在派工失败,请核对派工情况!"%str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),True)
+                                if empNos["faillist"]:
                                     try:
-                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
                                         requests.get(url=ip, timeout=30).json()
                                     except Exception as e:
                                         app_logger.log_error(e)
                                         QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                    self.show_info("成功提示", "派工成功!")
-                                else:
-                                    app_logger.log_error("派工失败")
-                                    app_logger.log_error(res)
-                                    self.show_waring("派工错误", f"%s中存在派工失败,请核对派工情况!"%str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),True)
-                            if empNos["faillist"]:
-                                try:
-                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                    requests.get(url=ip, timeout=30).json()
-                                except Exception as e:
-                                    app_logger.log_error(e)
-                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                self.show_waring("派工错误", "以下人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"],True)
+                                    self.show_waring("派工错误", "以下人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"],True)
+                            else:
+                                self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工派工!!", True)
+                            return
                         else:
-                            self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工派工!!", True)
-                        return
+                            return
                     elif action == item18:
                         if int(self.authority) <= 2:
                             if self.tableWidgetFlight.item(rowIndex, 49).text() !="" and "【交班航班】" not in fj and \
@@ -2246,191 +2284,206 @@ class MainWidget(QWidget, Ui_Form):
                             self.show_waring("人工提醒", "%s,%s附加消息有需要人工通知的内容,将推送航班监控席位由人工通知!" % (acno, flightno),True)
                         return
                     elif action == item2:
-                        if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(
-                                self.tableWidgetFlight.item(rowIndex, 53).text()) and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
-                            empNos = self.severpostData_nomeassge("get_empNos", dict_people)
-                            if empNos["code"] != "fail":
-                                res = self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["FXempNos"], "FX", empNos["date"], empNos["bc"])
-                                if res == "ok":
+                        if self.maintainAuthCheck(fx,auttype):
+                            if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(
+                                    self.tableWidgetFlight.item(rowIndex, 53).text()) and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
+                                empNos = self.severpostData_nomeassge("get_empNos", dict_people)
+                                if empNos["code"] != "fail":
+                                    res = self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["FXempNos"], "FX", empNos["date"], empNos["bc"])
+                                    if res == "ok":
+                                        try:
+                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(fx),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                            requests.get(url=ip, timeout=30).json()
+                                        except:
+                                            self.show_info("日志功能失效", "操作日志功能失效请联系管理员")
+                                        self.show_info("成功提示", "派工成功!")
+
+                                    else:
+                                        app_logger.log_error("派工失败")
+                                        app_logger.log_error(res)
+                                        self.show_waring( "派工错误" , f"%s中存在派工失败,请核对派工情况!"%str(fx), True)
+                                if empNos["faillist"]:
                                     try:
-                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(fx),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
                                         requests.get(url=ip, timeout=30).json()
-                                    except:
-                                        self.show_info("日志功能失效", "操作日志功能失效请联系管理员")
-                                    self.show_info("成功提示", "派工成功!")
-
-                                else:
-                                    app_logger.log_error("派工失败")
-                                    app_logger.log_error(res)
-                                    self.show_waring( "派工错误" , f"%s中存在派工失败,请核对派工情况!"%str(fx), True)
-                            if empNos["faillist"]:
-                                try:
-                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                    requests.get(url=ip, timeout=30).json()
-                                except Exception as e:
-                                    app_logger.log_error(e)
-                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                self.show_waring("派工错误", "以下人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"], True)
+                                    except Exception as e:
+                                        app_logger.log_error(e)
+                                        QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                    self.show_waring("派工错误", "以下人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"], True)
+                            else:
+                                self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工派工!!", True)
+                            return
                         else:
-                            self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工派工!!", True)
-                        return
+                            return
                     elif action == item3:
-                        if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(self.tableWidgetFlight.item(rowIndex, 53).text()) and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
-                            empNos = self.severpostData_nomeassge("get_empNos", dict_people)
-                            if empNos["code"] != "fail":
-                                res = self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["ESempNos"], "ECSJ", empNos["date"], empNos["bc"])
+                        if self.maintainAuthCheck(qwstr,"CZQW"):
+                            if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(self.tableWidgetFlight.item(rowIndex, 53).text()) and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
+                                empNos = self.severpostData_nomeassge("get_empNos", dict_people)
+                                if empNos["code"] != "fail":
+                                    res = self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["ESempNos"], "ECSJ", empNos["date"], empNos["bc"])
 
-                                if res == "ok":
+                                    if res == "ok":
+                                        try:
+                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                            requests.get(url=ip, timeout=30).json()
+                                        except Exception as e:
+                                            app_logger.log_error(e)
+                                            QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                        self.show_info("成功提示", "派工成功!")
+                                    else:
+                                        app_logger.log_error("派工失败")
+                                        app_logger.log_error(res)
+                                        self.show_waring("派工错误" , f"%s中存在派工失败,请核对派工情况!"%str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2), True)
+                                if empNos["faillist"]:
                                     try:
-                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
                                         requests.get(url=ip, timeout=30).json()
                                     except Exception as e:
                                         app_logger.log_error(e)
                                         QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                    self.show_info("成功提示", "派工成功!")
-                                else:
-                                    app_logger.log_error("派工失败")
-                                    app_logger.log_error(res)
-                                    self.show_waring("派工错误" , f"%s中存在派工失败,请核对派工情况!"%str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2), True)
-                            if empNos["faillist"]:
-                                try:
-                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                    requests.get(url=ip, timeout=30).json()
-                                except Exception as e:
-                                    app_logger.log_error(e)
-                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                self.show_waring("派工错误", "以下人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"], True)
+                                    self.show_waring("派工错误", "以下人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"], True)
+                            else:
+                                self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工派工!!", True)
+                            return
                         else:
-                            self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工派工!!", True)
-                        return
+                            return
                     elif action == item4:
-                        if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(
-                                self.tableWidgetFlight.item(rowIndex, 53).text()) and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
-                            empNos = self.severpostData_nomeassge("get_empNos", dict_people)
-                            if empNos["code"] != "fail":
-                                risktips=""
-                                if self.tableWidgetFlight.item(rowIndex, 8).text() !="":
-                                    res=self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(), self.tableWidgetFlight.item(rowIndex, 19).text(), acno)
-                                    risktips=f"【风险提示】{res}" if res != "" else ""
-                                msgInfo="进港维修任务保障推送!%s%s" % (fj,risktips)
-                                res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
-                                                        self.tableWidgetFlight.item(rowIndex, 59).text(),
-                                                        "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
-                                                        self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),
-                                                        empNos["WXempNos"],"",empNos["WX"],empNos["FX"],"",msgInfo)
-                                if res != "ok":
-                                    msg="%s维修人员%s派工信息推送失败!" % (acno, empNos["WX"])
-                                    self.show_waring("失败提示", msg, True)
-                                else:
-                                    msg ="%s维修人员%s派工信息推送成功!!!" % (acno, empNos["WX"])
-                                    self.severpost_nomeassge("infoConfirm2", "/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
-                                    self.show_info("成功提示",msg)
-                                    self.QThreadSortNow("main")
+                        if self.maintainAuthCheck(qwstr,"CZQW"):
+                            if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(
+                                    self.tableWidgetFlight.item(rowIndex, 53).text()) and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
+                                empNos = self.severpostData_nomeassge("get_empNos", dict_people)
+                                if empNos["code"] != "fail":
+                                    risktips=""
+                                    if self.tableWidgetFlight.item(rowIndex, 8).text() !="":
+                                        res=self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(), self.tableWidgetFlight.item(rowIndex, 19).text(), acno,actype)
+                                        risktips=f"【风险提示】{res}" if res != "" else ""
+                                    msgInfo="进港维修任务保障推送!%s%s" % (fj,risktips)
+                                    res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
+                                                            self.tableWidgetFlight.item(rowIndex, 59).text(),
+                                                            "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
+                                                            self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),
+                                                            empNos["WXempNos"],"",empNos["WX"],empNos["FX"],"",msgInfo)
+                                    if res != "ok":
+                                        msg="%s维修人员%s派工信息推送失败!" % (acno, empNos["WX"])
+                                        self.show_waring("失败提示", msg, True)
+                                    else:
+                                        msg ="%s维修人员%s派工信息推送成功!!!" % (acno, empNos["WX"])
+                                        self.severpost_nomeassge("infoConfirm2", "/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
+                                        self.show_info("成功提示",msg)
+                                        self.QThreadSortNow("main")
 
-                                try:
-                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息内容:【{msg}】%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                    requests.get(url=ip, timeout=30).json()
-                                except Exception as e:
-                                    app_logger.log_error(e)
-                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                    try:
+                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息内容:【{msg}】%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                        requests.get(url=ip, timeout=30).json()
+                                    except Exception as e:
+                                        app_logger.log_error(e)
+                                        QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
 
-                            if empNos["faillist"]:
-                                try:
-                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                    requests.get(url=ip, timeout=30).json()
-                                except Exception as e:
-                                    app_logger.log_error(e)
-                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                self.show_waring("通知错误", "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"], True)
+                                if empNos["faillist"]:
+                                    try:
+                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                        requests.get(url=ip, timeout=30).json()
+                                    except Exception as e:
+                                        app_logger.log_error(e)
+                                        QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                    self.show_waring("通知错误", "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"], True)
+                            else:
+                                self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工叮咚消息通知!!", True)
+                            return
                         else:
-                            self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工叮咚消息通知!!", True)
-                        return
+                            return
 
                     elif action == item5:
-                        if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(
-                                self.tableWidgetFlight.item(rowIndex, 53).text())and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
-                            empNos = self.severpostData_nomeassge("get_empNos", dict_people)
-                            if empNos["code"] != "fail":
-                                risktips=""
-                                if self.tableWidgetFlight.item(rowIndex, 8).text() !="":
-                                    res=self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(), acno)
-                                    risktips=f"\n    【风险提示】:{res}" if res !="" else ""
-                                msgInfo="放行人员保障推送!%s%s" % (fj,risktips)
-                                res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
-                                                        self.tableWidgetFlight.item(rowIndex, 59).text(),
-                                                        "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
-                                                        self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),
-                                                        "", empNos["FXempNos"],empNos["WX"],empNos["FX"],"",msgInfo)
-
-                                if res != "ok":
-                                    msg="%s放行人员%s派工信息推送失败!" % (acno, empNos["FX"])
-                                    self.show_waring("失败提示", msg, True)
-                                else:
-                                    msg ="%s放行人员%s派工信息推送成功!!!" % (acno, empNos["FX"])
-                                    self.show_info("成功提示", msg)
-                                    self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
-                                    self.QThreadSortNow("main")
+                        if self.maintainAuthCheck(fx,auttype):
+                            if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(
+                                    self.tableWidgetFlight.item(rowIndex, 53).text())and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
+                                empNos = self.severpostData_nomeassge("get_empNos", dict_people)
+                                if empNos["code"] != "fail":
+                                    risktips=""
+                                    if self.tableWidgetFlight.item(rowIndex, 8).text() !="":
+                                        res=self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(), acno,actype)
+                                        risktips=f"\n    【风险提示】:{res}" if res !="" else ""
+                                    msgInfo="放行人员保障推送!%s%s" % (fj,risktips)
+                                    res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
+                                                            self.tableWidgetFlight.item(rowIndex, 59).text(),
+                                                            "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
+                                                            self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),
+                                                            "", empNos["FXempNos"],empNos["WX"],empNos["FX"],"",msgInfo)
 
-                                try:
-                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg}】%s/" % (acno, flightno, str(fx),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                    requests.get(url=ip, timeout=30).json()
-                                except Exception as e:
-                                    app_logger.log_error(e)
-                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                    if res != "ok":
+                                        msg="%s放行人员%s派工信息推送失败!" % (acno, empNos["FX"])
+                                        self.show_waring("失败提示", msg, True)
+                                    else:
+                                        msg ="%s放行人员%s派工信息推送成功!!!" % (acno, empNos["FX"])
+                                        self.show_info("成功提示", msg)
+                                        self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
+                                        self.QThreadSortNow("main")
 
-                            if empNos["faillist"]:
-                                try:
-                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                    requests.get(url=ip, timeout=30).json()
-                                except Exception as e:
-                                    app_logger.log_error(e)
-                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                self.show_waring("通知错误", "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"], True)
+                                    try:
+                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg}】%s/" % (acno, flightno, str(fx),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                        requests.get(url=ip, timeout=30).json()
+                                    except Exception as e:
+                                        app_logger.log_error(e)
+                                        QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+
+                                if empNos["faillist"]:
+                                    try:
+                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                        requests.get(url=ip, timeout=30).json()
+                                    except Exception as e:
+                                        app_logger.log_error(e)
+                                        QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                    self.show_waring("通知错误", "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"], True)
+                            else:
+                                self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工叮咚消息通知!!", True)
+                            return
                         else:
-                            self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工叮咚消息通知!!", True)
-                        return
+                            return
 
                     elif action == item6:
-                        if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(
-                                self.tableWidgetFlight.item(rowIndex, 53).text())and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
-                            empNos = self.severpostData_nomeassge("get_empNos", dict_people)
-                            if empNos["code"] != "fail":
-                                risktips = ""
-                                if self.tableWidgetFlight.item(rowIndex, 8).text() != "":
-                                    res = self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(), acno)
-                                    risktips = f"\n    【风险提示】:{res}" if res != "" else ""
-                                msgInfo = "二次送机任务推送!%s%s" % (fj, risktips)
-                                res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
-                                                        self.tableWidgetFlight.item(rowIndex, 59).text(),
-                                                        "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
-                                                        self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),
-                                                        empNos["ESempNos"], "",empNos["WX"],empNos["FX"],empNos["ES"],msgInfo)
-
-                                if res != "ok":
-                                    msg = "%s二次送机人员%s派工信息推送失败!" % (acno, empNos["ES"])
-                                    self.show_waring("失败提示", msg, True)
-                                else:
-                                    msg = "%s二次送机人员%s派工信息推送成功!!!" % (acno, empNos["ES"])
-                                    self.show_info("成功提示", msg)
-                                    self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
-                                    self.QThreadSortNow("main")
-                                try:
-                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg}】%s/" % (acno, flightno, str(g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                    requests.get(url=ip, timeout=30).json()
-                                except Exception as e:
-                                    app_logger.log_error(e)
-                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                            if empNos["faillist"]:
-                                try:
-                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                    requests.get(url=ip, timeout=30).json()
-                                except Exception as e:
-                                    app_logger.log_error(e)
-                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                self.show_waring("通知错误", "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"], True)
+                        if self.maintainAuthCheck(qwstr,"CZQW"):
+                            if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(
+                                    self.tableWidgetFlight.item(rowIndex, 53).text())and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
+                                empNos = self.severpostData_nomeassge("get_empNos", dict_people)
+                                if empNos["code"] != "fail":
+                                    risktips = ""
+                                    if self.tableWidgetFlight.item(rowIndex, 8).text() != "":
+                                        res = self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(), acno,actype)
+                                        risktips = f"\n    【风险提示】:{res}" if res != "" else ""
+                                    msgInfo = "二次送机任务推送!%s%s" % (fj, risktips)
+                                    res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
+                                                            self.tableWidgetFlight.item(rowIndex, 59).text(),
+                                                            "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
+                                                            self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),
+                                                            empNos["ESempNos"], "",empNos["WX"],empNos["FX"],empNos["ES"],msgInfo)
+
+                                    if res != "ok":
+                                        msg = "%s二次送机人员%s派工信息推送失败!" % (acno, empNos["ES"])
+                                        self.show_waring("失败提示", msg, True)
+                                    else:
+                                        msg = "%s二次送机人员%s派工信息推送成功!!!" % (acno, empNos["ES"])
+                                        self.show_info("成功提示", msg)
+                                        self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
+                                        self.QThreadSortNow("main")
+                                    try:
+                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg}】%s/" % (acno, flightno, str(g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                        requests.get(url=ip, timeout=30).json()
+                                    except Exception as e:
+                                        app_logger.log_error(e)
+                                        QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                if empNos["faillist"]:
+                                    try:
+                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                        requests.get(url=ip, timeout=30).json()
+                                    except Exception as e:
+                                        app_logger.log_error(e)
+                                        QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                    self.show_waring("通知错误", "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"], True)
+                            else:
+                                self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工叮咚消息通知!!", True)
+                            return
                         else:
-                            self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工叮咚消息通知!!", True)
-                        return
+                            return
                     elif action == item7:
                         self.severpost_nomeassge("infoConfirm", "/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex, 53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
                         try:
@@ -2509,158 +2562,44 @@ class MainWidget(QWidget, Ui_Form):
                         self.QThreadSortNow("log")
                         return
                     elif action == item13:
-                        msg = {}
-                        msg_fail = ""
-                        sts=False
-                        if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(self.tableWidgetFlight.item(rowIndex, 53).text())and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
-                            if self.tableWidgetFlight.item(rowIndex, 19).text() != "短停送" and self.tableWidgetFlight.item(rowIndex, 19).text() != "特后前送":
-                                empNos = self.severpostData_nomeassge("get_empNos", dict_people)
-                                # print(empNos)
-                                try:
-                                    if empNos["code"] != "fail":
-                                        res=self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["WXempNos"],"WX",empNos["date"],empNos["bc"])
+                        if self.maintainAuthCheck(fx,auttype) and self.maintainAuthCheck(qwstr,"CZQW"):
+                            msg = {}
+                            msg_fail = ""
+                            sts=False
+                            if str(self.tableWidgetFlight.item(rowIndex, 53).text()) != "" and "MAN" not in str(self.tableWidgetFlight.item(rowIndex, 53).text())and str(self.tableWidgetFlight.item(rowIndex, 55).text()) != "":
+                                if self.tableWidgetFlight.item(rowIndex, 19).text() != "短停送" and self.tableWidgetFlight.item(rowIndex, 19).text() != "特后前送":
+                                    empNos = self.severpostData_nomeassge("get_empNos", dict_people)
+                                    # print(empNos)
+                                    try:
+                                        if empNos["code"] != "fail":
+                                            res=self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["WXempNos"],"WX",empNos["date"],empNos["bc"])
 
-                                        if res == "ok":
-                                            msg["aa"] = "%s维修人员派工成功!"% str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2)
-                                            try:
-                                                ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                                requests.get(url=ip, timeout=30).json()
-                                            except Exception as e:
-                                                app_logger.log_error(e)
-                                                QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                        else:
-                                            app_logger.log_error("派工失败")
-                                            app_logger.log_error(res)
-                                            msg["aa"] = f"%s中存在派工失败,请核对派工情况!"%str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2)
-                                            sts=True
+                                            if res == "ok":
+                                                msg["aa"] = "%s维修人员派工成功!"% str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2)
+                                                try:
+                                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                                    requests.get(url=ip, timeout=30).json()
+                                                except Exception as e:
+                                                    app_logger.log_error(e)
+                                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                            else:
+                                                app_logger.log_error("派工失败")
+                                                app_logger.log_error(res)
+                                                msg["aa"] = f"%s中存在派工失败,请核对派工情况!"%str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2)
+                                                sts=True
 
-                                    if empNos["faillist"]:
-                                        msg["a"] = "以下维修人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
-                                        sts = True
-                                        try:
-                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]", ""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                            requests.get(url=ip, timeout=30).json()
-                                        except Exception as e:
-                                            app_logger.log_error(e)
-                                            QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                except Exception as e:
-                                    msg_fail=msg_fail+f"维修人员派工存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
-                                    sts = True
-                                try:
-                                    if empNos["code"] != "fail":
-                                        res = self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["FXempNos"], "FX", empNos["date"], empNos["bc"])
-                                        if res == "ok":
-                                            msg["bb"] = "放行人员%s派工成功!"%str(fx)
+                                        if empNos["faillist"]:
+                                            msg["a"] = "以下维修人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
+                                            sts = True
                                             try:
-                                                ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(fx),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                                ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]", ""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
                                                 requests.get(url=ip, timeout=30).json()
                                             except Exception as e:
                                                 app_logger.log_error(e)
                                                 QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-
-                                        else:
-                                            app_logger.log_error("派工失败")
-                                            app_logger.log_error(res)
-                                            msg["bb"] = f"%s中存在派工失败,请核对派工情况!"%str(fx)
-                                            sts = True
-                                    if empNos["faillist"]:
-                                        msg["b"] = "以下放行人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
-                                        sts = True
-                                        try:
-                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                            requests.get(url=ip, timeout=30).json()
-                                        except Exception as e:
-                                            app_logger.log_error(e)
-                                            QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                except Exception as e:
-                                    msg_fail=msg_fail+f"放行人员派工存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
-                                    sts = True
-                                try:
-                                    if empNos["code"] != "fail":
-                                        risktips = ""
-                                        if self.tableWidgetFlight.item(rowIndex, 8).text() != "":
-                                            res = self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(), acno)
-                                            risktips = f"\n    【风险提示】:{res}" if res != "" else ""
-                                        msgInfo = "进港维修任务保障推送!%s%s" % (fj, risktips)
-                                        res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
-                                                                self.tableWidgetFlight.item(rowIndex, 59).text(),
-                                                                "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
-                                                                self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["WXempNos"],"",empNos["WX"],empNos["FX"],"",msgInfo)
-
-                                        if res == "ok":
-                                            msg["cc"] = "%s维修人员%s派工信息推送成功!!!" % (acno, empNos["WX"])
-                                            self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
-
-                                        else:
-                                            msg["cc"] = "%s维修人员%s派工信息推送失败!!!" % (acno , empNos[ "WX" ])
-                                            sts = True
-                                            app_logger.log_error("派工信息推送失败")
-                                            app_logger.log_error(res)
-                                        try:
-                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg['cc']}】%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                            requests.get(url=ip, timeout=30).json()
-                                        except Exception as e:
-                                            app_logger.log_error(e)
-                                            QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-
-                                    if empNos["faillist"]:
-                                        msg["c"] = "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
-                                        sts = True
-                                        try:
-                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                            requests.get(url=ip, timeout=30).json()
-                                        except Exception as e:
-                                            app_logger.log_error(e)
-                                            QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                except Exception as e:
-                                    msg_fail=msg_fail+f"派工信息推送存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
-                                    sts = True
-                                try:
-                                    if empNos["code"] != "fail":
-                                        risktips = ""
-                                        if self.tableWidgetFlight.item(rowIndex, 8).text() != "":
-                                            res = self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(), acno)
-                                            risktips = f"\n    【风险提示】:{res}" if res != "" else ""
-                                        msgInfo = "放行任务保障信息!%s%s" % (fj, risktips)
-                                        res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
-                                                                self.tableWidgetFlight.item(rowIndex, 59).text(),
-                                                                "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
-                                                                self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),
-                                                                "", empNos["FXempNos"],empNos["WX"],empNos["FX"],"",msgInfo)
-
-                                        if res == "ok":
-                                            msg["dd"] = "%s放行人员%s派工信息推成功!!!" % (acno, empNos["FX"])
-                                            self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
-
-                                        else:
-                                            msg[ "dd" ] = "%s放行人员%s派工信息推送失败!!!" % (acno , empNos[ "FX" ])
-                                            sts = True
-                                            app_logger.log_error("派工信息推送失败")
-                                            app_logger.log_error(res)
-                                        try:
-                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg['dd']}】%s/" % (acno, flightno, str(fx),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                            requests.get(url=ip, timeout=30).json()
-                                        except Exception as e:
-                                            app_logger.log_error(e)
-                                            QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-
-                                    if empNos["faillist"]:
-                                        msg["d"] = "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
+                                    except Exception as e:
+                                        msg_fail=msg_fail+f"维修人员派工存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
                                         sts = True
-                                        try:
-                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                            requests.get(url=ip, timeout=30).json()
-                                        except Exception as e:
-                                            app_logger.log_error(e)
-                                            QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                                except Exception as e:
-                                    msg_fail=msg_fail+f"派工信息推送存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
-                                    sts = True
-                                    
-
-                            else:
-                                empNos = self.severpostData_nomeassge("get_empNos", dict_people)
-                                if "【交班航班】" in fj:
                                     try:
                                         if empNos["code"] != "fail":
                                             res = self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["FXempNos"], "FX", empNos["date"], empNos["bc"])
@@ -2672,10 +2611,11 @@ class MainWidget(QWidget, Ui_Form):
                                                 except Exception as e:
                                                     app_logger.log_error(e)
                                                     QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+
                                             else:
                                                 app_logger.log_error("派工失败")
                                                 app_logger.log_error(res)
-                                                msg["bb"] =  f"%s中存在派工失败,请核对派工情况!"%str(fx)
+                                                msg["bb"] = f"%s中存在派工失败,请核对派工情况!"%str(fx)
                                                 sts = True
                                         if empNos["faillist"]:
                                             msg["b"] = "以下放行人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
@@ -2689,12 +2629,51 @@ class MainWidget(QWidget, Ui_Form):
                                     except Exception as e:
                                         msg_fail=msg_fail+f"放行人员派工存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
                                         sts = True
+                                    try:
+                                        if empNos["code"] != "fail":
+                                            risktips = ""
+                                            if self.tableWidgetFlight.item(rowIndex, 8).text() != "":
+                                                res = self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(), acno,actype)
+                                                risktips = f"\n    【风险提示】:{res}" if res != "" else ""
+                                            msgInfo = "进港维修任务保障推送!%s%s" % (fj, risktips)
+                                            res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
+                                                                    self.tableWidgetFlight.item(rowIndex, 59).text(),
+                                                                    "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
+                                                                    self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["WXempNos"],"",empNos["WX"],empNos["FX"],"",msgInfo)
+
+                                            if res == "ok":
+                                                msg["cc"] = "%s维修人员%s派工信息推送成功!!!" % (acno, empNos["WX"])
+                                                self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
+
+                                            else:
+                                                msg["cc"] = "%s维修人员%s派工信息推送失败!!!" % (acno , empNos[ "WX" ])
+                                                sts = True
+                                                app_logger.log_error("派工信息推送失败")
+                                                app_logger.log_error(res)
+                                            try:
+                                                ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg['cc']}】%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                                requests.get(url=ip, timeout=30).json()
+                                            except Exception as e:
+                                                app_logger.log_error(e)
+                                                QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
 
+                                        if empNos["faillist"]:
+                                            msg["c"] = "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
+                                            sts = True
+                                            try:
+                                                ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                                requests.get(url=ip, timeout=30).json()
+                                            except Exception as e:
+                                                app_logger.log_error(e)
+                                                QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                    except Exception as e:
+                                        msg_fail=msg_fail+f"派工信息推送存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
+                                        sts = True
                                     try:
                                         if empNos["code"] != "fail":
                                             risktips = ""
                                             if self.tableWidgetFlight.item(rowIndex, 8).text() != "":
-                                                res = self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(),acno)
+                                                res = self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(), acno,actype)
                                                 risktips = f"\n    【风险提示】:{res}" if res != "" else ""
                                             msgInfo = "放行任务保障信息!%s%s" % (fj, risktips)
                                             res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
@@ -2706,18 +2685,19 @@ class MainWidget(QWidget, Ui_Form):
                                             if res == "ok":
                                                 msg["dd"] = "%s放行人员%s派工信息推成功!!!" % (acno, empNos["FX"])
                                                 self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
+
                                             else:
-                                                msg["dd"] = "%s放行人员%s派工信息推失败!!!" % (acno, empNos["FX"])
+                                                msg[ "dd" ] = "%s放行人员%s派工信息推失败!!!" % (acno , empNos[ "FX" ])
                                                 sts = True
                                                 app_logger.log_error("派工信息推送失败")
                                                 app_logger.log_error(res)
-
                                             try:
-                                                ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg['dd']}】%s/" % (acno, flightno, str(fx),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                                ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息【{msg['dd']}】%s/" % (acno, flightno, str(fx),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
                                                 requests.get(url=ip, timeout=30).json()
                                             except Exception as e:
                                                 app_logger.log_error(e)
                                                 QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+
                                         if empNos["faillist"]:
                                             msg["d"] = "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
                                             sts = True
@@ -2728,78 +2708,154 @@ class MainWidget(QWidget, Ui_Form):
                                                 app_logger.log_error(e)
                                                 QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
                                     except Exception as e:
-                                        msg_fail=msg_fail+f"放行人员派工存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
+                                        msg_fail=msg_fail+f"派工信息推送存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
                                         sts = True
 
-                                # print(empNos)
-                                if empNos["code"] != "fail":
-                                    res = self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["ESempNos"], "ECSJ", empNos["date"], empNos["bc"])
-                                    if res == "ok":
-                                        msg["ee"] = "%s二次送机派工成功!"%str(g1 + "-" + g2)
+
+                                else:
+                                    empNos = self.severpostData_nomeassge("get_empNos", dict_people)
+                                    if "【交班航班】" in fj:
                                         try:
-                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                            if empNos["code"] != "fail":
+                                                res = self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["FXempNos"], "FX", empNos["date"], empNos["bc"])
+                                                if res == "ok":
+                                                    msg["bb"] = "放行人员%s派工成功!"%str(fx)
+                                                    try:
+                                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(fx),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                                        requests.get(url=ip, timeout=30).json()
+                                                    except Exception as e:
+                                                        app_logger.log_error(e)
+                                                        QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                                else:
+                                                    app_logger.log_error("派工失败")
+                                                    app_logger.log_error(res)
+                                                    msg["bb"] =  f"%s中存在派工失败,请核对派工情况!"%str(fx)
+                                                    sts = True
+                                            if empNos["faillist"]:
+                                                msg["b"] = "以下放行人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
+                                                sts = True
+                                                try:
+                                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                                    requests.get(url=ip, timeout=30).json()
+                                                except Exception as e:
+                                                    app_logger.log_error(e)
+                                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                        except Exception as e:
+                                            msg_fail=msg_fail+f"放行人员派工存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
+                                            sts = True
+
+                                        try:
+                                            if empNos["code"] != "fail":
+                                                risktips = ""
+                                                if self.tableWidgetFlight.item(rowIndex, 8).text() != "":
+                                                    res = self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(),acno,actype)
+                                                    risktips = f"\n    【风险提示】:{res}" if res != "" else ""
+                                                msgInfo = "放行任务保障信息!%s%s" % (fj, risktips)
+                                                res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
+                                                                        self.tableWidgetFlight.item(rowIndex, 59).text(),
+                                                                        "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
+                                                                        self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),
+                                                                        "", empNos["FXempNos"],empNos["WX"],empNos["FX"],"",msgInfo)
+
+                                                if res == "ok":
+                                                    msg["dd"] = "%s放行人员%s派工信息推成功!!!" % (acno, empNos["FX"])
+                                                    self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
+                                                else:
+                                                    msg["dd"] = "%s放行人员%s派工信息推失败!!!" % (acno, empNos["FX"])
+                                                    sts = True
+                                                    app_logger.log_error("派工信息推送失败")
+                                                    app_logger.log_error(res)
+
+                                                try:
+                                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg['dd']}】%s/" % (acno, flightno, str(fx),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                                    requests.get(url=ip, timeout=30).json()
+                                                except Exception as e:
+                                                    app_logger.log_error(e)
+                                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                            if empNos["faillist"]:
+                                                msg["d"] = "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
+                                                sts = True
+                                                try:
+                                                    ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                                    requests.get(url=ip, timeout=30).json()
+                                                except Exception as e:
+                                                    app_logger.log_error(e)
+                                                    QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                        except Exception as e:
+                                            msg_fail=msg_fail+f"放行人员派工存在问题,请留意派工成功情况,请联系管理员!{e}+\n"
+                                            sts = True
+
+                                    # print(empNos)
+                                    if empNos["code"] != "fail":
+                                        res = self.LM_TSK_SURE_PG_NOW(self.tableWidgetFlight.item(rowIndex, 55).text(),empNos["ESempNos"], "ECSJ", empNos["date"], empNos["bc"])
+                                        if res == "ok":
+                                            msg["ee"] = "%s二次送机派工成功!"%str(g1 + "-" + g2)
+                                            try:
+                                                ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工成功%s/" % (acno, flightno, str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                                requests.get(url=ip, timeout=30).json()
+                                            except Exception as e:
+                                                app_logger.log_error(e)
+                                                QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+
+                                        else:
+                                            msg["ee"] =  f"%s中存在派工失败,请核对派工情况!"%str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2)
+                                            sts = True
+                                            app_logger.log_error("派工失败")
+                                            app_logger.log_error(res)
+                                    if empNos["faillist"]:
+                                        msg["e"] = "以下人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
+                                        sts = True
+                                    if empNos["code"] != "fail":
+                                        risktips = ""
+                                        if self.tableWidgetFlight.item(rowIndex, 8).text() != "":
+                                            res = self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(),acno,actype)
+                                            risktips = f"\n    【风险提示】:{res}" if res != "" else ""
+                                        msgInfo = "二次送机任务推送!%s%s" % (fj, risktips)
+                                        res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
+                                                                self.tableWidgetFlight.item(rowIndex, 59).text(),
+                                                                "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
+                                                                self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),
+                                                                empNos["ESempNos"], "",empNos["WX"],empNos["FX"],empNos["ES"],msgInfo)
+                                        if res == "ok":
+                                            msg["ff"] = "%s二次送机人员%s派工信息推送成功!!!" % (acno, empNos["ES"])
+                                            self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
+                                        else:
+                                            msg["ff"] = "%s二次送机人员%s派工信息推送失败!!!" % (acno, empNos["ES"])
+                                            sts = True
+                                            app_logger.log_error("派工信息推送失败")
+                                            app_logger.log_error(res)
+                                        try:
+                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg['ff']}】%s/" % (acno, flightno, str(g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
                                             requests.get(url=ip, timeout=30).json()
                                         except Exception as e:
                                             app_logger.log_error(e)
                                             QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
 
-                                    else:
-                                        msg["ee"] =  f"%s中存在派工失败,请核对派工情况!"%str(qw1 + "-" + qw2 + "-" + g1 + "-" + g2)
-                                        sts = True
-                                        app_logger.log_error("派工失败")
-                                        app_logger.log_error(res)
-                                if empNos["faillist"]:
-                                    msg["e"] = "以下人员派工失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
-                                    sts = True
-                                if empNos["code"] != "fail":
-                                    risktips = ""
-                                    if self.tableWidgetFlight.item(rowIndex, 8).text() != "":
-                                        res = self.getRiskData(self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 19).text(),acno)
-                                        risktips = f"\n    【风险提示】:{res}" if res != "" else ""
-                                    msgInfo = "二次送机任务推送!%s%s" % (fj, risktips)
-                                    res= self.send_dingdong(acno,self.tableWidgetFlight.item(rowIndex, 5).text(),
-                                                            self.tableWidgetFlight.item(rowIndex, 59).text(),
-                                                            "进" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[0] + ",出" +self.tableWidgetFlight.item(rowIndex, 57).text().split("</br>")[1],
-                                                            self.tableWidgetFlight.item(rowIndex, 8).text(),self.tableWidgetFlight.item(rowIndex, 55).text(),
-                                                            empNos["ESempNos"], "",empNos["WX"],empNos["FX"],empNos["ES"],msgInfo)
-                                    if res == "ok":
-                                        msg["ff"] = "%s二次送机人员%s派工信息推送成功!!!" % (acno, empNos["ES"])
-                                        self.severpost_nomeassge("infoConfirm2","/%s" % self.tableWidgetFlight.item(rowIndex, 19).text(),"/%s" % self.tableWidgetFlight.item(rowIndex,53).text(),"/%s" % self.displayMode, "/%s" % self.selectedtime)
-                                    else:
-                                        msg["ff"] = "%s二次送机人员%s派工信息推送失败!!!" % (acno, empNos["ES"])
+                                    if empNos["faillist"]:
+                                        msg["f"] = "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
                                         sts = True
-                                        app_logger.log_error("派工信息推送失败")
-                                        app_logger.log_error(res)
-                                    try:
-                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + f"%s,%s%s信息:【{msg['ff']}】%s/" % (acno, flightno, str(g1 + "-" + g2),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                        requests.get(url=ip, timeout=30).json()
-                                    except Exception as e:
-                                        app_logger.log_error(e)
-                                        QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-
-                                if empNos["faillist"]:
-                                    msg["f"] = "以下人员通知失败:%s,请确认考勤打卡情况!" % empNos["faillist"]
-                                    sts = True
-                                    try:
-                                        ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
-                                        requests.get(url=ip, timeout=30).json()
-                                    except Exception as e:
-                                        app_logger.log_error(e)
-                                        QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
-                            msgs = ""
-                            for j in ["aa", "bb", "cc", "dd", "ee", "ff", "a", "b", "c", "d", "e", "f"]:
-                                if j in msg.keys():
-                                    if msgs == "":
-                                        msgs = msg[j]
-                                    else:
-                                        msgs = msgs + "\n" + msg[j]
-                            msgs=msgs + "\n" +msg_fail
-                            self.show_waring("一键派工提示信息", msgs,sts)
-                            self.QThreadSortNow("main")
+                                        try:
+                                            ip = "http://" + str(self.ipinfo) + "/static/insertLogs2/" + "%s,%s%s派工信息推送失败%s/" % (acno, flightno,str(empNos["faillist"]).replace(",", "-").replace("'", "").replace("[", "").replace("]",""),datetime.datetime.now()) + "%s/" % str(self.user) + "%s" % str(datetime.datetime.now())
+                                            requests.get(url=ip, timeout=30).json()
+                                        except Exception as e:
+                                            app_logger.log_error(e)
+                                            QMessageBox.warning(self, "日志功能失效", "操作日志功能失效请联系管理员!")
+                                msgs = ""
+                                for j in ["aa", "bb", "cc", "dd", "ee", "ff", "a", "b", "c", "d", "e", "f"]:
+                                    if j in msg.keys():
+                                        if msgs == "":
+                                            msgs = msg[j]
+                                        else:
+                                            msgs = msgs + "\n" + msg[j]
+                                msgs=msgs + "\n" +msg_fail
+                                self.show_waring("一键派工提示信息", msgs,sts)
+                                self.QThreadSortNow("main")
 
+                            else:
+                                self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工派工和叮咚消息通知!!", True)
+                            return
                         else:
-                            self.show_waring("警告", "该航班非AMRO航班或者无任务编号,请确认是否为AMRO航班,如确认请使用AMRO人工派工和叮咚消息通知!!", True)
-                        return
+                            return
                     else:
                         return
             except Exception as e:

+ 2 - 1
Functions/QtFunctions/findServerWidget.py

@@ -117,7 +117,8 @@ class findServerWidget(Ui_FormLink, QWidget):
 
     def print_out_result(self, dlist):
         try:
-            self.serverList = dlist
+            unique_tuples = list(set(tuple(sublist) for sublist in dlist))
+            self.serverList = [list(t) for t in unique_tuples]
             # print(self.serverList)
             if self.serverList == [] or self.serverList ==None:
                 self.setipinfo2()