Explorar o código

fix: 接通首页所有接口,完成模板管理去除是否启用功能

kuanghua liu hai 1 ano
pai
achega
911469b5ad

+ 2 - 2
src/api/home/home-panel.ts

@@ -25,14 +25,14 @@ export type RecordType = {
 /** 面板数据 */
 export const getCount = () => {
   return http.request<CountType>({
-    url: '/dataPreview/getCount',
+    url: '/dataPreview/queryCameraAlgoUserCount',
     method: 'get',
   });
 };
 
 export const getUserRecord = () => {
   return http.request<RecordType>({
-    url: '/userRecord/overview',
+    url: '/admin/userRecord/overview',
     method: 'get',
   });
 };

+ 2 - 3
src/api/home/home.ts

@@ -256,12 +256,11 @@ export type ViolationCount = {
 };
 
 /** 根据用户权限查询违规记录 */
-export const getViolation = (params: ViolationsQueryParam) => {
+export const getViolation = (startDate: string, endDate: string) => {
   return http.request<ViolationCount>(
     {
-      url: '/dataPreview/getViolation',
+      url: `/dataPreview/getViolation?startDate=${startDate}&endDate=${endDate}`,
       method: 'get',
-      params,
     },
     {
       isShowErrorMessage: false,

+ 1 - 1
src/api/template/template.ts

@@ -8,7 +8,7 @@ export interface SceneModule {
   name: string;
   previewImage: string | null | undefined;
   remark: string;
-  isDisabled: number;
+  isDisabled?: number;
   elementIdList?: Array<string>;
   // updatedAt: string,
 }

+ 3 - 2
src/views/dashboard/home/hooks/useHomeInfo.ts

@@ -38,7 +38,7 @@ export function useHomeInfo() {
       endDate: range[1],
       userName: userName.value,
     };
-    getViolation(params).then((res) => {
+    getViolation(params.startDate, params.endDate).then((res) => {
       violationData.value = res;
     });
   };
@@ -48,7 +48,8 @@ export function useHomeInfo() {
   };
 
   onMounted(() => {
-    getSceneData();
+    //场景树不再首页拉取
+    // getSceneData();
 
     const today = formatDay(dayjs());
     getViolationCount([today, today]);

+ 8 - 8
src/views/templateManage/CardCommon.vue

@@ -28,20 +28,20 @@
         添加模板</el-button
       >
       <el-table style="width: 100%" :data="tableData" highlight-current-row>
-        <el-table-column label="模板名称" prop="name" min-width="14%" />
+        <el-table-column label="模板名称" prop="name" min-width="16%" />
         <!-- <el-table-column :label="props.type + `代码`" prop="code" /> -->
-        <el-table-column label="模板编码" prop="code" min-width="14%" />
-        <el-table-column label="看板组件" min-width="14%" />
-        <el-table-column prop="isDisabled" label="状态" min-width="14%">
+        <el-table-column label="模板编码" prop="code" min-width="16%" />
+        <el-table-column label="看板组件" min-width="16%" />
+        <!-- <el-table-column prop="isDisabled" label="状态" min-width="16%">
           <template #default="scope">
             <el-tag v-if="scope.row.isDisabled === 0" type="success">启用</el-tag>
             <el-tag v-else type="danger">禁用</el-tag>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
-        <el-table-column label="创建时间" prop="createdAt" min-width="14%" />
-        <el-table-column label="备注" prop="remark" min-width="16%" />
-        <el-table-column label="操作" min-width="14%">
+        <el-table-column label="创建时间" prop="createdAt" min-width="16%" />
+        <el-table-column label="备注" prop="remark" min-width="20%" />
+        <el-table-column label="操作" min-width="16%">
           <!-- <template #default="scoped">
             <el-popconfirm title="确认要删除吗?" @confirm="deleteTableData(scoped.row)">
               <template #reference>

+ 5 - 5
src/views/templateManage/DrawerCommon.vue

@@ -82,12 +82,12 @@
         <el-switch v-model="form.status" :active-value="0" :inactive-value="1" />
       </el-form-item> -->
 
-        <el-form-item label="状态" label-position="right">
+        <!-- <el-form-item label="状态" label-position="right">
           <el-radio-group v-model="status" aria-label="label position">
             <el-radio-button :value="0">启用</el-radio-button>
             <el-radio-button :value="1">禁用</el-radio-button>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item style="margin-top: 100px">
           <el-button style="margin-left: auto" @click="resetForm(ruleDrawerRef)">重置</el-button>
@@ -143,7 +143,7 @@
     name: '',
     previewImage: null,
     remark: '',
-    isDisabled: 0,
+    // isDisabled: 0,
   });
 
   const status = ref(0); //el-radio不能绑对象,因此把他独立出来
@@ -248,7 +248,7 @@
           dataUpload.value.name = form.value.name;
           dataUpload.value.previewImage = form.value.thumbnail;
           dataUpload.value.remark = form.value.remark;
-          dataUpload.value.isDisabled = status.value;
+          // dataUpload.value.isDisabled = status.value;
           props.addItem(dataUpload.value);
         } else {
           dataUpload.value.id = form.value.id;
@@ -256,7 +256,7 @@
           dataUpload.value.name = form.value.name;
           dataUpload.value.previewImage = form.value.thumbnail;
           dataUpload.value.remark = form.value.remark;
-          dataUpload.value.isDisabled = status.value;
+          // dataUpload.value.isDisabled = status.value;
           props.editItem(dataUpload.value);
         }
       } else {