1 年間前 · 71ebb446ab
--- a/dist.zip
+++ b/dist.zip
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 
				 {
			
 
				-  "name": "perf-web",
			
 
				+  "name": "",
			
 
				   "version": "0.1.0",
			
 
				   "private": true,
			
 
				   "scripts": {
			
--- a/public/index.html
+++ b/public/index.html
@@ -1,28 +1,25 @@
 
				 <!DOCTYPE html>
			
 
				 <html lang="">
			
 
				+  <head>
			
 
				+    <meta charset="utf-8" />
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
			
 
				+    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
			
 
				+    <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
			
 
				 
			
 
				-<head>
			
 
				-  <meta charset="utf-8">
			
 
				-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
			
 
				-  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
			
 
				+    <title>风机运行管理系统</title>
			
 
				+    <script src="./config/config.js"></script>
			
 
				+  </head>
			
 
				 
			
 
				-
			
 
				-
			
 
				-  <title>
			
 
				-    <%= htmlWebpackPlugin.options.title %>
			
 
				-  </title>
			
 
				-  <script src="./config/config.js"></script>
			
 
				-</head>
			
 
				-
			
 
				-<body>
			
 
				-  <noscript>
			
 
				-    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
			
 
				-        Please enable it to continue.</strong>
			
 
				-  </noscript>
			
 
				-  <!-- <script src="https://api.map.baidu.com/api?v=3.0&ak=HYs3fpdhRaoOt8WhFWebCeZ0eibLzNQe"></script> -->
			
 
				-  <div id="app"></div>
			
 
				-  <!-- built files will be auto injected -->
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
 
				+  <body>
			
 
				+    <noscript>
			
 
				+      <strong
			
 
				+        >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
			
 
				+        properly without JavaScript enabled. Please enable it to
			
 
				+        continue.</strong
			
 
				+      >
			
 
				+    </noscript>
			
 
				+    <!-- <script src="https://api.map.baidu.com/api?v=3.0&ak=HYs3fpdhRaoOt8WhFWebCeZ0eibLzNQe"></script> -->
			
 
				+    <div id="app"></div>
			
 
				+    <!-- built files will be auto injected -->
			
 
				+  </body>
			
 
				+</html>
			
--- a/src/components/HeaderCom.vue
+++ b/src/components/HeaderCom.vue
@@ -15,15 +15,15 @@
 
				         <img src="@/assets/portrait.png" slot="reference" />
			
 
				         <div>
			
 
				           <div class="cursor-pointer boxmini">
			
 
				-            <p>账号：admin</p>
			
 
				+            <p>账号：{{ $store.state.auth.userInfo.userInfo.loginName }}</p>
			
 
				           </div>
			
 
				           <el-divider></el-divider>
			
 
				-          <div class="cursor-pointer boxmini">
			
 
				-            <p>岗位：超级管理员</p>
			
 
				+          <!-- <div class="cursor-pointer boxmini">
			
 
				+            <p>岗位：{{ $store.state.auth.userInfo.userInfo.loginName }}</p>
			
 
				           </div>
			
 
				-          <el-divider></el-divider>
			
 
				+          <el-divider></el-divider> -->
			
 
				           <div class="cursor-pointer boxmini">
			
 
				-            <p>角色：超级管理员</p>
			
 
				+            <p>角色：{{ $store.state.auth.userInfo.role.roleDescription }}</p>
			
 
				           </div>
			
 
				           <el-divider></el-divider>
			
 
				           <div class="cursor-pointer boxmini">
			
--- a/src/views/ledger/enterprise.vue
+++ b/src/views/ledger/enterprise.vue
@@ -47,10 +47,9 @@
 
				         row-key="id"
			
 
				         default-expand-all
			
 
				         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
			
 
				-         
			
 
				       >
			
 
				         <!-- Table Columns -->
			
 
				-        <el-table-column fixed prop="codeName" align="center" label="单位名称">
			
 
				+        <el-table-column fixed prop="codeName" align="left" label="单位名称">
			
 
				         </el-table-column>
			
 
				         <el-table-column prop="companyCode" align="center" label="单位ID">
			
 
				         </el-table-column>
			
@@ -212,14 +211,9 @@
 
				           width="80"
			
 
				         >
			
 
				         </el-table-column>
			
 
				-        <el-table-column
			
 
				-          prop="longitude"
			
 
				-          align="center"
			
 
				-          label="经度"
			
 
				-   
			
 
				-        >
			
 
				+        <el-table-column prop="longitude" align="center" label="经度">
			
 
				         </el-table-column>
			
 
				-        <el-table-column prop="latitude" align="center" label="纬度" >
			
 
				+        <el-table-column prop="latitude" align="center" label="纬度">
			
 
				         </el-table-column>
			
 
				         <el-table-column
			
 
				           prop="ratedCapacityNumber"
			
@@ -316,8 +310,7 @@ export default {
 
				     },
			
 
				   },
			
 
				   methods: {
			
 
				-    
			
 
				-     handleClose() {
			
 
				+    handleClose() {
			
 
				       Object.assign(this.newform, {
			
 
				         companyName: "",
			
 
				         province: null,
			
@@ -487,7 +480,6 @@ export default {
 
				                   type: "error",
			
 
				                   message: "删除失败！",
			
 
				                 });
			
 
				-  
			
 
				               } else {
			
 
				                 this.$message({
			
 
				                   type: "success",
			
--- a/src/views/login/Index.vue
+++ b/src/views/login/Index.vue
@@ -85,6 +85,7 @@ export default {
 
				               loginForm: this.loginForm,
			
 
				               router: this.$router,
			
 
				             });
			
 
				+            this.loadingView = false;
			
 
				           } catch (error) {
			
 
				             this.loadingView = false;
			
 
				             console.log("error submit!!");
			
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,7 +4,7 @@ const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 
				 const WorkboxPlugin = require("workbox-webpack-plugin");
			
 
				 const HappyPack = require("happypack");
			
 
				 const webpack = require("webpack");
			
 
				-
			
 
				+// const HtmlWebpackPlugin = require("html-webpack-plugin");
			
 
				 function resolve(dir) {
			
 
				   return path.join(__dirname, dir);
			
 
				 }
			
@@ -65,8 +65,8 @@ module.exports = {
 
				     proxy: {
			
 
				       "/api": {
			
 
				         // target: "http://192.168.5.4:16200", // 石月
			
 
				-        target: "http://192.168.50.235:16200", //内网
			
 
				-        // target: "http://192.168.5.15:16200",
			
 
				+        // target: "http://192.168.50.235:16200", //内网
			
 
				+        target: "http://192.168.5.15:16200",
			
 
				         // target: "http://106.120.102.238:16600", //外网
			
 
				         changeOrigin: true,
			
 
				         pathRewrite: {
			
@@ -97,6 +97,14 @@ module.exports = {
 
				       minimize: true,
			
 
				       minimizer: [new TerserPlugin(), new CssMinimizerPlugin()],
			
 
				     },
			
 
				+    // plugins: [
			
 
				+    //   new HtmlWebpackPlugin({
			
 
				+    //     filename: "custom-filename.html", // 自定义输出的 HTML 文件名
			
 
				+    //     title: "风机运行管理系统", // 设置页面的标题
			
 
				+    //     // 其他配置...
			
 
				+    //   }),
			
 
				+    //   // 其他插件...
			
 
				+    // ],
			
 
				   },
			
 
				 
			
 
				   pluginOptions: {