.env.dev

@@ -14,11 +14,10 @@ VUE_APP_TITLE = MES系统
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
 # VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.56:48080'
+VUE_APP_BASE_API = 'http://192.168.1.56:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.188:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.159:48080'
 

src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue

@@ -35,39 +35,34 @@
       <el-tabs v-model="activeName" @tab-click="toggleTab">
         <el-tab-pane label="数据列表" name="dataList">
           <!-- 列表 -->
-          <div v-if="activeName === 'dataList'">
+          <base-table
-            <base-table
+            :page="queryParams.pageNo"
-              :page="queryParams.pageNo"
+            :limit="queryParams.pageSize"
-              :limit="queryParams.pageSize"
+            :table-props="tableProps"
-              :table-props="tableProps"
+            :table-data="tableData"
-              :table-data="tableData"
+            :max-height="tableH"
-              :max-height="tableH"
+          >
-            >
+            <method-btn
-              <method-btn
+              v-if="tableBtn.length"
-                v-if="tableBtn.length"
+              slot="handleBtn"
-                slot="handleBtn"
+              :width="150"
-                :width="150"
+              label="操作"
-                label="操作"
+              :method-list="tableBtn"
-                :method-list="tableBtn"
+              @clickBtn="viewDetDetail"
-                @clickBtn="viewDetDetail"
-              />
-            </base-table>
-            <pagination
-              :page.sync="queryParams.pageNo"
-              :limit.sync="queryParams.pageSize"
-              :total="total"
-              @pagination="getList"
             />
-          </div>
+          </base-table>
+          <pagination
+            :page.sync="queryParams.pageNo"
+            :limit.sync="queryParams.pageSize"
+            :total="total"
+            @pagination="getList"
+          />
         </el-tab-pane>
         <el-tab-pane label="环形图" name="barChart">
-          <div v-if="activeName === 'barChart'">
+          <div 
-            <div 
+            id="logDetPieBar"
-              id="logDetPieBar"
+            style="width: 182px; height: 180px;"
-              style="width: 100%"
+          ></div>
-              :style="{ height: chartHeight + 'px' }"
-            ></div>
-          </div>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -115,8 +110,6 @@
 <script>
 import { deliveryLogPage, deliveryLogDetPage } from '@/api/base/delivery'
 import { parseTime } from '@/utils/ruoyi'
-import * as echarts from 'echarts'
-import resize from '@/utils/chartMixins/resize'
 const tableProps = [
   {
     prop: 'deliveryTime',
@@ -189,7 +182,6 @@ const tableProps2 = [
 ]
 export default {
   name: 'DeliveryLogDetDetail',
-  mixins: [resize],
   data() {
     return {
       centervisible: false,
@@ -203,7 +195,6 @@ export default {
       orderMsg: {},
       tableProps,
       tableData: [],
-      total: 0,
       tableH: this.tableHeight(350),
       tableBtn: [
         this.$auth.hasPermi('base:group-team:update')
@@ -224,18 +215,9 @@ export default {
       tableData2: [],
       tableH2: this.tableHeight(275),
       total2: 0,
-      logCode: '',
+      logCode: ''
-      // 图
-      chartDom: '',
-      chart: '',
-      chartHeight: this.tableHeight(300)
     }
   },
-  // watch: {
-  //   chartData: function () {
-  //     this.getChart()
-  //   }
-  // },
   mounted() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(350)
@@ -243,9 +225,6 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH2 = this.tableHeight(275)
     })
-    window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(300)
-    })
   },
   methods: {
     init(params) {
@@ -257,87 +236,13 @@ export default {
     getList() {
       deliveryLogPage({...this.queryParams}).then(res => {
         this.tableData = res.data.list || []
-        this.taotal = res.data.total || 0
       })
     },
     toggleTab() {
-      if (this.activeName  === 'barChart') {
+
-        this.$nextTick(() => {
-          this.getBar()
-        })
-      }
     },
     getBar() {
-      if (
-        this.chart !== null &&
-        this.chart !== '' &&
-        this.chart !== undefined
-      ) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-      }
-      this.chartDom = document.getElementById('logDetPieBar')
-      this.chart = echarts.init(this.chartDom)
-      let seriesData = []
-      let sumData = 0
-      this.tableData && this.tableData.map(item =>{
-        let obj = {}
-        obj.value = item.rate
-        obj.name = item.name
-        seriesData.push(obj)
-        sumData+=item.rate
-      })
-      if (sumData < 100) {
-        let obj = {}
-        obj.value = 100 - sumData
-        obj.name = "未发货"
-        seriesData.push(obj)
-      }
-      var option = {
-        color: ['#B0EB42', '#FF9747', '#FF6860', '#7164FF', '#288AFF', '#63BDFF', '#73DE93', '#FFCE6A'],
-        tooltip: {
-          trigger: 'item',
-          formatter: function(params) {
-            let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${params.color};"></span>`
-            return `<span>
-                <span style="color:rgba(0,0,0,0.85);">${str}${params.name}</span>
-                <span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${params.percent}</span>
-              </span>`
-          }
-        },
-        legend: {
-          bottom: '5%',
-          left: 'center',
-          icon: 'rect',
-          itemHeight: 8,
-          itemWidth: 8
-        },
-        series: [
-          {
-            type: 'pie',
-            radius: ['60%', '80%'],
-            avoidLabelOverlap: false,
-            label: {
-              show: false,
-              position: 'center'
-            },
-            emphasis: {
-              label: {
-                show: true,
-                fontSize: 40,
-                fontWeight: 'bold'
-              },
-              scale: true ,
-              scaleSize: 20 ,
-            },
-            labelLine: {
-              show: false
-            },
-            data: seriesData
-          }
-        ]
-      };
       
-      option && this.chart.setOption(option);
     },
     viewDetDetail(val) {
       this.logCode = val.data.code

src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD'>
+    <el-drawer title="参数绑定" :visible.sync="visible" size="70%" @close='closeD'>
       <div class="box">
         <el-form :inline="true">
           <el-form-item label="关联表名">
@@ -94,7 +94,6 @@ export default {
   data() {
     return {
       visible: false,
-      drawerTitle: '',
       tableProps,
       tableData: [],
       tableBtn: [],
@@ -132,11 +131,9 @@ export default {
       this.objName = data.objName
       this.getList()
       if (title === 'detail') {
-        this.drawerTitle = '查看参数'
         this.showBtn = false
         this.tableBtn = []
       } else {
-        this.drawerTitle = '参数绑定'
         this.showBtn = true
         this.tableBtn = [
           {

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD'>
+    <el-drawer title="参数绑定" :visible.sync="visible" size="70%" @close='closeD'>
       <div class="box">
         <el-form :inline="true">
           <el-form-item label="方案名称">
@@ -85,7 +85,6 @@ export default {
   data() {
     return {
       visible: false,
-      drawerTitle: '',
       tableProps,
       tableData: [],
       tableBtn: [],
@@ -126,11 +125,9 @@ export default {
       this.energyTypeId = data.energyTypeId
       this.getList()
       if (title === 'detail') {
-        this.drawerTitle = '查看参数'
         this.showBtn = false
         this.tableBtn = []
       } else {
-        this.drawerTitle = '参数绑定'
         this.showBtn = true
         this.tableBtn = [
           {