From 5817fff11fa334832f720ca3f8b44bbdda1be6f7 Mon Sep 17 00:00:00 2001
From: zz <2510566342@qq.com>
Date: Thu, 19 Sep 2024 09:57:25 +0800
Subject: [PATCH] =?UTF-8?q?9.19=20=E8=A1=A8=E5=8D=95=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenanceWorkOrder/index.vue            |   2 +-
 .../hoursAndMinutes/modelTimeList.vue         | 488 +++++++-----------
 .../billingModel/components/month/index.vue   |  37 +-
 .../electricityPriceModelDetails.vue          | 460 +++++++++--------
 .../operationalModel/RunModelDetails.vue      |  14 +-
 .../siteManager/StationInfoForm.vue           |   3 +-
 .../feetVehiclesList/feetVehiclesListForm.vue |   2 +-
 7 files changed, 451 insertions(+), 555 deletions(-)

diff --git a/src/views/system/operationMaintenanceManagement/maintenanceWorkOrder/index.vue b/src/views/system/operationMaintenanceManagement/maintenanceWorkOrder/index.vue
index 5fd38b7..00da7d4 100644
--- a/src/views/system/operationMaintenanceManagement/maintenanceWorkOrder/index.vue
+++ b/src/views/system/operationMaintenanceManagement/maintenanceWorkOrder/index.vue
@@ -127,7 +127,7 @@
         :formatter="dateFormatter"
         width="180px"
       /> -->
-      <el-table-column label="状态" align="center" prop="status" >       
+      <el-table-column label="状态" align="center" prop="status"  width="100">       
 <template #default="scope">
  <dict-tag :type="DICT_TYPE.MAINTENANCE_STATUS" :value="scope.row.status" />
 </template>
diff --git a/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeList.vue b/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeList.vue
index 3c473df..b522973 100644
--- a/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeList.vue
+++ b/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeList.vue
@@ -1,312 +1,220 @@
 <template>
-    <ContentWrap>
-      <!-- 搜索工作栏 -->
-      <el-form
-        class="-mb-15px"
-        :model="queryParams"
-        ref="queryFormRef"
-        :inline="true"
-        label-width="100px"
-      >
-        <el-form-item label="计费模型名称" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="请输入计费模型名称"
-            clearable
-            @keyup.enter="handleQuery"
-            class="!w-200px"
-          />
-        </el-form-item>
-        <el-form-item label="计费模型名称" prop="billingDateId">
-          <el-select v-model="queryParams.billingDateId"    style="width: 100%;">
-            <el-option
-            v-for="item in namelist"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-              
-            />
-          </el-select>
-          <!-- <el-input
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="100px"
+    >
+      <el-form-item label="计费模型名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入计费模型名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-200px"
+        />
+      </el-form-item>
+      <el-form-item label="计费模型名称" prop="billingDateId">
+        <el-select v-model="queryParams.billingDateId" style="width: 100%">
+          <el-option v-for="item in namelist" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+        <!-- <el-input
             v-model="queryParams.name"
             placeholder="请输入计费模型名称"
             clearable
             @keyup.enter="handleQuery"
             class="!w-200px"
           /> -->
-        </el-form-item>
-        <!-- <el-form-item label="换电服务单价" prop="price">
-          <el-input
-            v-model="queryParams.price"
-            placeholder="请输入换电服务单价"
-            clearable
-            @keyup.enter="handleQuery"
-            class="!w-200px"
-          />
-        </el-form-item> -->
+      </el-form-item>
 
-       
-        <!-- <el-form-item label="是否启用:0启用;1禁用" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="请选择是否启用:0启用;1禁用"
-            clearable
-            class="!w-240px"
-          >
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item> -->
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
 
-       
-    
-        
-      
-        <!-- <el-form-item label="开始时刻" prop="startTime">
-          <el-date-picker
-            v-model="queryParams.startTime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            type="daterange"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-            class="!w-200px"
-          />
-        </el-form-item>
-        <el-form-item label="结束时刻" prop="endTime">
-          <el-date-picker
-            v-model="queryParams.endTime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            type="daterange"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-            class="!w-200px"
-          />
-        </el-form-item> -->
-        <el-form-item>
-          <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-          <!-- <el-button
-            type="primary"
-            plain
-            @click="openForm('create')"
-        
-          >
-            <Icon icon="ep:plus" class="mr-5px" /> 新增
-          </el-button>
-          <el-button
-            type="success"
-            plain
-            @click="handleExport"
-            :loading="exportLoading"
-          
-          >
-            <Icon icon="ep:download" class="mr-5px" /> 导出
-          </el-button> -->
-        </el-form-item>
-      </el-form>
-    </ContentWrap>
-  
-    <!-- 列表 -->
-    <ContentWrap>
-      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :header-cell-style="{
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      :header-cell-style="{
         backgroundColor: '#eff4fa'
