ly 3 vuotta sitten
vanhempi
commit
b43e62b43d

+ 2 - 2
master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java

@@ -228,9 +228,9 @@ public class TSpecdevYlgdController extends BaseController {
                         entity.setMedium(cellValue);//介质
                     } else if (j == 23) {
                         entity.setDesPressure(cellValue);//设计压力
-                    } else if (j == 24) {
-                        entity.setDesTemp(cellValue);//设计温度
                     } else if (j == 25) {
+                        entity.setDesTemp(cellValue);//设计温度
+                    } else if (j == 24) {
                         entity.setOptPressure(cellValue);//工作压力
                     } else if (j == 26) {
                         entity.setOptTemp(cellValue);//工作温度

+ 2 - 2
master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevYlgd.java

@@ -78,12 +78,12 @@ public class TSpecdevYlgd extends BaseEntity
 
     /** 安装年月 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "安装年月", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "安装年月", width = 30, dateFormat = "yyyy-MM")
     private Date installDate;
 
     /** 投用年月 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "投用年月", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "投用年月", width = 30, dateFormat = "yyyy-MM")
     private Date submitdate;
 
     /** 材质 */

+ 65 - 1
ui/src/views/monitor/elec/centerLeft1.vue

@@ -10,7 +10,7 @@
           <dv-decoration-3 style="width:1.25rem;height:.25rem; position:relative;top:-.0375rem;" />
         </div>
       </div>
-      <div class="d-flex chartStyle">
+      <div class="d-flex chartStyle" @click="openchart1">
         <!--渐变折线图-->
         <div id="oneGTGyChart" style="width:100%;height:2rem;"></div>
       </div>
@@ -27,6 +27,9 @@
         <div id="fourGTGyChart" style="width:100%;height:2rem;"></div>
       </div>
     </div>
+    <el-dialog   :visible.sync="openchart" @open="open" width="1600px" append-to-body>
+      <div id="oneGTGyChart1" style="width:100%;height:600px;"></div>
+    </el-dialog>
   </div>
 </template>
 
@@ -46,6 +49,7 @@ export default {
   },
   data() {
     return {
+      openchart: false,
       config: {
         lineWidth: 30,
         activeRadius: "80%",
@@ -121,6 +125,14 @@ export default {
     this.initFourChart();
   },
   methods: {
+    open(){
+      this.$nextTick(() => {
+        this.initOneChart1()
+      })
+    },
+    openchart1(){
+      this.openchart = true
+    },
     changeTiming() {
       setInterval(() => {
         this.changeNumber();
@@ -183,6 +195,58 @@ export default {
         ]
       })
     },
+    initOneChart1() {
+      console.log("====")
+      // 基于准备好的dom,初始化echarts实例
+      this.chart1 = this.echarts.init(document.getElementById('oneGTGyChart1'))
+      const dateDay = [];
+      const dateNum = [];
+      for (let i = 0; i < this.monthData.length; i++) {
+        dateDay[i] = this.monthData[i].dateDay
+        dateNum[i] = this.monthData[i].gtg1Lv
+      }
+      this.chart1.setOption({
+        /* 周围边距 */
+        grid: {
+          left: '3%',
+          right: '3%',
+          bottom: '1%',
+          top: '13%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          // data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
+          data:dateDay
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            // data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
+            data:dateNum,
+            type: 'line',
+            itemStyle: {
+              color: 'rgb(78,109,60)'
+            },
+            symbol: "none",
+            areaStyle: {
+              color: new this.echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                {
+                  offset: 0,
+                  color: 'rgb(207,243,68)'
+                },
+                {
+                  offset: 1,
+                  color: 'rgb(119,189,74)'
+                }
+              ])
+            },
+          }
+        ]
+      })
+    },
     initTwoChart() {
       // 基于准备好的dom,初始化echarts实例
       this.chart = this.echarts.init(document.getElementById('twoGTGyChart'))

+ 3 - 0
ui/src/views/monitor/elec/echart/bottom/bottomLeftChart.vue

@@ -313,6 +313,9 @@ export default {
         ]
       };
       this.chart.setOption(option);
+      this.chart.on('click' , function (params) {
+        console.log(params + '==================')
+      })
     }
   },
   destroyed() {

+ 0 - 9
ui/src/views/sems/specCc/bf.vue

@@ -28,15 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('设备位号')" prop="devno" label-width="50">
-        <el-input
-          v-model="queryParams.devno"
-          :placeholder="$t('请输入') + $t('设备位号')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('搜索') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('重置') }}</el-button>

+ 0 - 9
ui/src/views/sems/specCc/index.vue

@@ -28,15 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('设备位号')" prop="devno" label-width="50">
-        <el-input
-          v-model="queryParams.devno"
-          :placeholder="$t('请输入') + $t('设备位号')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('申请状态')" prop="approveStatus" label-width="50">
         <el-select v-model="queryParams.approveStatus" :placeholder="$t('请选择') + $t('申请状态')" clearable size="small">
           <el-option

+ 0 - 9
ui/src/views/sems/specCc/ty.vue

@@ -28,15 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('设备位号')" prop="devno" label-width="50">
-        <el-input
-          v-model="queryParams.devno"
-          :placeholder="$t('请输入') + $t('设备位号')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('搜索') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('重置') }}</el-button>

+ 0 - 9
ui/src/views/sems/specCc/zx.vue

@@ -28,15 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('设备位号')" prop="devno" label-width="50">
-        <el-input
-          v-model="queryParams.devno"
-          :placeholder="$t('请输入') + $t('设备位号')"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('搜索') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('重置') }}</el-button>