常规上传

.env.development

@@ -7,43 +7,43 @@ VUE_APP_TITLE = '页面标题'
 # 开发环境/重写路径(公共路径)
 
 # 登录
-# VUE_APP_LOGIN_URL = 'http://123.60.219.66:48080'
+# VUE_APP_LOGIN_URL = 'https://123.60.219.66:48080'
 # 马力军
-# VUE_APP_LOGIN_URL = 'http://192.168.2.45:48080'
+# VUE_APP_LOGIN_URL = 'https://192.168.2.45:48080'
 # 王波
-# VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
-VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
+VUE_APP_LOGIN_URL = 'https://172.16.12.101:48080'
+# VUE_APP_LOGIN_URL = 'https://172.16.12.101:48080'
 
 # 发电能力分析
-# VUE_APP_GENERAT_URL = 'http://192.168.0.102:9002'
+# VUE_APP_GENERAT_URL = 'https://192.168.0.102:9002'
 # 马力军
-# VUE_APP_GENERAT_URL = 'http://192.168.2.45:9002'
+# VUE_APP_GENERAT_URL = 'https://192.168.2.45:9002'
 # 王波
-VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
-# VUE_APP_GENERAT_URL = 'http://127.0.0.1:9002'
+VUE_APP_GENERAT_URL = 'https://172.16.12.101:9002'
+# VUE_APP_GENERAT_URL = 'https://127.0.0.1:9002'
 
 # 智能报表
-# VUE_APP_REPORT_URL = 'http://192.168.0.102:9001'
+# VUE_APP_REPORT_URL = 'https://192.168.0.102:9001'
 # 马力军
-# VUE_APP_REPORT_URL = 'http://192.168.2.45:9001'
+# VUE_APP_REPORT_URL = 'https://192.168.2.45:9001'
 # 王波
-VUE_APP_REPORT_URL = 'http://172.16.12.101:9001'
+VUE_APP_REPORT_URL = 'https://172.16.12.101:9001'
 
 # 功率预测
 # 徐世利
-# VUE_APP_BASE_URL = 'http://192.168.2.150:8086'
+# VUE_APP_BASE_URL = 'https://192.168.2.150:8086'
 # 马力军
-# VUE_APP_BASE_URL = 'http://192.168.2.45:8086'
+# VUE_APP_BASE_URL = 'https://192.168.2.45:8086'
 # 王波
-VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
+VUE_APP_BASE_URL = 'https://172.16.12.101:8086'
 
 # 综合报警
-# VUE_APP_ALARM = 'http://10.127.7.241:6015'
-VUE_APP_ALARM = 'http://172.16.12.101:7095'
-# VUE_APP_ALARM = 'http://localhost:6015'
+# VUE_APP_ALARM = 'https://10.127.7.241:6015'
+VUE_APP_ALARM = 'https://172.16.12.101:7095'
+# VUE_APP_ALARM = 'https://localhost:6015'
 
-# VUE_APP_ADP_BASE_URL = 'http://10.127.7.241:6015'
-VUE_APP_ADP_BASE_URL = 'http://172.16.12.103'
+# VUE_APP_ADP_BASE_URL = 'https://10.127.7.241:6015'
+VUE_APP_ADP_BASE_URL = 'https://172.16.12.103'
 
 # 百度地图KEY
 VUE_APP_BAIDU_MAP_KEY = ''

.env.production

@@ -12,47 +12,47 @@ NODE_ENV = 'production'
 VUE_APP_TITLE = '页面标题'
 
 # 登录
-# VUE_APP_LOGIN_URL = 'http://123.60.219.66:48080'
-# VUE_APP_LOGIN_URL = 'http://192.168.0.105:48080'
-# VUE_APP_LOGIN_URL = 'http://10.127.7.241:48080'
-# VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
-# VUE_APP_LOGIN_URL = 'http://192.168.2.231:48080'
-# VUE_APP_LOGIN_URL = 'http://127.0.0.1:48080'
+# VUE_APP_LOGIN_URL = 'https://123.60.219.66:48080'
+# VUE_APP_LOGIN_URL = 'https://192.168.0.105:48080'
+# VUE_APP_LOGIN_URL = 'https://10.127.7.241:48080'
+# VUE_APP_LOGIN_URL = 'https://172.16.12.101:48080'
+# VUE_APP_LOGIN_URL = 'https://192.168.2.231:48080'
+# VUE_APP_LOGIN_URL = 'https://127.0.0.1:48080'
 
-VUE_APP_LOGIN_URL = 'http://10.127.7.241:48080'
-# VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
+VUE_APP_LOGIN_URL = 'https://10.127.7.241:48080'
+# VUE_APP_LOGIN_URL = 'https://172.16.12.101:48080'
 
 # 生产环境/重写路径(公共路径)
 
 # 发电能力分析
-# VUE_APP_GENERAT_URL = 'http://123.60.219.66:9002'
-VUE_APP_GENERAT_URL = 'http://10.127.7.241:9002'
-# VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
-# VUE_APP_GENERAT_URL = 'http://192.168.2.231:9002'
-# VUE_APP_GENERAT_URL = 'http://127.0.0.1:9002'
+# VUE_APP_GENERAT_URL = 'https://123.60.219.66:9002'
+VUE_APP_GENERAT_URL = 'https://10.127.7.241:9002'
+# VUE_APP_GENERAT_URL = 'https://172.16.12.101:9002'
+# VUE_APP_GENERAT_URL = 'https://192.168.2.231:9002'
+# VUE_APP_GENERAT_URL = 'https://127.0.0.1:9002'
 
 # 智能报表