-      }">
-        <el-table-column label="序号" type="index" align="center" width="80" />
-        <!-- <el-table-column label="索引" align="center" prop="id" /> -->
-        <el-table-column label="计费模型名称" align="center" prop="name" />
-        <!-- <el-table-column label="计费模型id" align="center" prop="billingModelId" /> -->
-        <el-table-column label="换电服务单价(分)" align="center" prop="price" >
-          <template #default="scope">
-            {{scope.row.price }}
-
-          </template>
-        </el-table-column>
-        <el-table-column label="电池服务费(分)" align="center" prop="batFee" >
-          <template #default="scope">
-            {{scope.row.batFee }}
-
-          </template>
-        </el-table-column>
-        <el-table-column label="平台服务费(分)" align="center" prop="platformFee" >
-          <template #default="scope">
-            {{scope.row.platformFee }}
-
-          </template>
-        </el-table-column>
-        <el-table-column label="是否启用" align="center" prop="status" >
-          <template #default="scope">
+      }"
+    >
+      <el-table-column label="序号" type="index" align="center" width="80" />
+      <el-table-column label="计费模型名称" align="center" prop="name" width="200" />
+      <el-table-column label="换电服务单价(分)" align="center" prop="price">
+        <template #default="scope">
+          {{ scope.row.price }}
+        </template>
+      </el-table-column>
+      <el-table-column label="电池服务费(分)" align="center" prop="batFee">
+        <template #default="scope">
+          {{ scope.row.batFee }}
+        </template>
+      </el-table-column>
+      <el-table-column label="平台服务费(分)" align="center" prop="platformFee">
+        <template #default="scope">
+          {{ scope.row.platformFee }}
+        </template>
+      </el-table-column>
+      <el-table-column label="是否启用" align="center" prop="status">
+        <template #default="scope">
           <dict-tag :type="DICT_TYPE.MODEL_TIME_STATUS" :value="scope.row.status" />
         </template>
-        </el-table-column>
-        <!-- MODEL_TIME_STATUS -->
-        <!-- <el-table-column label="数据来源:0:云平台;1;三方运营商" align="center" prop="source" />
-        <el-table-column label="唯一编码" align="center" prop="code" />
-        <el-table-column
-          label="创建时间"
-          align="center"
-          prop="createTime"
-          :formatter="dateFormatter"
-          width="180px"
-        /> -->
-        <!-- <el-table-column label="换电计费模型月id" align="center" prop="billingDateId" /> -->
-        <el-table-column label="开始时刻" align="center" prop="startTime" />
-        <el-table-column label="结束时刻" align="center" prop="endTime" />
-        <el-table-column label="操作" align="center" fixed="right" width="120">
-          <template #default="scope">
-            <!-- <el-button
-              link
-              type="primary"
-              @click="openForm('update', scope.row.id)"
-          
-            >
-              编辑
-            </el-button> -->
-            <el-button
-              link
-              type="danger"
-              @click="handleDelete(scope.row.id)"
-            
-            >
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 分页 -->
-      <Pagination
-        :total="total"
-        v-model:page="queryParams.pageNo"
-        v-model:limit="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </ContentWrap>
-  
-    <!-- 表单弹窗：添加/修改 -->
-    <!-- <modelTimeForm ref="formRef" @success="getList" /> -->
-  </template>
+      </el-table-column>
+      <el-table-column label="开始时刻" align="center" prop="startTime" />
+      <el-table-column label="结束时刻" align="center" prop="endTime" />
+      <el-table-column label="操作" align="center" fixed="right" width="120">
+        <template #default="scope">
+          <el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
   
   <script setup lang="ts">
-  import { dateFormatter } from '@/utils/formatTime'
-  import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-  import download from '@/utils/download'
-  import { BillingTimeApi, BillingTimeVO } from '@/api/operationsManagement/billingModel/timeModel'
-  // 获取单独模型月列表名称
-import { ElectricityDateApi, ElectricityDateVO } from '@/api/operationsManagement/billingModel/monthModel'
+import { dateFormatter } from '@/utils/formatTime'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import download from '@/utils/download'
+import { BillingTimeApi, BillingTimeVO } from '@/api/operationsManagement/billingModel/timeModel'
+// 获取单独模型月列表名称
+import {
+  ElectricityDateApi,
+  ElectricityDateVO
+} from '@/api/operationsManagement/billingModel/monthModel'
 //   import modelTimeForm from './hoursAndMinutes/modelTimeForm.vue'
