Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/components/report-dialog/main.vue

@@ -151,17 +151,19 @@ export default {
         });
       } else if (name == "国内贸易-库存账.ureport.xml") {
         this.$router.push({
-          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}
-          &code=${this.searchValue.code}
-          &cname=${this.searchValue.cname}
-          &brandItem=${this.searchValue.brandItem}
-          &placeProduction=${this.searchValue.placeProduction}
-          &typeno=${this.searchValue.typeno}
-          &typenoOne=${this.searchValue.typenoOne}
-          &typenoTwo=${this.searchValue.typenoTwo}
-          &stockName=${this.searchValue.stockName}
-          &brand=${this.searchValue.brand}
-          &tenantId=${tenantId}`
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`,
+          query: {
+            code:this.searchValue.code,
+            cname:this.searchValue.cname,
+            brandItem:this.searchValue.brandItem,
+            placeProduction:this.searchValue.placeProduction,
+            typeno:this.searchValue.typeno,
+            typenoOne:this.searchValue.typenoOne,
+            typenoTwo:this.searchValue.typenoTwo,
+            stockName:this.searchValue.stockName,
+            brand:this.searchValue.brand,
+            tenantId:tenantId,
+          }
         });
       } else if (name == "国内贸易-客户确认.ureport.xml") {
         this.$router.push({

src/page/index/tags.vue

@@ -2,9 +2,9 @@
   <div class="avue-tags" v-if="showTag">
     <!-- tag盒子 -->
     <div
-      v-if="contextmenuFlag"
-      class="avue-tags__contentmenu"
-      :style="{ left: contentmenuX + 'px', top: contentmenuY + 'px' }"
+        v-if="contextmenuFlag"
+        class="avue-tags__contentmenu"
+        :style="{ left: contentmenuX + 'px', top: contentmenuY + 'px' }"
     >
       <div class="item" @click="clearCacheTags">
         {{ $t("tagsView.clearCache") }}
@@ -18,38 +18,38 @@
     </div>
     <div style="display:flex;align-items: center;">
       <div
-        class="avue-breadcrumb"
-        :class="[{ 'avue-breadcrumb--active': isCollapse }]"
-        v-if="showCollapse"
+          class="avue-breadcrumb"
+          :class="[{ 'avue-breadcrumb--active': isCollapse }]"
+          v-if="showCollapse"
       >
         <i class="icon-navicon" @click="setCollapse"></i>
       </div>
       <div
-        class="avue-tags__box"
-        :class="{ 'avue-tags__box--close': !website.isFirstPage }"
+          class="avue-tags__box"
+          :class="{ 'avue-tags__box--close': !website.isFirstPage }"
       >
         <el-tabs
-          v-model="active"
-          type="card"
-          @contextmenu.native="handleContextmenu"
-          :closable="tagLen !== 1"
-          @tab-click="openTag"
-          @edit="menuTag"
+            v-model="active"
+            type="card"
+            @contextmenu.native="handleContextmenu"
+            :closable="tagLen !== 1"
+            @tab-click="openTag"
+            @edit="menuTag"
         >
           <el-tab-pane
-            :key="item.value"
-            v-for="item in tagList"
-            :label="generateTitle(item)"
-            :name="item.value"
+              :key="item.value"
+              v-for="item in tagList"
+              :label="generateTitle(item)"
+              :name="item.value"
           >
           </el-tab-pane>
         </el-tabs>
         <div class="avue-tags__menu avue-tags-top-foot">
           <el-tooltip
-            v-if="showColor"
-            effect="dark"
-            :content="$t('navbar.color')"
-            placement="bottom"
+              v-if="showColor"
+              effect="dark"
+              :content="$t('navbar.color')"
+              placement="bottom"
           >
             <top-color></top-color>
           </el-tooltip>
@@ -81,36 +81,36 @@
           </div>
         </el-tooltip> -->
           <el-tooltip
-            effect="dark"
-            :content="$t('navbar.notice')"
-            placement="bottom"
-            style="margin-right:12px"
+              effect="dark"
+              :content="$t('navbar.notice')"
+              placement="bottom"
+              style="margin-right:12px"
           >
             <div class="top-bar__item--show">
               <top-notice></top-notice>
             </div>
           </el-tooltip>
           <el-tooltip
-            effect="dark"
-            :content="$t('navbar.language')"
-            placement="bottom"
+              effect="dark"
+              :content="$t('navbar.language')"
+              placement="bottom"
           >
             <div class="top-bar__item--show">
               <top-lang></top-lang>
             </div>
           </el-tooltip>
           <el-tooltip
-            v-if="showFullScren"
-            effect="dark"
-            :content="
+              v-if="showFullScren"
+              effect="dark"
+              :content="
               isFullScren ? $t('navbar.screenfullF') : $t('navbar.screenfull')
             "
-            placement="bottom"
+              placement="bottom"
           >
             <div>
               <i
-                :class="isFullScren ? 'icon-tuichuquanping' : 'icon-quanping'"
-                @click="handleScreen"
+                  :class="isFullScren ? 'icon-tuichuquanping' : 'icon-quanping'"
+                  @click="handleScreen"
               ></i>
             </div>
           </el-tooltip>
@@ -129,34 +129,41 @@
             <top-theme ref="theme"></top-theme>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="$parent.isSearch = true">{{
-                $t("tagsView.search")
-              }}</el-dropdown-item>
+                  $t("tagsView.search")
+                }}
+              </el-dropdown-item>
               <el-dropdown-item @click.native="openBug">{{
-                $t("navbar.bug")
-              }}</el-dropdown-item>
+                  $t("navbar.bug")
+                }}
+              </el-dropdown-item>
               <el-dropdown-item @click.native="openLock">{{
-                $t("navbar.lock")
-              }}</el-dropdown-item>
+                  $t("navbar.lock")
+                }}
+              </el-dropdown-item>
               <el-dropdown-item @click.native="openTheme">{{
-                $t("navbar.theme")
-              }}</el-dropdown-item>
+                  $t("navbar.theme")
+                }}
+              </el-dropdown-item>
               <el-dropdown-item @click.native="closeOthersTags">{{
-                $t("tagsView.closeOthers")
-              }}</el-dropdown-item>
+                  $t("tagsView.closeOthers")
+                }}
+              </el-dropdown-item>
               <el-dropdown-item @click.native="closeAllTags">{{
-                $t("tagsView.closeAll")
-              }}</el-dropdown-item>
+                  $t("tagsView.closeAll")
+                }}
+              </el-dropdown-item>
               <el-dropdown-item @click.native="clearCacheTags">{{
-                $t("tagsView.clearCache")
-              }}</el-dropdown-item>
+                  $t("tagsView.clearCache")
+                }}
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown>
             <span class="el-dropdown-link">
               <img
