几个小修改

src/views/module_ems/energyAnalyse/electricityDay/index.vue

@@ -61,7 +61,7 @@
       </el-table-column>
       <el-table-column label="设备名称" align="center" prop="equipmentname" />
       <el-table-column label="设备编号" align="center" prop="equipmentcode" />
-      <el-table-column label="用电量(kWh)" align="center" prop="electricityvalue" />
+      <el-table-column label="用电量(kWh)" align="center" prop="tagvalue2" />
     </el-table>
 
   </div>

src/views/module_ems/energyAnalyse/emsdata.json

@@ -3367,7 +3367,7 @@
             "beginvalue": 119.6,
             "endvalue": 128.4,
             "tagvalue": 8.8,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床CK7530",
@@ -3375,7 +3375,7 @@
             "beginvalue": 204.8,
             "endvalue": 206.8,
             "tagvalue": 2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床SK50P/750",
@@ -3383,7 +3383,7 @@
             "beginvalue": 552.4,
             "endvalue": 562,
             "tagvalue": 9.6,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床SK50P/750",
@@ -3391,7 +3391,7 @@
             "beginvalue": 442.8,
             "endvalue": 455.6,
             "tagvalue": 12.8,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床SL-30",
@@ -3399,7 +3399,7 @@
             "beginvalue": 2515.6,
             "endvalue": 2562.4,
             "tagvalue": 46.8,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床CK7530",
@@ -3407,7 +3407,7 @@
             "beginvalue": 3280,
             "endvalue": 3316,
             "tagvalue": 36,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床CAK5085NJ",
@@ -3415,7 +3415,7 @@
             "beginvalue": 231.6,
             "endvalue": 234.8,
             "tagvalue": 3.2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床CY510n/1500",
@@ -3423,7 +3423,7 @@
             "beginvalue": 495.6,
             "endvalue": 503.6,
             "tagvalue": 8,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床CY510n/1500",
@@ -3431,7 +3431,7 @@
             "beginvalue": 658.4,
             "endvalue": 666.8,
             "tagvalue": 8.4,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床QK1316A",
@@ -3439,7 +3439,7 @@
             "beginvalue": 2853.6,
             "endvalue": 2903.6,
             "tagvalue": 50,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床CK7530/2000",
@@ -3447,7 +3447,7 @@
             "beginvalue": 659.6,
             "endvalue": 672.8,
             "tagvalue": 13.2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床CW6163C/6000",
@@ -3455,7 +3455,7 @@
             "beginvalue": 84,
             "endvalue": 86.4,
             "tagvalue": 2.4,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床QKJ1319",
@@ -3463,7 +3463,7 @@
             "beginvalue": 98,
             "endvalue": 100,
             "tagvalue": 2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床HK63B",
@@ -3471,7 +3471,7 @@
             "beginvalue": 2550.4,
             "endvalue": 2622,
             "tagvalue": 71.6,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床SK50P/3000",
@@ -3479,7 +3479,7 @@
             "beginvalue": 2899.2,
             "endvalue": 2964,
             "tagvalue": 64.8,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控车床HTC50-250t",
@@ -3487,7 +3487,7 @@
             "beginvalue": 1492.8,
             "endvalue": 1492.8,
             "tagvalue": 0,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "加工中心C-32",
@@ -3495,7 +3495,7 @@
             "beginvalue": 633.2,
             "endvalue": 643.6,
             "tagvalue": 10.4,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "立式加工中心VF-2SS",
@@ -3503,7 +3503,7 @@
             "beginvalue": 808.4,
             "endvalue": 810.4,
             "tagvalue": 2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "立式加工中心VF-2SS",
@@ -3511,7 +3511,7 @@
             "beginvalue": 1773.6,
             "endvalue": 1816.8,
             "tagvalue": 43.2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "加工中心DV-1166",
@@ -3519,7 +3519,7 @@
             "beginvalue": 1882,
             "endvalue": 1938,
             "tagvalue": 56,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "加工中心DV850",
@@ -3527,7 +3527,7 @@
             "beginvalue": 1329.6,
             "endvalue": 1354.4,
             "tagvalue": 24.8,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "加工中心DV-1166",
@@ -3535,7 +3535,7 @@
             "beginvalue": 184,
             "endvalue": 184.4,
             "tagvalue": 0.4,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "数控钻铣床BOSM-2200×1200",