-  
-  /** 换电计费分时模型 列表 */
-  defineOptions({ name: 'BillingTime' })
-  const emit=defineEmits(["open"])
-  const props=defineProps({
-  selectId:{
-    type:String,
-    default:''
+
+/** 换电计费分时模型 列表 */
+defineOptions({ name: 'BillingTime' })
+const emit = defineEmits(['open'])
+const props = defineProps({
+  selectId: {
+    type: String,
+    default: ''
   }
 })
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-  
-  const loading = ref(true) // 列表的加载中
-  const namelist = ref('') // 列表的加载中
-  const list = ref<BillingTimeVO[]>([]) // 列表的数据
-  // 列表的总页数
-  const total = ref(0)
-  const queryParams = reactive({
-    pageNo: 1,
-    pageSize: 10,
-    name: undefined,
-    billingModelId: props.selectId,
-    price: undefined,
-    batFee: undefined,
-    platformFee: undefined,
-    status: undefined,
-    source: undefined,
-    code: undefined,
-    createTime: [],
-    billingDateId: undefined,
-    startTime: [],
-    endTime: [],
-  })
-  const queryFormRef = ref() // 搜索的表单
-  const exportLoading = ref(false) // 导出的加载中
-  
-  /** 查询列表 */
-  const getList = async () => {
-    loading.value = true
-    try {
-      queryParams.billingModelId=props.selectId
-      const data = await BillingTimeApi.getBillingTimePage(queryParams)
-      list.value = data.list
-      total.value = data.total
-    } finally {
-      loading.value = false
-    }
-  }
-  
-  /** 搜索按钮操作 */
-  const handleQuery = () => {
-    queryParams.pageNo = 1
-    getList()
-  }
-  
-  /** 重置按钮操作 */
-  const resetQuery = () => {
-    queryFormRef.value.resetFields()
-    handleQuery()
-  }
-  
-  /** 添加/修改操作 */
-  const formRef = ref()
-  const openForm = (type: string, id?: number) => {
-    emit('open',type, id)
-    // formRef.value.open(type, id)
-  }
-  
-  /** 删除按钮操作 */
-  const handleDelete = async (id: number) => {
-    try {
-      // 删除的二次确认
-      await message.delConfirm()
-      // 发起删除
-      await BillingTimeApi.deleteBillingTime(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch {}
-  }
-  
-  /** 导出按钮操作 */
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await BillingTimeApi.exportBillingTime(queryParams)
-      download.excel(data, '换电计费分时模型.xls')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
-  }
-  async function getbillingDateData(){
-  const data = await ElectricityDateApi.getElectricityDatenew({modeId:props.selectId})//此处传月模型的id
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
 
-  namelist.value=data||[]
+const loading = ref(true) // 列表的加载中
+const namelist = ref('') // 列表的加载中
+const list = ref<BillingTimeVO[]>([]) // 列表的数据
+// 列表的总页数
+const total = ref(0)
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  billingModelId: props.selectId,
+  price: undefined,
+  batFee: undefined,
+  platformFee: undefined,
+  status: undefined,
+  source: undefined,
+  code: undefined,
+  createTime: [],
+  billingDateId: undefined,
+  startTime: [],
+  endTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
 
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    queryParams.billingModelId = props.selectId
+    const data = await BillingTimeApi.getBillingTimePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
 }
-  /** 初始化 **/
-  // onMounted(() => {
-  //   getList()
-  // })
-  defineExpose({ getList }) 
 
-  watch(()=>props.selectId,async(newValue)=>{
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
   getList()
-  getbillingDateData()
-},{
-  deep:true,
-  immediate:true
-})
-  </script>
\ No newline at end of file
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  emit('open', type, id)
+  // formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BillingTimeApi.deleteBillingTime(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BillingTimeApi.exportBillingTime(queryParams)
+    download.excel(data, '换电计费分时模型.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+async function getbillingDateData() {
+  const data = await ElectricityDateApi.getElectricityDatenew({ modeId: props.selectId }) //此处传月模型的id
+
+  namelist.value = data || []
+}
+/** 初始化 **/
+// onMounted(() => {
+//   getList()
+// })
+defineExpose({ getList })
+
+watch(
+  () => props.selectId,
+  async (newValue) => {
+    getList()
+    getbillingDateData()
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+</script>
\ No newline at end of file
diff --git a/src/views/system/operationsManagement/billingModel/components/month/index.vue b/src/views/system/operationsManagement/billingModel/components/month/index.vue
index 0b88391..7cba025 100644
--- a/src/views/system/operationsManagement/billingModel/components/month/index.vue
+++ b/src/views/system/operationsManagement/billingModel/components/month/index.vue
@@ -127,44 +127,18 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :header-cell-style="{
         backgroundColor: '#eff4fa'
       }">
-          <el-table-column label="序号" type="index" align="center" width="80" />
-      <!-- <el-table-column label="电网电价月份模型 ID" align="center" prop="id" /> -->
-      <!-- <el-table-column label="电网电价模型id" align="center" prop="priceId" /> -->
-      <el-table-column label="计费模型名称" align="center" prop="name" />
+          <el-table-column label="序号" type="index" align="center" width="80" />    
+      <el-table-column label="计费模型名称" align="center" prop="name"  width="200"/>
       <el-table-column label="时段数量" align="center" prop="periodsAmount" />
-      <!-- <el-table-column label="序列" align="center" prop="no" /> -->
       <el-table-column label="开始日期" align="center" prop="startDate" />
-      <el-table-column label="结束日期" align="center" prop="endDate" />
-      <!-- <el-table-column label="尖电价" align="center" prop="theTipPrice" />
-      <el-table-column label="峰电价" align="center" prop="peakPrice" />
-      <el-table-column label="平电价" align="center" prop="flatPrice" />
-      <el-table-column label="谷电价" align="center" prop="theValleyPrice" /> -->
+      <el-table-column label="结束日期" align="center" prop="endDate" />    
       <el-table-column label="是否启用" align="center" prop="status" >
           <template #default="scope">
           <dict-tag :type="DICT_TYPE.MODEL_TIME_STATUS" :value="scope.row.status" />
         </template>
         </el-table-column>
-   
-      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
-      <!-- <el-table-column label="数据来源:0:云平台;1;三方运营商" align="center" prop="source" />
-      <el-table-column label="唯一编码" align="center" prop="code" /> -->
-      <!-- <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      /> -->
       <el-table-column label="操作" align="center" width="120" fixed="right">
-        <template #default="scope">
-          <!-- <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-          
-          >
-            编辑
-          </el-button> -->
+        <template #default="scope">        
           <el-button
             link
             type="danger"
@@ -184,9 +158,6 @@
       @pagination="getList"
     />
   </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <!-- <modelDateForm ref="formRef" @success="getList" /> -->
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/system/operationsManagement/electricityPriceModel/electricityPriceModelDetails.vue b/src/views/system/operationsManagement/electricityPriceModel/electricityPriceModelDetails.vue
index 51cae19..c8d1aaf 100644
--- a/src/views/system/operationsManagement/electricityPriceModel/electricityPriceModelDetails.vue
+++ b/src/views/system/operationsManagement/electricityPriceModel/electricityPriceModelDetails.vue
@@ -1,238 +1,254 @@
 <template>
-    <el-drawer title="基本信息" v-model="dialogVisible" size="60%">
-      <el-descriptions :column="1" border>
-        <el-descriptions-item label="电价模型名称" min-width="120">
-          {{ oldlist.name || "--" }}
-        </el-descriptions-item>
-      </el-descriptions>
-      <br/>
-<div class="title_info" style="margin-top: 20px">换电站基础信息 </div>
-<br/>
-<!-- table -->
-<ContentWrap>
-<el-table  :data="stationList" :stripe="true" :show-overflow-tooltip="true"  :header-cell-style="{
-        backgroundColor: '#eff4fa'
-      }">
-    
-      <el-table-column label="换电站编码" align="center" prop="stationNo" />
-      <el-table-column label="换电站名称" align="center" prop="stationName" />
-      <el-table-column label="换电站识别号" align="center" prop="stationSn" />
-      <!-- <el-table-column label="地理位置" align="center" prop="stationLocation" /> -->
-      <el-table-column label="站类型" align="center" prop="stationType" >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SITECLASSIFICATION_TYPE" :value="scope.row.stationType" />
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="换电站现场照片" align="center" prop="avatar" /> -->
-      <!-- <el-table-column label="纬度" align="center" prop="latitude" /> -->
-      <!-- <el-table-column label="经度" align="center" prop="longitude" /> -->
-      <el-table-column label="区域名称" align="center" prop="areaName" />
-      <!-- <el-table-column label="区域编号" align="center" prop="areaCode" /> -->
+  <el-drawer title="基本信息" v-model="dialogVisible" size="60%">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="电价模型名称" min-width="120">
+        {{ oldlist.name || '--' }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <br />
+    <div class="title_info" style="margin-top: 20px">换电站基础信息 </div>
+    <br />
+    <!-- table -->
+    <ContentWrap>
+      <el-table
+        :data="stationList"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        :header-cell-style="{
+          backgroundColor: '#eff4fa'
+        }"
+      >
+        <el-table-column label="换电站编码" align="center" prop="stationNo" width="120" />
+        <el-table-column label="换电站名称" align="center" prop="stationName" width="120" />
+        <el-table-column label="换电站识别号" align="center" prop="stationSn" width="120" />
+        <!-- <el-table-column label="地理位置" align="center" prop="stationLocation" /> -->
+        <el-table-column label="站类型" align="center" prop="stationType" width="120">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.SITECLASSIFICATION_TYPE" :value="scope.row.stationType" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="换电站现场照片" align="center" prop="avatar" /> -->
+        <!-- <el-table-column label="纬度" align="center" prop="latitude" /> -->
+        <!-- <el-table-column label="经度" align="center" prop="longitude" /> -->
+        <el-table-column label="区域名称" align="center" prop="areaName" />
+        <!-- <el-table-column label="区域编号" align="center" prop="areaCode" /> -->
 
-      <el-table-column label="营运时间" align="center" prop="operationTime"  width="180"
-      :formatter="dateFormatter"/>
-      <el-table-column label="投放时间	" align="center" prop="launchTime"  width="180"
-      :formatter="dateFormatter"/>
-      <el-table-column label="联系方式-手机号	" align="center" prop="contactWay" />
-      <!-- <el-table-column label="服务电话" align="center" prop="serviceTel" /> -->
-      <!-- <el-table-column label="联系方式-邮箱地址	" align="center" prop="email" /> -->
-      <el-table-column label="负责人" align="center" prop="principal" />
-      <!-- <el-table-column label="所属运营企业" align="center" prop="stationCompany" /> -->
-      <!-- <el-table-column label="场站服务状态" align="center" prop="status" /> -->
-      <!-- <el-table-column label="场站运行模式" align="center" prop="runModel" /> -->
-      <!-- <el-table-column label="工位分类" align="center" prop="staType" /> -->
-      <!-- <el-table-column label="区域分类" align="center" prop="areaType" /> -->
-      <!-- <el-table-column label="站型类型	" align="center" prop="siteType" /> -->
-      <!-- 1：公共; 50:个人; 100：公交（专用）101：环卫（专用）102：物流（专用）103： 出租⻋（专用）104：分时租赁（专用）105：小区共享（专用）106：单位（专用）107：私人共享桩（专用）255：其他 -->
-      <!-- <el-table-column label="服务车型" align="center" prop="matchVehicles" /> -->
-      <el-table-column label="是否全天营业" align="center" prop="oahFlag" >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.OAHFLAG_STATUS" :value="scope.row.oahFlag" />
-        </template>
-      </el-table-column>
-       <!-- 0是;1否 -->
-      <!-- <el-table-column label="站点分类" align="center" prop="siteClassification" /> -->
-      <!-- 站点分类 1:充电站;2:换电站;3:充换电一体站 -->
-      <!-- <el-table-column label="建设场所" align="center" prop="constructionSite" /> -->
-      <!-- construction建设场所 1：居民区;2：公共机构;3：企事业单位;4：写字楼;5：工业园区;6：交通枢纽;7：大型文体设施;8：城市绿地;9：大型建筑配建停车场;10：路边停车位;11：城际高速服务区;2：风景区;13：公交场站;14：加油加气站;15：出租车;255：其他 -->
-      <el-table-column label="是否启用" align="center" prop="enable" >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.MODEL_TIME_STATUS" :value="scope.row.enable" />
-        </template>
-      </el-table-column>
-      <!-- 0:未启用 1:启用 -->
-      
-      <el-table-column label="计费电量" align="center" prop="electricitySource" >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ELECTRICITYSOURCE" :value="scope.row.electricitySource" />
-        </template>
-      </el-table-column>
-    
-      <!-- 计费电量：1默认（最大值），2：soc差值；3：soe差值，4：交流，5：直流，6：0 -->
-      <el-table-column label="电价电量" align="center" prop="electricityPriceSource" >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ELECTRICITYSOURCE" :value="scope.row.electricityPriceSource" />
-        </template>
-      </el-table-column>
-      <!-- 电价电量：1默认（最大值），2：soc差值；3：soe差值，4：交流，5：直流，6：0 -->
-      <!-- <el-table-column label="soc差值来源" align="center" prop="socSource" /> -->
-      <!-- soc差值来源:1：换电时的SOC;2:充电时的SOC -->
-     
-    </el-table>
-</ContentWrap>
-<br/>
-<div class="title_info" style="margin-top: 20px">电价模型月份信息 </div>
-<br/>
-<!-- table -->
-<ContentWrap>
-<el-table  :data="electricityDate" :stripe="true" :show-overflow-tooltip="true"  :header-cell-style="{
-        backgroundColor: '#eff4fa'
-      }">
-    
-      <el-table-column label="电价模型名称	" align="center" prop="name" />
-      <el-table-column label="时段数量	" align="center" prop="periodsAmount" />
-      <el-table-column label="开始日期	" align="center" prop="startDate" width="180"
-      />
-      <el-table-column label="结束日期	" align="center" prop="endDate" width="180"
-      />
+        <el-table-column
+          label="营运时间"
+          align="center"
+          prop="operationTime"
+          width="180"
+          :formatter="dateFormatter"
+        />
+        <el-table-column
+          label="投放时间	"
+          align="center"
+          prop="launchTime"
+          width="180"
+          :formatter="dateFormatter"
+        />
+        <el-table-column label="联系方式-手机号	" align="center" prop="contactWay" width="130" />
+        <!-- <el-table-column label="服务电话" align="center" prop="serviceTel" /> -->
+        <!-- <el-table-column label="联系方式-邮箱地址	" align="center" prop="email" /> -->
+        <el-table-column label="负责人" align="center" prop="principal" />
+        <!-- <el-table-column label="所属运营企业" align="center" prop="stationCompany" /> -->
+        <!-- <el-table-column label="场站服务状态" align="center" prop="status" /> -->
+        <!-- <el-table-column label="场站运行模式" align="center" prop="runModel" /> -->
+        <!-- <el-table-column label="工位分类" align="center" prop="staType" /> -->
+        <!-- <el-table-column label="区域分类" align="center" prop="areaType" /> -->
+        <!-- <el-table-column label="站型类型	" align="center" prop="siteType" /> -->
+        <!-- 1：公共; 50:个人; 100：公交（专用）101：环卫（专用）102：物流（专用）103： 出租⻋（专用）104：分时租赁（专用）105：小区共享（专用）106：单位（专用）107：私人共享桩（专用）255：其他 -->
+        <!-- <el-table-column label="服务车型" align="center" prop="matchVehicles" /> -->
+        <el-table-column label="是否全天营业" align="center" prop="oahFlag" width="120">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.OAHFLAG_STATUS" :value="scope.row.oahFlag" />
+          </template>
+        </el-table-column>
+        <!-- 0是;1否 -->
+        <!-- <el-table-column label="站点分类" align="center" prop="siteClassification" /> -->
+        <!-- 站点分类 1:充电站;2:换电站;3:充换电一体站 -->
+        <!-- <el-table-column label="建设场所" align="center" prop="constructionSite" /> -->
+        <!-- construction建设场所 1：居民区;2：公共机构;3：企事业单位;4：写字楼;5：工业园区;6：交通枢纽;7：大型文体设施;8：城市绿地;9：大型建筑配建停车场;10：路边停车位;11：城际高速服务区;2：风景区;13：公交场站;14：加油加气站;15：出租车;255：其他 -->
+        <el-table-column label="是否启用" align="center" prop="enable" width="100">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.MODEL_TIME_STATUS" :value="scope.row.enable" />
+          </template>
+        </el-table-column>
+        <!-- 0:未启用 1:启用 -->
 
-      <el-table-column label="尖电价(分)" align="center" prop="theTipPrice" />
-      <el-table-column label="峰电价(分)" align="center" prop="peakPrice" />
-      <el-table-column label="平电价(分)" align="center" prop="flatPrice" />
-      <el-table-column label="谷电价(分)" align="center" prop="theValleyPrice" />
+        <el-table-column label="计费电量" align="center" prop="electricitySource" width="100">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.ELECTRICITYSOURCE" :value="scope.row.electricitySource" />
+          </template>
+        </el-table-column>
 
-      <el-table-column label="是否启用" align="center" prop="status" >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.MODEL_TIME_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <!-- <el-table-column label="数据来源" align="center" prop="source" /> -->
-      <!-- :0:云平台;1;三方运营商   -->
-    </el-table>
-</ContentWrap>
-<br/>
-<div class="title_info" style="margin-top: 20px">电价模型小时信息 </div>
-<br/>
-<!-- table -->
-<ContentWrap>
-<el-table  :data="electricityTimeList" :stripe="true" :show-overflow-tooltip="true"  :header-cell-style="{
-        backgroundColor: '#eff4fa'
-      }">
-      <el-table-column label="电价模型名称" align="center" prop="name" />
-      <el-table-column label="类型" align="center" prop="type">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.PEAK_PLATEAU_STATE" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <!-- 1尖2峰3平4谷 -->
-      <el-table-column label="尖电价开始时刻" align="center" prop="startTime" width="180"
-      />
-      <el-table-column label="尖电价结束时刻" align="center" prop="endTime" width="180"
-      />
-     
+        <!-- 计费电量：1默认（最大值），2：soc差值；3：soe差值，4：交流，5：直流，6：0 -->
+        <el-table-column label="电价电量" align="center" prop="electricityPriceSource" width="100">
+          <template #default="scope">
+            <dict-tag
+              :type="DICT_TYPE.ELECTRICITYSOURCE"
+              :value="scope.row.electricityPriceSource"
+            />
+          </template>
+        </el-table-column>
+        <!-- 电价电量：1默认（最大值），2：soc差值；3：soe差值，4：交流，5：直流，6：0 -->
+        <!-- <el-table-column label="soc差值来源" align="center" prop="socSource" /> -->
+        <!-- soc差值来源:1：换电时的SOC;2:充电时的SOC -->
+      </el-table>
+    </ContentWrap>
+    <br />
+    <div class="title_info" style="margin-top: 20px">电价模型月份信息 </div>
+    <br />
+    <!-- table -->
+    <ContentWrap>
+      <el-table
+        :data="electricityDate"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        :header-cell-style="{
+          backgroundColor: '#eff4fa'
+        }"
+      >
+        <el-table-column label="电价模型名称" align="center" prop="name" width="120" />
+        <el-table-column label="时段数量" align="center" prop="periodsAmount" />
+        <el-table-column label="开始日期" align="center" prop="startDate" width="180" />
+        <el-table-column label="结束日期" align="center" prop="endDate" width="180" />
+        <el-table-column label="尖电价(分)" align="center" prop="theTipPrice" />
+        <el-table-column label="峰电价(分)" align="center" prop="peakPrice" />
+        <el-table-column label="平电价(分)" align="center" prop="flatPrice" />
+        <el-table-column label="谷电价(分)" align="center" prop="theValleyPrice" />
+        <el-table-column label="是否启用" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.MODEL_TIME_STATUS" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <!-- <el-table-column label="数据来源" align="center" prop="source" /> -->
+        <!-- :0:云平台;1;三方运营商   -->
+      </el-table>
+    </ContentWrap>
+    <br />
+    <div class="title_info" style="margin-top: 20px">电价模型小时信息 </div>
+    <br />
+    <!-- table -->
+    <ContentWrap>
+      <el-table
+        :data="electricityTimeList"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        :header-cell-style="{
+          backgroundColor: '#eff4fa'
+        }"
+      >
+        <el-table-column label="电价模型名称" align="center" prop="name" />
+        <el-table-column label="类型" align="center" prop="type">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.PEAK_PLATEAU_STATE" :value="scope.row.type" />
+          </template>
+        </el-table-column>
+        <!-- 1尖2峰3平4谷 -->
+        <el-table-column label="尖电价开始时刻" align="center" prop="startTime" width="180" />
+        <el-table-column label="尖电价结束时刻" align="center" prop="endTime" width="180" />
+      </el-table>
+    </ContentWrap>
+    <br />
+  </el-drawer>
+</template>
+  <script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import {
+  ElectricityPriceApi,
+  ElectricityPriceVO
+} from '@/api/operationsManagement/electricityPriceModel'
+/** 电价模型 表单 */
+defineOptions({ name: 'ElectricityPriceForm' })
 
