Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue

@@ -1,11 +1,11 @@
 <template>
   <Card class="DisposalProcess" title="处置过程">
     <template #title-suffix>
-      <ButtonGradient class="title-button"> 事件解除 </ButtonGradient>
+      <ButtonGradient class="title-button" @click=""> 事件解除 </ButtonGradient>
-      <ButtonGradient class="title-button"> 协同调度 </ButtonGradient>
+      <!-- <ButtonGradient class="title-button"> 协同调度 </ButtonGradient> -->
-      <ButtonGradient class="title-button"> 无需清障 </ButtonGradient>
+      <ButtonGradient class="title-button" @click=""> 无需清障 </ButtonGradient>
       <ButtonGradient class="title-button"> 重要事件上报 </ButtonGradient>
-      <ButtonGradient class="title-button"> 路赔 </ButtonGradient>
+      <!-- <ButtonGradient class="title-button"> 路赔 </ButtonGradient> -->
       <ButtonGradient
         class="title-button special-button"
         @click.native="handleFullHeight"
@@ -66,9 +66,9 @@
       <ButtonGradient class="title-button special-button" @click="onSubmit">
         发送
       </ButtonGradient>
-      <ButtonGradient class="title-button special-button">
+      <!-- <ButtonGradient class="title-button special-button">
         调度预案
-      </ButtonGradient>
+      </ButtonGradient> -->
     </div>
   </Card>
 </template>
@@ -233,8 +233,8 @@ export default {
     },
   },
   async mounted() {
-    // this.getProcessNode();
+    this.getProcessNode();
-    // await this.detailChange("1a91d65cc31f4a9d90122888edb31043");
+    await this.detailChange("1a91d65cc31f4a9d90122888edb31043");
   },
 };
 </script>

ruoyi-ui/vue.config.js

@@ -52,7 +52,7 @@ module.exports = {
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
-        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 
+        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
         // target: `http://10.168.68.42:8087`, //王思祥
         // target: `http://10.168.65.194:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