diff --git a/src/components/MyComponents/Upload/index.vue b/src/components/MyComponents/Upload/index.vue index 8181522..ddad0be 100644 --- a/src/components/MyComponents/Upload/index.vue +++ b/src/components/MyComponents/Upload/index.vue @@ -19,9 +19,7 @@ :before-upload="beforeImgUpload" > - 上传文件 + 上传文件 @@ -108,13 +106,11 @@ const props = defineProps({ showBtn: { type: Boolean, default: false - } + }, }); const actionUrl = computed(() => - props.isImg - ? "/mosty-api/mosty-base/minio/image/upload/id" - : "/mosty-api/mosty-base/minio/file/upload" + props.isImg ? "/mosty-api/mosty-base/minio/image/upload/id" : "/mosty-api/mosty-base/minio/file/upload" ); const emits = defineEmits(["update:modelValue", "handleChange"]); @@ -183,11 +179,11 @@ watch( if (arr && arr.length > 0) { if (!props.sfUrl) { fileList.value = arr.map((el) => { - return { url: `/mosty-api/mosty-base/minio/image/download/` + el }; + return { url: `/mosty-api/mosty-base/minio/image/download/` + el,name:'生活时尚' }; }); } else { fileList.value = arr.map((el) => { - return { url: el }; + return { url: el ,name:'生活时尚'}; }); } } @@ -197,13 +193,12 @@ watch( const handlerSuccess = (res, file) => { - console.log(file,'===========00'); - // file.url = `/mosty-api/mosty-base/minio/image/download/` + res.data; - // fileList.value.push(file); - // let arr = props.modelValue ? props.modelValue : []; - // arr.push(res.data); - // emits("update:modelValue", arr); - // emits("handleChange", props.modelValue); + file.url = `/mosty-api/mosty-base/minio/image/download/` + res.data; + fileList.value.push(file); + let arr = props.modelValue ? props.modelValue : []; + arr.push(res.data); + emits("update:modelValue", arr); + emits("handleChange", props.modelValue); }; const handleExceed = (files, fileList) => { diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/zxsForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/zxsForm.vue index 5ad128a..68e7114 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/zxsForm.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/zxsForm.vue @@ -22,7 +22,7 @@ 上传附件:(可附电子表格、Word文档、图像、音视频文件) - + @@ -108,7 +108,6 @@ onMounted(()=>{ // 初始化数据 const init = (list) => { - fjdz.value = [] tabHeightFn() dialogForm.value = true; diff --git a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue index 2ce96ce..bd1fca4 100644 --- a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue +++ b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue @@ -21,7 +21,7 @@ 上传附件:(可附电子表格、Word文档、图像、音视频文件) - + @@ -127,6 +127,7 @@ const init = (type, row) => { // 根据id查询详情 const getDataById = (id) => { qcckGet({id}, "/mosty-gsxt/qbcj/selectByid").then((res) => { + fjdz.value = res.fjdz ? res.fjdz.split(',') :[]; listQuery.value = res; pageForm.tableData = res.ryList || []; }); diff --git a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue index 95eb662..1e96d51 100644 --- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue +++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue @@ -22,7 +22,7 @@ 上传附件:(可附电子表格、Word文档、图像、音视频文件) - + @@ -127,6 +127,7 @@ const init = (type, row) => { // 根据id查询详情 const getDataById = (id) => { qcckGet({id}, "/mosty-gsxt/qbcj/selectByid").then((res) => { + fjdz.value = res.fjdz ? res.fjdz.split(',') :[]; listQuery.value = res; pageForm.tableData = res.ryList || []; }); diff --git a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue index 8ae9724..43e7923 100644 --- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue +++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue @@ -146,8 +146,8 @@ const pageData = reactive({ { label: "线索名称", prop: "xsMc" }, { label: "线索类型", prop: "xlLx",showSolt:true }, { label: "线索来源", prop: "qbLy",showSolt:true }, - { label: "指向时间", prop: "zxkssj",showSolt:true }, - { label: "上报时间", prop: "sxsbsj" }, + { label: "指向时间", prop: "zxkssj",showSolt:true,showOverflowTooltip:true }, + { label: "上报时间", prop: "sxsbsj",showOverflowTooltip:true }, { label: "指向地点", prop: "zxdz" }, { label: "线索内容", prop: "xsNr"}, { label: "处置状态", prop: "czzt",showSolt: true}, diff --git a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addForm.vue b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addForm.vue index 77d3efc..944f318 100644 --- a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addForm.vue +++ b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addForm.vue @@ -21,7 +21,7 @@ 上传附件:(可附电子表格、Word文档、图像、音视频文件) - + @@ -122,6 +122,7 @@ const init = (type, row) => { // 根据id查询详情 const getDataById = (id) => { qcckGet({id}, "/mosty-gsxt/qbcj/selectByid").then((res) => { + fjdz.value = res.fjdz ? res.fjdz.split(',') :[]; listQuery.value = res; pageForm.tableData = res.ryList || []; }); diff --git a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue index a7e39ca..d94759e 100644 --- a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue +++ b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue @@ -35,6 +35,10 @@ + + {{ row.zxkssj }} 至 + {{ row.zxjssj }} + @@ -79,11 +83,10 @@ const isShowhB = ref() const searchConfiger = ref([ { label: "线索名称", prop: 'xsMc', placeholder: "请输入线索名称", showType: "input" }, { label: "内容关键字", prop: 'xsNr', placeholder: "请输入语义关键字", showType: "input" }, - { label: "线索类型", prop: 'xlLx', placeholder: "请选择线索类型", showType: "select" }, - { label: "线索来源", prop: 'qbLy', placeholder: "请选择线索来源", showType: "select" }, - { label: "线索状态", prop: 'xszt', placeholder: "请选择线索状态", showType: "select" }, - { label: "开始时间", prop: 'zxkssj', placeholder: "请选择开始时间", showType: "date" }, - { label: "结束时间", prop: 'zxjssj', placeholder: "请选择结束时间", showType: "date" }, + { label: "线索类型", prop: 'xlLx', placeholder: "请选择线索类型", showType: "select",options:D_GS_XS_LX }, + { label: "线索来源", prop: 'qbLy', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY }, + { label: "开始时间", prop: 'kssj', placeholder: "请选择开始时间", showType: "date" }, + { label: "结束时间", prop: 'jssj', placeholder: "请选择结束时间", showType: "date" }, { label: "指向地点", prop: 'zxdz', placeholder: "请输入指向地点", showType: "input" }, ]); @@ -111,8 +114,8 @@ const pageData = reactive({ { label: "线索名称", prop: "xsMc" }, { label: "线索类型", prop: "xlLx",showSolt:true }, { label: "线索来源", prop: "qbLy",showSolt:true }, - { label: "开始时间", prop: "zxkssj" }, - { label: "结束时间", prop: "zxjssj" }, + { label: "指向时间", prop: "zxkssj",showSolt:true,showOverflowTooltip:true }, + { label: "上报时间", prop: "sxsbsj",showOverflowTooltip:true }, { label: "指向地点", prop: "zxdz" }, { label: "线索内容", prop: "xsNr"}, { label: "处置状态", prop: "czzt",showSolt: true}, @@ -146,7 +149,7 @@ const changeSize = (val) =>{ } // 获取列表 -const getList = (val) =>{ +const getList = () =>{ pageData.tableConfiger.loading = true; let data = { ...pageData.pageConfiger, ...queryFrom.value }; qcckGet(data,'/mosty-gsxt/qbcj/selectPage').then(res=>{ diff --git a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/addPeo.vue b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/addPeo.vue new file mode 100644 index 0000000..2441ca3 --- /dev/null +++ b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/addPeo.vue @@ -0,0 +1,107 @@ + + + + + + 请选择标签 + + {{ it.bqMc }} + + + + + + + 取消 + 确认 + + + + + + + + + \ No newline at end of file diff --git a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/detail.vue b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/detail.vue index dade19a..f87cbb7 100644 --- a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/detail.vue +++ b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/detail.vue @@ -2,7 +2,8 @@ {{ title }} - + + 保存 关闭 @@ -21,11 +22,11 @@ 上传附件:(可附电子表格、Word文档、图像、音视频文件) - + - 相关人员 + 相关人员 添加人员 {{ it.bqMc }} + + + 编辑 + 删除 + + +