修改测试bug

src/components/cockpit/monitoringPointList/components/overLimitDetails.vue

@@ -14,7 +14,7 @@
                             <el-option
                                 v-for="item in options"
                                 :key="item.lineId"
-                                :label="item.name"
+                                :label="item.lineName"
                                 :value="item.lineId"
                             />
                         </el-select>
@@ -34,7 +34,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
 import HarmonicRatio‌ from '@/components/cockpit/gridSideStatistics/components/harmonicRatio‌.vue'
-import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+import { cslineList ,governLineList} from '@/api/harmonic-boot/cockpit/cockpit'
 
 const dialogVisible: any = ref(false)
 const harmonicRatio‌Ref: any = ref(null)
@@ -139,8 +139,10 @@ const tableStore: any = new TableStore({
 provide('tableStore', tableStore)
 tableStore.table.params.sortBy = ''
 tableStore.table.params.orderBy = ''
+const time:any=ref([])
 const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
     dialogVisible.value = true
+    time.value=[searchBeginTime,searchEndTime]
     initCSlineList()
     tableStore.table.params.lineId = row.lineId
 
@@ -175,8 +177,19 @@ const onHarmonicRatioClose = () => {
 }
 
 const initCSlineList = async () => {
-    const res = await cslineList({})
+    // const res = await cslineList({})
-    options.value = res.data
+    const res = await governLineList({
+        endTime:time.value[1],
+keywords:"",
+pageNum:1,
+pageSize:10000,
+searchBeginTime:time.value[0],
+searchEndTime:time.value[1],
+startTime:time.value[0],
+timeFlag:1
+    })
+    options.value = res.data.records
+
 }
 
 

src/components/cockpit/monitoringPointList/index.vue

@@ -6,7 +6,8 @@
             :showReset="false"
             @selectChange="selectChange"
             datePicker
-            v-if="fullscreen"  :timeKeyList="prop.timeKey"
+            v-if="fullscreen"
+            :timeKeyList="prop.timeKey"
         ></TableHeader>
         <Table
             ref="tableRef"
@@ -17,27 +18,29 @@
         <OverLimitDetails ref="OverLimitDetailsRef" />
 
         <!-- 上传对话框 -->
-        <el-dialog v-model="uploadDialogVisible" title="上传报告" width="500px" @closed="handleDialogClosed">
+        <el-dialog v-model="uploadDialogVisible" title="上传报告" append-to-body  width="500px" @closed="handleDialogClosed">
             <el-upload
                 ref="uploadRef"
                 class="upload-demo"
-                :auto-upload="true"
+                action=""
+                accept=".doc,.docx,.PDF"
                 :on-change="handleChange"
                 :before-upload="beforeUpload"
-                :http-request="handleUpload"
                 :limit="1"
+                :auto-upload="false"
                 :on-exceed="handleExceed"
+                :on-remove="handleRemove"
                 :file-list="fileList"
             >
                 <el-button type="primary">点击上传</el-button>
                 <template #tip>
-                    <div class="el-upload__tip">只能上传Word或PDF文件，且不超过10MB</div>
+                    <div class="el-upload__tip">请上传Word或PDF文件</div>
                 </template>
             </el-upload>
             <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="uploadDialogVisible = false">取消</el-button>
-                    <el-button type="primary" @click="uploadDialogVisible = false">确定</el-button>
+                    <el-button type="primary" @click="handleUpload">确定</el-button>
                 </span>
             </template>
         </el-dialog>
@@ -59,7 +62,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-   timeKey: { type: Array as () => string[] },
+    timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })
@@ -279,14 +282,18 @@ const handleDialogClosed = () => {
 }
 
 // 处理文件超出限制
