wxy %!s(int64=4) %!d(string=hai) anos
pai
achega
3cacf3200a
Modificáronse 4 ficheiros con 123 adicións e 88 borrados
  1. 82 45
      package-lock.json
  2. 31 33
      src/views/company/index.vue
  3. 4 4
      src/views/lunbo/index.vue
  4. 6 6
      src/views/product/productIndex.vue

+ 82 - 45
package-lock.json

@@ -1782,17 +1782,6 @@
             "unique-filename": "^1.1.1"
             "unique-filename": "^1.1.1"
           }
           }
         },
         },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-3.0.0.tgz?cache=0&sync_timestamp=1591687042638&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-3.0.0.tgz",
-          "integrity": "sha1-P3PCv1JlkfV0zEksUeJFY0n4ROQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
         "cliui": {
         "cliui": {
           "version": "6.0.0",
           "version": "6.0.0",
           "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz?cache=0&sync_timestamp=1597606145227&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-6.0.0.tgz",
           "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz?cache=0&sync_timestamp=1597606145227&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-6.0.0.tgz",
@@ -1846,13 +1835,6 @@
             "path-exists": "^4.0.0"
             "path-exists": "^4.0.0"
           }
           }
         },
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
         "is-fullwidth-code-point": {
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "version": "3.0.0",
           "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz",
           "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz",
@@ -1943,16 +1925,6 @@
             "ansi-regex": "^5.0.0"
             "ansi-regex": "^5.0.0"
           }
           }
         },
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1598611878833&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "terser-webpack-plugin": {
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz",
@@ -1970,21 +1942,6 @@
             "webpack-sources": "^1.4.3"
             "webpack-sources": "^1.4.3"
           }
           }
         },
         },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.0.0-beta.6",
