Merge remote-tracking branch 'origin/master'

src/api/modules/data-fill/wbs.js

@@ -374,4 +374,12 @@ export default {
             params: form,
         }, msg)
     },
+    //获取图纸
+    async getTreeDrawings(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-business/contractTreeDrawings/getTreeDrawings',
+            method: 'get',
+            params: form,
+        }, msg)
+    },
 }

src/views/data-fill/wbs.vue

@@ -277,7 +277,8 @@
             widths="380px" @close="drawingsClose"
         >
             <div class="hc-image-preview-view">
-                <el-image-viewer :url-list="[nodeDataInfo.fileUrl]" />
+                <!-- <el-image-viewer :url-list="[nodeDataInfo.fileUrl]" /> -->
+                <el-image-viewer :url-list="drawList" />
             </div>
         </HcDragModal>
 
@@ -1523,6 +1524,7 @@ const sortNodeClick = async () => {
 }
 
 //查看图纸
+const drawList = ref([])
 const drawingsShow = ref(false)
 const viewsDrawings = () => {
     const { primaryKeyId, fileUrl } = nodeDataInfo.value
@@ -1532,11 +1534,21 @@ const viewsDrawings = () => {
         window?.$message?.warning('该节点暂未上传图纸')
     } else {
         drawingsShow.value = true
+        getDrawList()
     }
 }
 const drawingsClose = (res) => {
     drawingsShow.value = res
 }
+const getDrawList = async (primaryKeyId)=>{
+    const { error, code, data } = await wbsApi.getTreeDrawings({ primaryKeyId })
+       //判断状态
+       if (!error && code === 200) {
+            drawList.value = getArrValue(data)
+       } else {
+        drawList.value = []
+       }
+}
 
 //设置滚动条位置
 const ListItemScrollRef = ref(null)