Merge branch 'master' of https://git.rokedata.com/dws/dwsproject

tht_project/controllers/controllers.py

@@ -2,12 +2,13 @@
 from odoo import http
 from odoo.http import request
 from odoo.addons.roke_mes_three_colour_light.controller.main import RokeMesThreeColourLight
+from odoo.addons.roke_workstation_api.controllers.abnormal import RokeWorkstationAbnormal
 import os
 import math
 from datetime import datetime, time
 from jinja2 import Environment, FileSystemLoader
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
-templateloader = FileSystemLoader(searchpath=BASE_DIR + "/static/src/view")
+templateloader = FileSystemLoader(searchpath=BASE_DIR + "/static")
 env = Environment(loader=templateloader)
 
 class ThtProject(http.Controller):
@@ -54,7 +55,7 @@ class RokeMesThreeColourLightExt(RokeMesThreeColourLight):
                 "override": True  # 添加额外字段
             }
         }
-        template = env.get_template('equipment_status.html')
+        template = env.get_template('src/view/equipment_status.html')
         return template.render(data)
 
     @http.route('/roke/equipment/search', type='json', methods=['POST', 'OPTIONS'], auth="none", csrf=False,
@@ -113,3 +114,11 @@ class RokeMesThreeColourLightExt(RokeMesThreeColourLight):
             'code': 200,
             'data': equipment_list
         }
+    
+
+class RokeWorkstationAbnormalExt(RokeWorkstationAbnormal):
+    @http.route('/roke/abnormal_alarm/census', type='http', auth='public', csrf=False, cors="*")
+    def roke_index_demo_module(self, **kwargs):
+        template = env.get_template('html/abnormal_alarm/view/index.html')
+        html = template.render({})
+        return html