@@ -3543,7 +3543,7 @@
             "beginvalue": 1843.6,
             "endvalue": 1901.2,
             "tagvalue": 57.6,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "刮削滚光机SRB250X2600",
@@ -3551,7 +3551,7 @@
             "beginvalue": 180,
             "endvalue": 180.4,
             "tagvalue": 0.4,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "刮削滚光机SRB250X1100",
@@ -3559,7 +3559,7 @@
             "beginvalue": 1003.6,
             "endvalue": 1071.6,
             "tagvalue": 68,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "双工位双头镗SGWSTT01",
@@ -3567,7 +3567,7 @@
             "beginvalue": 700.4,
             "endvalue": 708.8,
             "tagvalue": 8.4,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "双工位双头镗",
@@ -3575,7 +3575,7 @@
             "beginvalue": 146.4,
             "endvalue": 148.4,
             "tagvalue": 2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "双工位双头镗",
@@ -3583,7 +3583,7 @@
             "beginvalue": 904.8,
             "endvalue": 926.4,
             "tagvalue": 21.6,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "油嘴环缝焊机NZC-500",
@@ -3591,7 +3591,7 @@
             "beginvalue": 377.6,
             "endvalue": 388.8,
             "tagvalue": 11.2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "油缸环缝焊机NZC-500-3600",
@@ -3599,7 +3599,7 @@
             "beginvalue": 38.4,
             "endvalue": 39.2,
             "tagvalue": 0.8,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "油缸环缝焊机NZC-500-4000",
@@ -3607,7 +3607,7 @@
             "beginvalue": 46.8,
             "endvalue": 46.8,
             "tagvalue": 0,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "焊接机器人NZCR-500H",
@@ -3615,7 +3615,7 @@
             "beginvalue": 4189.2,
             "endvalue": 4270.4,
             "tagvalue": 81.2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "焊接机器人FD-B6 (OTC)",
@@ -3623,7 +3623,7 @@
             "beginvalue": 3750,
             "endvalue": 3815.2,
             "tagvalue": 65.2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "焊接机器人NZC-YGR6M",
@@ -3631,7 +3631,7 @@
             "beginvalue": 4884.8,
             "endvalue": 4964,
             "tagvalue": 79.2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "双工位焊接机器人NZCR-500YGD×2M",
@@ -3639,7 +3639,7 @@
             "beginvalue": 3707.6,
             "endvalue": 3813.2,
             "tagvalue": 105.6,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "摩擦焊MCH-110T",
@@ -3647,7 +3647,7 @@
             "beginvalue": 2008.4,
             "endvalue": 2144,
             "tagvalue": 135.6,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "摩擦焊MCH-40T",
@@ -3655,7 +3655,7 @@
             "beginvalue": 2414.4,
             "endvalue": 2433.6,
             "tagvalue": 19.2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "清洗机",
@@ -3663,7 +3663,7 @@
             "beginvalue": 622,
             "endvalue": 630.4,
             "tagvalue": 8.4,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "清洗机",
@@ -3671,7 +3671,7 @@
             "beginvalue": 3827.2,
             "endvalue": 3931.2,
             "tagvalue": 104,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "超声波清洗机AX-3CZ",
@@ -3679,7 +3679,7 @@
             "beginvalue": 1385.6,
             "endvalue": 1412.4,
             "tagvalue": 26.8,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "活塞杆清洗机",
@@ -3687,7 +3687,7 @@
             "beginvalue": 58.8,
             "endvalue": 58.8,
             "tagvalue": 0,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "新增清洗机2",
@@ -3695,7 +3695,7 @@
             "beginvalue": 16.8,
             "endvalue": 16.8,
             "tagvalue": 0,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "新增清洗机1",
@@ -3703,7 +3703,7 @@
             "beginvalue": 84,
             "endvalue": 84,
             "tagvalue": 0,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "生产线1米1",
@@ -3711,7 +3711,7 @@
             "beginvalue": 6932.8,
             "endvalue": 7158.4,
             "tagvalue": 225.6,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "高速园锯机",
@@ -3719,7 +3719,7 @@
             "beginvalue": 164,
             "endvalue": 164,
             "tagvalue": 0,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "零件清洗机",
@@ -3727,7 +3727,7 @@
             "beginvalue": 7171.6,
             "endvalue": 7396.8,
             "tagvalue": 225.2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "配电柜总控_214",
@@ -3735,7 +3735,7 @@
             "beginvalue": 89007,
             "endvalue": 96585,
             "tagvalue": 7578,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "车间北_215",
