Browse Source

样式修改

lichao 3 năm trước cách đây
mục cha
commit
aa322bb750
3 tập tin đã thay đổi với 74 bổ sung32 xóa
  1. 2 2
      src/views/footer/index.vue
  2. 25 1
      src/views/navigation/navigation.vue
  3. 47 29
      src/views/stock/index.vue

+ 2 - 2
src/views/footer/index.vue

@@ -18,7 +18,7 @@
         <div style="margin-left: 60px">
           <h3>服务平台</h3>
           <ul style="list-style:none;text-align: left;cursor: pointer;margin-left: 50px">
-            <li>供应链平台</li>
+            <li>仓储管理平台</li>
             <li>运输管理平台</li>
             <li>商品管理平台</li>
           </ul>
@@ -36,7 +36,7 @@
     </div>
     <div style="color:#ffffff;font-size: 12px;padding-bottom: 20px">
       <img src="../../assets/icp.png" alt="" height="14px" style="margin-right:2px"> <span>
-<!--      <a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a>-->
+      <a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37020202001621">鲁公网安备 37020202001621号</a>
       <a href="https://beian.miit.gov.cn/">鲁ICP备06017170号</a>  青岛中电国际物流有限公司</span>
 <!--      <span>Copyright © 1996-2017</span>-->
 <!--      <el-divider direction="vertical"></el-divider>-->

+ 25 - 1
src/views/navigation/navigation.vue

@@ -44,6 +44,7 @@
         <el-menu-item index="/coldChain">供应链管理</el-menu-item>
         <el-menu-item index="/railway">中欧铁路物流</el-menu-item>
         <el-menu-item index="/stock">云仓平台</el-menu-item>
+        <el-menu-item @click="smartScreen">数据中心</el-menu-item>
       </el-submenu>
       <el-submenu index="52">
         <template slot="title">联系我们</template>
@@ -68,6 +69,8 @@
 
 <script>
 import Cookies from 'js-cookie'
+import { request } from '../../request/request';
+
 export default {
   name: 'navigation',
   data() {
@@ -108,7 +111,28 @@ export default {
     },
     immediately(){
       this.$router.push('/login')
-    }
+    },
+    smartScreen(){
+      request({
+        url: '/system/user/profile',
+        method: 'get'
+      }).then(res=>{
+        if (res.data.data.userName === 'admin'){
+          request({
+            url: '/system/config/configKey/large.screen',
+            method: 'get'
+          }).then((response) => {
+            if (response.data.msg) {
+              window.open( 'http://119.3.74.195:9527/view/'+ response.data.msg +'?Authorization=' + Cookies.get('TokenKey'))
+            } else {
+              return this.$message.warning('模板开发中')
+            }
+          });
+        }else {
+          this.$message.warning('您无此权限查看面板');
+        }
+      })
+    },
   }
 };
 </script>

+ 47 - 29
src/views/stock/index.vue

@@ -6,6 +6,7 @@
       :inline="true"
       v-show="showSearch"
       label-width="68px"
+      style="margin-top: 8px"
     >
 <!--      <el-form-item label="客户" prop="fCorpid">-->
 <!--        <el-select-->
@@ -155,33 +156,32 @@
         >搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <div class="tabSetting">
-<!--        <el-col :span="1.5">-->
-<!--          <el-button-->
-<!--            type="warning"-->
-<!--            icon="el-icon-download"-->
-<!--            size="mini"-->
-<!--            @click="handleExport"-->
-<!--          >导出</el-button-->
-<!--          >-->
-<!--        </el-col>-->
-        <right-toolbar
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-        ></right-toolbar>
-        <div style="margin: 0 12px">
-          <el-button
-            icon="el-icon-setting"
-            size="mini"
-            circle
-            @click="showSetting = !showSetting"
-          ></el-button>
+      <el-form-item>
+        <div class="tabSetting">
+          <!--        <el-col :span="1.5">-->
+          <!--          <el-button-->
+          <!--            type="warning"-->
+          <!--            icon="el-icon-download"-->
+          <!--            size="mini"-->
+          <!--            @click="handleExport"-->
+          <!--          >导出</el-button-->
+          <!--          >-->
+          <!--        </el-col>-->
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+          <div style="margin: 0 12px">
+            <el-button
+              icon="el-icon-setting"
+              size="mini"
+              circle
+              @click="showSetting = !showSetting"
+            ></el-button>
+          </div>
         </div>
-      </div>
-    </el-row>
+      </el-form-item>
+    </el-form>
     <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px" append-to-body>
       <div>配置排序列数据(拖动调整顺序)</div>
       <div style="margin-left: 17px">
@@ -242,6 +242,7 @@
       ref="table"
       :height="tableHeight"
       :header-cell-style="{background: '#2A328E',color: '#fff'}"
+      style="margin-top: -12px"
     >
       <el-table-column
         type="index"
@@ -527,7 +528,20 @@ export default {
           checked: 0,
           width: 100,
         },
-
+        {
+          surface: "9",
+          label: "fBusinessTypes",
+          name: "产地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "10",
+          label: "fMarks",
+          name: "品质",
+          checked: 0,
+          width: 100,
+        },
         // {
         //   surface: "9",
         //   label: "fTrademodeid",
@@ -940,9 +954,10 @@ export default {
       this.loading = true;
       this.queryParams.fTel = Cookies.get("phone")
       this.queryParams.fTel = decrypt(this.queryParams.fTel)
-      console.log(this.queryParams.fTel)
+      this.queryParams.fTel = String(this.queryParams.fTel)
+      // delete this.queryParams.fTel
       request({
-        url: '/warehouseBusiness/whgenleg/websiteWhGenLegList',
+        url: '/warehouseBusiness/whgenleg/whgenlegList',
         method: 'get',
         params: this.queryParams
       }).then((response) => {
@@ -1139,4 +1154,7 @@ export default {
 /deep/ .el-table__fixed-footer-wrapper {
   background-color: #2A328E;
 }
+::v-deep  .el-form-item {
+  margin-bottom: 10px;
+}
 </style>