2021-07-13

src/components/main.vue

@@ -7,16 +7,16 @@
             >
                 <img
                     class="sl-header-li-logo"
-                    src="../assets/img/login/zhonggang_logo.png"
+                    src="../assets/img/login/xintai_log.png"
                     alt="能源管控系统"
                 >
                 <div class="sl-header-li-name">能源管控系统</div>
-                <div class="hnstLogo">
+                <!-- <div class="hnstLogo">
                     <img
                         src="../assets/img/hnst_logo.png"
                         alt=""
                     >
-                </div>
+                </div> -->
                 <timeLED style="position: absolute; right: 250px; top: 15px;"></timeLED>
                 <div class="oa-header-user">
                     <div class="oa-header-upt">
@@ -1250,6 +1250,8 @@ export default {
     float: left;
     margin-top: 13px;
     margin-left: 20px;
+    width: 20%;
+    height: 80%;
 }
 .sl-header-li-name {
     float: left;

src/config/apolloConfig.js

@@ -37,7 +37,7 @@ const errorLink = onError(({ networkError, response }) => {
             duration: 1000,
             type: 'error',
             onClose: function () {
-                //  弹窗关闭时，跳转到登录
+              //   弹窗关闭时，跳转到登录
                 setCookie('accessToken', '', -1, '/');
                 setCookie('refreshToken', '', -1, '/');
                 setCookie('workDate', '', -1);

src/config/axios.js

@@ -107,9 +107,9 @@ axios.interceptors.response.use(function (response) {
     '<span>请刷新页面重新操作，如果问题依旧存在，请联系管理员</span>';
     if ((error.response.data.exception && error.response.data.exception.indexOf('ShiroJwtException') >= 0) || (error.response.data.message && (error.response.data.message.indexOf('Token') >= 0))) {
       ElementUI.Message({
-        message: '登录失效,请重新登录',
-        dangerouslyUseHTMLString: true,
-        type: 'error'
+        // message: '登录失效,请重新登录',
+        // dangerouslyUseHTMLString: true,
+        // type: 'error'
       });
       setTimeout(() => {
         window.top.location.href = store.getters.ctx;

src/views/basicInformation/components/energyType.vue

@@ -152,36 +152,6 @@
                                 <span v-else>{{scope.row.energyCode}}</span>
                             </template>
                         </el-table-column>
-                        <!-- <el-table-column
-                            sortable
-                            prop="dataCode"
-                            label="数据传输代码"
-                            width="120px"
-                            :show-overflow-tooltip="true"
-                        > <template slot-scope="scope">
-                                <el-form-item
-                                    v-if="scope.row.isSelection"
-                                    :prop="scope.row.id + '.dataCode'"
-                                    :rules="dialog.editorBox.form.rules.dataCode"
-                                >
-                                    <el-input
-                                        clearable
-                                        style="width: 100%;"
-                                        v-model="tableFormDataObj[scope.row.id].dataCode"
-                                    ></el-input>
-                                    <template
-                                        slot="error"
-                                        slot-scope="scope"
-                                    >
-                                        <p
-                                            class="error"
-                                            :title="scope.error"
-                                        >{{ scope.error }}</p>
-                                    </template>
-                                </el-form-item>
-                                <span v-else>{{scope.row.dataCode}}</span>
-                            </template>
-                        </el-table-column> -->
                         <el-table-column
                             sortable
                             prop="note"

src/views/energyPerformance/components/outElectricity.vue

@@ -38,7 +38,7 @@
                                     v-model="filterForm.data.clock"
                                     style="width: 100%;"
                                     :type="'daterange'"
-                                    :timegranId="'DAY'"
+                                    :timegranId="'MONTH'"
                                     :oneFoo="getTableData"
                                     :defaultOffset="-1"
                                     :custom="1"

src/views/energyPerformance/components/supplyAnddemand/ProjectData.vue

@@ -44,14 +44,14 @@
                                     start-placeholder="开始日期"
                                     end-placeholder="结束日期">
                                 </el-date-picker> -->
-                                <zj-timegran-date
+                                <!-- <zj-timegran-date
                                     v-model="filterForm.data.clock"
                                     style="width: 100%;"
                                     :type="'daterange'"
                                     :timegranId="filterForm.data.timegranid"
                                     :oneFoo="getTableData"
                                     :defaultOffset="-1"
-                                ></zj-timegran-date>
+                                ></zj-timegran-date> -->
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">

src/views/energyPlan/router/index.js

@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 import '@/assets/iconfont/iconfont.css'
-
 // 主要
 import main from '@/components/main.vue'
 // 计划项目维护
@@ -14,7 +13,28 @@ import planProjectData from '@/views/energyPlan/components/supplyAndDemand/planP
 import plan from '@/views/energyPlan/components/planValue/plan.vue'
 // 计划项目推荐方案维护
 import PlanProjectRecommend from '@/views/energyPlan/components/planValue/PlanProjectRecommend.vue'
-
+// 年计划编制(焦化)
+import PlanProjectCoking from '@/views/energyPlan/components/supplyAndDemand/planProjectCoking.vue'
+// 年计划编制 (炼铁车间)
+import PlanProjectPuddling from '@/views/energyPlan/components/supplyAndDemand/planProjectPuddling.vue'
+// 年计划编制(炼钢)
+import PlanProjectIronMill from '@/views/energyPlan/components/supplyAndDemand/planProjectIronMill.vue'
+// 年计划编制(轧钢)
+import PlanProjectSteelRolling from '@/views/energyPlan/components/supplyAndDemand/planProjectSteelRolling.vue'
+// 年计划编制(机焦厂)
+import PlanProjectCoke from '@/views/energyPlan/components/supplyAndDemand/planProjectCoke.vue'
+// 月度计划编制
+import PlanProjectDataMonth from '@/views/energyPlan/components/supplyAndDemand/planProjectDataMonth.vue'
+// 轮次计划编制-Gx
+import PlanProjectRoundGx from '@/views/energyPlan/components/supplyAndDemand/planProjectRoundGx.vue'
+// 年度计划编制
+import PlanProjectDataYear from '@/views/energyPlan/components/supplyAndDemand/planProjectDataYear.vue'
+// 年度计划编制(建材厂) H:\湖南视拓\安泰能源项目\xt-ems-front\src\views\energyPlan\components\supplyAndDemand\
+import PlanProjectBuildingMaterialsFactory from '@/views/energyPlan/components/supplyAndDemand/planProjectBuildingMaterialsFactory.vue'
+// 年度计划编制(烧结厂) H:\湖南视拓\安泰能源项目\xt-ems-front\src\views\energyPlan\components\supplyAndDemand\
+import PlanProjectSinter from '@/views/energyPlan/components/supplyAndDemand/planProjectSinter.vue'
+// 年度计划编制(发电厂)H:\湖南视拓\安泰能源项目\xt-ems-front\src\views\energyPlan\components\supplyAndDemand\
+import PlanProjectPowerPlant from '@/views/energyPlan/components/supplyAndDemand/planProjectPowerPlant.vue'
 Vue.use(Router)
 
 export default new Router({
@@ -50,6 +70,61 @@ export default new Router({
                 path: 'PlanProjectRecommend',
                 name: 'PlanProjectRecommend',
                 component: PlanProjectRecommend
+            },
+            {
+                path: 'PlanProjectCoking',
+                name: 'PlanProjectCoking',
+                component: PlanProjectCoking
+            },
+            {
+                path: 'PlanProjectPuddling',
+                name: 'PlanProjectPuddling',
+                component: PlanProjectPuddling
+            },
+            {
+                path: 'PlanProjectIronMill',
+                name: 'PlanProjectIronMill',
+                component: PlanProjectIronMill
+            },
+            {
+                path: 'PlanProjectSteelRolling',
+                name: 'PlanProjectSteelRolling',
+                component: PlanProjectSteelRolling
+            },
+            {
+                path: 'PlanProjectCoke',
+                name: 'PlanProjectCoke',
+                component: PlanProjectCoke
+            },
+            {
+                path: 'PlanProjectDataMonth',
+                name: 'PlanProjectDataMonth',
+                component: PlanProjectDataMonth
+            },
+            {
+                path: 'PlanProjectRoundGx',
+                name: 'PlanProjectRoundGx',
+                component: PlanProjectRoundGx
+            },
+            {
+                path: 'PlanProjectDataYear',
+                name: 'PlanProjectDataYear',
+                component: PlanProjectDataYear
+            },
+            {
+                path: 'PlanProjectBuildingMaterialsFactory',
+                name: 'PlanProjectBuildingMaterialsFactory',
+                component: PlanProjectBuildingMaterialsFactory
+            },
+            {
+                path: 'PlanProjectSinter',
+                name: 'PlanProjectSinter',
+                component: PlanProjectSinter
+            },
+            {
+                path: 'PlanProjectPowerPlant',
+                name: 'PlanProjectPowerPlant',
+                component: PlanProjectPowerPlant
             }
         ]
     }]

src/views/index/app.html

@@ -4,9 +4,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
-    <meta content="中钢能源管控系统" name="keywords">
-    <meta content="中钢能源管控系统" name="description">
-    <title>首页 - 中钢能源管控系统</title>
+    <meta content="安泰控股集团智能管控系统" name="keywords">
+    <meta content="安泰控股集团智能管控系统" name="description">
+    <title>首页 - 安泰控股集团智能管控系统</title>
     <link href="../static/css/common.css" rel="stylesheet"/>
     <link href="../static/img/favicon.ico" rel="shortcut icon"/>
     <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>
@@ -14,7 +14,6 @@
     <script src="../static/lib/qrcode.min.js" type="text/javascript"></script>
     <script src='../static/lib/XLSX/xlsx.core.min.js' type='text/javascript'></script>
     <!--<script src="../static/lib/swiper/js/swiper.min.js" type="text/javascript"></script>-->
-    <script src="../static/js/common.js" type="text/javascript"></script>
   </head>
   <body>
     <div id="app"></div>

src/views/index/components/login.vue

@@ -2,12 +2,12 @@
     <div class="xs-lg ggshown">
         <img
             style="width:100%;height:100%;position:absolute;"
-            src="../../../assets/img/icore-shown-all.png"
+            src="../../../assets/img/icore-shown.png"
         />
         <section class="xs-lg-content xs-lg-mmw">
             <div class="xs-lg-bg">
                 <div class="frame-area">
-                    <div class="desc-area" style="background: none;color: #fff;font-size: 16px;">中钢能源管控系统</div>
+                    <div class="desc-area" style="background: none;color: #fff;font-size: 13px;">安泰控股集团智能管控系统</div>
                     <div style="position: absolute;left: 30px;width: 346px;top: 105px;">
                         <el-form
                             :inline="false"
@@ -213,10 +213,11 @@ export default {
                         setCookie('loginName', this.loginForm.loginName);
                         setCookie('userInfo', JSON.stringify(res.data.user));
                         let sRedirect = this.$route.query.redirect;
+                        console.log(sRedirect);
                         if (sRedirect) {
                           this.$router.push({ path: sRedirect });
                         } else {
-                          this.$router.push({ path: 'main' }).catch(() => {});
+                           this.$router.push({ path: 'main' }).catch(() => {});
                         }
                       } else {
                         //  登录失败
@@ -227,6 +228,7 @@ export default {
                         });
                       }
                       this.loginBtnLoading = false;
+                        console.log(res.date)
                     }).catch(() => {
                       this.loginBtnLoading = false;
                     });