tangning 7 月之前
父節點
當前提交
e7e81f8473
共有 5 個文件被更改,包括 33 次插入13 次删除
  1. 3 3
      src/view/case/records/index.vue
  2. 11 4
      src/view/layout/index.vue
  3. 17 4
      src/view/layout/top/index.vue
  4. 1 1
      src/view/material/index.vue
  5. 1 1
      src/view/vrmodel/index.vue

+ 3 - 3
src/view/case/records/index.vue

@@ -57,8 +57,8 @@
         <el-input
           type="textarea"
           :rows="6"
-          v-model="data.klsy"
-          placeholder=""
+          v-model="data.inquestResource"
+          placeholder="报警人:xxx(性别:xxx 电话:xxx)报警称:xxx发生一起:xxx案,现场需勘察。接报后技术科科长:xxx带领技术员:xxx、法医:xxx立即赶赴现场进行勘察."
           style="width: 100%"
         />
       </div>
@@ -486,7 +486,7 @@ const data = reactive({
   times: [], // startTime ,endTime
   address: "", // 勘验地址
   inquestTime: "", //勘验时间
-  klsy: "报警人:xxx(性别:xxx 电话:xxx)报警称:xxx发生一起:xxx案,现场需勘察。接报后技术科科长:xxx带领技术员:xxx、法医:xxx立即赶赴现场进行勘察.", //勘验范围
+  inquestResource: "报警人:xxx(性别:xxx 电话:xxx)报警称:xxx发生一起:xxx案,现场需勘察。接报后技术科科长:xxx带领技术员:xxx、法医:xxx立即赶赴现场进行勘察.", //勘验范围
   protector: {
     name: "",
     unit: "",

+ 11 - 4
src/view/layout/index.vue

@@ -20,12 +20,15 @@
             >
             <div class="poprs sceneList" v-if="sceneList.length">
               <el-dropdown placement="bottom-start" trigger="click" @command="handleCommand">
-                <span class="el-dropdown-link" style="color: #fff">
+                <el-button >
+                  {{sceneListName}}<el-icon class="el-icon--right"><arrow-down /></el-icon>
+                </el-button>
+                <!-- <span class="el-dropdown-link" style="color: #fff">
                   {{sceneListName}}
                   <el-icon class="el-icon--right">
                     <arrow-down />
                   </el-icon>
-                </span>
+                </span> -->
               <template #dropdown>
                 <el-dropdown-menu>
                   <el-dropdown-item v-for="item,index in sceneList" :key="index" :command="item.id">{{ item.name || '多元融合' }}</el-dropdown-item>
@@ -90,11 +93,15 @@ const init = async () => {
 init()
 const qpisceneList = computed(() => getCaseSceneListData(caseId.value as number));
 watch(() => qpisceneList.value, () => {
-  let newqpisceneList = JSON.parse(JSON.stringify(qpisceneList.value))
+  if(!qpisceneList.value instanceof Array){
+    return;
+  }
+  let newqpisceneList = qpisceneList.value && JSON.parse(JSON.stringify(qpisceneList.value)) || []
   if(modeList.value.length){
     newqpisceneList.unshift({ id: -1, type: 99, name: '多元融合' });
   }
-  sceneList.value = [...newqpisceneList]
+  console.log('qpisceneList', qpisceneList.value, newqpisceneList);
+  sceneList.value = qpisceneList.value && [...newqpisceneList] || []
 })
 console.log(sceneList, 'sceneList');
 onMounted(() => {

+ 17 - 4
src/view/layout/top/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="header-top">
-    <div class="title">
-      {{ title }}
-        <div class="edit">编辑</div>
+    <div class="title" >
+      <div class="span" :title="title">{{ title }}</div>
+      <div class="edit" style="white-space: nowrap;text-overflow: ellipsis;">编辑</div>
     </div>
     <div class="oper-btns">
       <el-button style="padding: 5px 10px" type="primary" @click="handlemtk">媒体库</el-button>
@@ -50,7 +50,7 @@ const caseId = computed(() => {
 });
 getCaseInfo(caseId.value)
 // const useCaseStore = getCaseInfoData();
-const title = computed(() => getCaseInfoData().caseTitle);
+const title =  computed(() => getCaseInfoData().caseTitle);
 console.log("useCaseStore", title);
 // const title = ref('')
 // const getInfo = async () => {
@@ -88,4 +88,17 @@ const updatePwdHandler = async () => {
 
 <style lang="scss" scoped>
 @import "./style.scss";
+.header-top{
+  width: 100%;
+}
+.title{
+  // display: inline-block;
+  max-width: calc(50% + 300px);
+  .span{
+  overflow:hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow:ellipsis;
+  }
+}
 </style>

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

@@ -77,7 +77,7 @@
         </div>
         <div class="blList">
           <div class="bllistItem flex justify-between items-center mt-4" v-for="item,index in list.klbj" :key="index">
-            <div>{{item.filesTitle}}</div>
+            <div class="truncate" :title="item.filesTitle">{{item.filesTitle}}</div>
             <el-dropdown @command="(command)=>{handleCommand(command, item)}">
               <el-icon>
                 <MoreFilled />

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

@@ -58,7 +58,7 @@ async function geiList() {
   console.log("res", list.value);
 }
 function handlegotoEdit(record) {
-  let url = getUrlSrc(record, caseId.value)
+  let url = record.type == 2 || record.type == 6 ? `/mega/index.html?m=${record.num}` : `/epg.html?m=${record.num}`
   window.open(url.replace("spg", "epg"));
 }
 function handleAdddyrh(record) {