1

src/views/modules/load-forecasting-v2/index.vue

@@ -58,6 +58,71 @@
               <el-option v-for="item in regionList" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </div>
+		  <div
+		    :style="{
+		      alignItems: 'center',
+		      margin: '0 10px 0 0',
+		      display: 'flex',
+		    }"
+		  >
+		    <label
+		      :style="{
+		        margin: '0 10px 0 0',
+		        whiteSpace: 'nowrap',
+		        color: '#666',
+		        display: 'inline-block',
+		        lineHeight: '40px',
+		        fontSize: 'inherit',
+		        fontWeight: '500',
+		        height: '40px',
+		      }"
+		      class="item-label"
+		      >变电站</label
+		    >
+		    <el-select
+		      style="width: 100%"
+		      v-model="searchForm.regionId"
+		      placeholder="变电站"
+		      @keydown.enter.native="search()"
+		      clearable
+		    >
+		  			  <el-option label="全部" value="">全部</el-option>
+		      <el-option v-for="item in substationList" :key="item.value" :label="item.label" :value="item.value" />
+		    </el-select>
+		  </div>
+		  <div
+		    :style="{
+		      alignItems: 'center',
+		      margin: '0 10px 0 0',
+		      display: 'flex',
+		    }"
+		  >
+		    <label
+		      :style="{
+		        margin: '0 10px 0 0',
+		        whiteSpace: 'nowrap',
+		        color: '#666',
+		        display: 'inline-block',
+		        lineHeight: '40px',
+		        fontSize: 'inherit',
+		        fontWeight: '500',
+		        height: '40px',
+		      }"
+		      class="item-label"
+		      >时间维度</label
+		    >
+		    <el-select
+		      style="width: 100%"
+		      v-model="searchForm.dimension"
+		      placeholder="时间维度"
+		      @keydown.enter.native="search()"
+		      clearable
+		    >
+		  	<el-option label="日" value="daily">日</el-option>
+		  	<el-option label="月" value="monthly">月</el-option>
+		  	 <el-option label="年" value="yearly">年</el-option>
+		    </el-select>
+		  </div>
           <div
             :style="{
               alignItems: 'center',
@@ -202,7 +267,11 @@
               {{ scope.row.result=='0'?'待预测':(scope.row.result=='1'?'成功':'失败')}}
             </template>
           </el-table-column>
-          <el-table-column :resizable="true" :sortable="true" prop="execTime" label="执行时间" />
+          <el-table-column :resizable="true" :sortable="true" prop="execTime" label="执行时间">
+			  <template slot-scope="scope">
+			    {{ scope.row.execTime==null?'---': scope.row.execTime}}
+			  </template>
+		  </el-table-column>
 		  <el-table-column :resizable="true" :sortable="true" prop="createTime" label="添加时间" />
           <el-table-column width="300" label="操作">
             <template slot-scope="scope">