-    </el-table>
-</ContentWrap>
-<br/>
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
 
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const electricityDate = ref([])
+const oldlist = ref([])
+const stationList = ref([])
+const electricityTimeList = ref([])
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  theTipPrice: undefined,
+  peakPrice: undefined,
+  flatPrice: undefined,
+  theValleyPrice: undefined,
+  periodsAmount: undefined,
+  remark: undefined,
+  operatorId: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '电价模型名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
 
-    </el-drawer>
-  </template>
-  <script setup lang="ts">
-  import { dateFormatter } from '@/utils/formatTime'
-    import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-   import { ElectricityPriceApi, ElectricityPriceVO } from '@/api/operationsManagement/electricityPriceModel'
-  /** 电价模型 表单 */
-  defineOptions({ name: 'ElectricityPriceForm' })
-  
-  const { t } = useI18n() // 国际化
-  const message = useMessage() // 消息弹窗
-  
-  const dialogVisible = ref(false) // 弹窗的是否展示
-  const dialogTitle = ref('') // 弹窗的标题
-  const electricityDate = ref([])
-  const oldlist = ref([])
-  const stationList = ref([])
-  const electricityTimeList = ref([])
-  const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-  const formType = ref('') // 表单的类型：create - 新增；update - 修改
-  const formData = ref({
-    id: undefined,
-    name: undefined,
-    theTipPrice: undefined,
-    peakPrice: undefined,
-    flatPrice: undefined,
-    theValleyPrice: undefined,
-    periodsAmount: undefined,
-    remark: undefined,
-    operatorId: undefined,
-  })
-  const formRules = reactive({
-    name: [{ required: true, message: '电价模型名称不能为空', trigger: 'blur' }],
-  })
-  const formRef = ref() // 表单 Ref
-  
-  /** 打开弹窗 */
-  const open = async (id?: number) => {
-    dialogVisible.value = true
-  
-    resetForm()
-    // 修改时，设置数据
-    if (id) {
-      formLoading.value = true
-      try {
-        const formData2 = await ElectricityPriceApi.getElectricityPrice(id)
-        oldlist.value = formData2
-        // console.log(formData2,"-++++++---")
+/** 打开弹窗 */
+const open = async (id?: number) => {
+  dialogVisible.value = true
 
-        electricityDate.value[0] = formData2.electricityDateResp
-        stationList.value = formData2.stationList
-        electricityTimeList.value = formData2.electricityTimeList
-        // console.log(electricityTimeList.value,"==========")
-      } finally {
-        formLoading.value = false
-      }
-    }
-  }
-  defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-  
-  /** 提交表单 */
-  const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-  const submitForm = async () => {
-    // 校验表单
-    await formRef.value.validate()
-    // 提交请求
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
     formLoading.value = true
     try {
-      const data = formData.value as unknown as ElectricityPriceApi.ElectricityPriceVO
-      
-        await ElectricityPriceApi.createElectricityPrice(data)
-        message.success(t('common.createSuccess'))
+      const formData2 = await ElectricityPriceApi.getElectricityPrice(id)
+      oldlist.value = formData2
+      // console.log(formData2,"-++++++---")
 
-       
-      
-      dialogVisible.value = false
-      // 发送操作成功的事件
-      emit('success')
+      electricityDate.value[0] = formData2.electricityDateResp
+      stationList.value = formData2.stationList
+      electricityTimeList.value = formData2.electricityTimeList
+      // console.log(electricityTimeList.value,"==========")
     } finally {
       formLoading.value = false
     }
   }
-  
-  /** 重置表单 */
-  const resetForm = () => {
-    formData.value = {
-      id: undefined,
-      name: undefined,
-      theTipPrice: undefined,
-      peakPrice: undefined,
-      flatPrice: undefined,
-      theValleyPrice: undefined,
-      periodsAmount: undefined,
-      remark: undefined,
-      operatorId: undefined,
-    }
-    formRef.value?.resetFields()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ElectricityPriceApi.ElectricityPriceVO
+
+    await ElectricityPriceApi.createElectricityPrice(data)
+    message.success(t('common.createSuccess'))
+
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    theTipPrice: undefined,
+    peakPrice: undefined,
+    flatPrice: undefined,
+    theValleyPrice: undefined,
+    periodsAmount: undefined,
+    remark: undefined,
+    operatorId: undefined
   }
-  </script>
\ No newline at end of file
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/system/operationsManagement/operationalModel/RunModelDetails.vue b/src/views/system/operationsManagement/operationalModel/RunModelDetails.vue
index 6f0454a..32ec28f 100644
--- a/src/views/system/operationsManagement/operationalModel/RunModelDetails.vue
+++ b/src/views/system/operationsManagement/operationalModel/RunModelDetails.vue
@@ -14,12 +14,12 @@
         backgroundColor: '#eff4fa'
       }">
     
