Merge remote-tracking branch 'origin/dev-ly' into dev-ly

src/main/webapp/HG/BI/HGBI002.jsp

@@ -161,7 +161,7 @@
             </el-header>
             <el-container style="margin-top: 3vh;height: 80vh;">
                 <el-aside style="width: 20vw;height: 80vh;">
-                    <left-manage-cockpit ref="leftmanagecockpit" style="height: 100%" :factory="factory" :datapicker="dataPicker"></left-manage-cockpit>
+                    <left-manage-cockpit ref="leftmanagecockpit" style="height: 100%" :factory="factory" :datapicker="dataPicker" :ctx="ctx"></left-manage-cockpit>
                 </el-aside>
                 <el-main style="padding-bottom: 0;height: 80vh;">
                     <div class="productionMangerBg-img-background" >
@@ -172,7 +172,7 @@
                     </div>
                 </el-main>
                 <el-aside style="width: 23vw;height: 80vh;">
-                    <right-manage-cockpit ref="rightmanagecockpit" :factory="factory" :datapicker="dataPicker"></right-manage-cockpit>
+                    <right-manage-cockpit ref="rightmanagecockpit" :factory="factory" :datapicker="dataPicker" :ctx="ctx"></right-manage-cockpit>
                 </el-aside>
             </el-container>
         </el-container>