-# VUE_APP_REPORT_URL = 'http://123.60.219.66:9001'
-# VUE_APP_REPORT_URL = 'http://192.168.0.105:9001'
-VUE_APP_REPORT_URL = 'http://10.127.7.241:9001'
-# VUE_APP_REPORT_URL = 'http://172.16.12.101:9001'
-# VUE_APP_REPORT_URL = 'http://192.168.2.231:9001'
-# VUE_APP_REPORT_URL = 'http://127.0.0.1:9001'
+# VUE_APP_REPORT_URL = 'https://123.60.219.66:9001'
+# VUE_APP_REPORT_URL = 'https://192.168.0.105:9001'
+VUE_APP_REPORT_URL = 'https://10.127.7.241:9001'
+# VUE_APP_REPORT_URL = 'https://172.16.12.101:9001'
+# VUE_APP_REPORT_URL = 'https://192.168.2.231:9001'
+# VUE_APP_REPORT_URL = 'https://127.0.0.1:9001'
 
 # 功率预测
-# VUE_APP_BASE_URL = 'http://123.60.219.66:8086'
-# VUE_APP_BASE_URL = 'http://192.168.0.105:8086'
-VUE_APP_BASE_URL = 'http://10.127.7.241:8086'
-# VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
-# VUE_APP_BASE_URL = 'http://192.168.2.231:8086'
-# VUE_APP_BASE_URL = 'http://127.0.0.1:8086'
+# VUE_APP_BASE_URL = 'https://123.60.219.66:8086'
+# VUE_APP_BASE_URL = 'https://192.168.0.105:8086'
+VUE_APP_BASE_URL = 'https://10.127.7.241:8086'
+# VUE_APP_BASE_URL = 'https://172.16.12.101:8086'
+# VUE_APP_BASE_URL = 'https://192.168.2.231:8086'
+# VUE_APP_BASE_URL = 'https://127.0.0.1:8086'
 
 # 综合报警
-VUE_APP_ALARM = 'http://10.127.7.241:7095'
-# VUE_APP_ALARM = 'http://172.16.12.101:7095'
+VUE_APP_ALARM = 'https://10.127.7.241:7095'
+# VUE_APP_ALARM = 'https://172.16.12.101:7095'
 
-# VUE_APP_ADP_BASE_URL = 'http://10.127.7.241:6015'
-VUE_APP_ADP_BASE_URL = 'http://172.16.12.101'
+# VUE_APP_ADP_BASE_URL = 'https://10.127.7.241:6015'
+VUE_APP_ADP_BASE_URL = 'https://172.16.12.101'
 
 # 百度地图KEY
 VUE_APP_BAIDU_MAP_KEY = ''

public/static/config/modeConfig.js

@@ -16,16 +16,16 @@ const tilesMaxLevel = 18;
 const skipLogin = false;
 
 // 适配器地址
-// const adapterUrl = "http://10.155.32.4:8011/";
+// const adapterUrl = "https://10.155.32.4:8011/";
 
 // 切换模块时是否提示当前模块名称(用于对内介绍项目时便捷显示模块名称)
 const showModuleName = 0;
 
-const reportBaseUrl = "http://10.127.7.241:8083";
-// const reportBaseUrl = "http://172.16.12.101:8083";
+const reportBaseUrl = "https://10.127.7.241:8443";
+// const reportBaseUrl = "https://172.16.12.101:8443";
 
-const baseReportUrl = "http://10.127.7.196";
-// const baseReportUrl = "http://172.16.12.101";
+const baseReportUrl = "https://10.127.7.196";
+// const baseReportUrl = "https://172.16.12.101";
 
 // 是否隐藏控制台打印的 log info warn 信息
 const hideLog = false;
@@ -44,9 +44,9 @@ if (hideLog || hideError) {
 }
 
 // if (localTest) {
-//     baseURL = "http://192.168.10.8:9002/" // 联机调试 
+//     baseURL = "https://192.168.10.8:9002/" // 联机调试 
 // } else {
-//     baseURL = "http://10.155.32.14:9002/" // 正式环境
+//     baseURL = "https://10.155.32.14:9002/" // 正式环境
 
 // }
 

src/views/IntegratedAlarm/alarmConfig/customConfig/index.vue

@@ -5,9 +5,9 @@
         <el-button class="buttons" size="mini" round @click="handleInsert">
           新增记录
         </el-button>
-        <el-button class="buttons" size="mini" round @click="export2Excel">
+        <!-- <el-button class="buttons" size="mini" round @click="export2Excel">
           批量导出</el-button
-        >
+        > -->
         <el-button class="buttons" size="mini" round @click="outExe">
           模板下载</el-button
         >
@@ -169,6 +169,12 @@
             <span v-else-if="item.code == 'enable'">
               {{ enabledConvert(scope.row.enable) }}
             </span>
+            <span v-else-if="item.code == 'expression'">
+              {{ scope.row.expression.substring(0, 3) }}**********
+            </span>
+            <span v-else-if="item.code == 'description'">
+              {{ scope.row.description.substring(0, 3) }}**********
+            </span>
             <span v-else>
               {{ scope.row[item.code] }}
             </span>

src/views/generatingCapacity/dataFilter/prepare/search.vue

@@ -35,7 +35,7 @@
           <el-option
             v-for="item in windList"
             :key="item.id"
-            :label="item.name"
+            :label="item.aname"
             :value="item.id"
           ></el-option>
         </el-select>

src/views/login/index.vue

@@ -107,7 +107,8 @@
             return {
                 // administrator qweABC123
                 inputUser: 'Admin',
-                inputMima: 'admin@123456',
+                // inputMima: 'admin@123456',
+                inputMima: '!AdmiN!143@',
                 // inputUser: 'testdb',
                 // inputMima: '123456',
                 inputYanzhengma: '',