Merge branch 'question-alert' into 'dev'

Question alert

See merge request skyeye/skyeye_frontend/skyeye-admin!32

src/views/datamanager/alertformdata/components/common/AlertTable.vue

@@ -140,6 +140,7 @@ onBeforeMount(() => {
 .alert-table-box {
   display: flex;
   flex-direction: column;
+  height: calc(100vh - 350px);
 }
 
 .detail-text {

src/views/datamanager/alertformdata/components/common/QueryForm.vue

@@ -24,7 +24,7 @@
         <el-form-item label="日期：" v-if="!isShowTab">
           <el-date-picker v-model="dateRange" type="daterange" range-separator="~" start-placeholder="开始时间"
             end-placeholder="结束时间" clearable unlink-panels value-format="YYYY-MM-DD HH:mm:ss.SSS"
-            @change="handleDateChange" />
+            :default-time="defaultTime" @change="handleDateChange" />
         </el-form-item>
       </div>
       <div class="btn-group">
@@ -78,10 +78,12 @@ const typeDisable = ref(true);
 const location = { multiple: true };  // 级联选择器（打开多选）
 const workLocation = ref([]);   // 级联选择器，为二维数组（提取workspaceId）
 const dateRange = ref([]);  // 时间段，拆分成startTime/endTime
+const defaultTime = ref<[Date, Date]>([
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1, 23, 59, 59),
+])
 
 const handleSearch = () => {
-  console.log(queryForm);
-
   emits('onSearch', queryForm);
 };
 
@@ -89,6 +91,8 @@ const handleReset = () => {
   typeDisable.value = true;
   workLocation.value = [];
   dateRange.value = [];
+  Reflect.deleteProperty(queryForm, "startTime");
+  Reflect.deleteProperty(queryForm, "endTime");
   formRef.value?.resetFields();
   emits('onReset', queryForm);
 };
@@ -125,7 +129,6 @@ const handleDateChange = () => {
     Reflect.deleteProperty(queryForm, "startTime");
     Reflect.deleteProperty(queryForm, "endTime");
   }
-  console.log(queryForm);
 };
 </script>
 

src/views/datamanager/alertformdata/components/common/QuestionFormBase.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer v-model="visible" title="问题详情" direction="rtl" size="30%" :close-on-click-modal="false"
+    <el-drawer v-model="visible" title="问题编辑" direction="rtl" size="30%" :close-on-click-modal="false"
       @close="handleCancel">
       <el-form ref="formRef" :model="formData">
         <el-form-item label="问题来源：" prop="source" :rules="{ required: true, message: '请完成必填项' }">
@@ -36,7 +36,7 @@
             clearable @change="handleCascaderChange" />
         </el-form-item>
         <el-form-item label="问题时间：" prop="createdAt" :rules="{ required: true, message: '请完成必填项' }">
-          <el-date-picker v-model="formData.createdAt" type="datetime" value-format="YYYY-MM-DD HH:mm:ss.SSS"
+          <el-date-picker v-model="formData.createdAt" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="请选择问题时间" />
         </el-form-item>
         <el-form-item label="问题状态：" prop="issueState" :rules="{ required: true, message: '请完成必填项' }">

src/views/datamanager/alertformdata/components/default/Default.vue

@@ -282,8 +282,9 @@ onBeforeMount(() => {
 }
 
 .table-list {
-  height: calc(100vh - 350px);
-  overflow-y: scroll;
+  flex: 1;
+  // height: calc(100vh - 350px);
+  // overflow-y: scroll;
 
   .action-bar {
     display: flex;

src/views/datamanager/alertformdata/hooks/useWorkLocation.ts

@@ -4,12 +4,10 @@ import { getWorkLocationList } from '@/api/datamanagement/alert'
 type Location = {
   value: number,
   label: string,
-  children: [
-    {
-      value: number,
-      label: string
-    }
-  ]
+  children: {
+    value: number,
+    label: string
+  }[]
 }
 
 export function useWorkLocation() {
@@ -17,18 +15,16 @@ export function useWorkLocation() {
 
   const getLocationOptions = () => {
     getWorkLocationList().then((res) => {
-      res.forEach((item) => {
-        locationOptions.value.push({
+      locationOptions.value = res?.map((item) => {
+        const newChildren = item.workspaceList?.map(x => {
+          return { value: x.workspaceId, label: x.workspaceName }
+        }) || []
+        return {
           value: item.workshopId,
           label: item.workshopName,
-          children: [
-            {
-              value: item.workspaceList[0].workspaceId,
-              label: item.workspaceList[0].workspaceName
-            }
-          ]
-        })
-      })
+          children: newChildren
+        }
+      }) || []
     })
   };