@@ -192,6 +192,8 @@
         data() {
             return {
                 date: new Date(),
+
+                ctx:'${ctx}',
                 option: {},
                 option2: {},
                 factory:'',

src/main/webapp/HG/BI/HGBI003.jsp

@@ -163,7 +163,7 @@
             </el-header>
             <el-container style="margin-top: 3vh;height: 80vh;">
                 <el-aside style="width: 40vw;height: 80vh;">
-                    <left-manage-device style="height: 100%"></left-manage-device>
+                    <left-manage-device style="height: 100%" :ctx="ctx"></left-manage-device>
                 </el-aside>
 
                 <el-main style="padding-bottom: 0;height: 80vh;overflow: hidden">
@@ -235,7 +235,7 @@
         data() {
             return {
                 date: new Date(),
-
+                ctx:'${ctx}',
                 option1: {},
                 optionDate1: {},
                 option2: {},
@@ -265,7 +265,6 @@
             this.querySbNo();
             this.setOption();
             this.setOption2();
-
             // var self = this;
             // setTimeout(function() {
             //     self.init();
@@ -307,6 +306,7 @@
                 const day = String(today.getDate()).padStart(2, '0');
                 const formattedDate = year+month+day;
                 this.dataPicker = formattedDate;
+                console.log('ctx',this.ctx)
             },
             getRoleFactory(){
                 let _this = this;

src/main/webapp/HG/BI/components/hipi/001/left-manage-device.vue

@@ -4,39 +4,39 @@
     <div class="content-content-title">原材料库</div>
     <div style="width: 100%;display: flex">
     <div class="content-content-img device-img1" style="margin-left: 3.5vw;margin-right: 3vh">
-      <img src="../../hggp/common/img/device-img1-content.png" class="device-img1-content img" alt/>
+      <img  :src="`${ctx}/common/img/device-img1-content.png`"   class="device-img1-content img" alt/>
       <div class="content-content-title" style="justify-content: flex-start;margin-top: 2.8vh;padding-left: 1vw">型材切割机</div>
     </div>
     <div class="content-content-img device-img2">
-      <img src="../../hggp/common/img/device-img2-content.png" class="device-img2-content img" alt/>
+      <img :src="`${ctx}/common/img/device-img2-content.png`" class="device-img2-content img" alt/>
       <div class="content-content-title" style="justify-content: flex-end;margin-top: 2.8vh;padding-right: 1vw">激光切割机</div>
     </div>
     </div>
     <div style="width: 100%;height: 48vh;display: flex;margin-top: 2vh">
       <div style="width: 50%;height: 100%">
         <div class="content-content-img device-img1" style="width: 79%;margin-left: 3.2vw;">
-          <img src="../../hggp/common/img/device-img3-content.png" class="device-img1-content img" alt/>
+          <img :src="`${ctx}/common/img/device-img3-content.png`" class="device-img1-content img" alt/>
           <div class="content-content-title" style="justify-content: flex-start;margin-top: 2.8vh;padding-left: 1.5vw">组立机</div>
         </div>
         <div style="width: 79%;margin-left: 3.2vw;height: 28vh;margin-top: 2vh">
           <div class="content-device-img img">
             <div class="title-content-device img">成品库</div>
           </div>
-          <img src="../../hggp/common/img/architectureDiagram.png" style="width: 100%;height: 100%" alt/>
+          <img :src="`${ctx}/common/img/architectureDiagram.png`" style="width: 100%;height: 100%" alt/>
         </div>
       </div>
       <div  class="right-device img">
         <div style="width: 100%;height: 30%;display: flex;margin-top: 3vh;">
           <div class="content-content-title" style="width: 40%;">组立机</div>
-          <img src="../../hggp/common/img/device-img3-content.png" class="device-img1-content img" style="margin: 0;" alt/>
+          <img :src="`${ctx}/common/img/device-img3-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
         </div>
         <div style="width: 100%;height: 30%;display: flex;margin-top: 2vh;">
           <div class="content-content-title" style="width: 40%;">埋弧焊机</div>
-          <img src="../../hggp/common/img/device-img4-content.png" class="device-img1-content img" style="margin: 0;" alt/>
+          <img  :src="`${ctx}/common/img/device-img4-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
         </div>
         <div style="width: 100%;height: 30%;display: flex;margin-top: 2vh;">
           <div class="content-content-title" style="width: 40%;">激光焊接机</div>
-          <img src="../../hggp/common/img/device-img5-content.png" class="device-img1-content img" style="margin: 0;" alt/>
+          <img  :src="`${ctx}/common/img/device-img5-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
         </div>
       </div>
     </div>
@@ -45,6 +45,9 @@
 </template>
 <script>
 module.exports = {
+  props:{
+    ctx:String,
+  },
   data(){
     return {
       name: '红安',

src/main/webapp/HG/BI/components/hipi/002/left-manage-cockpit.vue

@@ -11,7 +11,7 @@
              :key="index" style="width: 28%;height: 70%;display: flex;flex-wrap: wrap;justify-content: center;margin-top: 2.5vh"
         >
           <div class="content-main-title">{{ getByProcessSumWtList[item] || 0}}</div>
-          <img src="../../hggp/common/img/production-icon.png" class="production-icon" alt/>
+          <img  :src="`${ctx}/common/img/production-icon.png`" class="production-icon" alt/>
           <div class="content-main-footer">{{ sumWtList[index] }}</div>
         </div>
       </div>
@@ -29,15 +29,15 @@
           <div class="page-content-left" style="position: relative">
             <div class="data-title-span temp"> {{ queryBySunWtList[index] || 0 }}</div>
             <div style="width: 100%;display: flex;" class="temp">
-              <img src="../../hggp/common/img/produce-img.png"  class="produce-img " alt/>
+              <img  :src="`${ctx}/common/img/produce-img.png`" class="produce-img " alt/>
             </div>
             <div class="content-main-footer temp" data-process="组立">{{  queryBySunWtDate[index] }}/ 吨</div>
             <div style="width: 100%;display: flex;" class="temp">
-            <img src="../../hggp/common/img/produce-put.png"  v-if="index < 4" alt/>
+            <img  :src="`${ctx}/common/img/produce-put.png`" v-if="index < 4" alt/>
             </div>
           </div>
           <div style="position: relative;top:-8vh; right: 0;bottom: 0;left: 6.5vw;" v-if="index == 4">
-               <img src="../../hggp/common/img/product-transmission.png" style="width: 4vw;height: 3vh;" alt/>
+               <img  :src="`${ctx}/common/img/product-transmission.png`" style="width: 4vw;height: 3vh;" alt/>
           </div>
 <!--          <div class="page-content-left" style="margin-right: -1vw">-->
 <!--            <div class="data-title-span temp">160</div>-->
@@ -110,6 +110,7 @@ module.exports = {
   props:{
     factory:String,
     datapicker:String,
+    ctx:String,
   },
   data(){
     return {

src/main/webapp/HG/BI/components/hipi/002/right-manage-cockpit.vue

@@ -34,6 +34,7 @@ module.exports = {
   props:{
     factory:String,
     datapicker:String,
+    ctx:String,
   },
   data(){
     return {