diff --git a/.env.development b/.env.development index dbe6e9a..68365f3 100644 --- a/.env.development +++ b/.env.development @@ -10,6 +10,7 @@ VITE_GLOB_API_URL=http://192.168.10.104:9020 # File upload address, optional +# VITE_GLOB_UPLOAD_URL=http://192.168.10.104:9011 VITE_GLOB_UPLOAD_URL=http://60.213.14.14:6070 # Interface prefix diff --git a/src/api/monitor/index.ts b/src/api/monitor/index.ts index 3453123..29b3f7c 100644 --- a/src/api/monitor/index.ts +++ b/src/api/monitor/index.ts @@ -31,6 +31,8 @@ enum Api { PicListTask = '/api/DroneShpImageexif/ListTask', // 图片上传,创建任务 PicAddTask = '/api/DroneShpImageexif/AddTask', + // 图片上传 + AddImageexif = '/api/DroneShpImageexif/AddImageexif', } /** @@ -90,3 +92,10 @@ export function addPicTask(params) { params, }); } + +export function addImageexif(params) { + return defHttp.post({ + url: Api.AddImageexif, + params, + }); +} diff --git a/src/views/demo/monitor/caselist/index.vue b/src/views/demo/monitor/caselist/index.vue index ac238ff..bfbdf90 100644 --- a/src/views/demo/monitor/caselist/index.vue +++ b/src/views/demo/monitor/caselist/index.vue @@ -48,8 +48,9 @@ columns, rowKey: 'id', formConfig: { - labelWidth: 120, + labelWidth: 80, schemas: searchFormSchema, + showAdvancedButton: false, }, useSearchForm: true, showTableSetting: true, diff --git a/src/views/demo/monitor/caselist/list.data.ts b/src/views/demo/monitor/caselist/list.data.ts index dddfd9c..d12bb79 100644 --- a/src/views/demo/monitor/caselist/list.data.ts +++ b/src/views/demo/monitor/caselist/list.data.ts @@ -100,18 +100,29 @@ export const searchFormSchema: FormSchema[] = [ component: 'Input', label: '案件编号', colProps: { span: 4 }, - componentProps: { - placeholder: '案件编号', - }, ifShow: false, }, + { + field: 'is_intact', + component: 'Select', + label: '案件状态', + colProps: { span: 4 }, + defaultValue: 1, + componentProps: { + options: [ + { label: '未判读', value: 0, key: '0' }, + { label: '已提交', value: 1, key: '1' }, + { label: '已关闭', value: 99, key: '99' }, + { label: '全部', value: null, key: '' }, + ], + }, + }, { field: 'is_drawback', component: 'Select', label: '新增退回', colProps: { span: 4 }, componentProps: { - placeholder: '新增退回', options: [ { label: '新增', value: 0, key: '0' }, { label: '退回', value: 1, key: '1' }, @@ -168,7 +179,6 @@ export const searchFormSchema: FormSchema[] = [ colProps: { span: 4 }, label: '现场状况', componentProps: { - placeholder: '现场状况', options: [ { value: 0, label: '合法' }, { value: 1, label: '违法' }, @@ -181,36 +191,24 @@ export const searchFormSchema: FormSchema[] = [ component: 'Input', label: '案件编号', colProps: { span: 4 }, - componentProps: { - placeholder: '案件编号', - }, }, { field: 'key', component: 'Input', label: '关键字', colProps: { span: 4 }, - componentProps: { - placeholder: '请输入关键字', - }, }, { field: 'identification_user', label: '判读人姓名', component: 'Input', colProps: { span: 4 }, - componentProps: { - placeholder: '判读人姓名', - }, }, { field: 'deal_username', component: 'Input', label: '处理人姓名', colProps: { span: 4 }, - componentProps: { - placeholder: '处理人姓名', - }, }, { field: '[report_start_time, report_end_time]', @@ -220,6 +218,6 @@ export const searchFormSchema: FormSchema[] = [ format: 'YYYY-MM-DD', placeholder: ['开始日期', '结束日期'], }, - colProps: { span: 8 }, + colProps: { span: 6 }, }, ]; diff --git a/src/views/demo/monitor/interpretation/index.vue b/src/views/demo/monitor/interpretation/index.vue index 7748ed9..3c3da5e 100644 --- a/src/views/demo/monitor/interpretation/index.vue +++ b/src/views/demo/monitor/interpretation/index.vue @@ -4,7 +4,7 @@
- + - + diff --git a/src/views/demo/monitor/interpretation/src/interpret.vue b/src/views/demo/monitor/interpretation/src/interpret.vue index 2dacf33..30d5c20 100644 --- a/src/views/demo/monitor/interpretation/src/interpret.vue +++ b/src/views/demo/monitor/interpretation/src/interpret.vue @@ -165,10 +165,10 @@ }); } async function imgApi(file, progress) { - const data: any = await uploadApi(file, progress); - if (data.result.length > 0) { + const obj: any = await uploadApi(file, progress); + if (obj.data.result.length > 0) { fileList.value.push(file); - filSuccessList.value.push(data.data.result[0]); + filSuccessList.value.push(obj.data.result[0]); } } function handleRemove(file) { diff --git a/src/views/demo/monitor/uploadpictures/index.vue b/src/views/demo/monitor/uploadpictures/index.vue index 48715c1..dea3073 100644 --- a/src/views/demo/monitor/uploadpictures/index.vue +++ b/src/views/demo/monitor/uploadpictures/index.vue @@ -19,25 +19,38 @@ + + +
+ diff --git a/src/views/demo/monitor/uploadpictures/src/taskModel.vue b/src/views/demo/monitor/uploadpictures/src/taskModel.vue index d3b16ce..50e6143 100644 --- a/src/views/demo/monitor/uploadpictures/src/taskModel.vue +++ b/src/views/demo/monitor/uploadpictures/src/taskModel.vue @@ -1,53 +1,47 @@ - - \ No newline at end of file + } +