-const handleExceed = (files: any, fileList: any) => {
+const handleExceed = (files: any) => {
     ElMessage.warning('只能上传一个文件，请先删除已选择的文件')
 }
+const handleRemove = (files: any) => {
+    fileList.value = []
+}
 
 // 文件变更处理函数
-const handleChange = (file: any, fileList: any) => {
+const handleChange = (file: any) => {
     // 在这里直接处理文件上传逻辑
-    beforeUpload(file.raw) // 注意使用 file.raw 获取原始文件对象
+    // beforeUpload(file.raw) // 注意使用 file.raw 获取原始文件对象
+    fileList.value = [file] // 只保留最新选择的文件
 }
 
 // 处理上传前检查
@@ -303,11 +310,7 @@ const beforeUpload = (file: any) => {
     const isLt10M = file.size / 1024 / 1024 < 10
 
     if (!isValidType) {
-        ElMessage.error('上传文件只能是 Word 文档(.doc/.docx) 或 PDF 文件(.pdf)!')
+        ElMessage.error('请上传(.doc/.docx/.pdf)格式文件!')
-        return false
-    }
-    if (!isLt10M) {
-        ElMessage.error('上传文件大小不能超过 10MB!')
         return false
     }
 
@@ -315,10 +318,12 @@ const beforeUpload = (file: any) => {
     return true
 }
 
-const handleUpload = async (options: any) => {
+const handleUpload = async () => {
-    const { file } = options
+    console.log(123, fileList.value)
+    // return
+
     const formData = new FormData()
-    formData.append('file', file)
+    formData.append('file', fileList.value[0]?.raw)
     formData.append('lineId', currentUploadRow.value?.lineId || currentUploadRow.value?.id || '')
 
     try {

src/components/table/fieldRender/index.vue

@@ -21,8 +21,8 @@
         <el-image
             :hide-on-click-modal="true"
             :preview-teleported="true"
-            :preview-src-list="[fieldValue]"
+            :preview-src-list="[imgList[fieldValue]]"
-            :src="fieldValue.length > 100 ? fieldValue : getUrl(fieldValue)"
+            :src="fieldValue.length > 100 ? fieldValue : getUrl(fieldValue) ? imgList[fieldValue] : ''"
         ></el-image>
     </div>
 
@@ -226,10 +226,12 @@ const handlerCommand = (item: OptButton) => {
             break
     }
 }
+const imgList: any = ref({})
 const getUrl = (url: string) => {
     getFileUrl({ filePath: url }).then(res => {
-        return res.data
+        imgList.value[url] = res.data
     })
+    return true
 }
 </script>
 

src/components/tree/govern/deviceTree.vue

@@ -35,7 +35,6 @@ const config = useConfig()
 const tree = ref()
 const treRef = ref()
 const changeDeviceType = (val: any, obj: any) => {
-    console.log('🚀 ~ changeDeviceType ~ val:', val, obj)
     emit('deviceTypeChange', val, obj)
 }
 getDeviceTree().then(res => {
@@ -105,7 +104,6 @@ getDeviceTree().then(res => {
             })
         }
     })
-    console.log('🚀 ~ file: deviceTree.vue ~ line 18 ~ getDeviceTree ~ tree:', arr, arr2, arr3)
     tree.value = res.data
 
     nextTick(() => {

src/layouts/admin/components/popup/password.vue

@@ -9,7 +9,12 @@
                     <el-input v-model.trim="form.newPwd" type="password" placeholder="请输入新密码" show-password />
                 </el-form-item>
                 <el-form-item label="确认密码:" prop="confirmPwd">
-                    <el-input v-model.trim="form.confirmPwd" type="password" placeholder="请输入确认密码" show-password />
+                    <el-input
+                        v-model.trim="form.confirmPwd"
+                        type="password"
+                        placeholder="请输入确认密码"
+                        show-password
+                    />
                 </el-form-item>
             </el-form>
         </el-scrollbar>
@@ -28,8 +33,10 @@ import { ElMessage } from 'element-plus'
 import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
 import { validatePwd } from '@/utils/common'
 import { useAdminInfo } from '@/stores/adminInfo'
-
+import router from '@/router'
+import { useNavTabs } from '@/stores/navTabs'
 const adminInfo = useAdminInfo()
+const navTabs = useNavTabs()
 const dialogVisible = ref(false)
 const title = ref('修改密码')
 const formRef = ref()
@@ -96,9 +103,16 @@ const submit = () => {
                 updatePassword({
                     id: adminInfo.$state.userIndex,
                     newPassword: form.newPwd
-                }).then((res: any) => {
+                }).then(async (res: any) => {
                     ElMessage.success('密码修改成功')
                     dialogVisible.value = false
+                    
+                    setTimeout(() => {
+                         navTabs.closeTabs()
+                        window.localStorage.clear()
+                        adminInfo.reset()
+                        router.push({ name: 'login' })
+                    }, 0)
                 })
             })
         }

src/utils/request.ts

@@ -65,6 +65,7 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
             if (
                 !(
                     config.url == '/system-boot/file/upload' ||
+                    config.url == '/system-boot/file/getFileUrl' ||
                     config.url == '/harmonic-boot/grid/getAssessOverview' ||
                     config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData' ||
                     config.url == '/cs-device-boot/csline/list' ||

src/views/auth/userList/popupEdit.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog class="cn-operate-dialog" v-model.trim="dialogVisible" :title="title">
-        <el-form :model="form" label-width="auto" class="form-two" :rules="rules">
+        <el-form :model="form" ref="formRef" label-width="auto" class="form-two" :rules="rules">
             <el-form-item label="用户名" prop="name">
                 <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入昵称" />
             </el-form-item>
@@ -138,6 +138,7 @@ const form = reactive({
     emailNotice: 0,
     type: 0
 })
+const formRef = ref()
 const rules: Partial<Record<string, Arrayable<FormItemRule>>> = {
     name: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
     role: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
@@ -224,9 +225,10 @@ queryRole()
 const dialogVisible = ref(false)
 const title = ref('新增菜单')
 const open = (text: string, data?: anyObj) => {
+    formRef.value?.resetFields()
     title.value = text
     dialogVisible.value = true
-    console.log("🚀 ~ open ~ data:", data)
+  
     if (data) {
         for (let key in form) {
             form[key] = data[key]
@@ -251,19 +253,23 @@ const open = (text: string, data?: anyObj) => {
     }
 }
 const submit = async () => {
-    let obj = JSON.parse(JSON.stringify(form))
+    formRef.value.validate(async (valid: any) => {
-    obj.limitTime = obj.limitTime.join('-')
+        if (valid) {
-    delete obj.password
+            let obj = JSON.parse(JSON.stringify(form))
-    if (form.id) {
+            obj.limitTime = obj.limitTime.join('-')
-        await edit(obj)
+            delete obj.password
-        ElMessage.success('修改成功')
+            if (form.id) {
-    } else {
+                await edit(obj)
-        form.type = adminInfo.$state.userType + 1
+                ElMessage.success('修改成功')
-        await add(obj)
+            } else {
-        ElMessage.success('新增成功')
+                form.type = adminInfo.$state.userType + 1
-    }
+                await add(obj)
-    tableStore.index()
+                ElMessage.success('新增成功')
-    dialogVisible.value = false
+            }
+            tableStore.index()
+            dialogVisible.value = false
+        }
+    })
 }
 
 const changeValue = () => {}

src/views/govern/device/fileService/index.vue

@@ -27,7 +27,7 @@
                 <el-input
                     maxlength="32"
                     show-word-limit
-                    style="width: 200px; height: 32px"
+                    style="width: 240px; height: 32px"
                     placeholder="请输入文件或文件夹名称"
                     clearable
                     v-model.trim="filterText"

src/views/govern/manage/gplot/index.vue

@@ -5,6 +5,7 @@
                 <el-upload
                     action=""
                     class="upload-demo"
+                    accept=".svg,.png,.jpg,.jpeg"
                     :show-file-list="false"
                     :auto-upload="false"
                     :on-change="chooseImage"
@@ -37,9 +38,13 @@ const tableStore = new TableStore({
     url: '/cs-device-boot/topologyTemplate/queryImage',
     method: 'POST',
     column: [
-    { title: '序号',  width: 80,formatter: (row: any) => {
+        {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            title: '序号',
-      } },
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
         { title: '拓扑图模版名称', field: 'name', align: 'center' },
         { title: '监测点数量', field: 'pointNum', align: 'center' },
         { title: '拓扑图', field: 'filePath', align: 'center', render: 'image' },
@@ -56,7 +61,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        popupRef.value.open( row)
+                        popupRef.value.open(row)
                     }
                 },
                 {
@@ -99,7 +104,13 @@ const addMenu = () => {
     popupRef.value.open('新增菜单')
 }
 const chooseImage = e => {
-    console.warn(e)
+    const isWord =
+        e.name.endsWith('.svg') || e.name.endsWith('.png') || e.name.endsWith('.jpg') || e.name.endsWith('.jpeg')
+
+    if (!isWord) {
+        return ElMessage.error('请上传图片或svg文件!')
+    }
+
     uploadTopo(e.raw).then(res => {
         ElMessage.success('新增成功')
         tableStore.index()

src/views/govern/manage/gplot/popupEdit.vue

@@ -106,8 +106,13 @@ const deletePoint = () => {
 }
 const submit = async () => {
     let allSelect = pointList.value.some(item => item.position === '')
+
+    if (pointList.value.length == 0) {
+        ElMessage.warning('请添加监测点！')
+        return
+    }
     if (allSelect) {
-        ElMessage.warning('请完善所有监测点位置')
+        ElMessage.warning('请完善所有监测点位置！')
         return
     }
     let arr = pointList.value.map(item => {

src/views/govern/sensitiveLoadMange/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker>
+        <TableHeader :showReset="false">
             <template #operation>
                 <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10">新增</el-button>
             </template>
@@ -21,7 +21,7 @@ import { Plus } from '@element-plus/icons-vue'
 import { useDictData } from '@/stores/dictData'
 
 defineOptions({
-    name: 'govern/device/sensitiveLoadMange'
+    name: 'govern/sensitiveLoadMange/index'
 })
 const detail = ref()
 

src/views/govern/setting/statisticalType/add.vue

@@ -1,15 +1,14 @@
 <template>
     <el-dialog width="500px" v-model.trim="dialogVisible" :title="title">
-
+        <el-form :model="form" ref="formRef" class="form-one" label-width="auto" :rules="rules">
-        <el-form :model="form" class="form-one" label-width="auto">
+            <el-form-item label="名称" prop="name">
-            <el-form-item label="名称">
                 <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入名称" />
             </el-form-item>
-            <el-form-item label="编码">
+            <el-form-item label="编码" prop="code">
                 <el-input maxlength="32" show-word-limit v-model.trim="form.code" placeholder="请输入编码" />
             </el-form-item>
-            <el-form-item label="类型" v-if="title == '新增'|| title == '编辑'">
+            <el-form-item label="类型" v-if="title == '新增' || title == '编辑'" >
-                <el-select v-model.trim="form.type" placeholder="请选择类型">
+                <el-select v-model.trim="form.type" placeholder="请选择类型" clearable>
                     <el-option v-for="item in options" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
             </el-form-item>
@@ -17,10 +16,9 @@
                 <el-input maxlength="32" show-word-limit v-model.trim="form.remark" placeholder="请输入备注" />
             </el-form-item>
 
-            <el-form-item label="排序">
+            <el-form-item label="排序" prop="sort">
                 <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
             </el-form-item>
-
         </el-form>
 
         <template #footer>
@@ -49,29 +47,35 @@ const form = reactive({
     name: '',
     code: '',
     remark: '',
-    // type: 2,
+    type: 2,
     sort: 100,
     pid: '',
     id: ''
 })
+const formRef = ref()
+const rules = {
+    name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+    code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
+    sort: [{ required: true, message: '请输入排序', trigger: 'blur' }]
+}
 const options = ref([
     { name: '通用指标', value: 2 },
     { name: 'APF模块', value: 3 },
     { name: '星型接线', value: 4 },
     { name: '角型接线', value: 5 },
     { name: 'V型接线', value: 6 },
-    { name: '驾驶舱指标', value: 7 },
+    { name: '驾驶舱指标', value: 7 }
 ])
 
 const dialogVisible = ref(false)
 const title = ref('新增菜单')
 const open = (text: string, data?: anyObj) => {
+    formRef.value?.resetFields()
     title.value = text
     for (let key in form) {
         form[key] = data ? data[key] : ''
 
         if (key == 'sort') {
-
             form[key] = data?.sort ? data[key] : 100
             // console.log("🚀 ~ open ~ form[key]:", form[key])
         }
@@ -80,28 +84,24 @@ const open = (text: string, data?: anyObj) => {
 }
 const submit = async () => {
     // 非空校验
-    for (let key in form) {
+    formRef.value.validate(async valid => {
-        if (key != 'pid' && key != 'id' && key != 'sort') {
+        if (valid) {
-            if (!form[key]) {
+            if (form.id) {
-                ElMessage.warning('请填写完整信息')
+                await updateStatistical(form).then(res => {
-                return
+                    ElMessage.success('编辑成功')
+                })
+            } else {
+                if (!form.pid) {
+                    form.pid = tableStore.table.params.pid
+                }
+                await addDictTree(form).then(res => {
+                    ElMessage.success('新增成功')
+                })
             }
+            emits('over')
+            dialogVisible.value = false
         }
-    }
+    })
-    if (form.id) {
-        await updateStatistical(form).then(res => {
-            ElMessage.success('编辑成功')
-        })
-    } else {
-        if (!form.pid) {
-            form.pid = tableStore.table.params.pid
-        }
-        await addDictTree(form).then(res => {
-            ElMessage.success('新增成功')
-        })
-    }
-    emits('over')
-    dialogVisible.value = false
 }
 
 defineExpose({ open })