优化一些内容：包括logo之类的

.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 工业效益智能检测系统
+VUE_APP_TITLE = 工业企业运行效益监测系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 工业效益智能检测系统/开发环境
+# 工业企业运行效益智能监测系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 工业效益智能检测系统
+VUE_APP_TITLE = 工业企业运行效益监测系统
 
 # 生产环境配置
 ENV = 'production'
 
-# 工业效益智能检测系统/生产环境
+# 工业企业运行效益智能监测系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 工业效益智能检测系统
+VUE_APP_TITLE = 工业企业运行效益监测系统
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 工业效益智能检测系统/测试环境
+# 工业企业运行效益智能监测系统/测试环境
 VUE_APP_BASE_API = '/stage-api'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.8",
-  "description": "工业效益智能检测系统",
+  "description": "工业企业运行效益智能监测系统",
   "author": "若依",
   "license": "MIT",
   "scripts": {

src/layout/components/Sidebar/Logo.vue

@@ -3,11 +3,12 @@
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }"
+        style="word-wrap: break-word">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
+        <h1 class="sidebar-title"  :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }" style="word-wrap: break-word">{{ title }} </h1>
       </router-link>
     </transition>
   </div>

src/views/benefit/index.vue

@@ -99,17 +99,22 @@
         label="企业名称"
         width="200"
         sortable
+        align="center"
       ></el-table-column>
       <el-table-column
         prop="code"
         label="所属行业"
         width="100"
+        align="center"
       ></el-table-column>
-      <el-table-column prop="year" label="年度" width="100"></el-table-column>
+      <el-table-column
+      align="center" 
+      prop="year" label="年度" width="100"></el-table-column>
       <el-table-column
         prop="season"
         label="季度"
         width="100"
+        align="center"
         sortable
       ></el-table-column>
       <el-table-column
@@ -126,7 +131,7 @@
       ></el-table-column>
       <el-table-column
         prop="operationalEvaluate"
-        label="企业运营评估结果"
+        label="企业运营评估结果参考"
       ></el-table-column>
     </el-table>
     <el-pagination

src/views/dashboard/sandianpredict.vue

@@ -68,10 +68,9 @@
         <el-form-item style="margin-bottom: 0">
           <el-button
             type="primary"
-            icon="el-icon-search"
             @click="updateChart"
             size="mini"
-            >搜索</el-button
+            >计算</el-button
           >
         </el-form-item>
       </el-form>
@@ -393,18 +392,17 @@ export default {
         });
         return errorArray;
       }
