王二提交

website/src/components/ghcgscygl/cgsh/fileview.vue

@@ -20,11 +20,12 @@
       </div>
       <!-- pdf -->
       <div class="pdf max-box" v-if="['pdf'].includes(fileView.fileHZM)">
-        <a
+        <iframe
+          :src="fileView.filePath"
+          ref="myIframe"
           class="media max-box"
           style="height: 100%; width: 100% !important"
-          :href="fileView.filePath"
-        ></a>
+        ></iframe>
       </div>
     </div>
   </div>
@@ -53,11 +54,21 @@ export default {
       (count) => {
         nextTick(() => {
           setTimeout(() => {
-            if (count.filePath && document.getElementsByClassName("pdf")[0]) {
-              document.getElementsByClassName("pdf")[0].children[0].src =
-                count.filePath;
-              filefun();
-            }
+            console.log("afdsadf");
+            console.log(count);
+            // if (count.filePath && document.getElementsByClassName("pdf")[0]) {
+            //   document.getElementsByClassName(
+            //     "pdf",
+            //   )[0].children[0].children[0].src = ""; // 先清空src
+            //   setTimeout(() => {
+            //     document.getElementsByClassName(
+            //       "pdf",
+            //     )[0].children[0].children[0].src = count.filePath; // 延迟重新赋值
+            //   }, 100);
+            //   // document.getElementsByClassName("pdf")[0].children[0].src =
+            //   //   count.filePath;
+            //   filefun();
+            // }
           }, 100);
         });
       },

website/src/components/ghcgscygl/cgsh/treeList.vue

@@ -12,7 +12,7 @@
       class="margin-top-10 margin-bottom-10 padding-left-10 padding-right-10"
     >
       <el-input
-        placeholder="输入关键字进行过滤"
+        placeholder="输入关键字过滤"
         v-model="filterText"
         class="input"
         suffix-icon="Search"
@@ -118,6 +118,7 @@ export default {
       },
       // 选中矢量数据进行切片渲染
       changeCheckbox(data) {
+        console.log("changeCheckbox");
         var lay = arcMap.getLayerById(data.id);
         if (data.checked) {
           data.checked = false;
@@ -134,10 +135,12 @@ export default {
       },
       // 目录树复选框选中事件监听回调
       handleCheckChange(item, checked, self) {
+        console.log("handleCheckChange");
         xmcg.changeCheckbox(item);
       },
       // 鼠标左击事件
       handleLeftclick(data) {
+        console.log("handleLeftclick");
         if (data.isparent || data.isVectorLayer) {
           return;
         }
@@ -145,6 +148,7 @@ export default {
       },
       // pdf/图片可预览，其余附件文件暂定先下载
       setfileview(obj) {
+        console.log("setfileview");
         xmcg.act_item = obj.id;
         // parent.emit("update:tableView", { is_open: false });
         // parent.emit("update:fileView", { is_open: false });
@@ -155,7 +159,14 @@ export default {
           (obj.filepath.indexOf("/") == 0
             ? obj.filepath.substr(1)
             : obj.filepath);
-        if (["pdf", "jpg", "png", "jpeg"].includes(hzm)) {
+        if (["pdf"].includes(hzm)) {
+          parent.emit("update:tableView", { is_open: false });
+          parent.emit("update:fileView", {
+            filePath: filePath,
+            fileHZM: hzm,
+            is_open: true,
+          });
+        } else if (["jpg", "png", "jpeg"].includes(hzm)) {
           parent.emit("update:tableView", { is_open: false });
           parent.emit("update:fileView", {
             filePath: filePath,

website/src/components/ghss/fzxmxz/lsjl.vue

@@ -12,6 +12,17 @@
             @input="changeForm"
           ></el-input>
         </el-form-item>
+        <el-form-item label="任务来源:">
+          <el-select
+            v-model="pageObj.rwly"
+            placeholder="请选择"
+            @change="changeForm"
+            style="width: 100%"
+          >
+            <el-option label="一张图系统" value="Web"></el-option>
+            <el-option label="策划项目" value="OpenAPI"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="选择日期:" prop="name" class="label-style">
           <el-date-picker
             v-model="pageObj.sj"
@@ -191,6 +202,7 @@ export default {
     const parent = { ...context };
     const tpwjxm = reactive({
       pageObj: {
+        rwly: "Web",
         page: 1,
         total: 0,
         kssj: "",
@@ -200,7 +212,10 @@ export default {
         limit: 10,
         allpage: 0,
       },
-      defaultTime1: [new Date(2023, 1, 1, 0, 0, 0),new Date(2023, 2, 1, 23, 59, 59)], // '00:00:00', '23:59:59'
+      defaultTime1: [
+        new Date(2023, 1, 1, 0, 0, 0),
+        new Date(2023, 2, 1, 23, 59, 59),
+      ], // '00:00:00', '23:59:59'
       data: [],
       report(item) {
         window.open(item.fxbg.replace(".docx", ".pdf"), "_blank");
@@ -213,7 +228,7 @@ export default {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning",
-          }
+          },
         )
           .then(() => {
             Delect({ bsm: item.bsm }).then((res) => {
@@ -315,11 +330,11 @@ export default {
       () => prop.rzBsm,
       (newValue, oldValue) => {
         tpwjxm.changeForm();
-      }
+      },
     );
     onMounted(() => {
       tpwjxm.getData();
-      console.log(new Date())
+      console.log(new Date());
     });
     return { ...toRefs(tpwjxm) };
   },

website/src/components/ghss/xmhgfx/lsjl.vue

@@ -12,6 +12,17 @@
             @input="changeForm"
           ></el-input>
         </el-form-item>
+        <el-form-item label="任务来源:">
+          <el-select
+            v-model="pageObj.rwly"
+            placeholder="请选择"
+            @change="changeForm"
+            style="width: 100%"
+          >
+            <el-option label="一张图系统" value="Web"></el-option>
+            <el-option label="策划项目" value="OpenAPI"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="选择日期:" prop="name" class="label-style">
           <el-date-picker
             v-model="pageObj.sj"
@@ -39,8 +50,9 @@
             <div class="title-item font-bold line-35">
               {{ item.xmmc }}
             </div>
-            <div style="color: #777">项目类型：{{ item.xmlx }}</div>
+            <!-- <div style="color: #777">项目类型：{{ item.xmlx }}</div> -->
             <div style="color: #777">建设单位：{{ item.jsdw }}</div>
+            <div style="color: #777">创建时间：{{ item.cjsj }}</div>
             <div
               class="title-item margin-top-5 flex-box align-center justify-between"
             >
@@ -186,6 +198,7 @@ export default {
     const tpwjxm = reactive({
       pageObj: {
         page: 1,
+        rwly: "Web",
         total: 0,
         kssj: "",
         sj: [],

website/vite.config.js

@@ -54,48 +54,48 @@ export default defineConfig(({ mode, command }) => {
             proxy: {
                 "/dev-api": {
                     // target: 'http://localhost:8080',
-                    target: "http://192.168.100.252:8080",
+                    target: "http://192.168.60.20:8080",
                     changeOrigin: true,
                     rewrite: (p) => p.replace(/^\/dev-api/, ""),
                 },
                 "/api": {
                     // target: 'http://localhost:5000',
-                    target: "http://192.168.100.252:5000",
+                    target: "http://192.168.60.20:5000",
                     ws: false,
                     changeOrigin: true,
                 },
                 "/files": {
-                    target: "http://192.168.100.252:9201",
+                    target: "http://192.168.60.20:9201",
                     ws: false,
                     changeOrigin: true,
                     // rewrite: (p) => p.replace(/^\/files/, '')
                 },
                 "/file": {
-                    target: "http://192.168.100.252:8080",
+                    target: "http://192.168.60.20:8080",
                     ws: false,
                     changeOrigin: true,
                     // rewrite: (p) => p.replace(/^\/files/, '')
                 },
                 "/ghfile": {
-                    target: "http://192.168.100.252:8080",
+                    target: "http://192.168.60.20:8080",
                     ws: false,
                     changeOrigin: true,
                     // rewrite: (p) => p.replace(/^\/files/, '')
                 },
                 // 现场市级arcgiserver服务器ip
                 "/arcgis": {
-                    target: "http://192.168.100.252:6080",
+                    target: "http://192.168.60.20:6080",
                     ws: false,
                     changeOrigin: true,
                 },
                 "/geoserver": {
-                    target: "http://192.168.100.252:8080",
+                    target: "http://192.168.60.20:8080",
                     ws: false,
                     changeOrigin: true,
                 },
                 // 现场旗县arcgisserver服务器ip
                 "/qx-arc-server": {
-                    target: "http://192.168.100.252:6080",
+                    target: "http://192.168.60.20:6080",
                     ws: false,
                     changeOrigin: true,
                     rewrite: (path) => path.replace(/^\/qx-arc-server/, '')