修改大屏样式

src/components/prompt/api.js

@@ -2,7 +2,7 @@ import axios from '@/utils/request'
 // 查询分页数据：
 export const iengineerlogList = (arg) => {
   return axios.request({
-    url: '/iproductionplan/querywarn',
+    url: '/iwarn/list',
     method: 'get',
     params: arg,
     dataType: 'json',

src/components/prompt/index.vue

@@ -15,11 +15,9 @@ const state = reactive({
   arr: [],
 });
 onMounted(() => {
-  proxy.$getsystemdict('purpose_expenses').then((res) => {
-    if (res.length > 0) {
-      iengineerlogList({ day: res[0].value }).then((res) => {
+  iengineerlogList().then((res) => {
     if (res.code == 200) {
-          res.data.slice(0, 3).map((item) => {
+      res.data.list.map((item) => {
         setTimeout(() => {
           notify.value[item.id] = ElNotification({
             title: "进度预警提示",
@@ -64,8 +62,11 @@ onMounted(() => {
 
     }
   })
-    }
-  })
+  // proxy.$getsystemdict('purpose_expenses').then((res) => {
+  //   if (res.length > 0) {
+
+  //   }
+  // })
 
 
 });

src/views/constructionScheduling/progress-alert/api.js

@@ -8,15 +8,7 @@ export const iwarnlist = (arg) => {
     dataType: 'json',
   })
 }
-export const iengineerlogList = (arg) => {
-  return axios.request({
-    url: '/iproductionplan/querywarn',
-    method: 'get',
-    params: arg,
-    dataType: 'json',
 
-  })
-}
 // 查询详情数据：
 export const iengineerlogGetById = (arg) => {
   return axios.request({

src/views/constructionScheduling/progress-alert/index.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { reactive } from 'vue'
-import { iengineerlogList, iengineerlogAdd, iengineerlogUpdate, iengineerlogDelete, iengineerlogGetById, iproductionplanList, iwarnlist } from './api'
+import { iengineerlogAdd, iengineerlogUpdate, iengineerlogDelete, iengineerlogGetById, iproductionplanList, iwarnlist } from './api'
 import { baseModelOptions, baseFilterOptions } from './options'
 
 const { proxy } = getCurrentInstance();
@@ -36,19 +36,10 @@ const state = reactive({
   // baseQuery: { day: "" },
   hideselection: true,
   pageInfo: { total: 0, base: { limit: 8, current: 1 } },
-  autoQuery: false,
 })
 const table = ref()
 onMounted(async () => {
-  proxy.$getsystemdict('purpose_expenses').then(async (res) => {
-    if (res.length > 0) {
-      await iengineerlogList({ day: res[0].value })
-      const {
-        getTableData, //查询表格数据执行的函数
-      } = table.value;
-      await getTableData();
-    }
-  })
+ 
 })
 </script>
 

src/views/large-screen/api.js

@@ -24,15 +24,7 @@ export const iengineerlogList = (arg) => {
         dataType: 'json'
     })
 }
-// 进度预警
-export const querywarn = (arg) => {
-    return axios.request({
-        url: '/iproductionplan/querywarn',
-        method: 'get',
-        params: arg,
-        dataType: 'json'
-    })
-}
+
 // 工种统计
 export const iuserworkerType = (arg) => {
     return axios.request({

src/views/large-screen/index.vue

@@ -165,16 +165,19 @@
                         <div v-else class="boxcontent"
                             style="display: grid;grid-template-columns: 1fr 1fr ;grid-gap: .75rem;padding: 1.5625rem 1.3125rem;">
                             <div class="yj-box" v-for="item, index in state.warnList.slice(0, 2)" :key="index">
-                                <img class="jgbj" src="../../assets/images/jglv.png" alt="">
+                                <img v-if="index==0" class="jgbj" src="../../assets/images/jglv.png" alt="">
+                                <img v-else class="jgbj" src="../../assets/images/jgred.png" alt="">
                                 <div style="text-align: center;font-size: .875rem;">{{ item.planName }}</div>
                                 <div>开始时间：{{ item.startTime }}</div>
                                 <div>计划结束时间：{{ item.endTime }}</div>
                                 <div style="display: flex;align-items: center;">当前进度：<div style="flex: 1;"> <el-progress
-                                            color="#0AA0FE" :stroke-width="8" :percentage="Number(item.accumulativeProgress?item.accumulativeProgress:0)" class="jd">
+                                            color="#0AA0FE" :stroke-width="8"
+                                            :percentage="Number(item.currentProgress ? item.currentProgress : 0)"
+                                            class="jd">
                                         </el-progress>
                                     </div>
                                 </div>
-                                <div>预警信息：{{ item.warnInfo ? item.warnInfo : '-' }}</div>
+                                <div>备注：当前计划进度已滞后</div>
                             </div>
                         </div>
                     </div>
@@ -289,7 +292,7 @@ import { ref, onMounted, reactive, nextTick } from 'vue'
 import { echartsZhu, echartsBing } from "./echartsOptions";
 import { echart } from "../../echarts";
 import { stausList } from './options'
-import { getRecordPage, iengineerlogList, querywarn, iuserworkerType, iresourcescheduleList, vehiclestat, statistics, dataOverview, iwarnlist } from './api'
+import { getRecordPage, iengineerlogList,  iuserworkerType, iresourcescheduleList, vehiclestat, statistics, dataOverview, iwarnlist } from './api'
 const { proxy } = getCurrentInstance();
 const tableTrue = ref(false);
 const router = useRouter();
@@ -519,16 +522,12 @@ function getIuserworkerType() {
 }
 // 进度预警
 function getQuerywarn(params) {
-    proxy.$getsystemdict('purpose_expenses').then(async (res) => {
-        if (res.length > 0) {
-            // await querywarn({ day: res[0].value })
-            await iwarnlist().then((res) => {
+    iwarnlist().then((res) => {
         if (res.code == 200) {
             state.warnList = res.data.list
         }
     })
-        }
-    })
+   
 
 }
 // 门禁记录