lrl-2021-11-10

src/views/energyBalance/components/foldvalue.vue

@@ -29,7 +29,7 @@
                                 </el-select>
                             </el-form-item>
                         </el-col> -->
-                        <el-col :span="6">
+                        <el-col :span="4">
                             <el-form-item label="检测日期">
                                 <!-- <el-date-picker
                                     v-model="filterForm.data.clock"
@@ -49,7 +49,7 @@
                                 ></zj-timegran-date>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :span="4">
                             <el-form-item label="时间粒度">
                                 <el-select
                                     filterable clearable
@@ -66,15 +66,25 @@
                                 </el-select>
                             </el-form-item>
                         </el-col>
-                        <!-- <el-col :span="6">
-                            <el-form-item label="能介编码">
-                                <el-input clearable
-                                    v-model.trim="filterForm.data.energyid"
-                                    placeholder="能介编码"
+                        <el-col :span="4">
+                            <el-form-item label="能介名称">
+                                  <el-select
+                                    filterable clearable
+                                    collapse-tags
+                                    v-model="filterForm.data.energyid"
+                                    multiple
+                                    placeholder=""
                                     style="width: 100%;"
-                                ></el-input>
+                                >
+                                    <el-option
+                                        v-for="item of nameObj.energyid.arr"
+                                        :key="item.id"
+                                        :value="item.id"
+                                        :label="item.name"
+                                    ></el-option>
+                                </el-select>
                             </el-form-item>
-                        </el-col> -->
+                        </el-col>
                     </el-row>
                 </el-form>
                 <div class="box-top-gjl">
@@ -193,7 +203,7 @@
                         <el-table-column
                         sortable
                             prop="estimatedvalue"
-                            label="低热值"
+                            label="低热值/灰分"
                             align="center"
                             width="100px"
                             :show-overflow-tooltip="true"
@@ -201,7 +211,7 @@
                         <el-table-column
                         sortable
                             prop="code"
-                            label="折标值/灰分"
+                            label="折标值"
                             align="center"
                             width="125px"
                             :show-overflow-tooltip="true"
@@ -621,7 +631,7 @@ export default {
         getTableData (pageNum) {
             let that = this,
                 params = {
-                    energyid: that.filterForm.data.energyid,
+                    energyid: that.filterForm.data.energyid.join(','),
                     startTime: that.filterForm.data.clock[0],
                     endTime:that.filterForm.data.clock[1],
                     timegranid: that.filterForm.data.timegranid

src/views/energyPlan/components/supplyAndDemand/planProjectRoundGx.vue

@@ -32,14 +32,14 @@
                     </el-row>
                 </el-form>
                <div class="box-top-gjl">
-                        <!-- <el-button
+                        <el-button
                             class="button"
                             type="primary"
                             size="mini"
                             icon="el-icon-plus"
                             v-privilege="activeMenu + 'ADD'"
                             @click="but_addNBJH()"
-                        >新增内部计划</el-button> -->
+                        >新增内部计划</el-button>
                         <el-button
                             class="button"
                             type="primary"
@@ -509,11 +509,10 @@
                                 <template slot-scope="scope">
                                    <el-form-item
                                    :prop="scope.row.seq + '.chemicalStandard'"
-                                    :rules="tableFormRules.chemicalStandard"
+                                   :rules="tableFormRules.chemicalStandard"
                                    v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   >
                                     <el-select
-                                    allow-create
                                     filterable
                                     clearable
                                     v-model="rightTableObj[scope.row.seq].chemicalStandard"
@@ -1595,7 +1594,7 @@ export default {
         },
         getStandards () {
             let that = this
-            let url = 'pass/ems/v1/emsprodplanrounds/getstdchem';
+            let url = 'pass/product/v1/emsstandard/getStandards?type=线材';
             that.axios.get(url)
                 .then(function (res) {
                     if (res.code === '0') {
@@ -1603,8 +1602,8 @@ export default {
                         let obj = {};
                         for (let item of res.data) {
                             arr.push({
-                                id: item.id,
-                                name: item.chemicalStandard
+                                id: item.basecode,
+                                name: item.basename
                             })
                         }
                         that.nameObj.chemicalStandard.arr = arr;

src/views/energyPlan/components/supplyAndDemand/planProjectRoundLG.vue

@@ -491,7 +491,6 @@
                                   >
                                     <el-select
                                     allow-create
-                                    filterable
                                     clearable
                                     @keydown.native="keyDown" :id="scope.$index + scope.column.id"
                                     v-model="rightTableObj[scope.row.seq].chemicalStandard"
@@ -1601,7 +1600,7 @@ export default {
         },
         getStandards () {
             let that = this
-            let url = 'pass/ems/v1/emsprodplanrounds/getstdchem';
+            let url = 'pass/product/v1/emsstandard/getStandards?type=钢坯';
             that.axios.get(url)
                 .then(function (res) {
                     if (res.code === '0') {
@@ -1609,8 +1608,8 @@ export default {
                         let obj = {};
                         for (let item of res.data) {
                             arr.push({
-                                id: item.id,
-                                name: item.chemicalStandard
+                                id: item.basecode,
+                                name: item.basename
                             })
                         }
                         that.nameObj.chemicalStandard.arr = arr;

src/views/energyPlan/components/supplyAndDemand/planProjectRoundXG.vue

@@ -570,7 +570,6 @@
                                   >
                                     <el-select
                                     allow-create
-                                    filterable
                                     clearable
                                     v-model="rightTableObj[scope.row.seq].chemicalStandard"
                                     @keydown.native="keyDown" :id="scope.$index + scope.column.id"
@@ -1688,7 +1687,7 @@ export default {
         },
         getStandards () {
             let that = this
-            let url = 'pass/ems/v1/emsprodplanrounds/getstdchem';
+            let url = 'pass/product/v1/emsstandard/getStandards?type=线材';
             that.axios.get(url)
                 .then(function (res) {
                     if (res.code === '0') {

src/views/energyQuality/components/power/powerMonitoringDayData.vue

@@ -257,7 +257,7 @@
                     <el-table-column
                         sortable
                         prop="datadate"
-                        label="监测时间"
+                        label="上传时间"
                         min-width="100px"
                         :show-overflow-tooltip="true"
                     ></el-table-column>