diff --git a/public/a.json b/public/a.json new file mode 100644 index 0000000..e69de29 diff --git a/public/mp4/1.ts b/public/mp4/1.ts deleted file mode 100644 index 1040290..0000000 Binary files a/public/mp4/1.ts and /dev/null differ diff --git a/src/api/data/petitionComplaint.ts b/src/api/data/petitionComplaint.ts new file mode 100644 index 0000000..baac7b4 --- /dev/null +++ b/src/api/data/petitionComplaint.ts @@ -0,0 +1,22 @@ +import request from "@/api/request"; + +export function importPetitionComplaint(body) { + return request.post({ + url: '/data/petitionComplaint/import', + body + }); +} + +export function listPetitionComplaint(query) { + return request.get({ + url: '/data/petitionComplaint', + query + }); +} + +export function addPetitionComplaint(body, dataUpdateMethod) { + return request.post({ + url: `/data/petitionComplaint/dataUpdateMethod/${dataUpdateMethod}`, + body + }); +} \ No newline at end of file diff --git a/src/api/request.ts b/src/api/request.ts index 4f959df..dd480d2 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,4 +1,4 @@ -import { ElMessageBox } from 'element-plus' + import { getToken, deleteToken } from '@/utils/token' import feedback from '@/utils/feedback' @@ -38,7 +38,7 @@ function del(options: Options) { let isRelogin = false; function ajax(url: string, options: Options) { const headers: Record = { - "Content-Type": "application/json", + "Authorization": getToken() }; let body: string | FormData; @@ -65,9 +65,13 @@ function ajax(url: string, options: Options) { } } if (options?.body) { - if (options.body instanceof String || options.body instanceof FormData) { + if (options.body instanceof FormData) { body = options.body; } else { + headers["Content-Type"] = "application/json" + if (options.body instanceof String) { + body = options.body; + } if (options.body instanceof Array || (options.body instanceof Object && Object.keys(options.body).length > 0)) { body = JSON.stringify(options.body); } @@ -100,7 +104,6 @@ function ajax(url: string, options: Options) { }) } - const request = { get, post, diff --git a/src/api/system/depart.ts b/src/api/system/depart.ts index a014eab..a8983a0 100644 --- a/src/api/system/depart.ts +++ b/src/api/system/depart.ts @@ -7,6 +7,13 @@ export function departTreeList(query) { }); } +export function listDepart(query) { + return request.get({ + url: '/depart/list', + query + }); +} + export function departTree() { return request.get({ url: '/depart/tree' @@ -37,4 +44,11 @@ export function updateDepart(body) { url: '/depart', body }); +} + + +export function delDepart(id) { + return request.del({ + url: `/depart/${id}` + }); } \ No newline at end of file diff --git a/src/api/system/holiday.ts b/src/api/system/holiday.ts new file mode 100644 index 0000000..c745e71 --- /dev/null +++ b/src/api/system/holiday.ts @@ -0,0 +1,7 @@ +import request from "@/api/request"; + +export function listHolidays(year) { + return request.get({ + url: `/holiday/${year}` + }); +} \ No newline at end of file diff --git a/src/api/work/negative.ts b/src/api/work/negative.ts index 583ecb6..654c333 100644 --- a/src/api/work/negative.ts +++ b/src/api/work/negative.ts @@ -34,3 +34,12 @@ export function generateOriginId(problemSourcesCode, businessTypeCode) { url: `/negative/${problemSourcesCode}/${businessTypeCode}/generateOriginId` }); } + + +export function negativeExport(query) { + return request.post({ + url: `/negative/export/excel`, + query + }); +} + diff --git a/src/api/work/negativeTask.ts b/src/api/work/negativeTask.ts new file mode 100644 index 0000000..750bc04 --- /dev/null +++ b/src/api/work/negativeTask.ts @@ -0,0 +1,8 @@ +import request from "@/api/request"; + +export function listNegativeTask(query) { + return request.get({ + url: `/negativeTask`, + query + }); +} \ No newline at end of file diff --git a/src/components/home/work/my-todo.vue b/src/components/home/work/my-todo.vue index ce12366..03fbe06 100644 --- a/src/components/home/work/my-todo.vue +++ b/src/components/home/work/my-todo.vue @@ -24,7 +24,7 @@ class="add-btn" >问题录入问题下发
diff --git a/src/components/negative/add.vue b/src/components/negative/add.vue index 45047fc..5fbe42a 100644 --- a/src/components/negative/add.vue +++ b/src/components/negative/add.vue @@ -155,6 +155,7 @@ item.dictValue === val )[0].dictLabel) " + clearable > @@ -236,10 +236,6 @@ 关联问题涉及单位 @@ -481,6 +477,7 @@ import { TimeLimit, ApprovalFlow, ProblemSources, + ProblemSources_XFTS } from "@/enums/dictEnums"; import feedback from "@/utils/feedback"; import { addNegative, generateOriginId } from "@/api/work/negative"; @@ -514,7 +511,12 @@ watch( ); const formRef = ref(null); async function handleAddNegative() { - await formRef.value.validate(); + try { + await formRef.value.validate(); + } catch(e) { + feedback.msgWarning('请检查输入项') + throw e + } form.value.thingFiles = form.value.thingFiles.filter( (item) => item.filePath ); @@ -575,6 +577,11 @@ function handleSelectInvolveProblem(vals) { }; }); } + +function handleLinkDepart() { + form.value.departId = form.value.involveDepartId + form.value.departName = form.value.involveDepartName +} \ No newline at end of file diff --git a/src/views/data/Gjxf.vue b/src/views/data/Gjxf.vue new file mode 100644 index 0000000..e57ae39 --- /dev/null +++ b/src/views/data/Gjxf.vue @@ -0,0 +1,342 @@ + + + \ No newline at end of file diff --git a/src/views/data/PetitionComplaint.vue b/src/views/data/PetitionComplaintExcel.vue similarity index 100% rename from src/views/data/PetitionComplaint.vue rename to src/views/data/PetitionComplaintExcel.vue diff --git a/src/views/sensitivePerception/ClueData.vue b/src/views/sensitivePerception/ClueData.vue index cadb28e..0c317a7 100644 --- a/src/views/sensitivePerception/ClueData.vue +++ b/src/views/sensitivePerception/ClueData.vue @@ -102,17 +102,17 @@ const query = ref({}); const data = ref([ { - label: "123", + label: "全部", value: 1, children: [ { - label: "123", + label: "模型", value: 3, }, ], }, { - label: "123", + label: "执法监督", value: 2, }, ]); diff --git a/src/views/system/Depart.vue b/src/views/system/Depart.vue index 3b59bfa..09d2bc8 100644 --- a/src/views/system/Depart.vue +++ b/src/views/system/Depart.vue @@ -1,18 +1,7 @@ - 新增单位 -
- -
-
- - - - - - - - - - - + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + +
+ 查询 + 重置 +
+ + + + +
+
+ + + + + + + - - - -
+ + + + + + + +
+ + +
+ + - + -

