auto

config/index.js

@@ -21,6 +21,13 @@ module.exports = {
           "/api1": ""
         }
       },
+      '/api2': {
+        target: "http://castgroupadmin.hw.hongweisoft.com/admin/screen",
+        changeOrigin: true,
+        pathRewrite: {
+          "/api2": ""
+        }
+      },
     },
 
     // Various Dev Server settings

src/components/alarm.vue

@@ -8,9 +8,9 @@
                 <img src="../assets/img/gaojing.png" alt="">
                 <div class="g-container">
                 <ul :style="{'--s': alarmNum}">
-                    <li v-for="(item,index) in data" :key="item.msg+index">{{item.msg}}</li>
+                    <li v-for="(item) in data" :key="item.id">{{item.content}}</li>
                     <!--末尾补一个首条数据-->
-                    <li>{{data[0].msg}}</li>
+                    <li>{{data[0].content}}</li>
                 </ul>
                 </div>
             </div>

src/components/pickerAddr.vue

@@ -115,6 +115,14 @@ export default {
   }
   .el-select{
       width: 8vw;
+      /deep/ .el-input__inner{
+        color: rgba(255, 255, 255,1);
+        background: rgba(38, 80, 179,.5);
+        border: 2px solid rgba(38, 80, 179,1);
+        &::-webkit-input-placeholder{
+          color: #eee;
+        }
+      }
   }
 }
 </style>

src/service/index.js

@@ -1,15 +1,49 @@
+/*
+ * @LastEditors: gcz
+ */
 import { callApi } from '../utils/request'
 
 export * from './mock'
 
-// get请求带参数
+export const rightScrollData = () =>
+    callApi({
+        url: 'smallClass',
+        prefixUrl: 'api2',
+    })
 
-export const getQuery = (data) =>
+
+// 事件信息
+export const alarmDataApi = () =>
     callApi({
-        url: 'admin/getQuery',
-        data,
+        url: 'event/latest',
+        prefixUrl: 'api2',
     })
 
+// export const page6numerical = () =>
+//     callApi({
+//         url: 'event/statis',
+//         prefixUrl: 'api2',
+//     })
+
+
+
+
+
+
+
+
+
+
+
+
+// get请求带参数
+
+// export const getQuery = (data) =>
+//     callApi({
+//         url: 'admin/getQuery',
+//         data,
+//     })
+
 // export const postDel = (data) =>
 //     callApi({
 //         url: 'admin/postDel',

src/views/index.vue

@@ -49,7 +49,7 @@
         </el-input>
       </div>
       <section class="scroll-board-wrap blur-wrap">
-        <dv-scroll-board class="scroll-board-01" :config="scrollBoardConfig" style="width:100%;height:25vh" />
+        <dv-scroll-board class="scroll-board-01" :config="scrollBoardConfig" ref="scrollBoard" @click="scrollBoardClick" style="width:100%;height:25vh" />
       </section>
     </section>
     
@@ -116,22 +116,11 @@
         ],
         scrollBoardConfig:{
           header: ['小班号', '树种组成', '每亩蓄积','小班面积'],
-          data: [
-            ['163', '9杉1马', '27.2','4083.9'],
-            ['163', '9杉1马', '27.2','4083.9'],
-            ['163', '9杉1马', '27.2','4083.9'],
-            ['163', '9杉1马', '27.2','4083.9'],
-            ['163', '9杉1马', '27.2','4083.9'],
-            ['163', '9杉1马', '27.2','4083.9'],
-            ['163', '9杉1马', '27.2','4083.9'],
-            ['163', '9杉1马', '27.2','4083.9'],
-            ['163', '9杉1马', '27.2','4083.9'],
-            ['163', '9杉1马', '27.2','4083.9']
-          ],
+          data: [],
           headerBGC:'rgba(38,80,179,1)',//表头背景色
           oddRowBGC:'rgba(38,80,179,.5)',//奇数行背景色
           evenRowBGC:'transparent',//偶数行背景色	
-          align:['center','center','center'],//列对齐方式
+          align:['center','center','center','center'],//列对齐方式
         },
         page1numerical:[
           {name:'储蓄量',number:'2309',unit:'立方米'},
@@ -266,8 +255,14 @@
       },
       getRightScrollData(){
         rightScrollData().then(res=>{
-          // console.log('res',res);
-          this.scrollBoardConfig = res.data;
+          // console.log('this.scrollBoardConfig',this.scrollBoardConfig);
+          this.scrollBoardConfig.data = [];
+          res.rows.forEach(element => {
+            this.scrollBoardConfig.data.push([element.smallNumber,element.treeComp,element.perAcreStock,element.landArea])            
+          });
+          this.$refs.scrollBoard.updateRows(this.scrollBoardConfig.data)
+          // console.log('this.scrollBoardConfig.data', this.scrollBoardConfig.data);
+          // this.scrollBoardConfig = res.data;
         }).catch(err=>{
           console.log('echarts01 err',err);
         })
@@ -362,6 +357,9 @@
       xiaobansearch(){
         // console.log('xiaobansearch');
         this.getRightScrollData();
+      },
+      scrollBoardClick(e){
+        console.log('scrollBoardClick',e);
       }
 
     },