删除vue代码

将kafka从cmms移动到tpm中

module_ems/src/main/java/org/jeecg/modules/dataCurrent/vue/DataCurrentList.vue

@@ -1,252 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('ems_data_current')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <data-current-modal ref="modalForm" @ok="modalFormOk"></data-current-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import DataCurrentModal from './modules/DataCurrentModal'
-
-  export default {
-    name: 'DataCurrentList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      DataCurrentModal
-    },
-    data () {
-      return {
-        description: 'ems_data_current管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'设备实时电流ID',
-            align:"center",
-            dataIndex: 'currentid'
-          },
-          {
-            title:'点位ID',
-            align:"center",
-            dataIndex: 'tagid'
-          },
-          {
-            title:'点位名',
-            align:"center",
-            dataIndex: 'tagname'
-          },
-          {
-            title:'设备ID',
-            align:"center",
-            dataIndex: 'equipmentid'
-          },
-          {
-            title:'设备名称',
-            align:"center",
-            dataIndex: 'equipmentname'
-          },
-          {
-            title:'时间',
-            align:"center",
-            dataIndex: 'logtime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'点位值(电流)',
-            align:"center",
-            dataIndex: 'tagvalue'
-          },
-          {
-            title:'所属年',
-            align:"center",
-            dataIndex: 'year'
-          },
-          {
-            title:'所属月',
-            align:"center",
-            dataIndex: 'month'
-          },
-          {
-            title:'日期',
-            align:"center",
-            dataIndex: 'day'
-          },
-          {
-            title:'时间',
-            align:"center",
-            dataIndex: 'time'
-          },
-          {
-            title:'所属年月',
-            align:"center",
-            dataIndex: 'yearmonth'
-          },
-          {
-            title:'所属周',
-            align:"center",
-            dataIndex: 'week'
-          },
-          {
-            title:'周几',
-            align:"center",
-            dataIndex: 'dayofweek'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/dataCurrent/dataCurrent/list",
-          delete: "/dataCurrent/dataCurrent/delete",
-          deleteBatch: "/dataCurrent/dataCurrent/deleteBatch",
-          exportXlsUrl: "/dataCurrent/dataCurrent/exportXls",
-          importExcelUrl: "dataCurrent/dataCurrent/importExcel",
-
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'int',value:'currentid',text:'设备实时电流ID'})
-        fieldList.push({type:'int',value:'tagid',text:'点位ID'})
-        fieldList.push({type:'string',value:'tagname',text:'点位名'})
-        fieldList.push({type:'int',value:'equipmentid',text:'设备ID'})
-        fieldList.push({type:'string',value:'equipmentname',text:'设备名称'})
-        fieldList.push({type:'date',value:'logtime',text:'时间'})
-        fieldList.push({type:'number',value:'tagvalue',text:'点位值(电流)'})
-        fieldList.push({type:'int',value:'year',text:'所属年'})
-        fieldList.push({type:'int',value:'month',text:'所属月'})
-        fieldList.push({type:'string',value:'day',text:'日期'})
-        fieldList.push({type:'string',value:'time',text:'时间'})
-        fieldList.push({type:'string',value:'yearmonth',text:'所属年月'})
-        fieldList.push({type:'int',value:'week',text:'所属周'})
-        fieldList.push({type:'int',value:'dayofweek',text:'周几'})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>

module_ems/src/main/java/org/jeecg/modules/dataCurrent/vue/DataCurrent_menu_insert.sql

@@ -1,26 +0,0 @@
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
-VALUES ('2024011903064680470', NULL, 'ems_data_current', '/dataCurrent/dataCurrentList', 'dataCurrent/DataCurrentList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-01-19 15:06:47', NULL, NULL, 0);
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903064680471', '2024011903064680470', '添加ems_data_current', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_current:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:06:47', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903064680472', '2024011903064680470', '编辑ems_data_current', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_current:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:06:47', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903064680473', '2024011903064680470', '删除ems_data_current', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_current:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:06:47', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903064680474', '2024011903064680470', '批量删除ems_data_current', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_current:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:06:47', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903064680475', '2024011903064680470', '导出excel_ems_data_current', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_current:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:06:47', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903064680476', '2024011903064680470', '导入excel_ems_data_current', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_current:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:06:47', NULL, NULL, 0, 0, '1', 0);

module_ems/src/main/java/org/jeecg/modules/dataCurrent/vue/modules/DataCurrentForm.vue

