提交

ruoyi-ui/src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
-  urls: `http://192.168.101.245:8057`,
-   // urls: `http://114.99.51.58:15000`,
+  // urls: `http://192.168.101.245:8057`,
+   urls: `http://114.99.51.58:15000`,
    // http://114.99.51.58:15000/shebecanshuhuabu
   // 10.90.90.52 192.168.101.245
   // 10.90.90.53

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

@@ -200,7 +200,7 @@
                               <p>{{item.channelNum == null?'暂无数据' : item.channelNum}}</p>
                             </div> -->
                             <div style="display: flex;align-items: center;margin-top: 8px;">
-                             <el-tooltip class="item" effect="dark" content="告警日期" placement="left-start">
+                             <el-tooltip class="item" effect="dark" :content="'告警日期' + item.warnTime " placement="left-start">
                               <p>告警日期：</p>
                               </el-tooltip>
                               <p>{{item.warnTime == null?'暂无数据' : item.warnTime}}</p>

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

@@ -9,11 +9,11 @@
         <div class="iuer" style="margin-bottom:10px;">
         </div>
       </el-row>
-      <div>
+      <div >
         <el-row :gutter="20">
           <!-- postList -->
           <el-col :span='4'>
-            <div style="background-color: #fff;border-radius: 10px;padding: 20px 20px;height: 95vh;">
+            <div class=" infinite-list" style="overflow:auto;background-color: #fff;border-radius: 10px;padding: 20px 20px;height: 95vh;">
               <p
                 style="margin: 0;border-left: 6px solid #03BF8A;margin-left: -20px;padding-left: 10px;font-weight: 800;">
                 通道管理</p>
@@ -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 =  this.defaultSettings.urls  + process.env.VUE_APP_BASE_API +   row ;
+        row = 'http://114.99.51.58:15000/prod-api/profile/image/20250805_103507_11.png'
+        this.imgUrl =   row ;
         // this.imgUrl = this.srt
         // this.imgWidth = 1920;
         // this.imgHeight = 1080;
@@ -753,7 +753,7 @@
         objectPoints = this.drawedPoints.map((area,t) => {
           console.log(t)
           let polygon = [];
-          let name = '绘制区域' + (t+1)
+          let name = this.form.channelNum
           area.forEach((point, i) => {
             let nsdfs = {x:null,y:null}
             console.log(point,93)
@@ -771,7 +771,11 @@
 
             })
           });
-          console.log(polygon,this.shapes,9123,this.form.channelId)
+
+          if(polygon.length > 4){
+            polygon =  polygon.slice(0, 4);
+          }
+         console.log(polygon,this.shapes,9123,this.form.channelId)
           return {
             points: polygon,
             id:t+1,

ruoyi-ui/src/views/system/role/authUser.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+     <el-form style="background-color: #fff;padding: 10px;padding-bottom: 0; padding-top: 20px; border-radius: 10px;margin-bottom: 20px;" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="用户名称" prop="userName">
         <el-input
           v-model="queryParams.userName"
@@ -20,17 +20,16 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button style="background-color: #03BF8A; border-color: #03BF8A;" type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button  size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
+          type="success"
           plain
-          icon="el-icon-plus"
           size="mini"
           @click="openSelectUser"
           v-hasPermi="['system:role:add']"
@@ -40,7 +39,6 @@
         <el-button
           type="danger"
           plain
-          icon="el-icon-circle-close"
           size="mini"
           :disabled="multiple"
           @click="cancelAuthUserAll"
@@ -51,7 +49,6 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-close"
           size="mini"
           @click="handleClose"
         >关闭</el-button>
@@ -77,13 +74,18 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <el-button size="mini" style="width: 62px;height: 26px;
+                                   background: #EBEFFF;
+                                          border-radius: 4px;border: 1px solid #4D73F8;color: #4D73F8;
+                                   " type="text" plain @click="cancelAuthUser(scope.row)"
+            v-hasPermi="['system:role:remove']">取消授权</el-button>
+         <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-circle-close"
             @click="cancelAuthUser(scope.row)"
             v-hasPermi="['system:role:remove']"
-          >取消授权</el-button>
+          >取消授权</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -196,4 +198,4 @@ export default {
     }
   }
 }
-</script>
+</script>