-                class="top-bar__img"
-                :src="userInfo.avatar"
-                style="margin-left:8px"
+                  class="top-bar__img"
+                  :src="userInfo.avatar"
+                  style="margin-left:8px"
               />
               <i class="el-icon-arrow-down el-icon--right"></i>
             </span>
@@ -166,11 +173,12 @@
               </el-dropdown-item>
               <el-dropdown-item>
                 <router-link to="/info/index">{{
-                  $t("navbar.userinfo")
-                }}</router-link>
+                    $t("navbar.userinfo")
+                  }}
+                </router-link>
               </el-dropdown-item>
               <el-dropdown-item @click.native="logout" divided
-                >{{ $t("navbar.logOut") }}
+              >{{ $t("navbar.logOut") }}
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -180,16 +188,17 @@
   </div>
 </template>
 <script>
-import { resetRouter } from "@/router/router";
-import { fullscreenToggel, listenfullscreen } from "@/util/util";
-import { mapGetters, mapState } from "vuex";
-import { clearCache } from "@/api/user";
+import {resetRouter} from "@/router/router";
+import {fullscreenToggel, listenfullscreen} from "@/util/util";
+import {mapGetters, mapState} from "vuex";
+import {clearCache} from "@/api/user";
 import topColor from "./top/top-color.vue";
 import topLock from "./top/top-lock";
 import topTheme from "./top/top-theme";
 import topLogs from "./top/top-logs";
 import topLang from "./top/top-lang";
 import topNotice from "./top/top-notice";
