浏览代码

风机绩效榜页面修改

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 2 年之前
父节点
当前提交
f45aeb8c16

+ 12 - 6
.env.development

@@ -1,16 +1,19 @@
 # VUE_APP_BASE_API = http://192.168.11.250:18600
 # VUE_APP_Economy = http://192.168.11.250:6060
 # VUE_APP_BASE_API = http://192.168.1.101:6060
-VUE_APP_Economy = http://192.168.1.103:6060
+# 备份 VUE_APP_Economy = http://192.168.1.103:6060
+VUE_APP_Economy = http://192.168.2.5:6060
 # 服务名,调用后台微服务
 VUE_APP_SERVER_NAME = /nem-api
 
-VUE_APP_BASE_MENU = http://192.168.11.250:18600/ims-ext/sys/sysMenu/menuList
+# 备份 VUE_APP_BASE_MENU = http://192.168.11.250:18600/ims-ext/sys/sysMenu/menuList
+VUE_APP_BASE_MENU = http://192.168.2.5:6060/ims-ext/sys/sysMenu/menuList
 
 VUE_APP_SYS_TITLE = 智慧光伏集维管理系统
 VUE_APP_SYS_VERSION = VERSION 5.0
 # 跳转后台路径
-VUE_APP_SYS_TARGET_HREF=http://192.168.11.250:19098
+# 备份 VUE_APP_SYS_TARGET_HREF=http://192.168.11.250:19098
+VUE_APP_SYS_TARGET_HREF=http://192.168.2.5:19098
 VUE_APP_SYS_CODE=JS_RGN
 
 
@@ -24,11 +27,14 @@ VUE_APP_DIALOG_NUM = 8
 VUE_APP_DIALOG_POINT = contextmenu
 
 # 统一认证登录地址
-VUE_APP_UNIFIED_LOGIN = http://192.168.11.250:81/?exitFlag=true
+# 备份VUE_APP_UNIFIED_LOGIN = http://192.168.11.250:81/?exitFlag=true
+VUE_APP_UNIFIED_LOGIN = http://192.168.2.5:81/?exitFlag=true
 # 统一认证跳转地址
 VUE_APP_REDIRECT_URL = http://localhost:18701/vue/login?url=http://localhost:8080
 
 #vue方式登录地址
-VUE_APP_VUE_LOGIN_URL = http://192.168.11.250:81/api/ims-idas/oauth/tokenWrapper
+# 备份 VUE_APP_VUE_LOGIN_URL = http://192.168.11.250:81/api/ims-idas/oauth/tokenWrapper
+VUE_APP_VUE_LOGIN_URL = http://192.168.2.5:81/api/ims-idas/oauth/tokenWrapper
 # 后台管理地址,vue前端跳转至后端时使用
-VUE_APP_BACK_URL = http://192.168.11.250:19098
+# 备份 VUE_APP_BACK_URL = http://192.168.11.250:19098
+VUE_APP_BACK_URL = http://192.168.2.5:19098

+ 71 - 58
src/views/layout/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -6,22 +6,32 @@
       :hiddenSearch="true"
       @firstRender="firstRender"
     />
-    <!-- <div class="title">
+    <div class="title">
+      <el-select v-model="tabIndex" placeholder="请选择">
+        <el-option
+          v-show="item.id"
+          v-for="(item, index) in tabOptions"
+          :key="index"
+          :label="item.name"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
       <el-select
-          size="mini"
-          v-model="company"
-          placeholder="请选择"
-          @change="handleCompanyChange(company)"
+        size="mini"
+        v-model="company"
+        placeholder="请选择"
+        @change="handleCompanyChange(company)"
       >
         <el-option
-            v-for="item in companyOptions"
-            :key="item.id"
-            :label="item.aname"
-            :value="item.id"
+          v-for="item in companyOptions"
+          :key="item.id"
+          :label="item.aname"
+          :value="item.id"
         >
         </el-option>
       </el-select>
-      <div class="tabCut">
+      <!-- <div class="tabCut">
         <div
             @click="tabClick(val.id)"
             :class="tabIndex === val.id ? 'active' : ''"
@@ -30,73 +40,75 @@
         >
           <span>{{ val.name }}</span>
         </div>
-      </div>
+      </div> -->
 
       <div class="station">
         场站:
         <el-select
-            size="mini"
-            v-model="stationObj"
-            placeholder="请选择"
-            @change="handleStationChange(stationObj)"
-            clearable
+          size="mini"
+          v-model="stationObj"
+          placeholder="请选择"
+          @change="handleStationChange(stationObj)"
+          clearable
         >
           <el-option
-              v-for="item in stationList"
-              :key="item.id"
-              :label="item.aname"
-              :value="item.id"
+            v-for="item in stationList"
+            :key="item.id"
+            :label="item.aname"
+            :value="item.id"
           >
           </el-option>
         </el-select>
       </div>
-      <div class="station">
-        项目:
-        <el-select
+      <template v-if="tabIndex === -1">
+        <div class="station">
+          项目:
+          <el-select
             size="mini"
             v-model="projectObj"
             placeholder="请选择"
             @change="handleProjectChange(projectObj)"
             clearable
-        >
-          <el-option
+          >
+            <el-option
               v-for="item in projectList"
               :key="item.id"
               :label="item.aname"
               :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </div>
-      <div class="station">
-        线路:
-        <el-select
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div class="station">
+          线路:
+          <el-select
             size="mini"
             v-model="lineObj"
             placeholder="请选择"
             clearable
             @change="typeClick('1')"
-        >
-          <el-option
+          >
+            <el-option
               v-for="item in lineList"
               :key="item.id"
               :label="item.aname"
               :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </div>
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </template>
 
       <div class="dates">
         开始日期
         <div class="search-input">
           <el-date-picker
-              v-model="starTime"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="选择日期"
-              popper-class="date-select"
-              @change="typeClick('1')"
+            v-model="starTime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="选择日期"
+            popper-class="date-select"
+            @change="typeClick('1')"
           >
           </el-date-picker>
         </div>
@@ -105,31 +117,31 @@
         结束日期
         <div class="search-input">
           <el-date-picker
-              v-model="endTime"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="选择日期"
-              popper-class="date-select"
-              @change="typeClick('1')"
+            v-model="endTime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="选择日期"
+            popper-class="date-select"
+            @change="typeClick('1')"
           >
           </el-date-picker>
         </div>
       </div>
       <div class="but">
         <el-button
-            round
-            size="mini"
-            class="buttons active"
-            @click="getPerformance"
-        >搜索</el-button
+          round
+          size="mini"
+          class="buttons active"
+          @click="getPerformance"
+          >搜索</el-button
         >
         <el-button round size="mini" class="buttons" @click="mxClick"
-        >明细</el-button
+          >明细</el-button
         >
       </div>
-    </div> -->
+    </div>
 
-    <div class="tabCut1">
+    <div class="tabCut1" v-if="tabIndex === -1">
       <div
         class="tabCut-item"
         @click="typeClick(val.id)"
@@ -247,6 +259,7 @@ export default {
       tabIndex: -1,
       bardata: [],
       lineData: [],
+      tabType: -1,
       tabOptions: [
         { id: -1, name: "风电" },
         { id: -2, name: "光伏" },