微调

frontend/package.json

@@ -22,6 +22,7 @@
     "echarts": "^5.4.3",
     "echarts-liquidfill": "^3.1.0",
     "element-plus": "^2.7.8",
+    "html2canvas": "^1.4.1",
     "md5": "^2.3.0",
     "mitt": "^3.0.1",
     "mkdirp": "^3.0.1",
@@ -41,11 +42,13 @@
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.8.0",
     "@tsconfig/node20": "^20.1.4",
+    "@types/html2canvas": "^1.0.0",
     "@types/md5": "^2.3.2",
     "@types/node": "^20.14.14",
     "@types/nprogress": "^0.2.0",
     "@types/qs": "^6.9.8",
     "@types/sortablejs": "^1.15.2",
+    "@types/xlsx": "^0.0.36",
     "@typescript-eslint/eslint-plugin": "^6.7.0",
     "@typescript-eslint/parser": "^6.7.0",
     "@vitejs/plugin-vue": "^5.0.5",

frontend/src/api/system/log/index.ts

@@ -0,0 +1,11 @@
+import type {AuditLog  } from '@/api/system/log/interface/log.ts'
+import http from '@/api'
+
+/**
+ * @name 审计日志管理模块
+ */
+
+//获取审计日志
+export const getAuditLog = (params: AuditLog.ReqAuditLogParams) => {
+  return http.post(`/sysLog/list`, params)
+}

frontend/src/api/system/log/interface/log.ts

@@ -1,15 +1,36 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
 // 审计日志管理模块