-      // console.log(yValues, base_data_monthYValues);
-      // base_data_monthYValues = [
-      //   [1096, "2"],
-      //   [563, "3"],
-      //   [1053, "4"],
-      //   [737, "5"],
-      //   [1043, "6"],
-      //   [980, "7"],
-      //   [1428, "8"],
-      //   [1098, "9"],
-      // ];
-      // yValues = [[823.04, "10"],[1000, "9"]];
+      // console.log(yValues, base_data_monthYValues, xValues);
+      yValues.sort((a, b) => {
+        let aValue = new Decimal(a[1]);
+        let bValue = new Decimal(b[1]);
+        return aValue.cmp(bValue); // cmp方法用于比较两个Decimal对象
+      });
+      base_data_monthYValues.sort((a, b) => {
+        let aValue = new Decimal(a[1]);
+        let bValue = new Decimal(b[1]);
+        return aValue.cmp(bValue); // cmp方法用于比较两个Decimal对象
+      });
       this.chart.setOption(
         {
           legend: {

src/views/dashboard/sandianpredictseason.vue

@@ -66,8 +66,8 @@
           </div>
         </el-form-item>
         <el-form-item  style="margin-bottom: 0">
-          <el-button type="primary" icon="el-icon-search" @click="updateChart" size="mini"
-            >搜索</el-button
+          <el-button type="primary" @click="updateChart" size="mini"
+            >计算</el-button
           >
         </el-form-item>
       </el-form>
@@ -381,6 +381,16 @@ export default {
       //   [3263, "2"],
       //   [4900, "3"]
       // ];
+      yValues.sort((a, b) => {
+        let aValue = new Decimal(a[1]);
+        let bValue = new Decimal(b[1]);
+        return aValue.cmp(bValue); // cmp方法用于比较两个Decimal对象
+      });
+      base_data_seasonYValues.sort((a, b) => {
+        let aValue = new Decimal(a[1]);
+        let bValue = new Decimal(b[1]);
+        return aValue.cmp(bValue); // cmp方法用于比较两个Decimal对象
+      });
       this.chart.setOption({
         tooltip: {
           trigger: "axis",

src/views/dashboard/sandianpredictyear.vue

@@ -68,10 +68,9 @@
         <el-form-item style="margin-bottom: 0">
           <el-button
             type="primary"
-            icon="el-icon-search"
             @click="updateChart"
             size="mini"
-            >搜索</el-button
+            >计算</el-button
           >
         </el-form-item>
       </el-form>
@@ -379,6 +378,16 @@ export default {
         });
         return errorArray;
       }
+      yValues.sort((a, b) => {
+        let aValue = new Decimal(a[1]);
+        let bValue = new Decimal(b[1]);
+        return aValue.cmp(bValue); // cmp方法用于比较两个Decimal对象
+      });
+      base_data_yearYValues.sort((a, b) => {
+        let aValue = new Decimal(a[1]);
+        let bValue = new Decimal(b[1]);
+        return aValue.cmp(bValue); // cmp方法用于比较两个Decimal对象
+      });
       this.chart.setOption({
         tooltip: {
           trigger: "axis",

src/views/dashboard/zhifangbasedata.vue

@@ -24,7 +24,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="年度" style="margin-bottom: 0">
-          <el-select v-model="selectedYear" style="width: 100%">
+          <el-select v-model="selectedYear" style="width: 100%" >
             <el-option v-for="year in availableYears" :key="year" :value="year">
               {{ year }}
             </el-option>
@@ -101,7 +101,7 @@
       <el-table-column prop="enterpriseId" label="企业ID"></el-table-column>
       <el-table-column
         prop="value"
-        label="评估指标值"
+        :label="label"
         width="200"
       ></el-table-column>
     </el-table>
@@ -133,6 +133,7 @@ export default {
   },
   data() {
     return {
+      label: "评估指标值/万元",
       chart: null,
       chartData: [],
       industryData: [],
@@ -161,6 +162,20 @@ export default {
         energyConsume: "能源消费量",
         powerConsume: "电力消费量",
       },
+      keyToUnit: {
+        landArea: "/亩",
+        totalIndustrialValue: "/万元",
+        gdp: "/万元",
+        taxableIncome: "/万元",
+        paidTax: "/万元",
+        mainBusinessIncome: "/万元",
+        employeeNumber: "/人",
+        profit: "/万元",
+        ownerEquity: "",
+        funding: "/万元",
+        energyConsume: "/万m³",
+        powerConsume: "/万KW·h",
+      },
       selectedYear: null,
       queryParams: {
         pageNum: 1,
@@ -413,7 +428,7 @@ export default {
             value: item[that.selectedDataKey],
           };
         });
-        console.log(filteredData, result, that.selectedDataKey, filteredArray); //获取自定义的值
+        // console.log(filteredData, result, that.selectedDataKey, filteredArray); //获取自定义的值
       });
     },
     generateQuadraticData(binCount, maxHistogramValue, totalHistogramValue) {
@@ -439,9 +454,9 @@ export default {
   },
   watch: {
     // littlegreen - 关闭监测数值变化
-    // selectedDataKey() {
-    //   this.updateChart();
-    // },
+    selectedDataKey() {
+      this.label = "评估指标值"+this.keyToUnit[this.selectedDataKey]
+    },
     // selectedYear() {
     //   this.updateChart();
     // },

src/views/investment/index.vue

@@ -62,10 +62,9 @@
         <el-form-item label-width="100px">
           <el-button
             type="primary"
-            icon="el-icon-search"
             size="mini"
             @click="submit"
-            >搜索</el-button
+            >计算</el-button
           >
           <el-button icon="el-icon-refresh" size="mini" @click="resetForm"
             >重置</el-button

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">工业效益智能检测系统</h3>
+      <h3 class="title">工业企业运行效益智能监测系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -161,7 +161,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/login.png");
   background-size: cover;
 }
 .title {

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '工业效益智能检测系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '工业企业运行效益监测系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口