Merge branch 'dev' of http://192.168.2.241:3000/wanghai/bimgis_sx into dev

src/api/APIs.ts

@@ -1190,7 +1190,7 @@ export const GetGroupNodeAndPipeInfo_api = (data) => {
 export const GetUserInitData = (data) => { //初始化用户所有资源
   return request({
     method: "get",
-    url: "/tofly-base/user/initData",
+    url: "/base/user/initData",
     params: data,
   });
 };

src/styles/base.scss

@@ -316,7 +316,9 @@ div:focus {
   max-height: 75vh;
   overflow: hidden auto;
 }
-
+.el-tree{
+  @include base-scroll-bar();
+}
 .el-table__body-wrapper,
 .el-dialog__wrapper.dialog .el-dialog__body {
   @include base-scroll-bar();

src/views/currentSystem/authorityManagement/projectManage/index.vue

@@ -53,7 +53,7 @@
           <!-- 项目详情 -->
           <div class="grid-content test-5" style="height: calc(100% - 98px);">
             <span style="display:block;margin-bottom:10px;">资源配置：</span>
-            <el-tree style="height:calc(100% - 30px);border:1px solid #dbe4ff;" v-if="data" :data="data" show-checkbox default-expand-all node-key="id" ref="tree" highlight-current :props="defaultProps" :default-checked-keys="treeSelectKeys" @node-contextmenu="setServeIndex">
+            <el-tree style="height:calc(100% - 30px);border:1px solid #dbe4ff;overflow:auto;" v-if="data" :data="data" show-checkbox default-expand-all node-key="id" ref="tree" highlight-current :props="defaultProps" :default-checked-keys="treeSelectKeys" @node-contextmenu="setServeIndex">
             </el-tree>
           </div>
           <div class="buttons">

src/views/spectrum/common/historyCurve/index.vue

@@ -20,7 +20,8 @@
             </el-col>
             <el-col :span="10">
               <el-form-item label="时间范围">
-                <el-date-picker v-model="form.date" type="daterange" align="right" unlink-panels range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" value-format="yyyy-MM-dd" format="yyyy/MM/dd" style="width:100%" :clearable="false">
+                <el-date-picker v-model="form.date" type="daterange" align="right" unlink-panels range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" value-format="yyyy-MM-dd"
+                  format="yyyy/MM/dd" style="width:100%" :clearable="false">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -39,9 +40,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="7">
               <el-form-item label="同比开始时间">
-                <el-date-picker v-model="form.date2" type="date" placeholder="选择日期" style="width: 100%;"></el-date-picker>
+                <!-- <el-date-picker v-model="form.date2" type="date" placeholder="选择日期" style="width: 100%;"></el-date-picker> -->
+                <el-date-picker v-model="form.date2" type="datetime" placeholder="选择日期时间" style="width: 100%;">
+                </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="2">
@@ -49,11 +52,11 @@
                 <el-button type="primary" size="small" style="width:85px" @click="query()">查询</el-button>
               </el-form-item>
             </el-col>
-            <el-col :span="2">
+            <!-- <el-col :span="2">
               <el-form-item label-width="0">
                 <el-button type="primary" size="small" style="width:85px">导出</el-button>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
         </el-form>
       </div>
@@ -89,7 +92,8 @@
             <el-table-column v-for="(item,index) in targetData" :key="index" :prop="item.targetCode+'s'" :label="item.targetName" align="center">
             </el-table-column>
           </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pagination.current" small :page-sizes="[20, 50, 100, 150]" :page-size="pagination.size" layout="total, sizes, prev, pager, next" :total="pagination.total">
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pagination.current" small :page-sizes="[20, 50, 100, 150]" :page-size="pagination.size" layout="total, sizes, prev, pager, next"
+            :total="pagination.total">
           </el-pagination>
         </el-tab-pane>
       </el-tabs>
@@ -104,7 +108,8 @@ import {
   getDayCurve,
   getSites,
   getGroupSite,
-  getTargetByType
+  getTargetByType,
+  getRainfallHour
 } from '@/views/spectrum/dynamicMonitor/api/api'
 
 import elementResizeDetectorMaker from 'element-resize-detector'
@@ -218,7 +223,7 @@ export default {
       pagination: { current: 1, size: 50, total: 0 }
     }
   },
-  mounted() {},
+  mounted() { },
   watch: {
     radio(val, oldVal) {
       this.query()
@@ -343,7 +348,7 @@ export default {
       }
       if (this.form.siteId2) params['comprasionSiteIds'] = this.form.siteId2[1]
       // 同比开始时间
-      if (this.form.date2) params['comprasionBeginTime'] = this.$moment(this.form.date2).format('YYYY-MM-DD 00:00:00')
+      if (this.form.date2) params['comprasionBeginTime'] = this.$moment(this.form.date2).format('YYYY-MM-DD HH:mm:ss')
       // 时间差
       let seconds = this.$moment(timeInterval.endTime).diff(this.$moment(timeInterval.startTime), 'seconds')
       // 同比结束时间

src/views/spectrum/dynamicMonitor/api/api.ts

@@ -108,6 +108,15 @@ export function getDevicecheckdataList(params) {
     })
 }
 
+// 获取实时雨量
+export function getRainfallHour(params){
+    return request({
+        url: '/survey/indicateSts/rainfallHour',
+        method: 'get',
+        params
+    })
+}
+
 // 获取站点监测数据作废
 export function checkdataToVoid(params) {
     return request({