修改设置日期函数

src/components/form/datePicker/index.vue

@@ -480,7 +480,7 @@ const NowgetEndTime = () => {
 const setTimeOptions = (list: any) => {
     timeOptions.value = list
 }
-const setInterval = (value: any) => {
+const setTheDate = (value: any) => {
     interval.value = value
     timeChange(value)
 }
@@ -510,6 +510,7 @@ function getMonthOnMonth(startDate: string, endDate: string): [string, string] {
 
     return [formatDate(startMonthAgo), formatDate(endMonthAgo)]
 }
+
 // 格式化日期为 YYYY-MM-DD
 function formatDate(date: Date): string {
     const year = date.getFullYear()

src/components/table/header/index.vue

@@ -161,14 +161,14 @@ const setDatePicker = (list: any) => {
 }
 const onResetForm = () => {
     //时间重置成默认值
-    datePickerRef.value?.setInterval(3)
+    datePickerRef.value?.setTheDate(3)
     tableStore.onTableAction('reset', {})
 }
-const setInterval = (val: any) => {
+const setTheDate = (val: any) => {
-    datePickerRef.value.setInterval(val)
+    datePickerRef.value.setTheDate(val)
 }
 
-defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef, showSelectChange })
+defineExpose({ onComSearch, areaRef, setDatePicker, setTheDate, datePickerRef, showSelectChange })
 </script>
 
 <style scoped lang="scss">

src/components/tree/index.vue

@@ -1,49 +1,27 @@
 <template>
     <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
-        <Icon
+        <Icon v-show="menuCollapse" @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-            v-show="menuCollapse"
+            :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 mt20 menu-collapse"
-            @click="onMenuCollapse"
+            style="cursor: pointer" />
-            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-            :class="menuCollapse ? 'unfold' : ''"
-            size="18"
-            class="fold ml10 mt20 menu-collapse"
-            style="cursor: pointer"
-        />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
             <div style="display: flex; align-items: center" class="mb10">
-                <el-input v-model="filterText" placeholder="请输入内容" clearable>
+                <el-input v-model="filterText" placeholder="请输入内容" clearable maxlength="10" show-word-limit @input="change">
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
                 </el-input>
-                <Icon
+                <Icon @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-                    @click="onMenuCollapse"
+                    :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 menu-collapse"
-                    :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                    style="cursor: pointer" v-if="props.canExpand" />
-                    :class="menuCollapse ? 'unfold' : ''"
+                <el-button icon="el-icon-Plus" v-if="props.addTree" type="primary" class="ml10"
-                    size="18"
+                    @click="onAddTree">新增</el-button>
-                    class="fold ml10 menu-collapse"
-                    style="cursor: pointer"
-                    v-if="props.canExpand"
-                />
-                <el-button icon="el-icon-Plus"  v-if="props.addTree" type="primary" class="ml10" @click="onAddTree">新增</el-button>
             </div>
-            <el-tree
+            <el-tree style="flex: 1; overflow: auto" ref="treeRef" :props="defaultProps" highlight-current
-                style="flex: 1; overflow: auto"
+                :filter-node-method="filterNode" node-key="id" v-bind="$attrs">
-                ref="treeRef"
-                :props="defaultProps"
-                highlight-current
-                :filter-node-method="filterNode"
-                node-key="id"
-                v-bind="$attrs"
-            >
                 <template #default="{ node, data }">
                     <span class="custom-tree-node">
-                        <Icon
+                        <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                            :name="data.icon"
+                            v-if="data.icon" />
-                            style="font-size: 16px"
-                            :style="{ color: data.color }"
-                            v-if="data.icon"
-                        />
                         <span style="margin-left: 4px">{{ node.label }}</span>
                     </span>
                 </template>
@@ -56,7 +34,7 @@
 import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElTree } from 'element-plus'
 import { ref, watch } from 'vue'
-
+import { ElMessage } from 'element-plus'
 defineOptions({
     name: 'govern/tree'
 })
@@ -79,9 +57,33 @@ const defaultProps = {
     label: 'name',
     value: 'id'
 }
-watch(filterText, val => {
+const specialCharsPattern = /[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g;
-    treeRef.value!.filter(val)
+const change=(val) => {
-})
+
+
+    if (specialCharsPattern.test(val)) {
+        ElMessage.warning('禁止输入特殊字符!')
+        filterText.value = val.replace(/[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g, "")
+        console.log("🚀 ~ change ~ filterText.value:", filterText.value)
+        
+        treeRef.value!.filter(filterText.value)
+    }else{
+        treeRef.value!.filter(filterText.value)
+    }
+}
+// watch(filterText, val => {
+
+//     console.log("🚀 ~ val:", specialCharsPattern.test(val))
+//     if (specialCharsPattern.test(val)) {
+//         ElMessage.warning('禁止输入特殊字符!')
+//         filterText.value = val.replace(/[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g, "")
+//         console.log("🚀 ~   filterText.value:",   filterText.value)
+//         treeRef.value!.filter(filterText.value)
+//     }else{
+//         treeRef.value!.filter(filterText.value)
+//     }
+
+// })
 const onMenuCollapse = () => {
     menuCollapse.value = !menuCollapse.value
     proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
@@ -90,10 +92,11 @@ const filterNode = (value: string, data: any, node: any) => {
     if (!value) return true
     // return data.name.includes(value)
     if (data.name) {
-        
+
         return chooseNode(value, data, node)
     }
 }
+
 // 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
 const chooseNode = (value: string, data: any, node: any) => {
 

src/main.ts

@@ -37,8 +37,8 @@ const setupAll = async () => {
     //开启离线地图
     app.use(BaiduMapOffline, {
         offline: true,
-        // offlineUrl: window.location.origin + '/map/',
+        offlineUrl:'http://sjzx:8088/map/' //window.location.origin + '/map/'
-    });
+    })
     app.use(BaiduMap, {
         ak: 'Yp57V71dkOPiXjiN8VdcFRsVELzlVNKK',
         v: '3.0'

src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue

@@ -222,7 +222,7 @@ onMounted(() => {
         size.value = Math.round((180 / (dom.offsetHeight + 60)) * 100)
     }
     datePickerRef.value.setTimeOptions([{ label: '周', value: 4 }])
-    datePickerRef.value.setInterval(4)
+    datePickerRef.value.setTheDate(4)
     info()
 })
 const info = () => {

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue

@@ -8,53 +8,30 @@
                 <DatePicker ref="datePickerRef"></DatePicker>
             </el-form-item>
             <el-form-item label="指标类型:">
-                <el-select
+                <el-select v-model="formData.condition" multiple collapse-tags :multiple-limit="5" filterable
-                    v-model="formData.condition"
+                    placeholder="请选择指标" @change="conditionChange">
-                    multiple
-                    collapse-tags
-                    :multiple-limit="5"
-                    filterable
-                    placeholder="请选择指标"
-                    @change="conditionChange"
-                >
                     <el-option-group v-for="group in indexOptions" :key="group.label" :label="group.label">
-                        <el-option
+                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                            v-for="item in group.options"
+                            :value="item.value"></el-option>
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        ></el-option>
                     </el-option-group>
                 </el-select>
             </el-form-item>
             <el-form-item label="数值类型:">
                 <el-select style="width: 100%" v-model="formData.valueType" placeholder="请选择类型">
-                    <el-option
+                    <el-option v-for="item in typeOptions" :key="item.value" :label="item.label"
-                        v-for="item in typeOptions"
+                        :value="item.value"></el-option>
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="谐波次数:" v-if="showXieBoCiShu">
                 <el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波">
-                    <el-option
+                    <el-option v-for="item in harmonicOptions" :key="item.value" :label="item.label"
-                        v-for="item in harmonicOptions"
+                        :value="item.value"></el-option>
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item v-if="showJianXieBoCiShu" label="间谐波次数:">
                 <el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波">
-                    <el-option
+                    <el-option v-for="item in inharmonicOptions" :key="item.value" :label="item.label"
-                        v-for="item in inharmonicOptions"
+                        :value="item.value"></el-option>
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item>
@@ -110,6 +87,7 @@ const typeOptions = ref([
     { label: 'cp95值', value: 4 }
 ])
 onMounted(() => {
+    datePickerRef.value.setTheDate(5)
     init()
 })
 const checkChange = () => {
@@ -1209,7 +1187,7 @@ const rendering = () => {
                 let data = {
                     name: item2,
                     type: 'scatter',
-                    symbol:`image://`+ new URL('@/assets/point.png', import.meta.url).href,
+                    symbol: `image://` + new URL('@/assets/point.png', import.meta.url).href,
                     symbolSize: 16,
                     itemStyle: {
                         width: '22px',
@@ -1302,7 +1280,7 @@ const rendering = () => {
                     data: item.gvalue
                 }
                 opitonserise.push(data)
-            } 
+            }
             // else {
             //     opitonserise.push([])
             // }
@@ -1354,29 +1332,29 @@ const getEcharts = () => {
                                 params[i].value[1] > 0
                                     ? 'A相谐波电流方向:流入<br/>'
                                     : params[i].value[1] == 0
-                                    ? 'A相谐波电流方向:无<br/>'
+                                        ? 'A相谐波电流方向:无<br/>'
-                                    : 'A相谐波电流方向:流出<br/>'
+                                        : 'A相谐波电流方向:流出<br/>'
                         } else if (params[i].seriesName == 'B相谐波电流方向') {
                             tips +=
                                 params[i].value[1] > 0
                                     ? 'B相谐波电流方向:流入<br/>'
                                     : params[i].value[1] == 0
-                                    ? 'B相谐波电流方向:无<br/>'
+                                        ? 'B相谐波电流方向:无<br/>'
-                                    : 'B相谐波电流方向:流出<br/>'
+                                        : 'B相谐波电流方向:流出<br/>'
                         } else if (params[i].seriesName == 'C相谐波电流方向') {
                             tips +=
                                 params[i].value[1] > 0
                                     ? 'C相谐波电流方向:流入<br/>'
                                     : params[i].value[1] == 0
-                                    ? 'C相谐波电流方向:无<br/>'
+                                        ? 'C相谐波电流方向:无<br/>'
-                                    : 'C相谐波电流方向:流出<br/>'
+                                        : 'C相谐波电流方向:流出<br/>'
                         } else if (params[i].seriesName == '总谐波电流方向') {
                             tips +=
                                 params[i].value[1] > 0
                                     ? '总谐波电流方向:流入<br/>'
                                     : params[i].value[1] == 0
-                                    ? '总谐波电流方向:无<br/>'
+                                        ? '总谐波电流方向:无<br/>'
-                                    : '总谐波电流方向:流出<br/>'
+                                        : '总谐波电流方向:流出<br/>'
                         } else if (params[i].seriesName == '正序电压') {
                             let str = (params[i].value[1] * 1).toString()
                             let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g

src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue

@@ -213,7 +213,7 @@ const treeData = ref()
 const loadData = () => {
     initDetpStataionTree({ orgId: dictData.state.area[0].id }).then(res => {
         treeList.value = res.data
-        initDetpStataionTree({ orgId: 'a3069759b0b6072c99cf9a7af6c162e9' }).then(res => {
+        initDetpStataionTree({ orgId: '02d1b4e1680413eb72f3fa63d46c496c' }).then(res => {
             treeListCgy.value = res.data
             setTimeout(() => {
                 changeArea()

src/views/pqs/supervise/technology/components/alarm.vue

@@ -7,6 +7,12 @@
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item label="是否解决">
+                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+                    <el-option label="未解决" value="0"></el-option>
+                    <el-option label="已解决" value="1"></el-option>
+                </el-select>
+            </el-form-item>
         </template>
         <template #operation>
             <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
@@ -452,6 +458,7 @@ const cancelLeave = async (row: any) => {
     tableStore.index()
 }
 tableStore.table.params.status = ''
+tableStore.table.params.dealState = ''
 
 provide('tableStore', tableStore)
 

src/views/pqs/supervise_jb/technology/components/alarm.vue

@@ -7,6 +7,12 @@
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item label="是否解决">
+                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+                    <el-option label="未解决" value="0"></el-option>
+                    <el-option label="已解决" value="1"></el-option>
+                </el-select>
+            </el-form-item>
         </template>
         <template #operation>
             <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
@@ -452,6 +458,7 @@ const cancelLeave = async (row: any) => {
     tableStore.index()
 }
 tableStore.table.params.status = ''
+tableStore.table.params.dealState = ''
 
 provide('tableStore', tableStore)
 

src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue

@@ -166,11 +166,11 @@ const wp = ref({})
 provide('tableStore', tableStore)
 
 onMounted(() => {
-    TableHeaderRef.value.setInterval(1)
+    TableHeaderRef.value.setTheDate(1)
     nextTick(() => {
 
         // tableStore.index()
-            TableHeaderRef.value.onComSearch()
+        TableHeaderRef.value.onComSearch()
 
     })
 })

src/views/pqs/voltageSags/analyse/impactscope/index.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="default-main">
-        <TableHeader datePicker ref="TableHeaderRef">
+      <div v-show="view"> 
+        <TableHeader datePicker ref="TableHeaderRef" >
             <template #select>
                 <el-form-item label="筛选">
                     <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选" />
@@ -10,7 +11,8 @@
                 <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button>
             </template>
         </TableHeader>
-        <Table ref="tableRef" />
+        <Table ref="tableRef"/>
+      </div>
         <!-- 暂降源定位 -->
         <el-dialog draggable v-model="dialogAnalysis" title="暂降源定位" width="70%">
             <div class="mb10" style="display: flex; justify-content: space-between">
@@ -46,24 +48,33 @@
                 :total="total" @size-change="onTableSizeChange" @current-change="onTableCurrentChange"></el-pagination>
         </el-dialog>
         <!-- 暂降源定位 -->
+        <Map :style="height" :showBut="false" v-if="!view" />
+        <el-button class="close" :icon="Back" @click="view=true"  v-if="!view">返回</el-button>
     </div>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide } from 'vue'
 import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
 import Table from '@/components/table/index.vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import TableHeader from '@/components/table/header/index.vue'
-import { queryEventDetailByAssId } from '@/api/advance-boot/analyse.ts'
+import { queryEventDetailByAssId } from '@/api/advance-boot/analyse'
 import { useDictData } from '@/stores/dictData'
-import { queryEventsAssPage } from '@/api/advance-boot/analyse.ts'
+import {Back} from '@element-plus/icons-vue'
+import { queryEventsAssPage } from '@/api/advance-boot/analyse'
+import  Map from '@/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue'
+import { useMonitoringPoint } from '@/stores/monitoringPoint'
 defineOptions({
     name: 'Advancedanalysis/impactscope'
 })
+const monitoringPoint = useMonitoringPoint()
+const height = mainHeight(20)
 const dialogAnalysis = ref(false)
 const AnalysisData = ref([])
 const AssociationNumber = ref()
 const total = ref(0)
+const view = ref(true)
 const tableRef = ref()
 const TableHeaderRef = ref()
 const dictData = useDictData()
@@ -110,14 +121,19 @@ const tableStore = new TableStore({
                         source()
                     }
                 },
-                // {
+                {
-                //     name: 'edit',
+                    name: 'edit',
-                //     title: '范围查看',
+                    title: '范围查看',
-                //     type: 'primary',
+                    type: 'primary',
 
-                //     icon: 'el-icon-Plus',
+                    icon: 'el-icon-Plus',
-                //     render: 'basicButton'
+                    render: 'basicButton' ,
-                // }
+                    click: row => {
+                        view.value = false
+                        // monitoringPoint.setValue('lineId', row.id)
+                        
+                    }
+                }
             ]
         }
     ],
@@ -234,4 +250,10 @@ const positioningexport = () => {
 :deep(.highlight-first-row) {
     color: red !important;
 }
+.close{
+    position: absolute;
+    right: 10px;
+    top: 50px;
+  
+}
 </style>

src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue

@@ -40,40 +40,21 @@
                 <span>无暂降</span>
             </div>
         </div>
-        <baidu-map
+        <baidu-map class='bm-view' :zoom='zoom' :map-click='false' :scroll-wheel-zoom='true' :center='center'
-            class='bm-view'
+            @ready='handler' @zoomend='syncCenterAndZoom' :dragging="true">
-            :zoom='zoom'
+            <bm-map-type :map-types="['BMAP_NORMAL_MAP', 'BMAP_HYBRID_MAP']"
-            :map-click='false'
+                anchor='BMAP_ANCHOR_TOP_RIGHT'></bm-map-type>
-            :scroll-wheel-zoom='true'
-            :center='center'
-            @ready='handler'
-            @zoomend='syncCenterAndZoom'
-        >
-            <bm-map-type
-                :map-types="['BMAP_NORMAL_MAP', 'BMAP_HYBRID_MAP']"
-                anchor='BMAP_ANCHOR_TOP_RIGHT'
-            ></bm-map-type>
             <!--  线-->
             <bm-polyline :path='path' v-for='(path, index) in polyline' :key='index'></bm-polyline>
             <!-- 变电站-->
             <template v-if='zoom > 12'>
-                <bm-marker
+                <bm-marker :position='path' v-for='path in siteList' :key='path.subId' :icon='path.icon'
-                    :position='path'
+                    @click='markerClick(path)'></bm-marker>
-                    v-for='path in siteList'
-                    :key='path.subId'
-                    :icon='path.icon'
-                    @click='markerClick(path)'
-                ></bm-marker>
             </template>
             <!-- 点 -->
             <BmlMarkerClusterer>
-                <bm-marker
+                <bm-marker :position='path' v-for='path in areaLineInfo' :key='path.lineId' :icon='path.icon'
-                    :position='path'
+                    @click='markerClick(path)'></bm-marker>
-                    v-for='path in areaLineInfo'
-                    :key='path.lineId'
-                    :icon='path.icon'
-                    @click='markerClick(path)'
-                ></bm-marker>
             </BmlMarkerClusterer>
             <bm-marker :position='infoWindowPoint' :icon="{ url: '1', size: { width: 0, height: 0 } }">
                 <bm-info-window :show='infoWindowPoint.show' @close='infoWindowPoint.show = false'>
@@ -97,18 +78,14 @@
                         <el-descriptions-item label='通讯状态'>
                             {{ infoWindowPoint.comFlag == 0 ? '中断' : '正常' }}
                         </el-descriptions-item>
-                        <el-descriptions-item>
+                        <el-descriptions-item v-if="props.showBut">
                             <el-button type='primary' size='small' @click='changeTab("2")'>事件统计</el-button>
                             <el-button type='primary' size='small' @click='changeTab("3")'>事件分析</el-button>
                             <el-button type='primary' size='small' @click='changeTab("4")'>运行情况</el-button>
                         </el-descriptions-item>
                     </el-descriptions>
-                    <el-descriptions
+                    <el-descriptions :title='infoWindowPoint.subName' :column='1' v-else-if='infoWindowPoint.subId'
-                        :title='infoWindowPoint.subName'
+                        style='padding-top: 10px'></el-descriptions>
-                        :column='1'
-                        v-else-if='infoWindowPoint.subId'
-                        style='padding-top: 10px'
-                    ></el-descriptions>
                 </bm-info-window>
             </bm-marker>
         </baidu-map>
@@ -122,8 +99,18 @@ import { getAreaLineInfo } from '@/api/event-boot/areaInfo'
 import DatePicker from '@/components/form/datePicker/index.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
-
 const emit = defineEmits(['changeTab'])
+
+interface Props {
+    showBut?: boolean
+
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    showBut: true
+})
+
+
 const monitoringPoint = useMonitoringPoint()
 const adminInfo = useAdminInfo()
 const datePickerRef = ref()
@@ -138,6 +125,7 @@ const params = ref({
     serverName: 'event-boot',
     statisticalType: {}
 })
+
 const center = ref({
     lng: 0,
     lat: 0

src/views/pqs/voltageSags/overview/index.vue

@@ -65,6 +65,7 @@
                 :scroll-wheel-zoom='true'
                 :center='center'
                 @ready='handler'
+                :dragging="true"
                 @zoomend='syncCenterAndZoom'
             >
                 <bm-map-type

src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue

@@ -5,12 +5,8 @@
             <template v-slot:select>
                 <el-form-item label='用户'>
                     <el-select v-model='tableStore.table.params.userId' filterable @change='changeUser'>
-                        <el-option
+                        <el-option v-for='item in userListData' :key='item.id' :label='item.userName'
-                            v-for='item in userListData'
+                            :value='item.id' />
-                            :key='item.id'
-                            :label='item.userName'
-                            :value='item.id'
-                        />
                     </el-select>
                 </el-form-item>
             </template>
@@ -176,7 +172,7 @@ const tableStore = new TableStore({
 // 注入到子组件
 provide('tableStore', tableStore)
 onMounted(() => {
-    tableHeader.value.setInterval(1)
+    tableHeader.value.setTheDate(1)
 })
 //初始化页面
 const initData = async () => {
@@ -196,7 +192,7 @@ initData()
 const switchRadio = () => {
     if (radio.value == '电压暂降事件统计') {
         sags3DRef.value?.search(userId.value, tableHeader.value.datePickerRef.timeValue[0], tableHeader.value.datePickerRef.timeValue[1])
-    }else if(radio.value == '耐受曲线信息'){
+    } else if (radio.value == '耐受曲线信息') {
         toleranceCurveRef.value?.search(userId.value, tableHeader.value.datePickerRef.timeValue[0], tableHeader.value.datePickerRef.timeValue[1])
     }
 }
@@ -252,7 +248,6 @@ const exportExcelTemplate = () => {
 
 </script>
 <style scoped>
-
 .tableExtraButton {
     position: absolute;
     right: 17px;

src/views/pqs/voltageSags/sagGovern/scheme/schemeCalc/calcParam.vue

@@ -10,24 +10,16 @@
                 <el-col :span='7'>
                     <el-form-item label='用户' prop='userId'>
                         <el-select v-model='form.userId' @change='changeUser'>
-                            <el-option
+                            <el-option v-for='item in userListData' :key='item.id' :label='item.userName'
-                                v-for='item in userListData'
+                                :value='item.id' />
-                                :key='item.id'
-                                :label='item.userName'
-                                :value='item.id'
-                            />
                         </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='生产线' prop='productLineId'>
                         <el-select v-model='form.productLineId' filterable>
-                            <el-option
+                            <el-option v-for='item in productLineData' :key='item.id' :label='item.name'
-                                v-for='item in productLineData'
+                                :value='item.id' />
-                                :key='item.id'
-                                :label='item.name'
-                                :value='item.id'
-                            />
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -40,12 +32,7 @@
                 <el-col :span='7'>
                     <el-form-item label='期望回收周期' prop='payBackPeriod'>
                         <el-select v-model='form.payBackPeriod'>
-                            <el-option
+                            <el-option v-for='item in 5' :key='item' :label='item + "年"' :value='item' />
-                                v-for='item in 5'
-                                :key='item'
-                                :label='item+"年"'
-                                :value='item'
-                            />
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -64,20 +51,14 @@
             <el-row>
                 <el-col :span='7'>
                     <el-form-item label='购置价格' prop='ups.price'>
-                        <el-input
+                        <el-input v-model='form.ups.price' clearable>
-                            v-model='form.ups.price'
-                            clearable
-                        >
                             <template #append>万元/kVA</template>
                         </el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='补偿能力' prop='ups.compensation'>
-                        <el-input
+                        <el-input v-model='form.ups.compensation' clearable>
-                            v-model='form.ups.compensation'
-                            clearable
-                        >
                             <template #append>p.u.</template>
                         </el-input>
                     </el-form-item>
@@ -85,10 +66,7 @@
 
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='年维护费' prop='ups.maintainFee'>
-                        <el-input
+                        <el-input v-model='form.ups.maintainFee' clearable>
-                            v-model='form.ups.maintainFee'
-                            clearable
-                        >
                             <template #append>万元/kVA</template>
                         </el-input>
                     </el-form-item>
@@ -96,10 +74,7 @@
 
                 <el-col :span='7'>
                     <el-form-item label='响应时间' prop='ups.responseTime'>
-                        <el-input
+                        <el-input v-model='form.ups.responseTime' clearable>
-                            v-model='form.ups.responseTime'
-                            clearable
-                        >
                             <template #append>ms</template>
                         </el-input>
                     </el-form-item>
@@ -107,10 +82,7 @@
 
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='后备时间' prop='ups.backupTime'>
-                        <el-input
+                        <el-input v-model='form.ups.backupTime' clearable>
-                            v-model='form.ups.backupTime'
-                            clearable
-                        >
                             <template #append>s</template>
                         </el-input>
                     </el-form-item>
@@ -127,20 +99,14 @@
             <el-row>
                 <el-col :span='7'>
                     <el-form-item label='购置价格' prop='avc.price'>
-                        <el-input
+                        <el-input v-model='form.avc.price' clearable>
-                            v-model='form.avc.price'
-                            clearable
-                        >
                             <template #append>万元/kVA</template>
                         </el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='补偿能力' prop='avc.compensation'>
-                        <el-input
+                        <el-input v-model='form.avc.compensation' clearable>
-                            v-model='form.avc.compensation'
-                            clearable
-                        >
                             <template #append>p.u.</template>
                         </el-input>
                     </el-form-item>
@@ -148,10 +114,7 @@
 
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='年维护费' prop='avc.maintainFee'>
-                        <el-input
+                        <el-input v-model='form.avc.maintainFee' clearable>
-                            v-model='form.avc.maintainFee'
-                            clearable
-                        >
                             <template #append>万元/kVA</template>
                         </el-input>
                     </el-form-item>
@@ -159,10 +122,7 @@
 
                 <el-col :span='7'>
                     <el-form-item label='响应时间' prop='avc.responseTime'>
-                        <el-input
+                        <el-input v-model='form.avc.responseTime' clearable>
-                            v-model='form.avc.responseTime'
-                            clearable
-                        >
                             <template #append>ms</template>
                         </el-input>
                     </el-form-item>
@@ -170,10 +130,7 @@
 
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='后备时间' prop='avc.backupTime'>
-                        <el-input
+                        <el-input v-model='form.avc.backupTime' clearable>
-                            v-model='form.avc.backupTime'
-                            clearable
-                        >
                             <template #append>s</template>
                         </el-input>
                     </el-form-item>
@@ -190,31 +147,21 @@
                 <el-col :span='7'>
                     <el-form-item label='备用进线' prop='quick.incomingLineId'>
                         <el-select v-model='form.quick.incomingLineId'>
-                            <el-option
+                            <el-option v-for='item in incomingLineListData' :key='item.id' :label='item.name'
-                                v-for='item in incomingLineListData'
+                                :value='item.id' />
-                                :key='item.id'
-                                :label='item.name'
-                                :value='item.id'
-                            />
                         </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='终端容量' prop='quick.governMachinePower'>
-                        <el-input
+                        <el-input v-model='form.quick.governMachinePower' clearable>
-                            v-model='form.quick.governMachinePower'
-                            clearable
-                        >
                             <template #append>kVA</template>
                         </el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='购置价格' prop='quick.price'>
-                        <el-input
+                        <el-input v-model='form.quick.price' clearable>
-                            v-model='form.quick.price'
-                            clearable
-                        >
                             <template #append>万元</template>
                         </el-input>
                     </el-form-item>
@@ -222,10 +169,7 @@
 
                 <el-col :span='7'>
                     <el-form-item label='建设成本' prop='quick.buildFee'>
-                        <el-input
+                        <el-input v-model='form.quick.buildFee' clearable>
-                            v-model='form.quick.buildFee'
-                            clearable
-                        >
                             <template #append>万元</template>
                         </el-input>
                     </el-form-item>
@@ -233,10 +177,7 @@
 
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='年维护费用' prop='quick.quickMaintainFee'>
-                        <el-input
+                        <el-input v-model='form.quick.quickMaintainFee' clearable>
-                            v-model='form.quick.quickMaintainFee'
-                            clearable
-                        >
                             <template #append>万元</template>
                         </el-input>
                     </el-form-item>
@@ -244,10 +185,7 @@
 
                 <el-col :span='7' :offset='1'>
                     <el-form-item label='动作时间' prop='quick.actionTime'>
-                        <el-input
+                        <el-input v-model='form.quick.actionTime' clearable>
-                            v-model='form.quick.actionTime'
-                            clearable
-                        >
                             <template #append>ms</template>
                         </el-input>
                     </el-form-item>
@@ -473,7 +411,7 @@ const initUserData = async () => {
  */
 onMounted(() => {
     initUserData()
-    datePickerRef.value.setInterval(1)
+    datePickerRef.value.setTheDate(1)
     form.startTime = datePickerRef.value.timeValue[0]
     form.endTime = datePickerRef.value.timeValue[1]
 })
@@ -506,7 +444,6 @@ function calcSag() {
 </script>
 
 <style scoped>
-
 .divider {
     font-family: AlimamaDongFangDaKai;
 }
@@ -515,6 +452,7 @@ function calcSag() {
     0% {
         color: #205CE8;
     }
+
     100% {
         color: #32B9FC;
     }

src/views/system/auth/userList/popupEdit.vue

@@ -111,7 +111,8 @@ const tableStore = inject('tableStore') as TableStore
 const form = reactive({
     id: '',
     name: '',
-    password: 'Jbdnzl@123',
+    // password: 'Jbdnzl@123',
+    password: '123456',
     email: '',
     limitIpStart: '',
     deptId: '',
@@ -233,7 +234,8 @@ const open = (text: string, data?: anyObj) => {
         form.id = ''
         form.limitIpStart = '0.0.0.0'
         form.limitIpEnd = '255.255.255.255'
-        form.password = 'Jbdnzl@123'
+        // form.password = 'Jbdnzl@123'
+        form.password = '123456'
     }
     form.type = adminInfo.$state.userType + 1
 }