-      <el-table-column label="换电站编码" align="center" prop="stationNo" />
-      <el-table-column label="换电站名称" align="center" prop="stationName" />
-      <el-table-column label="换电站识别号" align="center" prop="stationSn" />
+      <el-table-column label="换电站编码" align="center" prop="stationNo" width="100" />
+      <el-table-column label="换电站名称" align="center" prop="stationName" width="100"/>
+      <el-table-column label="换电站识别号" align="center" prop="stationSn" width="120"/>
       
       <!-- <el-table-column label="地理位置" align="center" prop="stationLocation" /> -->
-      <el-table-column label="站类型" align="center" prop="stationType" >
+      <el-table-column label="站类型" align="center" prop="stationType" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.SITECLASSIFICATION_TYPE" :value="scope.row.stationType" />
         </template>
@@ -34,7 +34,7 @@
       :formatter="dateFormatter"/>
       <el-table-column label="投放时间	" align="center" prop="launchTime"  width="180"
       :formatter="dateFormatter"/>
-      <el-table-column label="联系方式-手机号	" align="center" prop="contactWay" />
+      <el-table-column label="联系方式-手机号	" align="center" prop="contactWay" width="140"/>
       <!-- <el-table-column label="服务电话" align="center" prop="serviceTel" /> -->
       <!-- <el-table-column label="联系方式-邮箱地址	" align="center" prop="email" /> -->
       <el-table-column label="负责人" align="center" prop="principal" />