@@ -3743,7 +3743,7 @@
             "beginvalue": 63370.8,
             "endvalue": 65210.4,
             "tagvalue": 1839.6,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "车间南_217",
@@ -3751,7 +3751,7 @@
             "beginvalue": 67020,
             "endvalue": 69109.2,
             "tagvalue": 2089.2,
-            "electricityvalue": null
+            "tagvalue2": null
         },
         {
             "equipmentname": "空调_216",
@@ -3759,7 +3759,7 @@
             "beginvalue": 18500.8,
             "endvalue": 18521.2,
             "tagvalue": 20.4,
-            "electricityvalue": null
+            "tagvalue2": null
         }
     ],
     "paramData": {

src/views/module_ems/energyAnalyse/meterReadData/index.vue

@@ -145,7 +145,7 @@ export default {
         {
           title: '电费(元)',
           align: 'center',
-          dataIndex: 'electricityvalue',
+          dataIndex: 'tagvalue2',
           width: 130,
         },
       ],

src/views/module_tpm/equipmentRunStatis/realtime.vue

@@ -5,12 +5,12 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="设备名称">
-              <!-- <j-dict-select-tag placeholder="请选择设备名称" v-model="queryParam.result" dictCode="spotcheck_result"/> -->
+              <j-search-select-tag v-model="queryParams.equipmentid" dict="tpm_equipment,equipmentname,id"  style="width: 100%"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="参数类型">
-              <!-- <j-dict-select-tag placeholder="请选择参数类型" v-model="queryParam.result" dictCode="spotcheck_result"/> -->
+              <j-dict-select-tag  v-model="queryParam.tagtype"  placeholder="请输入优先级" dictCode="tpm_tag_type"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -76,23 +76,7 @@ export default {
   data() {
     return {
       loading: true,
-      // 数据
-      tpmequiponoffsectionList: [],
-      // 查询参数
-      queryParams: {
-        date: [],
-        day_begin: '',
-        day_end: '',
-      },
       dataSource: [],
-      // 设备
-      equipments: [],
-      // 运行
-      onduration: [],
-      // 待机
-      pauseduration: [],
-      // 关机
-      offduration: [],
       echartsHeight: window.innerHeight - 350,
       // 查询参数
       queryParams: {
@@ -108,18 +92,18 @@ export default {
       },
       // 时间
       timeList: [],
-      // 值
-      tagvalueList: [],
       // 类型
       tageTypeList: {
-        electricity: '电量',
-        currentA: 'A相电流',
-        currentB: 'B相电流',
-        currentC: 'C相电流',
-        voltageA: 'A相电压',
-        voltageB: 'B相电压',
-        voltageC: 'C相电压',
-        // power: "功率",
+        temp: '温度',
+        humi: '湿度',
+        curr: '电流',
+        volt: '电压',
+        power: '功率',
+        speed: '转速',
+        vacu: '真空度',
+        pres: '压力',
+        flow: "流量",
+        ph: "PH计",
       },
       // 表头
       columns: [
@@ -130,44 +114,29 @@ export default {
           width: 60,
           align: 'center',
           customRender: function (t, r, index) {
-            return parseInt(index) + 1
+            return parseInt(index) + 1;
           },
         },
         {
-          title: '设备名称',
+          title: '时间',
           align: 'center',
           dataIndex: 'equipmentid_dictText',
         },
         {
-          title: '设备编号',
+          title: 'A相电压',
           align: 'center',
           dataIndex: 'equipmentcode',
         },
         {
-          title: '日期',
+          title: 'B相电压',
           align: 'center',
           dataIndex: 'day',
         },
         {
-          title: '总时长(分钟)',
+          title: 'C相电压',
           align: 'center',
           dataIndex: 'duration',
         },
-        {
-          title: '运行时长(分钟)',
-          align: 'center',
-          dataIndex: 'onduration',
-        },
-        {
-          title: '待机时长(分钟)',
-          align: 'center',
-          dataIndex: 'pauseduration',
-        },
-        {
-          title: '关机时长(分钟)',
-          align: 'center',
-          dataIndex: 'offduration',
-        },
       ],
     }
   },
@@ -263,78 +232,108 @@ export default {
     },
     initEcharts() {
       var _this = this
-      var chartDom = this.$refs.trendCharts
-      var myChart = echarts.init(chartDom)
-      var option
-      var types = [
-        { name: '运行', color: '#75d874' },
-        { name: '待机', color: '#dc77dc' },
-        { name: '停机', color: '#bd6d6c' },
-      ]
+      var chartDom = _this.$refs.echarts
+      _this.myChart = echarts.init(chartDom)
 
-      option = {
-        title: {
-          text: '设备运行情况(分钟)',
-          left: 'center',
-        },
+      var option = {
         tooltip: {
           trigger: 'axis',
-          axisPointer: {
-            type: 'shadow',
+          position: function (pt) {
+            return [pt[0], '20%']
           },
         },
-        legend: {
-          bottom: 0,
+        title: {
+          left: 'left',
+          text: '实时数据',
         },
-        grid: {
-          top: '30px',
-          left: '3%',
-          right: '4%',
-          bottom: '25px',
-          containLabel: true,
+        legend: {
+          data: ['A相', 'B相', 'C相'],
         },
         xAxis: {
-          type: 'value',
+          type: 'category',
+          boundaryGap: false,
+          data: _this.moniparamData.times,
         },
         yAxis: {
-          type: 'category',
-          data: _this.equipments,
+          type: 'value',
+          boundaryGap: [0, '100%'],
         },
-        toolbox: {
-          show: true,
-          feature: {
-            saveAsImage: {},
+        dataZoom: [
+          {
+            type: 'inside',
+            start: 0,
+            end: 100,
+            xAxisIndex: 0,
           },
-        },
+          {
+            start: 0,
+            end: 10,
+          },
+          {
+            show: true,
+            yAxisIndex: 0,
+            filterMode: "empty",
+            width: 30,
+            height: "80%",
+            right: "7%",
+          },
+        ],
         series: [
           {
-            name: types[0].name,
-            type: 'bar',
-            stack: 'total',
-            color: types[0].color,
-            data: _this.onduration,
+            name: 'A相',
+            type: 'line',
+            symbol: 'none',
+            sampling: 'lttb',
+            // itemStyle: {
+            //   color: '#91CC75',
+            // },
+            markPoint: {
+              data: [
+                { type: 'max', name: 'Max' },
+                { type: 'min', name: 'Min' },
+              ],
+            },
+            data: _this.moniparamData.result.Pa,
           },
           {
-            name: types[1].name,
-            type: 'bar',
-            stack: 'total',
-            color: types[1].color,
-            data: _this.pauseduration,
+            name: 'B相',
+            type: 'line',
+            symbol: 'none',
+            sampling: 'lttb',
+            // itemStyle: {
+            //   color: '#EE6666',
+            // },
+            markPoint: {
+              data: [
+                { type: 'max', name: 'Max' },
+                { type: 'min', name: 'Min' },
+              ],
+            },
+            data: _this.moniparamData.result.Pb,
           },
           {
-            name: types[2].name,
-            type: 'bar',
-            stack: 'total',
-            color: types[2].color,
-            data: _this.offduration,
+            name: 'C相',
+            type: 'line',
+            symbol: 'none',
+            sampling: 'lttb',
+            // itemStyle: {
+            //   color: '#FAAD14',
+            // },
+            markPoint: {
+              data: [
+                { type: 'max', name: 'Max' },
+                { type: 'min', name: 'Min' },
+              ],
+            },
+            data: _this.moniparamData.result.Pc,
           },
         ],
       }
 
-      option && myChart.setOption(option)
+      option && _this.myChart.setOption(option)
 
       window.addEventListener('resize', function () {
-        myChart.resize()
+        _this.myChart.resize()
       })
     },
   },

src/views/system/DictItemList.vue

@@ -94,6 +94,7 @@
             title: '名称',
             align: "center",
             dataIndex: 'itemText',
+            width: 300,
           },
           {
             title: '数据值',
@@ -101,6 +102,16 @@
             dataIndex: 'itemValue',
           },
           {
+            title: '排序值',
+            align: "center",
+            dataIndex: 'sortOrder',
+          },
+          {
+            title: '是否启用',
+            align: "center",
+            dataIndex: 'status_dictText',
+          },
+          {
             title: '操作',
             dataIndex: 'action',
             align: "center",
@@ -198,10 +209,10 @@
       // 抽屉的宽度随着屏幕大小来改变
       resetScreenSize() {
         let screenWidth = document.body.clientWidth;
-        if (screenWidth < 600) {
+        if (screenWidth < 800) {
           this.screenWidth = screenWidth;
         } else {
-          this.screenWidth = 600;
+          this.screenWidth = 800;
         }
       },
       //update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------