From b3598f1ba8f1260b6bddd57438719ca6b2f5cd0f Mon Sep 17 00:00:00 2001
From: dashixiong <zztect_a1@163.com>
Date: Sat, 28 Jun 2025 20:03:49 +0800
Subject: [PATCH 1/2] init

---
 src/api/ems/ticket.js          |  44 +++++
 src/views/ems/ticket/index.vue | 333 +++++++++++++++++++++++++++++++++
 2 files changed, 377 insertions(+)
 create mode 100644 src/api/ems/ticket.js
 create mode 100644 src/views/ems/ticket/index.vue

diff --git a/src/api/ems/ticket.js b/src/api/ems/ticket.js
new file mode 100644
index 0000000..4a1cb35
--- /dev/null
+++ b/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'
+  })
+}
diff --git a/src/views/ems/ticket/index.vue b/src/views/ems/ticket/index.vue
new file mode 100644
index 0000000..9466105
--- /dev/null
+++ b/src/views/ems/ticket/index.vue
@@ -0,0 +1,333 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="工单号" prop="ticketNo">
+        <el-input
+          v-model="queryParams.ticketNo"
+          placeholder="请输入工单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <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 label="处理人ID" align="center" prop="workUserId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:ticket:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:ticket:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <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 { listTicket, getTicket, delTicket, addTicket, updateTicket } from "@/api/ems/ticket"
+
+export default {
+  name: "Ticket",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      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: {
+    /** 查询工单主列表 */
+    getList() {
+      this.loading = true
+      listTicket(this.queryParams).then(response => {
+        this.ticketList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        ticketNo: null,
+        userId: null,
+        title: null,
+        content: null,
+        images: null,
+        status: null,
+        createTime: null,
+        completeTime: null,
+        createBy: null,
+        updateBy: null,
+        updateTime: null,
+        workUserId: null
+      }
+      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 {
+            addTicket(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功")
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    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>

From 5f4fcdf754a28aa670a1110e1cb65889ad88ef2a Mon Sep 17 00:00:00 2001
From: dashixiong <zztect_a1@163.com>
Date: Mon, 30 Jun 2025 14:18:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             | 2 +-
 .env.production                              | 2 +-
 .env.staging                                 | 2 +-
 src/components/Ems/ZdSelect/index.vue        | 2 +-
 src/router/ems.js                            | 2 +-
 src/views/ems/dzjk/sbjk/RealTimeBaseInfo.vue | 2 +-
 src/views/login.vue                          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index 04f6073..880eb72 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = EMS管理系统
+VUE_APP_TITLE = 上动新能源-EMS管理系统
 
 # 开发环境配置
 ENV = 'development'
diff --git a/.env.production b/.env.production
index 1a3f9e4..9b79e53 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = EMS管理系统
+VUE_APP_TITLE = 上动新能源-EMS管理系统
 
 # 生产环境配置
 ENV = 'production'
diff --git a/.env.staging b/.env.staging
index 9e4bb17..31319a8 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = EMS管理系统
+VUE_APP_TITLE = 上动新能源-EMS管理系统
 
 BABEL_ENV = production
 
diff --git a/src/components/Ems/ZdSelect/index.vue b/src/components/Ems/ZdSelect/index.vue
index 540b509..db30228 100644
--- a/src/components/Ems/ZdSelect/index.vue
+++ b/src/components/Ems/ZdSelect/index.vue
@@ -49,7 +49,7 @@ import {mapGetters} from "vuex"
         this.$emit('submitSite',this.id)
       },
       setDefaultSite(){
-        const defaultSite = parseInt(this.defaultSiteId)
+        const defaultSite = this.defaultSiteId
         if(defaultSite && this.siteList.find(item=>item.id === defaultSite)){
           this.id = defaultSite
         }else if(!defaultSite && this.siteList.length>0){
diff --git a/src/router/ems.js b/src/router/ems.js
index 6ebce35..3c9db17 100644
--- a/src/router/ems.js
+++ b/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',
diff --git a/src/views/ems/dzjk/sbjk/RealTimeBaseInfo.vue b/src/views/ems/dzjk/sbjk/RealTimeBaseInfo.vue
index ff32e7f..41dafbb 100644
--- a/src/views/ems/dzjk/sbjk/RealTimeBaseInfo.vue
+++ b/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'
diff --git a/src/views/login.vue b/src/views/login.vue
index 7c87763..9c18e95 100644
--- a/src/views/login.vue
+++ b/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>