-          "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.0.0-beta.6.tgz?cache=0&sync_timestamp=1599617894400&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.0.0-beta.6.tgz",
-          "integrity": "sha1-ab7aUKRHXeIzaaP0eEXFkrO8VBo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@types/mini-css-extract-plugin": "^0.9.1",
-            "chalk": "^3.0.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^1.2.3",
-            "merge-source-map": "^1.1.0",
-            "source-map": "^0.6.1"
-          }
-        },
         "wrap-ansi": {
         "wrap-ansi": {
           "version": "6.2.0",
           "version": "6.2.0",
           "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz",
           "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz",
@@ -7418,8 +7375,8 @@
     },
     },
     "loadsh": {
     "loadsh": {
       "version": "0.0.4",
       "version": "0.0.4",
-      "resolved": "https://registry.npm.taobao.org/loadsh/download/loadsh-0.0.4.tgz",
-      "integrity": "sha1-UxS6vRK7EzFd3gJKTKcHWMVInS0="
+      "resolved": "https://registry.npmjs.org/loadsh/-/loadsh-0.0.4.tgz",
+      "integrity": "sha512-U+wLL8InpfRalWrr+0SuhWgGt10M4OyAk6G8xCYo2rwpiHtxZkWiFpjei0vO463ghW8LPCdhqQxXlMy2qicAEw=="
     },
     },
     "locate-path": {
     "locate-path": {
       "version": "3.0.0",
       "version": "3.0.0",
@@ -11381,6 +11338,86 @@
         }
         }
       }
       }
     },
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.0.0-beta.6",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.6.tgz",
+      "integrity": "sha512-ZhJp7FsSoQkjxp98i2+ECoSQX2G/Gil67Pp9/K/DmoIzAd2/dvQh3rDKtVvSZwM6Pqa8qIoYq/GRHCP348L7QA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@types/mini-css-extract-plugin": "^0.9.1",
+        "chalk": "^3.0.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^1.2.3",
+        "merge-source-map": "^1.1.0",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-meta": {
     "vue-meta": {
       "version": "2.4.0",
       "version": "2.4.0",
       "resolved": "https://registry.npm.taobao.org/vue-meta/download/vue-meta-2.4.0.tgz",
       "resolved": "https://registry.npm.taobao.org/vue-meta/download/vue-meta-2.4.0.tgz",

+ 31 - 33
src/views/company/index.vue

@@ -3,40 +3,38 @@
     <el-row>
     <el-row>
       <el-col :span="24">
       <el-col :span="24">
         <breadcrumb :breadcrumbTitle="this.$route.meta.title"></breadcrumb>
         <breadcrumb :breadcrumbTitle="this.$route.meta.title"></breadcrumb>
-        <el-col :span="24" style="margin:15px 0;text-align:right">
-          <el-button type="primary" size="mini" @click="increase()">添加</el-button>
-        </el-col>
         <el-col :span="24" class="container">
         <el-col :span="24" class="container">
-          <template>
-            <el-table :data="list">
-              <el-table-column prop="company" label="企业名称" width="120" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="engCompany" label="英文名称" width="120" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="brief" label="简介" width="150" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="mobile" label="统一热线" width="120" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="address" label="地址" width="150" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="weixin" label="微信" width="120" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="gzh" label="公众号" width="120" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="weibo" label="微博" width="120" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="beian" label="备案" width="150" show-overflow-tooltip> </el-table-column>
-              <el-table-column fixed="right" label="操作" width="145">
-                <template slot-scope="scope">
-                  <el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
-                  <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-col :span="24" class="page">
-              <el-pagination
-                background
-                @current-change="handleCurrentChange"
-                :current-page="currentPage"
-                layout="total, prev, pager, next, jumper"
-                :total="total"
-                :page-size="pageSize"
-              >
-              </el-pagination>
-            </el-col>
-          </template>
+          <el-col :span="24" style="margin:15px 0;text-align:right">
+            <el-button type="primary" size="mini" @click="increase()">添加</el-button>
+          </el-col>
+          <el-table :data="list" style="width: 100%" border>
+            <el-table-column prop="company" label="企业名称" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="engCompany" label="英文名称" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="brief" label="简介" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="mobile" label="统一热线" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="address" label="地址" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="weixin" label="微信" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="gzh" label="公众号" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="weibo" label="微博" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="beian" label="备案" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column fixed="right" label="操作" align="center" width="145px">
+              <template slot-scope="scope">
+                <el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
+                <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-col :span="24" class="page">
+            <el-pagination
+              background
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              layout="total, prev, pager, next, jumper"
+              :total="total"
+              :page-size="pageSize"
+            >
+            </el-pagination>
+          </el-col>
         </el-col>
         </el-col>
       </el-col>
       </el-col>
     </el-row>
     </el-row>

+ 4 - 4
src/views/lunbo/index.vue

@@ -10,10 +10,10 @@
             <el-button type="primary" size="mini" @click="dialogFormVisible = true">添加</el-button>
             <el-button type="primary" size="mini" @click="dialogFormVisible = true">添加</el-button>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
-            <el-table :data="list" style="width: 100%">
-              <el-table-column prop="name" label="名称" width="180"> </el-table-column>
-              <el-table-column prop="create_time" label="创建时间" width="180"> </el-table-column>
-              <el-table-column label="操作">
+            <el-table :data="list" style="width: 100%" border>
+              <el-table-column prop="name" label="名称" align="center"> </el-table-column>
+              <el-table-column prop="create_time" label="创建时间" align="center"> </el-table-column>
+              <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                   <el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
                   <el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
                   <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
                   <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>

+ 6 - 6
src/views/product/productIndex.vue

@@ -10,12 +10,12 @@
             <el-button type="primary" size="mini" @click="add()">添加</el-button>
             <el-button type="primary" size="mini" @click="add()">添加</el-button>
           </el-col>
           </el-col>
 
 
-          <el-table :data="list">
-            <el-table-column prop="name" label="产品名称" width="120" show-overflow-tooltip> </el-table-column>
-            <el-table-column prop="brief" label="简介" width="150" show-overflow-tooltip> </el-table-column>
-            <el-table-column prop="content" label="内容" width="150" show-overflow-tooltip> </el-table-column>
-            <el-table-column prop="create_time" label="发布时间" width="120" show-overflow-tooltip> </el-table-column>
-            <el-table-column label="操作">
+          <el-table :data="list" style="width: 100%" border>
+            <el-table-column prop="name" label="产品名称" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="brief" label="简介" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="content" label="内容" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="create_time" label="发布时间" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
                 <el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
                 <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
                 <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>