提交

ruoyi-ui/src/views/dashboard/LineChart.vue

@@ -109,7 +109,7 @@ export default {
           data: []
         },
         series: [{
-          name: 'expected', itemStyle: {
+          name: '离岗告警/月', itemStyle: {
             normal: {
               color: '#FFAB2B',
               lineStyle: {
@@ -129,7 +129,7 @@ export default {
           animationEasing: '离岗告警'
         },
         {
-          name: 'actual',
+          name: '玩手机告警/月',
           smooth: true,
           type: 'line',
           itemStyle: {

ruoyi-ui/src/views/index.vue

@@ -586,8 +586,8 @@
                     <div v-for="(item,index) in warnManageList" :key="index" class="box_14 flex-row" style="justify-content: space-between;padding: 0 20px;" v-if="shoue == true && warnManageList.length !=0">
                                   <div class="text-wrapper_17 flex-col justify-between">
                                     <span class="text_94">{{item.createTime}}</span>
-                                    <span class="text_95" style="color: #666666;font-weight: 400<strong></strong>;"> <span style="font-weight: 800;font-size: 15px;color: #333333;">{{item.rangName}}</span>
-                                     <span style="font-weight: 800;font-size: 15px;color: #03BF8A; margin-left: 5px;">{{ (item.algorithmType == 0 ? '离岗' : '玩手机')  }}</span> 告警</span>
+                                    <span class="text_95" style="color: #666666;font-weight: 400;"> <span style="font-weight: 800;font-size: 15px;color: #333333;">{{item.rangName}}</span>
+                                      告警</span>
                                     <!-- <span class="text_95">
                                       <span style="color: #333333; font-weight: 700;">{{item.deptName}} </span>
                                        <span style="color: #03BF8A; font-weight: 700;">{{item.equipmentName}} </span> 通道001</span> -->
@@ -596,6 +596,7 @@
                                   <div class="text-wrapper_18 " @click="thse(item)">
                                     <div class="text_96" v-if="item.algorithmType == 1">玩手机</div>
                                      <div class="text_96s" v-if="item.algorithmType == 0">离岗</div>
+                                     <div class="text_96s" v-if="item.algorithmType == 2">人员聚集</div>
                                     <div><img
                                     class="thumbnail_27"
                                     referrerpolicy="no-referrer"
@@ -3674,7 +3675,7 @@ button:active {
 }
 
 .text-wrapper_17 {
-  width: 150px;
+  width: 80%;
   height: 44px;
   margin: 22px 0 0 0;
 }
@@ -3693,7 +3694,7 @@ button:active {
 }
 
 .text_95 {
-  width: 59px;
+  // width: 59px;
   height: 16px;
   overflow-wrap: break-word;
   color: rgba(51, 51, 51, 1);
@@ -3704,6 +3705,9 @@ button:active {
   white-space: nowrap;
   line-height: 16px;
   margin: 13px 0 0 1px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .text-wrapper_18 {

ruoyi-ui/src/views/shipinggaoj/shebecanshuhuabu/index.vue

@@ -650,8 +650,8 @@
       getImage(row) {
         // 这里请求接口 ...
         // this.srt = row +  this.defaultSettings.urls  + process.env.VUE_APP_BASE_API
-        row = 'http://114.99.51.58:15000/prod-api/profile/image/20250805_103507_11.png'
-        this.imgUrl =   row ;
+        // row = 'http://114.99.51.58:15000/prod-api/profile/image/20250805_103507_11.png'
+        this.imgUrl =  this.defaultSettings.urls  + process.env.VUE_APP_BASE_API + row ;
         // this.imgUrl = this.srt
         // this.imgWidth = 1920;
         // this.imgHeight = 1080;