修改冀北现场问题

绘制 算法库 案例库页面
联调 辽宁 有功功率页面

src/components/echarts/rmsboxi.vue

@@ -5,7 +5,7 @@
                 <div class="bx" id="rms"></div>
             </div>
         </div>
-        <el-button
+        <!-- <el-button
             style="position: absolute; right: 10px; top: 0px; z-index: 20000"
             type="primary"
             link
@@ -14,7 +14,7 @@
             @click="download"
         >
             下载
-        </el-button>
+        </el-button> -->
     </div>
 </template>
 <script lang="js">
@@ -916,7 +916,7 @@ export default {
           enabled: true,
           itemDistance: 5,
           textStyle: {
-            fontSize: "0.6rem",
+            fontSize: "0.7rem",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
             rich: {
               a: {
@@ -1035,7 +1035,7 @@ export default {
         },
         grid: {
           left: "1%",
-          right: "2.8%",
+          right: "45px",
           bottom: "40px",
           top: "15%",
           containLabel: true,
@@ -1331,7 +1331,7 @@ export default {
           enabled: true,
           itemDistance: 5,
           textStyle: {
-            fontSize: "0.6rem",
+            fontSize: "0.7rem",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
             rich: {
               a: {
@@ -1453,7 +1453,7 @@ export default {
         },
         grid: {
           left: "1%",
-          right: "2.8%",
+          right: "45px",
           bottom: "40px",
           top: "15%",
           containLabel: true,

src/components/form/datePicker/index.vue

@@ -3,6 +3,7 @@
         <el-select v-model="interval" style="min-width: 90px; width: 90px; margin-right: 10px" @change="timeChange">
             <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
+
         <el-date-picker
             v-model="timeValue"
             type="daterange"
@@ -306,6 +307,8 @@ const next = () => {
             }
         } else {
             month = month + 3
+            console.log('🚀 ~ next ~ presentM:', presentM, month)
+
             // 季度进位后，超过当前月份是不科学的
             if (year == presentY && !props.nextFlag) {
                 if (month >= presentM) {
@@ -319,6 +322,7 @@ const next = () => {
                             endTime = year + '-0' + presentM + '-' + presentD
                         }
                     } else if (presentM > 3 && presentM < 7) {
+                        console.log(123123)
                         // 第二季度
                         startTime = year + '-04-01'
                         if (presentD < 10) {
@@ -354,7 +358,7 @@ const next = () => {
                         endTime = NowgetEndTime()
                     } else {
                         var day = getDays(year, month)
-                        endTime = year + '-' + month + '-' + day
+                        endTime = year + '-0' + month + '-' + day
                     }
                 }
             } else {
@@ -371,6 +375,7 @@ const next = () => {
                 }
             }
         }
+        console.log(startTime, endTime)
     } else if (interval.value == 5) {
     } else if (interval.value == 4) {
         //根据开始时间推

src/components/table/fieldRender/index.vue

@@ -28,7 +28,7 @@
 
     <!-- tag -->
     <div v-if="field.render == 'tag' && fieldValue !== ''">
-        <el-tag :type="getTagType(fieldValue, field.custom) || 'primary'" size="small">
+        <el-tag :type="getTagType(fieldValue, field.custom) || 'primary'" :effect="field.effect || ''" size="small">
             {{ field.replaceValue ? field.replaceValue[fieldValue] : fieldValue }}
         </el-tag>
     </div>

src/components/table/header/index.vue

@@ -162,7 +162,7 @@ const setDatePicker = (list: any) => {
 }
 const onResetForm = () => {
     //时间重置成默认值
-    datePickerRef.value?.timeChange(3)
+    datePickerRef.value?.setInterval(3)
     tableStore.onTableAction('reset', {})
 }
 const setInterval = (val: any) => {

src/components/tree/pqs/algorithmTree.vue

@@ -0,0 +1,81 @@
+<template>
+    <div class="point-tree">
+        <div style="flex: 1; overflow: hidden">
+            <Tree ref="treeRef" :data="tree" style="width: 100%; height: 100%" :canExpand="false" v-bind="$attrs" />
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { nextTick, onMounted, ref, useAttrs } from 'vue'
+import Tree from '../index.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
+import { useConfig } from '@/stores/config'
+
+defineOptions({
+    name: 'pms/pointTree'
+})
+const emit = defineEmits(['init'])
+const attrs = useAttrs()
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const config = useConfig()
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const tree = ref()
+const treeRef = ref()
+
+const loadData = () => {
+    let nodeKey = ''
+    let res = {
+        data: [
+            {
+                name: '运行管理',
+                id: '1',
+                children: [
+                    {
+                        name: '运行指标',
+                        id: '2'
+                    },
+                    {
+                        name: '数据质量核查',
+                        id: '3'
+                    }
+                ]
+            }
+        ]
+    }
+    // getTerminalTreeForFive(form).then(res => {
+    res.data.forEach((item: any) => {
+        item.icon = 'el-icon-FolderOpened'
+        item.color = config.getColorVal('elementUiPrimary')
+        item.children.forEach((item2: any) => {
+            item2.icon = 'el-icon-Document'
+            item.color = config.getColorVal('elementUiPrimary')
+        })
+    })
+
+    nodeKey = res.data[0].children[0].id
+    emit('init', res.data[0].children[0])
+
+    tree.value = res.data
+    if (nodeKey) {
+        setTimeout(() => {
+            treeRef.value.treeRef.setCurrentKey(nodeKey)
+        }, 10)
+    }
+    // })
+}
+loadData()
+</script>
+<style lang="scss">
+.point-tree {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    border: 1px solid var(--el-border-color);
+}
+</style>