Merge branch 'master' of http://175.27.215.92:3000/yinq/aucma-mes-ui

src/views/board/foaming/index2.vue

@@ -811,10 +811,10 @@ export default {
   background-size: 100% 100%;
   position: absolute;
   transform: translateX(-50%);
-  top: 21%;
+  top: 23%;
   left: 50%;
-  width: 40vw;
+  width: 46vw;
-  height: 20vw;
+  height: 23vw;
 }
 
 .app-container {

src/views/board/week/index.vue

@@ -2891,7 +2891,7 @@ export default {
       this.safeDayHtml = `
     <span style="position: absolute;top: 66%;left: 84%;white-space:nowrap;color: #CBE6F7;font-size: 1.3vw;font-weight:600;transform: translateX(-50%);letter-spacing: 0.3vw">${new Date().getFullYear().toString()}年连续安全生产天数</span>
     <span style="position: absolute;top: 74%;left: 84%;color: #08F580;font-size: 2.5vw;transform: translateX(-50%);letter-spacing: 0.3vw">${today()}<span style="font-size: 0.5vw">天</span> </span>
-    <span style="position: absolute;top: 89%;left: 84%;color: #CBE6F7;font-size: 1vw;transform: translateX(-50%);letter-spacing: 0.3vw">河南电器智能制造中心</span>
+    <span style="position: absolute;top: 89%;left: 84%;color: #CBE6F7;font-size: 1vw;transform: translateX(-50%);letter-spacing: 0.3vw">河南澳柯玛智能制造中心</span>
     `
     },
     curWeek() {

src/views/model/equipment.vue

@@ -31,7 +31,7 @@
     <div class="chart4">
       <div class="title">
         <div class="titleSpan1">排行</div>
-        <div class="titleSpan2">商品名</div>
+        <div class="titleSpan2">产品型号</div>
         <div class="titleSpan3">库存量</div>
       </div>
       <div class="chart4Info">

src/views/model/model.vue

@@ -4,7 +4,7 @@
 
       <div id="container" class="container"></div>
       <div class="titleBg"></div>
-      <div class="headTitle">澳柯玛智能制造中心</div>
+      <div class="headTitle">河南澳柯玛智能制造中心</div>
       \
       <div class="time" id="time">{{ time }}</div>
       <div class="date" id="date">{{ date }}</div>
@@ -21,7 +21,8 @@
         <span>通</span>
         <span>道</span>
       </div>
-      <div class="currentPosition"><span>当前位置</span></div>
+      <div class="currentPosition1" v-if="$route.query.id === '1'"><span>当前位置</span></div>
+      <div class="currentPosition2" v-if="$route.query.id === '2'"><span>当前位置</span></div>
       <div class="tool">
         <el-row>
           <el-col :span="4">
@@ -966,7 +967,7 @@ export default {
   left: 1%;
 }
 
-.currentPosition {
+.currentPosition1 {
   background-image: url("../../assets/model/model/currentPosition.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
@@ -988,6 +989,28 @@ export default {
   }
 }
 
+.currentPosition2 {
+  background-image: url("../../assets/model/model/currentPosition.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  width: 4vw;
+  height: 4vw;
+  position: absolute;
+  top: 35%;
+  left: 47%;
+  transform: translate(-50%, -100%);
+
+  span {
+    position: absolute;
+    top: 18%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    color: #fff;
+    font-size: 0.7vw;
+    white-space: nowrap;
+  }
+}
+
 .time, .date {
   position: absolute;
   font-size: 0.8vw;