近期提交

website/.env.production

@@ -9,7 +9,7 @@ port = '5000'
 #VITE_APP_BASE_API = 'http://192.168.60.40:8080'
 #VITE_ARC_SERVER_API = 'http://192.168.100.252:6080'
 #通辽部署环境 176
-VITE_APP_BASE_API = 'http://10.255.133.176:8080'
+VITE_APP_BASE_API = 'http://10.255.133.174:8080'
 VITE_ARC_SERVER_API = 'http://10.255.133.174:6080'
 
 #通辽部署环境 174

website/src/components/ghcgscygl/ghcgsb/ztgh/ghcgDialog.vue

@@ -12,6 +12,39 @@
       label-width="150px"
     >
       <el-row>
+        <el-col>
+          <el-form-item
+            label="上传成果包:"
+            prop="file"
+            style="position: relative; font-weight: 600"
+          >
+            <el-input style="width: 90%" autocomplete="off" readonly></el-input>
+            <el-upload
+              action="#"
+              :http-request="addFileToFormData"
+              v-model:file-list="fileList"
+            >
+              <!-- // 去掉边框// 去掉点击按钮后的边框 -->
+              <el-button
+                slot="trigger"
+                type="primary"
+                style="
+                  height: 90%;
+                  padding: 0;
+                  position: absolute;
+                  top: 1px;
+                  right: 45px;
+                  background-color: #fff;
+                  color: #169bd5;
+                  border: none;
+                  outline: none;
+                "
+                @click="upload"
+                >选择</el-button
+              ></el-upload
+            >
+          </el-form-item>
+        </el-col>
         <el-col>
           <el-form-item label="成果名称:" prop="name">
             <el-input
@@ -76,39 +109,6 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col>
-          <el-form-item
-            label="上传成果包:"
-            prop="file"
-            style="position: relative; font-weight: 600"
-          >
-            <el-input style="width: 90%" autocomplete="off" readonly></el-input>
-            <el-upload
-              action="#"
-              :http-request="addFileToFormData"
-              v-model:file-list="fileList"
-            >
-            <!-- // 去掉边框// 去掉点击按钮后的边框 -->
-              <el-button
-                slot="trigger"
-                type="primary"
-                style="
-                  height: 90%;
-                  padding: 0;
-                  position: absolute;
-                  top: 1px;
-                  right: 45px;
-                  background-color: #fff;
-                  color: #169bd5;
-                  border: none; 
-                  outline: none; 
-                "
-                @click="upload"
-                >选择</el-button
-              ></el-upload
-            >
-          </el-form-item>
-        </el-col>
         <el-col>
           <el-form-item label="报批单位:" prop="bpdw">
             <el-input
@@ -206,7 +206,7 @@ export default {
       getXzqdm() {
         GetXzqList().then((res) => {
           ghcgDialog.xzqList = res.data;
-          console.log(ghcgDialog.xzqList,'xzqList');
+          console.log(ghcgDialog.xzqList, "xzqList");
           if (!prop.isCity) {
             const xzq = ghcgDialog.xzqList.find(
               (item) => item.label === store.getters.user.dept.deptName,

website/src/views/ghcgscygl/ghcgsb/Search.vue

@@ -421,11 +421,9 @@ export default {
       },
       upload(row) {
         qxyh.instid = row.instId;
-        if (qxyh.formInline.planType == "1") {
-          qxyh.ztghDialog = true;
-        } else if (qxyh.formInline.planType == "2") {
+        if (qxyh.formInline.planType == "2") {
           qxyh.ghcgscDialog = true;
-        } else if (qxyh.formInline.planType == "3") {
+        } else {
           qxyh.ztghDialog = true;
         }
       },
@@ -484,10 +482,7 @@ export default {
           getLandGetAllTasks(qxyh.formInline).then((res) => {
             qxyh.formInline.total = res.data.total || 999;
             //待办的村庄规划需要检查补正的状态，未补正的可以上传成果包
-            if (
-              qxyh.formInline.planType == 2 ||
-              qxyh.formInline.planType == 3
-            ) {
+            if (qxyh.formInline.planType == 2) {
               getInstIds().then((res2) => {
                 qxyh.instids = res2.data.join(",");
                 qxyh.tableData2 = res.data.records;
@@ -516,10 +511,7 @@ export default {
             qxyh.formInline.current = 1;
             qxyh.formInline.total = res.data.total || 999;
             //待办的村庄规划需要检查补正的状态，未补正的可以上传成果包
-            if (
-              qxyh.formInline.planType == 2 ||
-              qxyh.formInline.planType == 3
-            ) {
+            if (qxyh.formInline.planType == 2) {
               getInstIds().then((res2) => {
                 qxyh.instids = res2.data.join(",");
                 qxyh.tableData2 = res.data.records;
@@ -608,7 +600,6 @@ export default {
 .dialog-footer {
   width: 100%;
   text-align: center;
-  position: absolute;
   bottom: 30px;
 }
 </style>

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/, '')