+
 export default {
   components: {
     topColor,
@@ -209,7 +218,8 @@ export default {
       data: ""
     };
   },
-  created() {},
+  created() {
+  },
   mounted() {
     this.setActive();
     this.data = this.active;
@@ -258,7 +268,7 @@ export default {
         this.$store.commit("DEL_ALL_DETAIL");
         this.$store.dispatch("LogOut").then(() => {
           resetRouter();
-          this.$router.push({ path: "/login" });
+          this.$router.push({path: "/login"});
         });
       });
     },
@@ -267,8 +277,8 @@ export default {
     },
     generateTitle(item) {
       return this.$router.$avueRouter.generateTitle(
-        item.label,
-        (item.meta || {}).i18n
+          item.label,
+          (item.meta || {}).i18n
       );
     },
     watchContextmenu(event) {
@@ -302,7 +312,7 @@ export default {
     },
     menuTag(value, action) {
       if (action === "remove") {
-        let { tag, key } = this.findTag(value);
+        let {tag, key} = this.findTag(value);
         if (tag.label == "报价(E)") {
           this.$store.commit("OUT_BJ_STATUS");
         }
@@ -397,16 +407,16 @@ export default {
       } else {
         tag = item;
       }
+      console.log(tag)
+      console.log(tag.query);
+      console.log(tag.meta);
+      console.log(this.$router.$avueRouter.getPath({name: tag.label,src: tag.value},tag.meta));
       this.$router.push({
-        path: this.$router.$avueRouter.getPath(
-          {
-            name: tag.label,
-            src: tag.value
-          },
-          tag.meta
-        ),
-        query: tag.query
+        path: this.$router.$avueRouter.getPath({name: tag.label,src: tag.value},tag.meta),
+        // query: tag.query
       });
+
+
       // }).catch(() => {
       //   this.active = this.data
       //   console.log(this.data)
@@ -438,7 +448,7 @@ export default {
           key = index;
         }
       });
-      return { tag: tag, key: key };
+      return {tag: tag, key: key};
     },
     closeAllTags() {
       this.contextmenuFlag = false;

src/styles/demo-center.css

@@ -0,0 +1,432 @@
+html {
+  font-size: 12px;
+}
+.amap-copyright{
+  box-sizing: content-box
+}
+* {
+  box-sizing: border-box
+}
+.input-textarea{
+   color:grey;
+   height:8em;
+   overflow:auto;
+   border-radius:0.4rem;
+   border:1px solid #ced4da;
+   margin-bottom:1rem;
+}
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  line-height: 1.5;
+  font-weight: 300;
+  color: #111213;
+}
+
+hr {
+  margin: 0.5rem 0;
+  box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+  border: 0;
+  border-top: 1px solid rgba(0, 0, 0, .1)
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+label {
+  display: inline-block;
+  margin-bottom: 0.4rem;
+}
+
+label, .btn {
+  margin-left: 0;
+  font-size: 1rem;
+}
+
+button, input, select {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+  overflow: visible;
+  text-transform: none
+}
+
+[type=button]::-moz-focus-inner, [type=reset]::-moz-focus-inner, [type=submit]::-moz-focus-inner, button::-moz-focus-inner {
+  padding: 0;
+  border-style: none;
+}
+
+input[type=checkbox], input[type=radio] {
+  box-sizing: border-box;
+  padding: 0;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 0;
+  margin: 0 0.5rem 0 0;
+}
+
+h4 {
+  font-family: inherit;
+  line-height: 1.8;
+  font-weight: 300;
+  color: inherit;
+  font-size: 1.1rem;
+  margin-top: 0;
+  margin-bottom: .5rem
+}
+
+.btn {
+  display: inline-block;
+  font-weight: 400;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  border: 1px solid transparent;
+  transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+  background-color: transparent;
+  background-image: none;
+  color: #25A5F7;
+  border-color: #25A5F7;
+  padding: .25rem .5rem;
+  line-height: 1.5;
+  border-radius: 1rem;
+  -webkit-appearance: button;
+  cursor:pointer;
+}
+
+.btn:hover {
+  color: #fff;
+  background-color: #25A5F7;
+  border-color: #25A5F7
+}
+
+.btn:hover {
+  text-decoration: none
+}
+
+.input-item {
+  position: relative;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+  -ms-flex-align: center;
+  align-items: center;
+  width: 100%;
+  height: 3rem;
+}
+
+.input-item:last-child {
+  margin-bottom: 0;
+}
+
+.input-item>select, .input-item>input[type=text], .input-item>input[type=date] {
+  position: relative;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  width: 1%;
+  margin-bottom: 0;
+}
+
+.input-item>select:not(:last-child), .input-item>input[type=text]:not(:last-child), .input-item>input[type=date]:not(:last-child) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0
+}
+
+.input-item>select:not(:first-child), .input-item>input[type=text]:not(:first-child), .input-item>input[type=date]:not(:first-child) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0
+}
+
+.input-item-prepend {
+  margin-right: -1px;
+}
+
+.input-item-text, input[type=text],input[type=date], select {
+  height: calc(2.2rem + 2px);
+}
+
+.input-item-text {
+  width: 6rem;
+  text-align: justify;
+  padding: 0.4rem 0.7rem;
+  display: inline-block;
+  text-justify: distribute-all-lines;
+  /*ie6-8*/
+  text-align-last: justify;
+  /* ie9*/
+  -moz-text-align-last: justify;
+  /*ff*/
+  -webkit-text-align-last: justify;
+  /*chrome 20+*/
+  -ms-flex-align: center;
+  align-items: center;
+  margin-bottom: 0;
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #495057;
+  text-align: center;
+  white-space: nowrap;
+  background-color: #e9ecef;
+  border: 1px solid #ced4da;
+  border-radius: .25rem;
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+
+.input-item-text input[type=checkbox], .input-item-text input[type=radio] {
+  margin-top: 0
+}
+
+.input-card {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+  word-wrap: break-word;
+  background-color: #fff;
+  background-clip: border-box;
+  border-radius: .25rem;
+  width: 22rem;
+  border-width: 0;
+  border-radius: 0.4rem;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
+  position: fixed;
+  bottom: 1rem;
+  right: 1rem;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  padding: 0.75rem 1.25rem;
+}
+
+.input-text {
+  line-height: 2rem;
+  margin-right: 2rem;
+}
+
+.info hr {
+  margin-right: 0;
+  margin-left: 0;
+  border-top-color: grey;
+}
+
+.info {
+  padding: .75rem 1.25rem;
+  margin-bottom: 1rem;
+  border-radius: .25rem;
+  position: fixed;
+  top: 1rem;
+  background-color: white;
+  width: auto;
+  min-width: 22rem;
+  border-width: 0;
+  right: 1rem;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
+}
+
+.code {
+  left: 1.5rem;
+  right: 1.5rem;
+  top: 1.5rem;
+  bottom: 1.5rem;
+  overflow: auto;
+  margin-bottom: 0rem;
+}
+
+.code .btn {
+  top: 1rem;
+  position: absolute;
+  right: 1rem;
+}
+
+.code .result {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 0.5rem;
+  padding: 1rem;
+  bottom: 1rem;
+  position: absolute;
+  top: 5.5rem;
+  right: 1rem;
+  left: 1rem;
+  overflow: auto;
+}
+
+.code .status {
+  color: #80adff;
+  display: inline-block;
+  font-size: 14px;
+}
+
+.code h4 {
+  display: inline-block;
+  max-width: 20rem;
+  margin-right: 1rem;
+  margin-bottom: 1rem;
+}
+
+select, input[type=text], input[type=date] {
+  display: inline-block;
+  width: 100%;
+  padding: .375rem 1.75rem .375rem .75rem;
+  line-height: 1.5;
+  color: #495057;
+  vertical-align: middle;
+  background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center;
+  background-size: 8px 10px;
+  border: 1px solid #ced4da;
+  border-radius: .25rem;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none
+}
+
+input[type=text],input[type=date] {
+  background: #fff;
+  padding: .375rem .75rem;
+}
+
+select:focus, input[type=text]:focus, input[type=date]:focus {
+  border-color: #80bdff;
+  outline: 0;
+  box-shadow: 0 0 0 .1rem rgba(128, 189, 255, .1)
+}
+
+.btn:focus {
+  outline: 0;
+  box-shadow: none;
+}
+
+select:focus::-ms-value, input[type=text]:focus::-ms-value,input[type=date]:focus::-ms-value {
+  color: #495057;
+  background-color: #fff
+}
+
+
+/* native toastr */
+.native-toast {
+  position: fixed;
+  background-color: rgba(50, 50, 50, .8);
+  border-radius: 33px;
+  color: white;
+  left: 50%;
+  text-align: center;
+  padding: 6px 12px;
+  opacity: 0;
+  z-index: 99999;
+  transition: transform .25s, opacity .25s, top .25s;
+  box-sizing: border-box;
+}
+
+.native-toast-bottom {
+  bottom: 50px;
+  -ms-transform: translateX(-50%) translateY(50px);
+      transform: translateX(-50%) translateY(50px)
+}
+
+.native-toast-bottom.native-toast-shown {
+  opacity: 1;
+  -ms-transform: translateX(-50%) translateY(0);
+      transform: translateX(-50%) translateY(0);
+}
+
+.native-toast-bottom.native-toast-edge {
+  bottom: 0;
+}
+
+.native-toast-top {
+  top: 50px;
+  -ms-transform: translateX(-50%) translateY(-50px);
+      transform: translateX(-50%) translateY(-50px)
+}
+
+.native-toast-top.native-toast-shown {
+  opacity: 1;
+  -ms-transform: translateX(-50%) translateY(0);
+      transform: translateX(-50%) translateY(0);
+}
+
+.native-toast-top.native-toast-edge {
+  top: 0;
+}
+
+.native-toast-center {
+  top: 0;
+  -ms-transform: translateX(-50%) translateY(-50px);
+      transform: translateX(-50%) translateY(-50px)
+}
+
+.native-toast-center.native-toast-shown {
+  opacity: 1;
+  top: 50%;
+  -ms-transform: translateX(-50%) translateY(-50%);
+      transform: translateX(-50%) translateY(-50%);
+}
+
+.native-toast-edge {
+  border-radius: 0;
+  width: 100%;
+  text-align: left;
+}
+
+@media screen and (min-width: 40rem) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 18rem;
+  }
+}
+
+/*
+  max-width does not seem to work in small screen?
+*/
+
+/*@media screen and (max-width: 768px) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 400px;
+  }
+}
+
+@media screen and (max-width: 468px) {
+  .native-toast:not(.native-toast-edge) {
+    max-width: 300px;
+  }
+}*/
+
+/* types */
+
+.native-toast-error {
+  background-color: #d92727;
+  color: white;
+}
+
+.native-toast-success {
+  background-color: #62a465;
+  color: white;
+}
+
+.native-toast-warning {
+  background-color: #fdaf17;
+  color: white;
+}
+
+.native-toast-info {
+  background-color: #5060ba;
+  color: white;
+}
+
+[class^="native-toast-icon-"] {
+  vertical-align: middle;
+  margin-right: 8px
+}
+
+[class^="native-toast-icon-"] svg {
+  width: 16px;
+  height: 16px;
+}

src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -542,7 +542,7 @@ export default {
       this.queryData(this.detailData.id);
     } else {
       this.form = {
-        type:0
+        type:'正常'
       };
       this.contactsData = [];
     }

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -196,8 +196,7 @@ export default {
 };
 </script>
 
-<style scoped Lang="less">
-@import url('https://a.amap.com/jsapi_demos/static/demo-center/css/demo-center.css');
+<style scoped lang="css" src="../../../../../styles/demo-center.css">
 #container {
   height: 80vh;
   width: 100%;