@@ -1,178 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="设备实时电流ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentid">
-              <a-input-number v-model="model.currentid" placeholder="请输入设备实时电流ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagid">
-              <a-input-number v-model="model.tagid" placeholder="请输入点位ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagname">
-              <a-input v-model="model.tagname" placeholder="请输入点位名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <a-input-number v-model="model.equipmentid" placeholder="请输入设备ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
-              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logtime">
-              <j-date placeholder="请选择时间" v-model="model.logtime"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位值(电流)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagvalue">
-              <a-input-number v-model="model.tagvalue" placeholder="请输入点位值(电流)" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="year">
-              <a-input-number v-model="model.year" placeholder="请输入所属年" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="month">
-              <a-input-number v-model="model.month" placeholder="请输入所属月" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="day">
-              <a-input v-model="model.day" placeholder="请输入日期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="time">
-              <a-input v-model="model.time" placeholder="请输入时间"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearmonth">
-              <a-input v-model="model.yearmonth" placeholder="请输入所属年月"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属周" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="week">
-              <a-input-number v-model="model.week" placeholder="请输入所属周" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="周几" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dayofweek">
-              <a-input-number v-model="model.dayofweek" placeholder="请输入周几" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'DataCurrentForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-           currentid: [
-              { required: true, message: '请输入设备实时电流ID!'},
-           ],
-           tagid: [
-              { required: true, message: '请输入点位ID!'},
-           ],
-           tagname: [
-              { required: true, message: '请输入点位名!'},
-           ],
-        },
-        url: {
-          add: "/dataCurrent/dataCurrent/add",
-          edit: "/dataCurrent/dataCurrent/edit",
-          queryById: "/dataCurrent/dataCurrent/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-
-        })
-      },
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataCurrent/vue/modules/DataCurrentModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <data-current-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></data-current-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import DataCurrentForm from './DataCurrentForm'
-
-  export default {
-    name: 'DataCurrentModal',
-    components: {
-      DataCurrentForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>

module_ems/src/main/java/org/jeecg/modules/dataCurrent/vue/modules/DataCurrentModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <data-current-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></data-current-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import DataCurrentForm from './DataCurrentForm'
-  export default {
-    name: 'DataCurrentModal',
-    components: {
-      DataCurrentForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataDemand/vue/DataDemandList.vue

@@ -1,246 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('ems_data_demand')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <data-demand-modal ref="modalForm" @ok="modalFormOk"></data-demand-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import DataDemandModal from './modules/DataDemandModal'
-
-  export default {
-    name: 'DataDemandList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      DataDemandModal
-    },
-    data () {
-      return {
-        description: 'ems_data_demand管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'需量值ID',
-            align:"center",
-            dataIndex: 'demandid'
-          },
-          {
-            title:'点位ID',
-            align:"center",
-            dataIndex: 'tagid'
-          },
-          {
-            title:'点位名',
-            align:"center",
-            dataIndex: 'tagname'
-          },
-          {
-            title:'设备ID',
-            align:"center",
-            dataIndex: 'equipmentid'
-          },
-          {
-            title:'设备名称',
-            align:"center",
-            dataIndex: 'equipmentname'
-          },
-          {
-            title:'时间',
-            align:"center",
-            dataIndex: 'logtime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'点位值(最大需量)',
-            align:"center",
-            dataIndex: 'tagvalue'
-          },
-          {
-            title:'所属年',
-            align:"center",
-            dataIndex: 'year'
-          },
-          {
-            title:'所属月',
-            align:"center",
-            dataIndex: 'month'
-          },
-          {
-            title:'日期',
-            align:"center",
-            dataIndex: 'day'
-          },
-          {
-            title:'所属年月',
-            align:"center",
-            dataIndex: 'yearmonth'
-          },
-          {
-            title:'所属周',
-            align:"center",
-            dataIndex: 'week'
-          },
-          {
-            title:'周几',
-            align:"center",
-            dataIndex: 'dayofweek'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/dataDemand/dataDemand/list",
-          delete: "/dataDemand/dataDemand/delete",
-          deleteBatch: "/dataDemand/dataDemand/deleteBatch",
-          exportXlsUrl: "/dataDemand/dataDemand/exportXls",
-          importExcelUrl: "dataDemand/dataDemand/importExcel",
-
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'int',value:'demandid',text:'需量值ID'})
-        fieldList.push({type:'int',value:'tagid',text:'点位ID'})
-        fieldList.push({type:'string',value:'tagname',text:'点位名'})
-        fieldList.push({type:'int',value:'equipmentid',text:'设备ID'})
-        fieldList.push({type:'string',value:'equipmentname',text:'设备名称'})
-        fieldList.push({type:'date',value:'logtime',text:'时间'})
-        fieldList.push({type:'number',value:'tagvalue',text:'点位值(最大需量)'})
-        fieldList.push({type:'int',value:'year',text:'所属年'})
-        fieldList.push({type:'int',value:'month',text:'所属月'})
-        fieldList.push({type:'string',value:'day',text:'日期'})
-        fieldList.push({type:'string',value:'yearmonth',text:'所属年月'})
-        fieldList.push({type:'int',value:'week',text:'所属周'})
-        fieldList.push({type:'int',value:'dayofweek',text:'周几'})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>

module_ems/src/main/java/org/jeecg/modules/dataDemand/vue/DataDemand_menu_insert.sql

@@ -1,26 +0,0 @@
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
-VALUES ('2024011903073830080', NULL, 'ems_data_demand', '/dataDemand/dataDemandList', 'dataDemand/DataDemandList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-01-19 15:07:08', NULL, NULL, 0);
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903073830081', '2024011903073830080', '添加ems_data_demand', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_demand:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:08', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903073830082', '2024011903073830080', '编辑ems_data_demand', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_demand:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:08', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903073830083', '2024011903073830080', '删除ems_data_demand', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_demand:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:08', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903073830084', '2024011903073830080', '批量删除ems_data_demand', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_demand:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:08', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903073830085', '2024011903073830080', '导出excel_ems_data_demand', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_demand:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:08', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903073830086', '2024011903073830080', '导入excel_ems_data_demand', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_demand:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:08', NULL, NULL, 0, 0, '1', 0);

module_ems/src/main/java/org/jeecg/modules/dataDemand/vue/modules/DataDemandForm.vue

@@ -1,173 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="需量值ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="demandid">
-              <a-input-number v-model="model.demandid" placeholder="请输入需量值ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagid">
-              <a-input-number v-model="model.tagid" placeholder="请输入点位ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagname">
-              <a-input v-model="model.tagname" placeholder="请输入点位名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <a-input-number v-model="model.equipmentid" placeholder="请输入设备ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
-              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logtime">
-              <j-date placeholder="请选择时间" v-model="model.logtime"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位值(最大需量)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagvalue">
-              <a-input-number v-model="model.tagvalue" placeholder="请输入点位值(最大需量)" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="year">
-              <a-input-number v-model="model.year" placeholder="请输入所属年" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="month">
-              <a-input-number v-model="model.month" placeholder="请输入所属月" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="day">
-              <a-input v-model="model.day" placeholder="请输入日期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearmonth">
-              <a-input v-model="model.yearmonth" placeholder="请输入所属年月"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属周" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="week">
-              <a-input-number v-model="model.week" placeholder="请输入所属周" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="周几" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dayofweek">
-              <a-input-number v-model="model.dayofweek" placeholder="请输入周几" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'DataDemandForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-           demandid: [
-              { required: true, message: '请输入需量值ID!'},
-           ],
-           tagid: [
-              { required: true, message: '请输入点位ID!'},
-           ],
-           tagname: [
-              { required: true, message: '请输入点位名!'},
-           ],
-        },
-        url: {
-          add: "/dataDemand/dataDemand/add",
-          edit: "/dataDemand/dataDemand/edit",
-          queryById: "/dataDemand/dataDemand/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-
-        })
-      },
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataDemand/vue/modules/DataDemandModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <data-demand-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></data-demand-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import DataDemandForm from './DataDemandForm'
-
-  export default {
-    name: 'DataDemandModal',
-    components: {
-      DataDemandForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>

module_ems/src/main/java/org/jeecg/modules/dataDemand/vue/modules/DataDemandModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <data-demand-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></data-demand-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import DataDemandForm from './DataDemandForm'
-  export default {
-    name: 'DataDemandModal',
-    components: {
-      DataDemandForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataElectricity/vue/DataElectricityList.vue

@@ -1,318 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('ems_data_electricity')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <data-electricity-modal ref="modalForm" @ok="modalFormOk"></data-electricity-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import DataElectricityModal from './modules/DataElectricityModal'
-
-  export default {
-    name: 'DataElectricityList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      DataElectricityModal
-    },
-    data () {
-      return {
-        description: 'ems_data_electricity管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'电量ID',
-            align:"center",
-            dataIndex: 'electricityid'
-          },
-          {
-            title:'点位ID',
-            align:"center",
-            dataIndex: 'tagid'
-          },
-          {
-            title:'点位名',
-            align:"center",
-            dataIndex: 'tagname'
-          },
-          {
-            title:'设备ID',
-            align:"center",
-            dataIndex: 'equipmentid'
-          },
-          {
-            title:'设备名称',
-            align:"center",
-            dataIndex: 'equipmentname'
-          },
-          {
-            title:'时间',
-            align:"center",
-            dataIndex: 'logtime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'点位值(总电量)',
-            align:"center",
-            dataIndex: 'tagvalue'
-          },
-          {
-            title:'分时电量',
-            align:"center",
-            dataIndex: 'electricityvalue'
-          },
-          {
-            title:'所属年',
-            align:"center",
-            dataIndex: 'year'
-          },
-          {
-            title:'所属月',
-            align:"center",
-            dataIndex: 'month'
-          },
-          {
-            title:'日期',
-            align:"center",
-            dataIndex: 'day'
-          },
-          {
-            title:'时间',
-            align:"center",
-            dataIndex: 'time'
-          },
-          {
-            title:'所属年月',
-            align:"center",
-            dataIndex: 'yearmonth'
-          },
-          {
-            title:'所属周',
-            align:"center",
-            dataIndex: 'week'
-          },
-          {
-            title:'周几',
-            align:"center",
-            dataIndex: 'dayofweek'
-          },
-          {
-            title:'电费',
-            align:"center",
-            dataIndex: 'amount'
-          },
-          {
-            title:'基本电费ID',
-            align:"center",
-            dataIndex: 'elecfeebaseid'
-          },
-          {
-            title:'基本电费',
-            align:"center",
-            dataIndex: 'baseamount'
-          },
-          {
-            title:'电度电费ID',
-            align:"center",
-            dataIndex: 'elecfeedegreeid'
-          },
-          {
-            title:'电度电费',
-            align:"center",
-            dataIndex: 'degreeamount'
-          },
-          {
-            title:'电度电费类型：峰平谷、售电、光伏',
-            align:"center",
-            dataIndex: 'degreetype'
-          },
-          {
-            title:'力调系数ID',
-            align:"center",
-            dataIndex: 'elecfeeratioid'
-          },
-          {
-            title:'力调电费',
-            align:"center",
-            dataIndex: 'ratioamount'
-          },
-          {
-            title:'附加电费ID',
-            align:"center",
-            dataIndex: 'elecfeeaddid'
-          },
-          {
-            title:'附加电费',
-            align:"center",
-            dataIndex: 'addamount'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/dataElectricity/dataElectricity/list",
-          delete: "/dataElectricity/dataElectricity/delete",
-          deleteBatch: "/dataElectricity/dataElectricity/deleteBatch",
-          exportXlsUrl: "/dataElectricity/dataElectricity/exportXls",
-          importExcelUrl: "dataElectricity/dataElectricity/importExcel",
-
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'int',value:'electricityid',text:'电量ID'})
-        fieldList.push({type:'int',value:'tagid',text:'点位ID'})
-        fieldList.push({type:'string',value:'tagname',text:'点位名'})
-        fieldList.push({type:'int',value:'equipmentid',text:'设备ID'})
-        fieldList.push({type:'string',value:'equipmentname',text:'设备名称'})
-        fieldList.push({type:'date',value:'logtime',text:'时间'})
-        fieldList.push({type:'number',value:'tagvalue',text:'点位值(总电量)'})
-        fieldList.push({type:'number',value:'electricityvalue',text:'分时电量'})
-        fieldList.push({type:'int',value:'year',text:'所属年'})
-        fieldList.push({type:'int',value:'month',text:'所属月'})
-        fieldList.push({type:'string',value:'day',text:'日期'})
-        fieldList.push({type:'string',value:'time',text:'时间'})
-        fieldList.push({type:'string',value:'yearmonth',text:'所属年月'})
-        fieldList.push({type:'int',value:'week',text:'所属周'})
-        fieldList.push({type:'int',value:'dayofweek',text:'周几'})
-        fieldList.push({type:'number',value:'amount',text:'电费'})
-        fieldList.push({type:'int',value:'elecfeebaseid',text:'基本电费ID'})
-        fieldList.push({type:'number',value:'baseamount',text:'基本电费'})
-        fieldList.push({type:'int',value:'elecfeedegreeid',text:'电度电费ID'})
-        fieldList.push({type:'number',value:'degreeamount',text:'电度电费'})
-        fieldList.push({type:'string',value:'degreetype',text:'电度电费类型：峰平谷、售电、光伏'})
-        fieldList.push({type:'int',value:'elecfeeratioid',text:'力调系数ID'})
-        fieldList.push({type:'number',value:'ratioamount',text:'力调电费'})
-        fieldList.push({type:'int',value:'elecfeeaddid',text:'附加电费ID'})
-        fieldList.push({type:'number',value:'addamount',text:'附加电费'})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>

module_ems/src/main/java/org/jeecg/modules/dataElectricity/vue/DataElectricity_menu_insert.sql

@@ -1,26 +0,0 @@
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
-VALUES ('2024011903078610250', NULL, 'ems_data_electricity', '/dataElectricity/dataElectricityList', 'dataElectricity/DataElectricityList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-01-19 15:07:25', NULL, NULL, 0);
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903078610251', '2024011903078610250', '添加ems_data_electricity', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:25', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903078610252', '2024011903078610250', '编辑ems_data_electricity', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:25', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903078610253', '2024011903078610250', '删除ems_data_electricity', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:25', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903078610254', '2024011903078610250', '批量删除ems_data_electricity', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:25', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903078610255', '2024011903078610250', '导出excel_ems_data_electricity', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:25', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903078610256', '2024011903078610250', '导入excel_ems_data_electricity', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:25', NULL, NULL, 0, 0, '1', 0);

module_ems/src/main/java/org/jeecg/modules/dataElectricity/vue/modules/DataElectricityForm.vue

@@ -1,233 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="电量ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="electricityid">
-              <a-input-number v-model="model.electricityid" placeholder="请输入电量ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagid">
-              <a-input-number v-model="model.tagid" placeholder="请输入点位ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagname">
-              <a-input v-model="model.tagname" placeholder="请输入点位名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <a-input-number v-model="model.equipmentid" placeholder="请输入设备ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
-              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logtime">
-              <j-date placeholder="请选择时间" v-model="model.logtime"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位值(总电量)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagvalue">
-              <a-input-number v-model="model.tagvalue" placeholder="请输入点位值(总电量)" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="分时电量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="electricityvalue">
-              <a-input-number v-model="model.electricityvalue" placeholder="请输入分时电量" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="year">
-              <a-input-number v-model="model.year" placeholder="请输入所属年" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="month">
-              <a-input-number v-model="model.month" placeholder="请输入所属月" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="day">
-              <a-input v-model="model.day" placeholder="请输入日期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="time">
-              <a-input v-model="model.time" placeholder="请输入时间"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearmonth">
-              <a-input v-model="model.yearmonth" placeholder="请输入所属年月"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属周" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="week">
-              <a-input-number v-model="model.week" placeholder="请输入所属周" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="周几" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dayofweek">
-              <a-input-number v-model="model.dayofweek" placeholder="请输入周几" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amount">
-              <a-input-number v-model="model.amount" placeholder="请输入电费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="基本电费ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="elecfeebaseid">
-              <a-input-number v-model="model.elecfeebaseid" placeholder="请输入基本电费ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="基本电费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="baseamount">
-              <a-input-number v-model="model.baseamount" placeholder="请输入基本电费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电度电费ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="elecfeedegreeid">
-              <a-input-number v-model="model.elecfeedegreeid" placeholder="请输入电度电费ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电度电费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="degreeamount">
-              <a-input-number v-model="model.degreeamount" placeholder="请输入电度电费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电度电费类型：峰平谷、售电、光伏" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="degreetype">
-              <a-input v-model="model.degreetype" placeholder="请输入电度电费类型：峰平谷、售电、光伏"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="力调系数ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="elecfeeratioid">
-              <a-input-number v-model="model.elecfeeratioid" placeholder="请输入力调系数ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="力调电费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ratioamount">
-              <a-input-number v-model="model.ratioamount" placeholder="请输入力调电费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="附加电费ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="elecfeeaddid">
-              <a-input-number v-model="model.elecfeeaddid" placeholder="请输入附加电费ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="附加电费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addamount">
-              <a-input-number v-model="model.addamount" placeholder="请输入附加电费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'DataElectricityForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-           electricityid: [
-              { required: true, message: '请输入电量ID!'},
-           ],
-           tagid: [
-              { required: true, message: '请输入点位ID!'},
-           ],
-           tagname: [
-              { required: true, message: '请输入点位名!'},
-           ],
-        },
-        url: {
-          add: "/dataElectricity/dataElectricity/add",
-          edit: "/dataElectricity/dataElectricity/edit",
-          queryById: "/dataElectricity/dataElectricity/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-
-        })
-      },
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataElectricity/vue/modules/DataElectricityModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <data-electricity-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></data-electricity-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import DataElectricityForm from './DataElectricityForm'
-
-  export default {
-    name: 'DataElectricityModal',
-    components: {
-      DataElectricityForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>

module_ems/src/main/java/org/jeecg/modules/dataElectricity/vue/modules/DataElectricityModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <data-electricity-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></data-electricity-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import DataElectricityForm from './DataElectricityForm'
-  export default {
-    name: 'DataElectricityModal',
-    components: {
-      DataElectricityForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataElectricityDay/vue/DataElectricityDayList.vue

@@ -1,306 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('ems_data_electricity_day')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <data-electricity-day-modal ref="modalForm" @ok="modalFormOk"></data-electricity-day-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import DataElectricityDayModal from './modules/DataElectricityDayModal'
-
-  export default {
-    name: 'DataElectricityDayList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      DataElectricityDayModal
-    },
-    data () {
-      return {
-        description: 'ems_data_electricity_day管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'一天电量ID',
-            align:"center",
-            dataIndex: 'electricitydayid'
-          },
-          {
-            title:'点位ID',
-            align:"center",
-            dataIndex: 'tagid'
-          },
-          {
-            title:'点位名',
-            align:"center",
-            dataIndex: 'tagname'
-          },
-          {
-            title:'设备ID',
-            align:"center",
-            dataIndex: 'equipmentid'
-          },
-          {
-            title:'设备名称',
-            align:"center",
-            dataIndex: 'equipmentname'
-          },
-          {
-            title:'计算时间',
-            align:"center",
-            dataIndex: 'logtime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'一天电量',
-            align:"center",
-            dataIndex: 'electricityvalue'
-          },
-          {
-            title:'所属年',
-            align:"center",
-            dataIndex: 'year'
-          },
-          {
-            title:'所属月',
-            align:"center",
-            dataIndex: 'month'
-          },
-          {
-            title:'日期',
-            align:"center",
-            dataIndex: 'day'
-          },
-          {
-            title:'所属年月',
-            align:"center",
-            dataIndex: 'yearmonth'
-          },
-          {
-            title:'所属周',
-            align:"center",
-            dataIndex: 'week'
-          },
-          {
-            title:'周几',
-            align:"center",
-            dataIndex: 'dayofweek'
-          },
-          {
-            title:'电费',
-            align:"center",
-            dataIndex: 'amount'
-          },
-          {
-            title:'基本电费ID',
-            align:"center",
-            dataIndex: 'elecfeebaseid'
-          },
-          {
-            title:'基本电费',
-            align:"center",
-            dataIndex: 'baseamount'
-          },
-          {
-            title:'电度电费ID',
-            align:"center",
-            dataIndex: 'elecfeedegreeid'
-          },
-          {
-            title:'电度电费',
-            align:"center",
-            dataIndex: 'degreeamount'
-          },
-          {
-            title:'电度电费类型：峰平谷、售电、光伏',
-            align:"center",
-            dataIndex: 'degreetype'
-          },
-          {
-            title:'力调系数ID',
-            align:"center",
-            dataIndex: 'elecfeeratioid'
-          },
-          {
-            title:'力调电费',
-            align:"center",
-            dataIndex: 'ratioamount'
-          },
-          {
-            title:'附加电费ID',
-            align:"center",
-            dataIndex: 'elecfeeaddid'
-          },
-          {
-            title:'附加电费',
-            align:"center",
-            dataIndex: 'addamount'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/dataElectricityDay/dataElectricityDay/list",
-          delete: "/dataElectricityDay/dataElectricityDay/delete",
-          deleteBatch: "/dataElectricityDay/dataElectricityDay/deleteBatch",
-          exportXlsUrl: "/dataElectricityDay/dataElectricityDay/exportXls",
-          importExcelUrl: "dataElectricityDay/dataElectricityDay/importExcel",
-
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'int',value:'electricitydayid',text:'一天电量ID'})
-        fieldList.push({type:'int',value:'tagid',text:'点位ID'})
-        fieldList.push({type:'string',value:'tagname',text:'点位名'})
-        fieldList.push({type:'int',value:'equipmentid',text:'设备ID'})
-        fieldList.push({type:'string',value:'equipmentname',text:'设备名称'})
-        fieldList.push({type:'date',value:'logtime',text:'计算时间'})
-        fieldList.push({type:'number',value:'electricityvalue',text:'一天电量'})
-        fieldList.push({type:'int',value:'year',text:'所属年'})
-        fieldList.push({type:'int',value:'month',text:'所属月'})
-        fieldList.push({type:'string',value:'day',text:'日期'})
-        fieldList.push({type:'string',value:'yearmonth',text:'所属年月'})
-        fieldList.push({type:'int',value:'week',text:'所属周'})
-        fieldList.push({type:'int',value:'dayofweek',text:'周几'})
-        fieldList.push({type:'number',value:'amount',text:'电费'})
-        fieldList.push({type:'int',value:'elecfeebaseid',text:'基本电费ID'})
-        fieldList.push({type:'number',value:'baseamount',text:'基本电费'})
-        fieldList.push({type:'int',value:'elecfeedegreeid',text:'电度电费ID'})
-        fieldList.push({type:'number',value:'degreeamount',text:'电度电费'})
-        fieldList.push({type:'string',value:'degreetype',text:'电度电费类型：峰平谷、售电、光伏'})
-        fieldList.push({type:'int',value:'elecfeeratioid',text:'力调系数ID'})
-        fieldList.push({type:'number',value:'ratioamount',text:'力调电费'})
-        fieldList.push({type:'int',value:'elecfeeaddid',text:'附加电费ID'})
-        fieldList.push({type:'number',value:'addamount',text:'附加电费'})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>

module_ems/src/main/java/org/jeecg/modules/dataElectricityDay/vue/DataElectricityDay_menu_insert.sql

@@ -1,26 +0,0 @@
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
-VALUES ('2024011903076850370', NULL, 'ems_data_electricity_day', '/dataElectricityDay/dataElectricityDayList', 'dataElectricityDay/DataElectricityDayList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-01-19 15:07:37', NULL, NULL, 0);
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903076850371', '2024011903076850370', '添加ems_data_electricity_day', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity_day:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:37', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903076850372', '2024011903076850370', '编辑ems_data_electricity_day', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity_day:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:37', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903076850373', '2024011903076850370', '删除ems_data_electricity_day', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity_day:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:37', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903076850374', '2024011903076850370', '批量删除ems_data_electricity_day', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity_day:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:37', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903076850375', '2024011903076850370', '导出excel_ems_data_electricity_day', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity_day:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:37', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903076850376', '2024011903076850370', '导入excel_ems_data_electricity_day', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_electricity_day:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:37', NULL, NULL, 0, 0, '1', 0);

module_ems/src/main/java/org/jeecg/modules/dataElectricityDay/vue/modules/DataElectricityDayForm.vue

@@ -1,223 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="一天电量ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="electricitydayid">
-              <a-input-number v-model="model.electricitydayid" placeholder="请输入一天电量ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagid">
-              <a-input-number v-model="model.tagid" placeholder="请输入点位ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagname">
-              <a-input v-model="model.tagname" placeholder="请输入点位名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <a-input-number v-model="model.equipmentid" placeholder="请输入设备ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
-              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="计算时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logtime">
-              <j-date placeholder="请选择计算时间" v-model="model.logtime"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="一天电量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="electricityvalue">
-              <a-input-number v-model="model.electricityvalue" placeholder="请输入一天电量" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="year">
-              <a-input-number v-model="model.year" placeholder="请输入所属年" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="month">
-              <a-input-number v-model="model.month" placeholder="请输入所属月" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="day">
-              <a-input v-model="model.day" placeholder="请输入日期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearmonth">
-              <a-input v-model="model.yearmonth" placeholder="请输入所属年月"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属周" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="week">
-              <a-input-number v-model="model.week" placeholder="请输入所属周" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="周几" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dayofweek">
-              <a-input-number v-model="model.dayofweek" placeholder="请输入周几" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amount">
-              <a-input-number v-model="model.amount" placeholder="请输入电费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="基本电费ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="elecfeebaseid">
-              <a-input-number v-model="model.elecfeebaseid" placeholder="请输入基本电费ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="基本电费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="baseamount">
-              <a-input-number v-model="model.baseamount" placeholder="请输入基本电费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电度电费ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="elecfeedegreeid">
-              <a-input-number v-model="model.elecfeedegreeid" placeholder="请输入电度电费ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电度电费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="degreeamount">
-              <a-input-number v-model="model.degreeamount" placeholder="请输入电度电费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电度电费类型：峰平谷、售电、光伏" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="degreetype">
-              <a-input v-model="model.degreetype" placeholder="请输入电度电费类型：峰平谷、售电、光伏"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="力调系数ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="elecfeeratioid">
-              <a-input-number v-model="model.elecfeeratioid" placeholder="请输入力调系数ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="力调电费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ratioamount">
-              <a-input-number v-model="model.ratioamount" placeholder="请输入力调电费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="附加电费ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="elecfeeaddid">
-              <a-input-number v-model="model.elecfeeaddid" placeholder="请输入附加电费ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="附加电费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addamount">
-              <a-input-number v-model="model.addamount" placeholder="请输入附加电费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'DataElectricityDayForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-           electricitydayid: [
-              { required: true, message: '请输入一天电量ID!'},
-           ],
-           tagid: [
-              { required: true, message: '请输入点位ID!'},
-           ],
-           tagname: [
-              { required: true, message: '请输入点位名!'},
-           ],
-        },
-        url: {
-          add: "/dataElectricityDay/dataElectricityDay/add",
-          edit: "/dataElectricityDay/dataElectricityDay/edit",
-          queryById: "/dataElectricityDay/dataElectricityDay/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-
-        })
-      },
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataElectricityDay/vue/modules/DataElectricityDayModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <data-electricity-day-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></data-electricity-day-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import DataElectricityDayForm from './DataElectricityDayForm'
-
-  export default {
-    name: 'DataElectricityDayModal',
-    components: {
-      DataElectricityDayForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>

module_ems/src/main/java/org/jeecg/modules/dataElectricityDay/vue/modules/DataElectricityDayModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <data-electricity-day-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></data-electricity-day-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import DataElectricityDayForm from './DataElectricityDayForm'
-  export default {
-    name: 'DataElectricityDayModal',
-    components: {
-      DataElectricityDayForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataPower/vue/DataPowerList.vue

@@ -1,252 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('ems_data_power')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <data-power-modal ref="modalForm" @ok="modalFormOk"></data-power-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import DataPowerModal from './modules/DataPowerModal'
-
-  export default {
-    name: 'DataPowerList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      DataPowerModal
-    },
-    data () {
-      return {
-        description: 'ems_data_power管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'设备实时功率ID',
-            align:"center",
-            dataIndex: 'powerid'
-          },
-          {
-            title:'点位ID',
-            align:"center",
-            dataIndex: 'tagid'
-          },
-          {
-            title:'点位名',
-            align:"center",
-            dataIndex: 'tagname'
-          },
-          {
-            title:'设备ID',
-            align:"center",
-            dataIndex: 'equipmentid'
-          },
-          {
-            title:'设备名称',
-            align:"center",
-            dataIndex: 'equipmentname'
-          },
-          {
-            title:'时间',
-            align:"center",
-            dataIndex: 'logtime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'点位值(功率)',
-            align:"center",
-            dataIndex: 'tagvalue'
-          },
-          {
-            title:'所属年',
-            align:"center",
-            dataIndex: 'year'
-          },
-          {
-            title:'所属月',
-            align:"center",
-            dataIndex: 'month'
-          },
-          {
-            title:'日期',
-            align:"center",
-            dataIndex: 'day'
-          },
-          {
-            title:'时间',
-            align:"center",
-            dataIndex: 'time'
-          },
-          {
-            title:'所属年月',
-            align:"center",
-            dataIndex: 'yearmonth'
-          },
-          {
-            title:'所属周',
-            align:"center",
-            dataIndex: 'week'
-          },
-          {
-            title:'周几',
-            align:"center",
-            dataIndex: 'dayofweek'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/dataPower/dataPower/list",
-          delete: "/dataPower/dataPower/delete",
-          deleteBatch: "/dataPower/dataPower/deleteBatch",
-          exportXlsUrl: "/dataPower/dataPower/exportXls",
-          importExcelUrl: "dataPower/dataPower/importExcel",
-
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'int',value:'powerid',text:'设备实时功率ID'})
-        fieldList.push({type:'int',value:'tagid',text:'点位ID'})
-        fieldList.push({type:'string',value:'tagname',text:'点位名'})
-        fieldList.push({type:'int',value:'equipmentid',text:'设备ID'})
-        fieldList.push({type:'string',value:'equipmentname',text:'设备名称'})
-        fieldList.push({type:'date',value:'logtime',text:'时间'})
-        fieldList.push({type:'number',value:'tagvalue',text:'点位值(功率)'})
-        fieldList.push({type:'int',value:'year',text:'所属年'})
-        fieldList.push({type:'int',value:'month',text:'所属月'})
-        fieldList.push({type:'string',value:'day',text:'日期'})
-        fieldList.push({type:'string',value:'time',text:'时间'})
-        fieldList.push({type:'string',value:'yearmonth',text:'所属年月'})
-        fieldList.push({type:'int',value:'week',text:'所属周'})
-        fieldList.push({type:'int',value:'dayofweek',text:'周几'})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>

module_ems/src/main/java/org/jeecg/modules/dataPower/vue/DataPower_menu_insert.sql

@@ -1,26 +0,0 @@
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
-VALUES ('202401190307730510', NULL, 'ems_data_power', '/dataPower/dataPowerList', 'dataPower/DataPowerList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-01-19 15:07:51', NULL, NULL, 0);
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202401190307730511', '202401190307730510', '添加ems_data_power', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_power:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:51', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202401190307730512', '202401190307730510', '编辑ems_data_power', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_power:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:51', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202401190307730513', '202401190307730510', '删除ems_data_power', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_power:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:51', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202401190307730514', '202401190307730510', '批量删除ems_data_power', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_power:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:51', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202401190307730515', '202401190307730510', '导出excel_ems_data_power', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_power:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:51', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202401190307730516', '202401190307730510', '导入excel_ems_data_power', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_power:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:07:51', NULL, NULL, 0, 0, '1', 0);

module_ems/src/main/java/org/jeecg/modules/dataPower/vue/modules/DataPowerForm.vue

@@ -1,178 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="设备实时功率ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="powerid">
-              <a-input-number v-model="model.powerid" placeholder="请输入设备实时功率ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagid">
-              <a-input-number v-model="model.tagid" placeholder="请输入点位ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagname">
-              <a-input v-model="model.tagname" placeholder="请输入点位名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <a-input-number v-model="model.equipmentid" placeholder="请输入设备ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
-              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logtime">
-              <j-date placeholder="请选择时间" v-model="model.logtime"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位值(功率)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagvalue">
-              <a-input-number v-model="model.tagvalue" placeholder="请输入点位值(功率)" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="year">
-              <a-input-number v-model="model.year" placeholder="请输入所属年" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="month">
-              <a-input-number v-model="model.month" placeholder="请输入所属月" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="day">
-              <a-input v-model="model.day" placeholder="请输入日期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="time">
-              <a-input v-model="model.time" placeholder="请输入时间"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearmonth">
-              <a-input v-model="model.yearmonth" placeholder="请输入所属年月"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属周" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="week">
-              <a-input-number v-model="model.week" placeholder="请输入所属周" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="周几" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dayofweek">
-              <a-input-number v-model="model.dayofweek" placeholder="请输入周几" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'DataPowerForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-           powerid: [
-              { required: true, message: '请输入设备实时功率ID!'},
-           ],
-           tagid: [
-              { required: true, message: '请输入点位ID!'},
-           ],
-           tagname: [
-              { required: true, message: '请输入点位名!'},
-           ],
-        },
-        url: {
-          add: "/dataPower/dataPower/add",
-          edit: "/dataPower/dataPower/edit",
-          queryById: "/dataPower/dataPower/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-
-        })
-      },
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataPower/vue/modules/DataPowerModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <data-power-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></data-power-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import DataPowerForm from './DataPowerForm'
-
-  export default {
-    name: 'DataPowerModal',
-    components: {
-      DataPowerForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>

module_ems/src/main/java/org/jeecg/modules/dataPower/vue/modules/DataPowerModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <data-power-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></data-power-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import DataPowerForm from './DataPowerForm'
-  export default {
-    name: 'DataPowerModal',
-    components: {
-      DataPowerForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataVoltage/vue/DataVoltageList.vue

@@ -1,252 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('ems_data_voltage')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <data-voltage-modal ref="modalForm" @ok="modalFormOk"></data-voltage-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import DataVoltageModal from './modules/DataVoltageModal'
-
-  export default {
-    name: 'DataVoltageList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      DataVoltageModal
-    },
-    data () {
-      return {
-        description: 'ems_data_voltage管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'设备实时电压ID',
-            align:"center",
-            dataIndex: 'voltageid'
-          },
-          {
-            title:'点位ID',
-            align:"center",
-            dataIndex: 'tagid'
-          },
-          {
-            title:'点位名',
-            align:"center",
-            dataIndex: 'tagname'
-          },
-          {
-            title:'设备ID',
-            align:"center",
-            dataIndex: 'equipmentid'
-          },
-          {
-            title:'设备名称',
-            align:"center",
-            dataIndex: 'equipmentname'
-          },
-          {
-            title:'时间',
-            align:"center",
-            dataIndex: 'logtime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'点位值(电量)',
-            align:"center",
-            dataIndex: 'tagvalue'
-          },
-          {
-            title:'所属年',
-            align:"center",
-            dataIndex: 'year'
-          },
-          {
-            title:'所属月',
-            align:"center",
-            dataIndex: 'month'
-          },
-          {
-            title:'日期',
-            align:"center",
-            dataIndex: 'day'
-          },
-          {
-            title:'时间',
-            align:"center",
-            dataIndex: 'time'
-          },
-          {
-            title:'所属年月',
-            align:"center",
-            dataIndex: 'yearmonth'
-          },
-          {
-            title:'所属周',
-            align:"center",
-            dataIndex: 'week'
-          },
-          {
-            title:'周几',
-            align:"center",
-            dataIndex: 'dayofweek'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/dataVoltage/dataVoltage/list",
-          delete: "/dataVoltage/dataVoltage/delete",
-          deleteBatch: "/dataVoltage/dataVoltage/deleteBatch",
-          exportXlsUrl: "/dataVoltage/dataVoltage/exportXls",
-          importExcelUrl: "dataVoltage/dataVoltage/importExcel",
-
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'int',value:'voltageid',text:'设备实时电压ID'})
-        fieldList.push({type:'int',value:'tagid',text:'点位ID'})
-        fieldList.push({type:'string',value:'tagname',text:'点位名'})
-        fieldList.push({type:'int',value:'equipmentid',text:'设备ID'})
-        fieldList.push({type:'string',value:'equipmentname',text:'设备名称'})
-        fieldList.push({type:'date',value:'logtime',text:'时间'})
-        fieldList.push({type:'number',value:'tagvalue',text:'点位值(电量)'})
-        fieldList.push({type:'int',value:'year',text:'所属年'})
-        fieldList.push({type:'int',value:'month',text:'所属月'})
-        fieldList.push({type:'string',value:'day',text:'日期'})
-        fieldList.push({type:'string',value:'time',text:'时间'})
-        fieldList.push({type:'string',value:'yearmonth',text:'所属年月'})
-        fieldList.push({type:'int',value:'week',text:'所属周'})
-        fieldList.push({type:'int',value:'dayofweek',text:'周几'})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>

module_ems/src/main/java/org/jeecg/modules/dataVoltage/vue/DataVoltage_menu_insert.sql

@@ -1,26 +0,0 @@
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
-VALUES ('2024011903086180030', NULL, 'ems_data_voltage', '/dataVoltage/dataVoltageList', 'dataVoltage/DataVoltageList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-01-19 15:08:03', NULL, NULL, 0);
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903086180031', '2024011903086180030', '添加ems_data_voltage', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_voltage:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:08:03', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903086180032', '2024011903086180030', '编辑ems_data_voltage', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_voltage:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:08:03', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903086180033', '2024011903086180030', '删除ems_data_voltage', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_voltage:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:08:03', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903086180034', '2024011903086180030', '批量删除ems_data_voltage', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_voltage:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:08:03', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903086180035', '2024011903086180030', '导出excel_ems_data_voltage', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_voltage:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:08:03', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011903086180036', '2024011903086180030', '导入excel_ems_data_voltage', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_data_voltage:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 15:08:03', NULL, NULL, 0, 0, '1', 0);

module_ems/src/main/java/org/jeecg/modules/dataVoltage/vue/modules/DataVoltageForm.vue

@@ -1,178 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="设备实时电压ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="voltageid">
-              <a-input-number v-model="model.voltageid" placeholder="请输入设备实时电压ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagid">
-              <a-input-number v-model="model.tagid" placeholder="请输入点位ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagname">
-              <a-input v-model="model.tagname" placeholder="请输入点位名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <a-input-number v-model="model.equipmentid" placeholder="请输入设备ID" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
-              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logtime">
-              <j-date placeholder="请选择时间" v-model="model.logtime"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="点位值(电量)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagvalue">
-              <a-input-number v-model="model.tagvalue" placeholder="请输入点位值(电量)" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="year">
-              <a-input-number v-model="model.year" placeholder="请输入所属年" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="month">
-              <a-input-number v-model="model.month" placeholder="请输入所属月" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="day">
-              <a-input v-model="model.day" placeholder="请输入日期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="time">
-              <a-input v-model="model.time" placeholder="请输入时间"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属年月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearmonth">
-              <a-input v-model="model.yearmonth" placeholder="请输入所属年月"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属周" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="week">
-              <a-input-number v-model="model.week" placeholder="请输入所属周" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="周几" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dayofweek">
-              <a-input-number v-model="model.dayofweek" placeholder="请输入周几" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'DataVoltageForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-           voltageid: [
-              { required: true, message: '请输入设备实时电压ID!'},
-           ],
-           tagid: [
-              { required: true, message: '请输入点位ID!'},
-           ],
-           tagname: [
-              { required: true, message: '请输入点位名!'},
-           ],
-        },
-        url: {
-          add: "/dataVoltage/dataVoltage/add",
-          edit: "/dataVoltage/dataVoltage/edit",
-          queryById: "/dataVoltage/dataVoltage/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-
-        })
-      },
-    }
-  }
-</script>

module_ems/src/main/java/org/jeecg/modules/dataVoltage/vue/modules/DataVoltageModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <data-voltage-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></data-voltage-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import DataVoltageForm from './DataVoltageForm'
-
-  export default {
-    name: 'DataVoltageModal',
-    components: {
-      DataVoltageForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>

module_ems/src/main/java/org/jeecg/modules/dataVoltage/vue/modules/DataVoltageModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <data-voltage-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></data-voltage-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import DataVoltageForm from './DataVoltageForm'
-  export default {
-    name: 'DataVoltageModal',
-    components: {
-      DataVoltageForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>