@@ -63,13 +63,13 @@
       </el-table-column>
       <!-- 0:未启用 1:启用 -->
         
-      <el-table-column label="计费电量" align="center" prop="electricitySource" >
+      <el-table-column label="计费电量" align="center" prop="electricitySource" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ELECTRICITYSOURCE" :value="scope.row.electricitySource" />
         </template>
       </el-table-column>
       <!-- 计费电量：1默认（最大值），2：soc差值；3：soe差值，4：交流，5：直流，6：0 -->
-      <el-table-column label="电价电量" align="center" prop="electricityPriceSource" >
+      <el-table-column label="电价电量" align="center" prop="electricityPriceSource" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ELECTRICITYSOURCE" :value="scope.row.electricityPriceSource" />
         </template>
diff --git a/src/views/system/substation/siteManager/StationInfoForm.vue b/src/views/system/substation/siteManager/StationInfoForm.vue
index a068173..ac095a0 100644
--- a/src/views/system/substation/siteManager/StationInfoForm.vue
+++ b/src/views/system/substation/siteManager/StationInfoForm.vue
@@ -389,7 +389,8 @@ const formRules = reactive({
   latitude: [{ required: true, message: '纬度不能为空', trigger: 'blur' }],
   longitude: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
   areaName: [{ required: true, message: '区域名称不能为空', trigger: 'blur' }],
-  areaCode: [{ required: true, message: '区域编号不能为空', trigger: 'blur' }]
+  areaCode: [{ required: true, message: '区域编号不能为空', trigger: 'blur' }],
+  Time: [{ required: true, message: '营业时间范围不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const chargeModeIdList=ref()
diff --git a/src/views/system/vehicleManagement/feetVehicles/feetVehiclesList/feetVehiclesListForm.vue b/src/views/system/vehicleManagement/feetVehicles/feetVehiclesList/feetVehiclesListForm.vue
index 8a6f9e3..0b42513 100644
--- a/src/views/system/vehicleManagement/feetVehicles/feetVehiclesList/feetVehiclesListForm.vue
+++ b/src/views/system/vehicleManagement/feetVehicles/feetVehiclesList/feetVehiclesListForm.vue
@@ -52,7 +52,7 @@
           v-model="formData.teamId"
           placeholder="请选择"
           clearable
-          class="!w-240px"
+         style="width: 100%"
         >
           <el-option
             v-for="item in carlist"