tangning 7 months ago
parent
commit
bb69731309

+ 3 - 1
src/components/viewImg/index.vue

@@ -8,6 +8,7 @@
             showViewer = false;
           }
         "
+        :initial-index="urlindex"
         v-if="showViewer"
         :url-list="initFileList"
       />
@@ -149,7 +150,7 @@ watchEffect(() => {
   }
 });
 
-const url = ref("");
+const urlindex = ref("");
 const showViewer = ref(false);
 const previewList = ref([]);
 
@@ -160,6 +161,7 @@ const showVideoView = (src) => {
   const showImgView = (src) => {
   console.log(src, "showImgView", initFileList.value);
   const fileType = src.substring(src.lastIndexOf(".")).toLowerCase();
+  urlindex.value = initFileList.value.findIndex((item) => item === src);
   console.log(fileType, fileList.value.includes(fileType), "urlFilter");
   if(fileList.value.includes(fileType)){
     window.open(window.location.origin + src);

+ 5 - 4
src/view/abstract/index.vue

@@ -44,11 +44,11 @@
             <el-form-item label="案发时间" required prop="crimeTime">
               <el-date-picker
                 v-model="bindExample.crimeTime"
-                type="date"
+                type="datetime"
                 aria-label="请选择案发时间"
                 placeholder="请选择案发时间"
                 style="width: 100%"
-                value-format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD HH:mm:ss"
               />
             </el-form-item>
 
@@ -140,7 +140,7 @@
           <el-form-item label="指挥中心电话时间">
             <el-date-picker
               v-model="ruleForm.commandTime"
-              type="date"
+              type="datetime"
               placeholder="请选择"
               aria-label="请选择"
               style="width: 100%"
@@ -149,7 +149,7 @@
           <el-form-item label="接警时间">
             <el-date-picker
               v-model="ruleForm.alarmTime"
-              type="date"
+              type="datetime"
               placeholder="请选择"
               aria-label="请选择"
               style="width: 100%"
@@ -333,6 +333,7 @@ const submit = async () => {
     }
     await setExample({...bindExample.value, caseId :caseId.value })
     await getCaseInfo(caseId.value)
+    ElMessage.success("保存成功");
   }else{
     casesaveOrUpDate({...ruleForm.value, caseId :caseId.value })
   }

+ 2 - 0
src/view/case/photos/index.vue

@@ -55,6 +55,7 @@
         <el-button
           @click="handleExport"
           class="opt"
+          v-if="newlist.length"
           :loading="!isSenseLoaded"
           :disabled="!isSenseLoaded"
           >导出</el-button
@@ -153,6 +154,7 @@ function refresh() {
   }
 }
 const changeList = async (list) => {
+  console.log("changeList", list, loadedDrawData.value);
   //同步数据
   if (!loadedDrawData.value) {
     const res = await getCaseImgTagData(caseId.value);

+ 3 - 2
src/view/material/index.vue

@@ -41,7 +41,8 @@
             <div class="list">
               <div class="listItem py-2" v-for="item,index in list.xczp" :key="index">
                 <div class="title1 pb-2">{{item.filesTypeName}}</div>
-                <div class="list2" v-for="item2,index2 in item.childrenList" :key="index2" v-show="item2.caseFilesList?.length">
+                  <viewImg :list="item.caseFilesList || []" @handleItem="handleItems" />
+                  <div class="list2" v-for="item2,index2 in item.childrenList" :key="index2" v-show="item2.caseFilesList?.length">
                   <div class="title2">{{item2.filesTypeName}}</div>
                   <viewImg :list="item2.caseFilesList || []" @handleItem="handleItems" />
                 </div>
@@ -101,7 +102,7 @@
   >
     <div>
       <el-radio-group v-model="radio">
-        <el-radio v-for="item,index in radioList" :key="index" :value="item.num">{{item.title}}</el-radio>
+        <el-radio style="    width: 100%;" v-for="item,index in radioList" :key="index" :value="item.num">{{item.title}}</el-radio>
       </el-radio-group>
     </div>
     <template #footer>

+ 5 - 2
src/view/originalPhoto/addCaseFile.vue

@@ -43,12 +43,12 @@
         :multiple="false"
         drag
         :limit="1"
-        :disabled="!!file"
         :before-upload="upload"
         :file-list="fileList"
         :http-request="uploadNewFile"
         :on-success="handleSuccess"
         :on-preview="previewFile"
+        :on-exceed="handleExceed"
         :accept="accept"
         :before-remove="removeFile"
       >
@@ -142,6 +142,9 @@ const formatDesc = computed(() => {
 const handleSuccess = (option) => {
   console.log('handleSuccess', option);
 }
+const handleExceed = (option) => {
+  ElMessage.error("只能上传1个文件!");
+}
 
 const handleAdd = async () => {
   let fileId =  await addCaseScenes({formats: props.fileInfo?.formats || [".jpg", ".jpeg", ".png", '.mp4']});
@@ -169,7 +172,7 @@ watchEffect(() => {
 defineExpose<QuiskExpose>({
   async submit() {
     let filesTypeId = caseFile.value.filesTypeId && Array.isArray(caseFile.value.filesTypeId)?caseFile.value.filesTypeId.slice(-1):caseFile.value.filesTypeId
-    console.log('filesTypeId', caseFile.value, filesTypeId);
+    console.log('filesTypeId', file.value, filesTypeId);
     if (!file.value && caseFile.value.filesType == 1 || caseFile.value.filesType == 0 && mtkList.value.length == 0) {
       ElMessage.error("请上传文件");
       throw "请上传文件";

+ 1 - 1
src/view/vrmodel/index.vue

@@ -59,7 +59,7 @@ async function geiList() {
 }
 function handlegotoEdit(record) {
   let url = getUrlSrc(record, caseId.value)
-  window.open(url);
+  window.open(url.replace("spg", "epg"));
 }
 function handleAdddyrh(record) {
   let url = `/code/index.html?caseId=${caseId.value}#/fuseEdit/merge`