单位排序号，数字越小越靠前

+

机构排序号，数字越小越靠前

 \ No newline at end of file diff --git a/src/views/system/Holiday.vue b/src/views/system/Holiday.vue index 0ed305c..c49e706 100644 --- a/src/views/system/Holiday.vue +++ b/src/views/system/Holiday.vue @@ -2,20 +2,42 @@
- + + +
- +
-
{{ year }}年{{ month }}月
+
{{ year }}年{{ item.month }}月
-
+
{{ week }}
-
-
{{ item.day }}
+
+
+ {{ day.day }} +
@@ -25,31 +47,31 @@
\ No newline at end of file diff --git a/src/views/work/NegativeTask.vue b/src/views/work/NegativeTask.vue new file mode 100644 index 0000000..9bee1c0 --- /dev/null +++ b/src/views/work/NegativeTask.vue @@ -0,0 +1,141 @@ + + + \ No newline at end of file diff --git a/src/views/work/Query.vue b/src/views/work/Query.vue index 7ec1ad2..3bc4ab1 100644 --- a/src/views/work/Query.vue +++ b/src/views/work/Query.vue @@ -110,11 +110,18 @@
- - - + +
-
- 数据导出 +
+ 数据导出
--> - + @@ -338,7 +368,7 @@ row.processingStatus === ProcessingStatus.COMPLETED ? 'success' - : '' + : 'primary' " v-if="row.processingStatus" >{{ @@ -386,9 +416,10 @@ />