合并最新代码 解决冲突

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = EMS管理系统
+VUE_APP_TITLE = 上动新能源-EMS管理系统
 
 # 开发环境配置
 ENV = 'development'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = EMS管理系统
+VUE_APP_TITLE = 上动新能源-EMS管理系统
 
 # 生产环境配置
 ENV = 'production'

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = EMS管理系统
+VUE_APP_TITLE = 上动新能源-EMS管理系统
 
 BABEL_ENV = production
 

src/api/ems/ticket.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询工单主列表
+export function listTicket(query) {
+  return request({
+    url: '/ticket/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询工单主详细
+export function getTicket(id) {
+  return request({
+    url: '/ticket/' + id,
+    method: 'get'
+  })
+}
+
+// 新增工单主
+export function addTicket(data) {
+  return request({
+    url: '/ticket',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改工单主
+export function updateTicket(data) {
+  return request({
+    url: '/ticket',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工单主
+export function delTicket(id) {
+  return request({
+    url: '/ticket/' + id,
+    method: 'delete'
+  })
+}

src/router/ems.js

@@ -60,7 +60,7 @@ export const dzjk=[
                 path: 'pcs',
                 component: () => import('@/views/ems/dzjk/sbjk/pcs/index.vue'),
                 name: 'DzjkSbjkPcs',
-                meta: { title: 'Pcs',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                meta: { title: 'PCS',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
               },
               {
                 path: 'bmszl',

src/views/ems/dzjk/sbjk/RealTimeBaseInfo.vue

@@ -35,7 +35,7 @@ export default {
         bgColor:'#CBD6FF',
         attr:'totalReactivePower'
       },{
-        title:'电池催SOC',
+        title:'电池堆SOC',
         value:'',
         bgColor:'#DCCBFF',
         attr:'soc'

src/views/ems/ticket/index.vue

@@ -1,158 +1,333 @@
 <template>
-  <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
+  <div class="app-container">
-    <el-button type="primary" @click="addTicket" native-type="button">新增</el-button>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-    <el-table
+      <el-form-item label="工单号" prop="ticketNo">
-      class="common-table"
+        <el-input
-      :data="tableData"
+          v-model="queryParams.ticketNo"
-      stripe
+          placeholder="请输入工单号"
-      max-height="500px"
+          clearable
-      style="width: 100%;margin-top: 25px">
+          @keyup.enter.native="handleQuery"
-      <el-table-column
+        />
-        prop="gdh"
+      </el-form-item>
-        label="工单号">
+      <el-form-item label="工单标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入工单标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="完成时间" prop="completeTime">
+        <el-date-picker clearable
+          v-model="queryParams.completeTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择完成时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="处理人ID" prop="workUserId">
+        <el-input
+          v-model="queryParams.workUserId"
+          placeholder="请输入处理人ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:ticket:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:ticket:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:ticket:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:ticket:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ticketList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="工单号" align="center" prop="ticketNo" />
+      <el-table-column label="提交用户ID" align="center" prop="userId" />
+      <el-table-column label="工单标题" align="center" prop="title" />
+      <el-table-column label="问题描述" align="center" prop="content" />
+      <el-table-column label="图片URL数组" align="center" prop="images" />
+      <el-table-column label="1待处理 2处理中 3已完成" align="center" prop="status" />
+      <el-table-column label="完成时间" align="center" prop="completeTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.completeTime, '{y}-{m}-{d}') }}</span>
+        </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="处理人ID" align="center" prop="workUserId" />
-        prop="title"
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        label="工单标题"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="question"
-        min-width="300"
-        show-overflow-tooltip
-        label="问题描述">
-      </el-table-column>
-      <el-table-column
-        prop="handleStatus"
-        label="处理状态">
-      </el-table-column>
-      <el-table-column
-        prop="submitName"
-        label="提交人">
-      </el-table-column>
-      <el-table-column
-        prop="handleName"
-        label="处理人">
-      </el-table-column>
-      <el-table-column
-        prop="submitTime"
-        label="提交时间">
-      </el-table-column>
-        <el-table-column
-          fixed="right"
-          label="操作"
-          width="150">
         <template slot-scope="scope">
           <el-button
-            @click="editTicket(scope.row.gdh)"
+            size="mini"
-            type="warning"
+            type="text"
-            size="mini">
+            icon="el-icon-edit"
-            编辑
+            @click="handleUpdate(scope.row)"
-          </el-button>
+            v-hasPermi="['system:ticket:edit']"
+          >修改</el-button>
           <el-button
-            @click="deleteTicket(scope.row)"
+            size="mini"
-            type="danger"
+            type="text"
-            size="small">
+            icon="el-icon-delete"
-            废弃
+            @click="handleDelete(scope.row)"
-          </el-button>
+            v-hasPermi="['system:ticket:remove']"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    <add-ticket ref="addTicket" :mode="mode"/>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改工单主对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="工单号" prop="ticketNo">
+          <el-input v-model="form.ticketNo" placeholder="请输入工单号" />
+        </el-form-item>
+        <el-form-item label="工单标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入工单标题" />
+        </el-form-item>
+        <el-form-item label="问题描述">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="完成时间" prop="completeTime">
+          <el-date-picker clearable
+            v-model="form.completeTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择完成时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="处理人ID" prop="workUserId">
+          <el-input v-model="form.workUserId" placeholder="请输入处理人ID" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-// import {getSingleSiteBaseInfo} from '@/api/ems/zddt'
+import { listTicket, getTicket, delTicket, addTicket, updateTicket } from "@/api/ems/ticket"
-import AddTicket from './AddTicket.vue'
+
 export default {
   name: "Ticket",
-  components: {AddTicket},
   data() {
     return {
-      mode:'',//新增、修改工单
+      // 遮罩层
-      editTicketId:'',
+      loading: true,
-      loading:false,
+      // 选中数组
-      tableData:[
+      ids: [],
-        {gdh:'0001',title:'工单一',question:'问题描述问题描述问题描述问题描述问题描述问题描述问题描述问题描述问题描述问题描述问题描述问题描述问题描述',handleStatus:'处理完成',submitName:'张三',handleName:'李四',submitTime:'2025/06/20'}
+      // 非单个禁用
-      ]
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 工单主表格数据
+      ticketList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ticketNo: null,
+        userId: null,
+        title: null,
+        content: null,
+        images: null,
+        status: null,
+        completeTime: null,
+        workUserId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        ticketNo: [
+          { required: true, message: "工单号不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "提交用户ID不能为空", trigger: "blur" }
+        ],
+        title: [
+          { required: true, message: "工单标题不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "问题描述不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "1待处理 2处理中 3已完成不能为空", trigger: "change" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
       }
+    }
+  },
+  created() {
+    this.getList()
   },
   methods: {
-    addTicket(){
+    /** 查询工单主列表 */
-      this.mode = 'add';
+    getList() {
-      this.$refs.addTicket.dialogTableVisible = true;
+      this.loading = true
+      listTicket(this.queryParams).then(response => {
+        this.ticketList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
-    editTicket(id){
+    // 取消按钮
-      this.mode = 'add';
+    cancel() {
-      this.editTicketId = id
+      this.open = false
-      this.$refs.addTicket.dialogTableVisible = true;
+      this.reset()
     },
-    deleteTicket(row){
+    // 表单重置
-      console.log('表格行数据',row)
+    reset() {
-      this.$confirm(`确认要废弃工单${row.title}吗?`, {
+      this.form = {
-        confirmButtonText: '确定',
+        id: null,
-        cancelButtonText: '取消',
+        ticketNo: null,
-        showClose:false,
+        userId: null,
-        closeOnClickModal:false,
+        title: null,
-        type: 'warning',
+        content: null,
-        beforeClose: (action, instance, done) => {
+        images: null,
-          if (action === 'confirm') {
+        status: null,
-            instance.confirmButtonLoading = true;
+        createTime: null,
-            setTimeout(() => {
+        completeTime: null,
-              // todo 调用接口如果关机成功 调用done方法 否则不关闭弹窗
+        createBy: null,
-              done();
+        updateBy: null,
-              // setTimeout(() => {
+        updateTime: null,
-              instance.confirmButtonLoading = false;
+        workUserId: null
-              // }, 300);
+      }
-            }, 3000);
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = "添加工单主"
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getTicket(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = "修改工单主"
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTicket(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
           } else {
-            done();
+            addTicket(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功")
+              this.open = false
+              this.getList()
+            })
           }
         }
-      }).then(() => {
+      })
-        //只有在废弃成功的情况下会走到这里
-        this.$message({
-          type: 'success',
-          message: '废弃成功!'
-        });
-        //调用接口 更新表格数据
-      }).catch(() => {
-        //取消关机
-      });
-    }
     },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除工单主编号为"' + ids + '"的数据项？').then(function() {
+        return delTicket(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ticket/export', {
+        ...this.queryParams
+      }, `ticket_${new Date().getTime()}.xlsx`)
+    }
+  }
 }
 </script>
-
-<style lang="scss" scoped>
-.ems-content-container{
-  display: flex;
-  padding:24px;
-  padding-right: 0;
-  .map-container{
-    flex:auto;
-  }
-  .zd-msg-container{
-    width: 500px;
-    padding: 24px;
-    .single-zd-name{
-      font-weight: 500;
-      line-height: 23px;
-      color: #FFBD00;
-      font-size: 16px;
-      margin-bottom: 24px;
-    }
-    .single-square-box-container{
-      height: 78px;
-      box-sizing: border-box;
-      margin-bottom: 10px;
-    }
-    .single-zd-info-container{
-      font-size: 12px;
-      margin-top: 10px;
-      color:#666666;
-    }
-  }
-}
-</style>

src/views/login.vue

@@ -56,7 +56,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2025 上海电动工具研究所（集团）有限公司.</span>
+      <span>Copyright © 2025 上海电动工具研究所（集团）有限公司.</span>
     </div>
   </div>
 </template>