From 4cae7b89b60956e6c23e4c6e7a9e5a7b76927c53 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 16 十一月 2021 14:02:05 +0800
Subject: [PATCH] 解决冲突

---
 src/api/shuohuang.ts |  215 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 205 insertions(+), 10 deletions(-)

diff --git a/src/api/shuohuang.ts b/src/api/shuohuang.ts
index c2a5273..9f76c70 100644
--- a/src/api/shuohuang.ts
+++ b/src/api/shuohuang.ts
@@ -1,16 +1,211 @@
-import request from "@/scripts/httpRequest";
+import request from '@/scripts/httpRequest'
+import qs from "qs";
+
 
 //鍒濆鍖栨煡璇�
-export const getlstInit = (query:any)=>request({
-    url:'/data/api-c/lkg/findlstA',
-    method:'get',
+export const getlstInit = (query: any) =>
+  request({
+    url: '/data/api-c/lkg/getlstA',
+    method: 'get',
     params: query
-});
-export const getShuohuangDepartTree = ()=>request({
+  })
+export const getlst = (query: any) =>
+  request({
+    url: '/data/api-c/lkg/getlstB',
+    method: 'get',
+    params: query
+  })
+export const getShuohuangDepartTree = () =>
+  request({
     url: '/data/api-c/dept/getlstWithUser',
     method: 'get'
-});
-export const getOrganizeTree = ()=>request({
-    url:'/data/api-c/dept/getlstWithOutUser',
+  })
+export const getOrganizeTree = () =>
+  request({
+    url: '/data/api-c/dept/getlstWithOutUser',
     method: 'get'
-});
+  })
+
+export const updateFollow = (data: any) =>
+  request({
+    url: '/data/api-c/lkg/updateFollow',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+export const getRelatedVideoInfo = (query: any) =>
+  request({
+    url: '/data/api-c/lkg/getRelatedVideo',
+    method: 'get',
+    params: query
+  })
+export const getCarVideos = (query: any) =>
+  request({
+    url: '/data/api-c/lkg/getCarVideos',
+    method: 'get',
+    params: query
+  })
+export const getLabelMap = () =>
+  request({
+    url: '/data/api-c/lkg/getCode',
+    method: 'get'
+  })
+export const delLabel = (data: any) =>
+  request({
+    url: '/data/api-c/lkg/delLable',
+    method: 'post',
+    data
+  })
+export const editLabel = (data: any) =>
+  request({
+    url: '/data/api-c/lkg/addLable',
+    method: 'post',
+    data
+  })
+export const getMemberList = (query: any) =>
+  request({
+    url: '/data/api-c/user/getlst',
+    method: 'get',
+    params: query
+  })
+export const updateUnit = (query: any) =>
+  request({
+    url: '/data/api-c/user/updateUnit',
+    method: 'post',
+    params: query
+  })
+export const addMember = (data: any) =>
+  request({
+    url: '/data/api-c/user/add',
+    method: 'post',
+    data
+  })
+export const updateMemberInfo = (data: any) =>
+  request({
+    url: '/data/api-c/user/update',
+    method: 'post',
+    data
+  })
+export const uploadMemberPic = (data: any) =>
+  request({
+    url: '/data/api-c/user/upload',
+    method: 'post',
+    data
+  })
+export const getMemberByOrg = (query: any) =>
+  request({
+    url: '/data/api-c/user/getUserByDeptID',
+    method: 'get',
+    params: query
+  })
+export const getVideoListBySearch = (query: any) =>
+  request({
+    url: '/data/api-c/lkg/getlstBySearch',
+    method: 'get',
+    params: query
+  })
+export const addToAssignList = (data: any) =>
+  request({
+    url: '/data/api-c/lkg/assignMission',
+    method: 'post',
+    data
+  })
+export const getTaskList = (query: any) =>
+  request({
+    url: '/data/api-c/lkg/getTaskList',
+    method: 'get',
+    params: query
+  })
+export const distributeTask = (data: any) =>
+  request({
+    url: '/data/api-c/lkg/assignMissionEnd',
+    method: 'post',
+    data
+  })
+export const cancelMission = (data: any) =>
+  request({
+    url: '/data/api-c/lkg/cancelMission',
+    method: 'post',
+    data
+  })
+
+export const cancelAssign = (data: any) =>
+  request({
+    url: '/data/api-c/lkg/cancelAssign',
+    method: 'post',
+    data
+  })
+export const uploadDirectory = (data: any) =>
+  request({
+    url: '/data/api-c/user/uploadMulti',
+    method: 'post',
+    data
+  })
+
+export const getTransferRecord = (query: any) => request({
+  url: '/data/api-c/saverecord/getlst',
+  method: 'get',
+  params: query
+})
+
+export const getTransferStatusList = () => request({
+  url: '/data/api-c/saverecord/getStatusList',
+  method: 'get'
+})
+export const addDevice = (data: any) => request({
+  url: '/data/api-c/device/add',
+  method: 'post',
+  data
+})
+export const getDeviceList = () => request({
+  url: '/data/api-c/device/getlst',
+  method: 'get'
+})
+export const getDeviceInfo = (data: any) => request({
+  url: '/data/api-c/slot/getlst',
+  method: 'post',
+  data: data
+})
+
+export const uploadLKG = (data: any) =>
+  request({
+    url: '/data/api-c/lkg/uploadLKGExcel',
+    method: 'post',
+    data
+  })
+
+export const getLKGData = () =>
+  request({
+    url: '/data/api-c/lkg/getLKGData',
+    method: 'get',
+  })
+
+export const delLKGData = (query: any) =>
+  request({
+    url: '/data/api-c/lkg/delLKGData',
+    method: 'get',
+    params: query
+  })
+
+export const getEventVideo = (query: any) => request({
+  url: '/data/api-c/event/getEventClip',
+  method: 'get',
+  params: query
+})
+
+export const getVideoUrl = (query: any) => request({
+  url: '/data/api-c/event/getEventVideo',
+  method: 'get',
+  params: query
+})
+
+export const downloadFile = () => request({
+  url: '/data/api-c/user/downloadExcel',
+  method: 'get',
+  responseType: "blob"
+})
+
+export const getHiddenEventStatistics = (query: any) => request({
+  url: '/data/api-c/index/getHiddenEventStatistics',
+  method: 'get',
+  params: query
+})

--
Gitblit v1.8.0