Merge branch 'Lvtianfang' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/LiaoNingDangAn

src/views/index.vue

@@ -47,7 +47,7 @@ export default {
       // )[0].children;
       // return staticRouter;
       // return this.$store.state.myselfPermission.routerList;
-      return this.$router.options.routes[5].children;
+      return this.$router.options.routes[5].children.slice(0, -1);
     },
   },
   created() {},

src/views/productsMsg/components/productInfo.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="ifram-view" :style="iframViewStyle">
     <!-- <span>!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</span> -->
-    <iframe src="https://dev-mssm-liaoning.imian.org.cn/ggfw/#/firmContent/drugInfo" frameborder="0" style="width: 100%;height: 100%;"></iframe>
+    <!-- <iframe src="https://dev-mssm-liaoning.imian.org.cn/ggfw/#/firmContent/drugInfo" frameborder="0" style="width: 100%;height: 100%;"></iframe> -->
+    <iframe src="http://localhost:81/#/firmContent/drugInfo" frameborder="0" style="width: 100%;height: 100%;"></iframe>
   </div>
 </template>
 <script>

src/views/productsMsg/index.vue

@@ -372,7 +372,7 @@
         .task-name {
           display: flex;
           align-items: center;
-          margin-right: 200px;
+          margin-right: 100px;
           .task-name-text {
             font-size: 16px;
             font-family: Source Han Sans CN;
@@ -385,11 +385,12 @@
             // margin-right: vw(10);
           }
           .task-input {
-            width: 251px;
+            width: 351px;
             height: 32px;
             ::v-deep .el-input {
-              width: 351px;
+              width: 351px !important;
               height: 32px;
+              margin-left: 0 !important;
             }
             ::v-deep .el-input__inner {
               width: 100%;
@@ -397,7 +398,6 @@
               font-size: 16px;
               font-family: Source Han Sans CN;
               font-weight: 400;
-              // color: #B1B6BF;
               line-height: 50px;
               padding-left: 15px;
             }
@@ -420,8 +420,6 @@
             font-family: Source Han Sans CN;
             font-weight: 400;
             color: #6a6c6f;
-            // line-height: 50px;
-            // margin-right: vw(10);
           }
         }
       }