进一步完善乌拉特前旗的相关问题

website/src/utils/websocket.js

@@ -58,6 +58,7 @@ export const socket = {
         socket.clientTimeout = setTimeout(() => {
             console.log("socket.websocket.readyState==" + socket.websocket.readyState);
             if (socket.websocket && socket.websocket.readyState == 1) {
+                //if (socket.websocket) {
                 //向后台发送消息进行心跳检测
                 socket.websocket.send("");
                 // socket.websocketState = false;

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

@@ -203,7 +203,7 @@
       v-if="ztghDialog"
       v-model:ghcgscDialog="ztghDialog"
       :isCity="
-        $store.getters.roles.join(',').indexOf('qixian') > -1 ? false : true
+        $store.getters.roles.join(',').indexOf('qixian') > -1 ? false : false
       "
       :instid="instid"
       @refresh="changeForm"
@@ -426,7 +426,7 @@ export default {
           qxyh.ztghDialog = true;
         } else if (qxyh.formInline.planType == "2") {
           qxyh.ghcgscDialog = true;
-        } else if (qxyh.formInline.planType == "3") {
+        } else if (qxyh.formInline.planType == "7") {
           qxyh.ztghDialog = true;
         }
       },

website/src/views/ghcgscygl/ghcgsb/xxgh/Czgh/Qxyh.vue

@@ -45,6 +45,8 @@
           </el-table-column>
           <el-table-column prop="village" label="村庄名称" width="240" align="center" show-overflow-tooltip>
           </el-table-column>
+          <el-table-column prop="instid" label="补正" align="center">
+          </el-table-column>
           <!-- <el-table-column
             prop="county"
             label="所属旗县"
@@ -328,6 +330,8 @@ export default {
       },
       handleChangeFile(file, fileList) {
         debugger
+        qxyh.reportform.file = file.raw;
+        return;
         const reader = new FileReader();
         reader.readAsArrayBuffer(file.raw);
         reader.onload = function () {
@@ -415,7 +419,11 @@ export default {
           socket.websocket.onmessage = qxyh.websocketOnMessage;
           qxyh.reportform.uuid = uuid;
           qxyh.reportform.cglevel = 1;
-          ReportSubmit(qxyh.reportform).then((res) => {
+          let data = new FormData();
+          for(let attr in qxyh.reportform){
+            data.append(attr, qxyh.reportform[attr])
+          }
+          ReportSubmit(data).then((res) => {
             socket.websocketOnClose();
             qxyh.sbjdProgress = false;
             qxyh.editDialogVisible = false;

website/src/views/ghcgscygl/ghcgsb/ztgh/Qxjghcg/Qxyh.vue

@@ -72,6 +72,8 @@
               <el-tag @click="errorLogOpen(scope.row)" v-if="scope.row.fileupload === '2'" type="danger">上传失败</el-tag>
             </template>
           </el-table-column> -->
+          <el-table-column prop="instid" label="补正" align="center">
+          </el-table-column>
           <el-table-column prop="uploadtime" label="上传时间" align="center">
           </el-table-column>
           <el-table-column prop="uploadstatus" label="上报状态" align="center">
@@ -383,6 +385,8 @@ export default {
         qxyh.reportform.file = null;
       },
       handleChangeFile(file, fileList) {
+        qxyh.reportform.file = file.raw;
+        return;
         const reader = new FileReader();
         reader.readAsArrayBuffer(file.raw);
         reader.onload = function () {
@@ -527,7 +531,11 @@ export default {
           socket.websocket.onmessage = qxyh.websocketOnMessage;
           qxyh.reportform.id = qxyh.editId;
           qxyh.reportform.uploadstatus = 1;
-          updateCgInfo(qxyh.reportform).then((res) => {
+          let data = new FormData();
+          for(let attr in qxyh.reportform){
+            data.append(attr, qxyh.reportform[attr])
+          }
+          updateCgInfo(data).then((res) => {
             socket.websocketOnClose();
             qxyh.sbjdProgress = false;
             if (res.success) {