大屏菜单调整

tht_project/controllers/big_screen.py

@@ -65,13 +65,17 @@ class ResMesBigScreen(http.Controller):
 
     def common_dws_interface(self, body=None, url='', cate=''):
         """获取大屏数据"""
-        plant_name = body.get("plant_name", False)
-        today = body.get("today", False)
-        if not today:
-            today = fields.Date.today().strftime('%Y-%m-%d')
-        category_name = body.get("category_name", False)
+        plant_name = body.get("plant_name", '')
+        today = body.get("today", '')
+        device_code_list = body.get("device_code_list", [])
+        # if not today:
+        #     today = fields.Date.today().strftime('%Y-%m-%d')
+        category_name = body.get("category_name",'')
         # 构建查询条件
-        equipment_list = self.search_equipments(plant_name=plant_name, category_name=category_name)
+        if device_code_list:
+            equipment_list =  device_code_list
+        else:
+            equipment_list = self.search_equipments(plant_name=plant_name, category_name=category_name)
         try:
             api_path = dws_platform_url + url
             payload = {

tht_project/static/html/big_screen/view/cook_process.html

@@ -364,6 +364,44 @@
                     })
                 })
             },
+            requestSelfApi(
+                url,
+                config = {},
+                errorMessage = "操作失败，请稍后重试",
+                contentType = "application/json",
+                baseurl="https://tht.dws.rokecloud.com"
+            ) {
+                return new Promise((resolve, reject) => {
+                    if (!url) reject(null)
+                    axios({
+                        method: "POST",
+                        url: baseurl + url,
+                        data: config,
+                        headers: { "Content-Type": contentType },
+                    }).then((result) => {
+                        if (
+                            result?.data?.result?.success ||
+                            result?.data?.result?.code == 0 ||
+                            result?.data?.result?.state == "success" ||
+                            result?.data?.code == 0
+                        ) {
+                            resolve(result.data)
+                        } else if (result?.data?.result?.code == 1) {
+                            reject(result.data.result.message)
+                        } else if (result?.data?.result?.state == "error") {
+                            reject(result.data.result.megs)
+                        } else if (result?.data?.code == 1) {
+                            reject(result.data.message)
+                        } else if (!result?.data?.result?.success) {
+                            reject(result.data.result.msg)
+                        } else if (result?.data?.error) {
+                            reject(result.data.error.message)
+                        }
+                    }).catch((error) => {
+                        reject(errorMessage)
+                    })
+                })
+            },
             // 接口请求Dws系统方法封装
             requestDwsApi(
                 url,
@@ -403,11 +441,12 @@
                     useRatio: []// 设备资源利用率
                 }
                 // 查询烟熏机数据
-                await this.requestDwsApi('/public/device/get_yanxunlu_data', {
+                await this.requestSelfApi('/get_yanxunlu_data', {
                     "plant_name": "蒸煮车间",
-                    "category_name": "烟熏炉"
+                    "category_name": "烟熏炉",
+                    'today':'',
                 }).then(result => {
-                    result.data.forEach(item => {
+                    result.result.data.forEach(item => {
                         smudgingChance.xAxisData.push(item.device_name)
                         smudgingChance.processTime.push(item.process)
                         smudgingChance.temperatureX.push(item.temperatureX)
@@ -415,9 +454,10 @@
                     })
                 }).catch(error => { console.error(error) })
                 // 查询烟熏机设备资源利用率
-                await this.requestDwsApi('/public/device/big_screen_today', {
+                await this.requestSelfApi('/big_screen_today', {
                     "plant_name": "蒸煮车间",
-                    "category_name": "烟熏炉"
+                    "category_name": "烟熏炉",
+                    'today':'',
                 }).then(result => {
                 }).catch(error => { console.error(error) })
                 setTimeout(() => {

tht_project/views/big_screen.xml

@@ -13,16 +13,16 @@
             <field name="target">current</field>
         </record>
 
-        <menuitem id="roke_mes_equipment_kanban" name="设备看板" sequence="31"
-                  parent="roke_mes_equipment.roke_mes_equipment_main_menu"
-                  active="1"/>
+<!--        <menuitem id="roke_mes_equipment_kanban" name="设备看板" sequence="31"-->
+<!--                  parent="roke_mes_equipment.roke_mes_equipment_main_menu"-->
+<!--                  active="1"/>-->
 
         <menuitem id="roke_mes_expected_process" name="预料看板" sequence="10"
-                  parent="tht_project.roke_mes_equipment_kanban"
+
                   action="action_expected_process" active="1"/>
 
         <menuitem id="roke_mes_cook_process" name="成型工序" sequence="20"
-                  parent="tht_project.roke_mes_equipment_kanban"
+
                   action="action_cook_process" active="1"/>