-export namespace Sys_Log_Audit {
+export namespace AuditLog {
-    // 日志列表
+
-    export interface Audit_LogList {
+  /**
-      id: string;//日志表Id
+   * 设备类型数据表格分页查询参数
-      operate_Type:string;//日志类型
+   */
+  export interface ReqAuditLogParams extends ReqPage {
+    id: string; //审计日志Id 必填
+    createTime?: string; //创建时间
+  }
+
+  /**
+   * 设备类型新增、修改、根据id查询返回的对象
+   */
+  export interface ResAuditLog {
+    id: string;//审计日志Id
+    operate_Type:string;//操作类型
     ip:string;//操作IP
     result: string;//事件结果
     remark: string;//事件描述
+    level:number;//告警等级
     warn:number;//告警标志
     create_By:string;//创建用户
     create_Time:string;//创建时间
+    sort:number;//排序
   }
 
+  /**
+   * 设备类型表格查询分页返回的对象；
+   */
+  export interface ResAuditLogPage extends ResPage<ResAuditLog> {
+
+  }
 }

frontend/src/views/home/components/tree.vue

@@ -6,8 +6,10 @@
         clearable
         v-model='searchForm.planName'
       ></el-input>
+      <el-tooltip content="检测计划列表" placement="top">
       <Menu style='width: 26px;height: 26px; margin-left: 8px;cursor: pointer;color:var(--el-color-primary)'
             @click.stop='detail()' />
+      </el-tooltip>
     </div>
     <div class='tree_container'>
       <el-tree
@@ -40,6 +42,7 @@ import { Menu, Platform, CircleCheck,Loading } from '@element-plus/icons-vue'
 import { nextTick, onMounted, ref, watch } from 'vue';
 import { useRouter } from 'vue-router'
 import {useCheckStore} from "@/stores/modules/check";
+import { ElTooltip } from 'element-plus';
 
 const router = useRouter()
 const checkStore = useCheckStore()
@@ -147,7 +150,7 @@ const filterNode = (value: string, data: any) => {
 
 // 点击详情
 const detail = () => {
-  router.push('/plan')
+  router.push('/plan/planList')
 }
 onMounted(() => {
  // console.log()

frontend/src/views/log/index.vue

@@ -3,7 +3,7 @@
     <ProTable
       ref='proTable'
       :columns='columns'
-      :data='logData'
+      :request-api='getTableList'
       @selection-change='handleSelectionChange'
       type='selection'
     >
@@ -21,41 +21,39 @@
 <script setup lang='tsx' name='useProTable'>
 // 根据实际路径调整
 import TimeControl from '@/components/TimeControl/index.vue'
-import { type Sys_Log_Audit } from '@/api/system/interface/log'
+import { type  AuditLog} from '@/api/system/log/interface/log.ts'
 import ProTable from '@/components/ProTable/index.vue'
 import { Upload ,DataAnalysis} from '@element-plus/icons-vue'
-import logDataList from '@/api/system/log/logData'
 import type { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
 import { reactive,ref,watch } from 'vue'
-import { useDictStore } from '@/stores/modules/dict'
+import {
+  getAuditLog,
+} from '@/api/system/log/index.ts'
 
-defineOptions({
-name: 'log'
-})
 
-let multipleSelection = ref<string[]>([])
+// defineOptions({
-const logData = logDataList
+// name: 'log'
-const dictStore = useDictStore()
+// })
-// 定义包含和排除的单位
+
-const includedUnits = ['日', '周', '月', '自定义']; // 可以根据需要包含的单位
+const startDate = ref('')
-const excludedUnits = ['季度','年']; // 要排除的单位
+const endDate = ref('')
-const defaultUnits = '日'; // 默认的单位
 // ProTable 实例
 const proTable = ref<ProTableInstance>()
 
-
+const getTableList = async (params: any) => {
+  let newParams = JSON.parse(JSON.stringify(params))
+  newParams.searchEndTime = endDate.value
+  newParams.searchBeginTime = startDate.value
+  return getAuditLog(newParams)
+}
 
 
 // 表格配置项
-const columns = reactive<ColumnProps<Sys_Log_Audit.Audit_LogList>[]>([
+const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
   { type: 'selection', fixed: 'left', width: 70 },
+  { type: 'index', fixed: 'left', width: 70, label: '序号' },
   {
-    prop: 'id',
+    prop: 'createBy',
-    label: '序号',
-    width: 70,
-  },
-  {
-    prop: 'create_By',
     label: '操作用户',
     search: { el: 'input' },
     minWidth: 100,
@@ -66,18 +64,17 @@ const columns = reactive<ColumnProps<Sys_Log_Audit.Audit_LogList>[]>([
     minWidth: 120,
   },
   {
-    prop: 'create_Time',
+    prop: 'createTime',
     label: '记录时间',
     minWidth: 180,
     search: {
-      span: 2,
       render: () => {
         return (
             <div class='flx-flex-start'>
               <TimeControl
-            include={includedUnits} 
+                  include={['日', '周', '月', '自定义']}
-            exclude={excludedUnits} 
+                  default={'月'}
-            default={defaultUnits} 
+                  onUpdate-dates={handleDateChange}
               />
             </div>
         )
@@ -108,18 +105,17 @@ const columns = reactive<ColumnProps<Sys_Log_Audit.Audit_LogList>[]>([
     prop: 'operate_Type',
     label: '日志类型',
     width: 100,
-    search: { el: 'select', props: { filterable: true } },
   },
 ])
 
-//选中
+  // 处理日期变化的回调函数
-// 处理选择变化
+const handleDateChange = (startDateTemp: string, endDateTemp: string) => {
-const handleSelectionChange = (selection: Sys_Log_Audit.Audit_LogList[]) => {
+  startDate.value = startDateTemp
-  multipleSelection.value = selection.map(row => row.id) // 更新选中的行
+  endDate.value = endDateTemp
-  
 }
 
 
+
 </script>
 
 <style scoped>

frontend/src/views/machine/devType/components/devTypePopup.vue

@@ -50,9 +50,9 @@
                 <el-select v-model="formContent.reportName"  clearable placeholder="请选择报告模版">
                     <el-option
                         v-for="item in dictStore.getDictData('Report_Template')"
-                        :key="item.code"
+                        :key="item.id"
                         :label="item.name"
-                        :value="item.code"
+                        :value="item.id"
                     />
                 </el-select>
             </el-form-item>

frontend/src/views/machine/devType/index.vue

@@ -96,6 +96,8 @@ import type { ICD } from '@/api/device/interface/icd'
       prop: 'reportName',
       label: '报告模版名称',
       minWidth: 150,
+      enum: dictStore.getDictData('Report_Template'),
+      fieldNames: { label: 'name', value: 'id' },
     },
     {
       prop: 'icd',
@@ -136,18 +138,15 @@ import type { ICD } from '@/api/device/interface/icd'
   }
   
   
-  // 批量删除设备
+  // 批量删除设备类型
   const batchDelete = async (id: string[]) => {
-    const patternId = dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''//获取数据字典中对应的id
     await useHandleData(deleteDevType, id, '删除所选设备类型')
-    
     proTable.value?.clearSelection()
     proTable.value?.getTableList()
   }
   
-  // 删除设备
+  // 删除设备类型
   const handleDelete = async (params: DevType.ResPqDevType) => {
-    const patternId = dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id//获取数据字典中对应的id
     await useHandleData(deleteDevType,  [params.id] , `删除【${params.name}】设备类型`)
     proTable.value?.getTableList()
     

frontend/src/views/machine/device/components/devicePopup.vue

@@ -194,7 +194,7 @@ const disabledDate = (time: Date) => {
       encryptionFlag: 0,
       reCheckNum:0,
       state: 1,
-      factorFlag:0,
+      factorFlag:1,
       icdId:'',
       power:'',
       preinvestmentPlan:''
@@ -224,7 +224,7 @@ const disabledDate = (time: Date) => {
         encryptionFlag: 0,
         reCheckNum:0,
         state: 1,
-        factorFlag:0,
+        factorFlag:1,
         icdId:'',
         power:'',
         preinvestmentPlan:''

frontend/src/views/machine/icd/index.vue

@@ -29,26 +29,21 @@
   </template>
   
   <script setup lang='tsx' name='useRole'>
-  import TimeControl from '@/components/TimeControl/index.vue'
   import { type ICD } from '@/api/device/interface/icd'
   import { useHandleData } from '@/hooks/useHandleData'
-  import { useDownload } from '@/hooks/useDownload'
   import ProTable from '@/components/ProTable/index.vue'
   import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/interface'
   import { CirclePlus, Delete, EditPen, Download, Upload } from '@element-plus/icons-vue'
-  import { useDictStore } from '@/stores/modules/dict'
   import {
     getICDList,
     deleteICD,
   } from '@/api/device/icd/index.ts'
   import { reactive, ref } from 'vue'
-  import { useModeStore, useAppSceneStore } from '@/stores/modules/mode'
   
   defineOptions({
     name: 'devType',
   })
-  const modeStore = useModeStore()
+
-  const dictStore = useDictStore()
   // ProTable 实例
   const proTable = ref<ProTableInstance>()
   const icdPopup = ref()
@@ -101,14 +96,14 @@
   }
   
   
-  // 批量删除设备
+  // 批量删除icd
   const batchDelete = async (id: string[]) => {
     await useHandleData(deleteICD, id, '删除所选icd')
     proTable.value?.clearSelection()
     proTable.value?.getTableList()
   }
   
-  // 删除设备
+  // 删除设备icd
   const handleDelete = async (params: ICD.ResICD) => {
     await useHandleData(deleteICD,  [params.id] , `删除【${params.name}】icd`)
     proTable.value?.getTableList()

frontend/src/views/plan/planList/index.vue

@@ -7,21 +7,22 @@
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader='scope'>
-        <el-button type='primary' :icon='Download' @click='importClick'>导入</el-button>
+        <el-button type='primary'  v-auth.plan="'import'" :icon='Download' @click='importClick'>导入</el-button>
-        <el-button type='primary' :icon='Upload' @click='exportClick'>导出</el-button>
+        <el-button type='primary'  v-auth.plan="'export'" :icon='Upload' @click='exportClick'>导出</el-button>
-        <el-button type='primary' :icon='ScaleToOriginal' :disabled='!(scope.selectedList.length > 1)' @click='combineClick'>
+        <el-button type='primary'  v-auth.plan="'combine'" :icon='ScaleToOriginal' :disabled='!(scope.selectedList.length > 1)' @click='combineClick'>
           合并
         </el-button>
-        <el-button type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
+        <el-button type='primary' v-auth.plan="'add'" :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
-        <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'  @click='batchDelete(scope.selectedListIds)'>
+        <el-button type='danger' v-auth.plan="'delete'" :icon='Delete' plain :disabled='!scope.isSelected'  @click='batchDelete(scope.selectedListIds)'>
           删除
         </el-button>
       </template>
       <!-- 表格操作 -->
       <template #operation='scope'>
-        <el-button type='primary' link :icon='EditPen' @click="openDialog('edit',scope.row)">编辑</el-button>
+        <el-button type='primary' v-auth.plan="'edit'" link :icon='EditPen' @click="openDialog('edit',scope.row)">编辑</el-button>
-        <el-button type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
+        <el-button type='primary' v-auth.plan="'delete'" link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
         <!-- <el-button type='primary' link :icon='List' @click='showDeviceOpen(scope.row)'>设备绑定</el-button> -->
+        <el-button type='primary' v-auth.plan="'analysis'" link :icon='List' @click='statisticalAnalysis(scope.row)'>统计分析</el-button>
       </template>
     </ProTable>
   </div>
@@ -35,6 +36,8 @@
     <!-- 查看设备绑定
     <DevTransfer :refresh-table='proTable?.getTableList' ref='devTransferPopup'/> -->
     <ImportExcel ref='deviceImportExcel' />
+
+
 </template>
 
 <script setup lang='tsx' name='useProTable'>
@@ -63,7 +66,9 @@ import { dictTestState,dictReportState,dictResult } from '@/api/plan/planData.ts
 import {getTestSourceById} from '@/api/device/testSource/index'
 import ImportExcel from "@/components/ImportExcel/index.vue";
 import {useDownload} from "@/hooks/useDownload";
-import {exportPqDev} from "@/api/device/device";
+import {getTestConfig } from '@/api/system/base/index'
+import {type  Base } from '@/api/system/base/interface'
+import { getBoundPqDevList } from '@/api/plan/plan.ts'
 
 // defineOptions({
 // name: 'planList'
@@ -104,7 +109,6 @@ const dataSourceType = computed(() => {
 })
 
 
-
 // 表格配置项
 const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
   { type: 'selection', fixed: 'left', width: 70 },
@@ -253,14 +257,9 @@ const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
     },
   },
 
-  { prop: 'operation', label: '操作', fixed: 'right', width: 200 },
+  { prop: 'operation', label: '操作', fixed: 'right', width: 300 },
 ])
 
-const handleSourceClicked = (id: string) => {
- 
-};
-
-
 
 function isVisible(row: Plan.ReqPlan) {
     if(!row.hasOwnProperty('sourceName') || !Array.isArray(row.sourceName)){
@@ -298,7 +297,6 @@ function showTestScript(row: string) {
   
 }
 
-
 function handleFiles(event: Event) {
   const target = event.target as HTMLInputElement
   const files = target.files
@@ -371,9 +369,6 @@ const combineClick = () => {
       })
 }
 
-
-
-    
 // 打开 drawer(新增、编辑)
 const openDialog = (titleType: string, row: Partial<Plan.ReqPlan> = {}) => {
   planPopup.value?.open(titleType, row,modeStore.currentMode)
@@ -397,6 +392,44 @@ const showDeviceOpen = (row: Partial<Plan.ReqPlan> = {}) => {
   devTransferPopup.value.open(row)
 }
 
+const myDict = new Map<string, any[]>();
+
+// 引用图表容器
+const chartContainer = ref<HTMLElement | null>(null);
+let myChart: echarts.ECharts | null = null;
+const statisticalAnalysis = async (row: Partial<Plan.ReqPlan> = {}) => {
+  //   const response = await getTestConfig() as unknown as  Base.ResTestConfig
+  //   const maxTime= response.data.maxTime//检测最大次数
+  //   const dev = await getBoundPqDevList({ 'planId': row.id })
+  //   for (let i = 0; i <= maxTime; i++) {
+  //     dev.data.forEach((item: any) => {
+  //     if(item.reCheckNum === i){
+  //       // 向已有的数组中添加元素
+  //       if (myDict.has(i.toString())) {
+  //         myDict.get(i.toString())?.push(item.name);
+  //       }else{
+  //         myDict.set(i.toString(), [item.name]);
+  //       }
+  //     }
+        
+  //     })
+  //   }
+
+  //   for (let i = 0; i <= maxTime; i++) {
+  //     if (myDict.has(i.toString())) {
+  //     const array = myDict.get(i.toString());
+  //     if (array) {
+  //       for (const value of array) {
+  //         console.log(i + '---'+value);
+  //       }
+  //     }
+     
+  //   }
+    
+  // }
+}
+
+
 </script>
 
 <style scoped>