Browse Source

feat:技术文档内容修改

DOVER-GLOBAL\10093976 1 week ago
parent
commit
7d88be7e98
20 changed files with 228 additions and 1253 deletions
  1. 90 1081
      admin.ui.plus-master/src/router/route.ts
  2. 1 1
      admin.ui.plus-master/src/views/admin/application/applicationManage/index.vue
  3. 4 4
      admin.ui.plus-master/src/views/admin/application/fuelingsdk/index.vue
  4. 1 1
      admin.ui.plus-master/src/views/admin/application/softwarePackageManagement/components/form-edit.vue
  5. 1 1
      admin.ui.plus-master/src/views/admin/application/softwarePackageManagement/index.vue
  6. 5 5
      admin.ui.plus-master/src/views/admin/authorize/fuelingsdk/index.vue
  7. 4 4
      admin.ui.plus-master/src/views/admin/authorize/oilUp/index.vue
  8. 1 1
      admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/components/form-edit.vue
  9. 74 136
      admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/components/search-history.vue
  10. 11 7
      admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/index.vue
  11. 2 0
      admin.ui.plus-master/src/views/admin/product/type/index.vue
  12. 1 1
      admin.ui.plus-master/src/views/admin/statement/BlackBox/index.vue
  13. 3 3
      admin.ui.plus-master/src/views/admin/statement/displayControl/index.vue
  14. 1 1
      admin.ui.plus-master/src/views/admin/statement/gasStationManagement/index.vue
  15. 1 1
      admin.ui.plus-master/src/views/admin/statement/listOfOilEngines/index.vue
  16. 1 1
      admin.ui.plus-master/src/views/admin/statement/problemData/index.vue
  17. 1 1
      admin.ui.plus-master/src/views/admin/statement/vxList/index.vue
  18. 2 2
      admin.ui.plus-master/src/views/example/application/applicationManage/index.vue
  19. 8 2
      admin.ui.plus-master/vite.config.ts
  20. 16 0
      admin.ui.plus-master/vite.config.ts.rej

File diff suppressed because it is too large
+ 90 - 1081
admin.ui.plus-master/src/router/route.ts


+ 1 - 1
admin.ui.plus-master/src/views/admin/application/applicationManage/index.vue

@@ -3,7 +3,7 @@
     <el-card class="mt8" shadow="never" :body-style="{ paddingBottom: '0' }">
       <el-form :inline="true" @submit.stop.prevent>
         <el-form-item label="应用名称">
-          <el-input v-model="state.filter.name" placeholder="应用名称" @keyup.enter="onQuery" />
+          <el-input v-model="state.filter.name" placeholder="请输入应用名称" @keyup.enter="onQuery" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>

+ 4 - 4
admin.ui.plus-master/src/views/admin/application/fuelingsdk/index.vue

@@ -8,22 +8,22 @@
             <el-form-item prop="name" style="width: 100%">
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
                 <el-form-item label="油站名称">
-                  <el-input v-model="sdkData.Filter.OilStation" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.Filter.OilStation" placeholder="请输入油站名称" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
                 <el-form-item label="项目名称">
-                  <el-input v-model="sdkData.Filter.Project" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.Filter.Project" placeholder="请输入项目名称" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
                 <el-form-item label="SN">
-                  <el-input v-model="sdkData.Filter.SN" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.Filter.SN" placeholder="请输入SN" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
                 <el-form-item label="授权码">
-                  <el-input v-model="sdkData.Filter.Key" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.Filter.Key" placeholder="请输入授权码" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">

+ 1 - 1
admin.ui.plus-master/src/views/admin/application/softwarePackageManagement/components/form-edit.vue

@@ -29,7 +29,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="版本" prop="version">
-              <el-input v-model="formData.editData.version" placeholder="请输入版本" clearable></el-input>
+              <el-input v-model="formData.editData.version" placeholder="请输入版本" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">

+ 1 - 1
admin.ui.plus-master/src/views/admin/application/softwarePackageManagement/index.vue

@@ -21,7 +21,7 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="版本">
-                  <el-input v-model="softwareData.Filter.version" placeholder="请输入版本" clearable></el-input>
+                  <el-input v-model="softwareData.Filter.version" placeholder="请输入版本" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">

+ 5 - 5
admin.ui.plus-master/src/views/admin/authorize/fuelingsdk/index.vue

@@ -8,27 +8,27 @@
             <el-form-item prop="name" style="width: 100%">
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="油站名称">
-                  <el-input v-model="sdkData.Filter.OilStation" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.Filter.OilStation" placeholder="请输入油站名称" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="项目名称">
-                  <el-input v-model="sdkData.Filter.Project" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.Filter.Project" placeholder="请输入项目名称" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="SN号">
-                  <el-input v-model="sdkData.Filter.SN" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.Filter.SN" placeholder="请输入SN号" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="授权码">
-                  <el-input v-model="sdkData.Filter.Key" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.Filter.Key" placeholder="请输入授权码" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                               <el-form-item label="状态">
-                                  <el-select  placeholder="请选择上传状态">
+                                  <el-select  placeholder="请选择状态">
                                    <el-option label="所有" :value="''"></el-option>
                                    <el-option label="正常" :value="''"></el-option>
                                    <el-option label="未授权" :value="''"></el-option>

+ 4 - 4
admin.ui.plus-master/src/views/admin/authorize/oilUp/index.vue

@@ -10,19 +10,19 @@
             <el-form-item prop="name" style="width: 100%">
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="省、市、区">
-                  <el-input v-model="state.filter.stationName" placeholder="请输入区" clearable></el-input>
+                  <el-input v-model="state.filter.stationName" placeholder="请输入省、市、区" clearable></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="加油站名称">
-                  <el-input v-model="state.filter.stationName" placeholder="请输入加油站" clearable></el-input>
+                  <el-input v-model="state.filter.stationName" placeholder="请输入加油站名称" clearable></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="软件版本">
-                  <el-select v-model="state.filter.softV" placeholder="请选择">
+                  <el-select v-model="state.filter.softV" placeholder="请选择软件版本">
                      <el-option label="所有" :value="''"></el-option>
                      <el-option label="开启" :value="''"></el-option>
                      <el-option label="关闭" :value="''"></el-option>
@@ -32,7 +32,7 @@
 
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="升级状态">
-                  <el-select v-model="state.filter.upgradeStatus" placeholder="请选择">
+                  <el-select v-model="state.filter.upgradeStatus" placeholder="请选择升级状态">
                      <el-option label="所有" :value="''"></el-option>
                      <el-option label="开启" :value="''"></el-option>
                      <el-option label="关闭" :value="''"></el-option>

+ 1 - 1
admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/components/form-edit.vue

@@ -29,7 +29,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="版本" prop="version">
-              <el-input v-model="formData.editData.version" placeholder="请输入版本" clearable></el-input>
+              <el-input v-model="formData.editData.version" placeholder="请输入版本" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">

+ 74 - 136
admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/components/search-history.vue

@@ -1,7 +1,22 @@
 <template>
-  <div class="admin-authorize-edit-info">
-    <el-dialog :title="formData.titleText" v-model="formData.isShowDialog" draggable width="769px" @open="handleDialogOpen">
-      <el-form :model="formData.editData" :rules="rules" ref="formRef" v-loading="formData.loading" size="default" label-width="120px">
+  <div class="layout-pd">
+    <el-card shadow="hover">
+      <div class="page-header">
+        <el-breadcrumb separator="/">
+          <el-breadcrumb-item :to="{ path: '/software-management' }">软件包管理</el-breadcrumb-item>
+          <el-breadcrumb-item>历史版本记录</el-breadcrumb-item>
+        </el-breadcrumb>
+        <el-button 
+          type="primary" 
+          icon="ele-ArrowLeft" 
+          @click="handleBack"
+          class="back-button"
+        >
+          返回列表
+        </el-button>
+      </div>
+
+      <el-form :model="formData.editData" ref="formRef" v-loading="formData.loading" size="default" label-width="120px">
         <el-row :gutter="35">
           <!-- 项目基本信息 -->
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -93,44 +108,25 @@
           </el-col>
         </el-row>
       </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取消</el-button>
-          <el-button type="primary" @click="handleSubmit" size="default">
-            {{formData.buttonText}}
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
+    </el-card>
   </div>
 </template>
 
 <script setup lang="ts">
-import { defineAsyncComponent, onMounted, reactive, ref, watch } from "vue";
-import { ElMessage, ElSkeleton, ElEmpty } from "element-plus";
+import { onMounted, reactive, ref, watch } from "vue";
+import { useRouter, useRoute } from "vue-router";
+import { ElMessage, ElEmpty, ElSkeleton, ElTimeline, ElTimelineItem, ElCard } from "element-plus";
 import { FormRules } from "element-plus";
-import eventBus from "/@/utils/mitt";
 import { HistoricalVersionRecordDto } from "/@/api/admin/productionManagement/slelistDto";
 import { Api } from "/@/api/admin/productionManagement/slelist";
 
-const MyUploadFile = defineAsyncComponent(() => import('/@/components/my-upload-file/index.vue'));
-
-/** 表单操作类型 */
-enum FormAction {
-  VIEW = '查看',
-  UPDATE = '更新',
-  ADD = '添加'
-}
+// 路由实例
+const router = useRouter()
+const route = useRoute()
 
 /**数据对象 */
 const formData = reactive({
   loading: false,
-  action: FormAction.VIEW,
-  titleText: '查看历史版本',
-  editIcon: 'el-icon-history',
-  buttonText: '关闭',
-  isShowDialog: false,
-  softwarePackageId: null, // 软件包ID(数值类型)
   editData: {
     guid: 0, // 接口返回的ID(数值类型)
     projectName: '',
@@ -149,107 +145,38 @@ const formData = reactive({
     state: 0,
     operatorTime: '',
     pubDate: '',
+    createdTime: '',
+    numberOfDownloads: 0,
     softVersions: []
   } as HistoricalVersionRecordDto,
   fileValue: null
 });
 
-/**有效版本号选择校验*/
-const validateVersion = (rule: any, value: any, callback: any) => {
-  const versionPattern: RegExp = /^\d+\.\d+\.\d+$/;
-  if (!versionPattern.test(value)) {
-    callback(new Error('输入的版本号格式错误,应为X.X.X格式'));
-  } else {
-    callback();
-  }
-};
-
-/**表单校验规则*/
-const rules = reactive<FormRules>({
-  softwareType: [{ required: true, message: '请选择软件类型', trigger: 'blur' }],
-  equipmentType: [{ required: true, message: '请选择设备类型', trigger: 'blur' }],
-  softwareName: [{ required: true, message: '请输入软件包名', trigger: 'blur' }],
-  version: [
-    { required: true, message: '请输入版本号', trigger: 'blur' },
-    { validator: validateVersion, trigger: 'blur' }
-  ]
-});
+/**
+ * 移除了不必要的表单校验规则
+ * 历史版本页面主要用于查看,无需校验逻辑
+ */
+const rules = reactive<FormRules>({});
 
 /** 表单引用 */
 const formRef = ref();
 
-/** 打开对话框并加载数据 */
-const openDialog = (softwareId: number, action: FormAction = FormAction.VIEW) => {
-  formData.action = action;
-  formData.editData.guid = softwareId;
-  
-  // 根据操作类型设置界面显示
-  if (action === FormAction.VIEW) {
-    formData.titleText = '查看历史版本';
-    formData.buttonText = '关闭';
-    formData.editIcon = 'el-icon-close';
-  } else if (action === FormAction.UPDATE) {
-    formData.titleText = '更新软件包';
-    formData.buttonText = '更新';
-    formData.editIcon = 'el-icon-refresh-right';
+/** 页面挂载时加载数据 */
+onMounted(() => {
+  // 从路由参数获取guid
+  const guid = route.query.guid
+  if (guid) {
+    formData.editData.guid = Number(guid)
+    fetchHistoricalVersion()
   } else {
-    formData.titleText = '添加软件包';
-    formData.buttonText = '添加';
-    formData.editIcon = 'el-icon-plus';
-  }
-  
-  formData.isShowDialog = true;
-  fetchHistoricalVersion(); // 立即加载数据
-};
-
-/** 对话框打开时触发 */
-const handleDialogOpen = () => {
-  if (formData.softwarePackageId && formData.action === FormAction.VIEW) {
-    fetchHistoricalVersion();
+    ElMessage.warning('未获取到软件包信息')
+    router.push('/software-management')
   }
-};
-
-/** 取消操作 */
-const onCancel = () => {
-  formData.editData = {
-    guid: 0,
-    projectName: '',
-    projectCode: '',
-    projectDescription: '',
-    projectLaunchDate: '',
-    equipmentType: '',
-    softwareType: '',
-    softwareName: '',
-    version: '',
-    explain: '',
-    remark: '',
-    downNum: 0,
-    downloadUrl: '',
-    fileName: '',
-    state: 0,
-    operatorTime: '',
-    pubDate: '',
-    softVersions: []
-  } as HistoricalVersionRecordDto;
-  formData.isShowDialog = false;
-};
-
-/***监听软件包ID变化,重新加载数据 */
-watch(() => formData.softwarePackageId, (newId) => {
-  if (newId && formData.action === FormAction.VIEW) {
-    fetchHistoricalVersion();
-  }
-});
-
-/** 文件上传处理 */
-const onUpload = (val) => {
-  formData.editData.downloadUrl = val.fileUrl;
-  formData.editData.fileName = val.fileName;
-};
+})
 
 /** 获取历史版本数据 */
 const fetchHistoricalVersion = async () => {
-  if (formData.editData.guid === null || formData.editData.guid === undefined) {
+  if (!formData.editData.guid) {
     ElMessage.warning('未获取到软件包ID');
     return;
   }
@@ -257,8 +184,6 @@ const fetchHistoricalVersion = async () => {
   formData.loading = true;
   try {
     const api = new Api();
-    // 传递formData.softwarePackageId作为ID参数
-    console.log(formData.editData.guid)
     const res = await api.getHistory(formData.editData.guid);
     
     if (res.success) {
@@ -295,31 +220,44 @@ const formatDate = (dateStr: string): string => {
   }
 };
 
-/** 提交处理 */
-const handleSubmit = () => {
-  if (formData.action === FormAction.UPDATE || formData.action === FormAction.ADD) {
-    formRef.value?.validate((valid: boolean) => {
-      if (valid) {
-        ElMessage.success(`${formData.buttonText}成功`);
-        formData.isShowDialog = false;
-      }
-    });
-  } else {
-    formData.isShowDialog = false;
-  }
-};
+/** 返回列表页 */
+const handleBack = () => {
+  router.push('/product/softwarePackageManagement')
+}
 
-defineExpose({
-  openDialog,
-  fetchHistoricalVersion
-});
 </script>
 
 <style scoped lang="scss">
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+}
+
+.back-button {
+  margin-top: 10px;
+}
+
 :deep(.el-form-item__label) {
   width: 120px !important;
   text-align: right;
   justify-content: flex-end;
   padding-right: 12px;
 }
-</style>
+
+.el-timeline {
+  margin-left: 20px;
+}
+
+.el-timeline-item {
+  margin-bottom: 20px;
+}
+
+.el-card {
+  margin-bottom: 10px;
+  padding: 10px;
+}
+</style>

+ 11 - 7
admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/index.vue

@@ -22,7 +22,7 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="版本">
-                  <el-input v-model="softwareData.Filter.version" placeholder="请输入版本" clearable></el-input>
+                  <el-input v-model="softwareData.Filter.version" placeholder="请输入版本" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
@@ -135,13 +135,13 @@
       </el-col>
     </el-row>
     <EditDialog ref="editDialogRef" />
-    <SearchHistory ref="SearchHistoryRef" />
     <DownloadDialog ref="downloadDialogRef" />
   </div>
 </template>
 
 <script setup lang="ts">
 import { defineAsyncComponent, onBeforeMount, onMounted, reactive, ref, watch } from "vue";
+import { useRouter } from "vue-router";
 import { useGlobalCacheStore } from "/@/stores/globalCacheStore";
 import {
   softwarePackageManagement_AllDto,
@@ -158,18 +158,19 @@ import { useDynamicPageSize } from "/@/composables/useDynamicPageSize";
 import { Api } from "/@/api/admin/productionManagement/slelist";
 import { useRoute } from "vue-router";
 
+// 路由实例
+const router = useRouter()
+
 // 使用组合式函数获取分页状态
 const pageState = useDynamicPageSize(10, 15);
 
 /** 引入组件 */
 const EditDialog = defineAsyncComponent(() => import('./components/form-edit.vue'))
-const SearchHistory = defineAsyncComponent(() => import('./components/search-history.vue'))
 const DownloadDialog = defineAsyncComponent(() => import('./components/table-download.vue'))
 
 // 组件引用
 const editDialogRef = ref()
 const downloadDialogRef = ref()
-const SearchHistoryRef = ref()
 const downloadLink = ref()
 
 /** 获取全局缓存 */
@@ -352,9 +353,12 @@ const editTableData = (row) => {
   editDialogRef.value.openDialog(row)
 }
 
-/** 查看历史版本 */
+/** 查看历史版本 - 改为路由跳转 */
 const searchHistory = (row) => {
-  SearchHistoryRef.value.openDialog(row.guid)
+  router.push({
+    path: '/software-history',
+    query: { guid: row.guid }
+  })
 }
 
 /** 发布软件包 */
@@ -521,4 +525,4 @@ const getStatusInfo = (status: string) => {
   word-break: break-all; /* 处理长单词和URL */
   line-height: 1.5; /* 适当调整行高 */
 }
-</style>
+</style>

+ 2 - 0
admin.ui.plus-master/src/views/admin/product/type/index.vue

@@ -84,6 +84,8 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column prop="remark" label="备注" />
+
 
             <!--            <el-table-column prop="createdTime" label="更新时间" >-->
             <!--              <template #default="{ row }">-->

+ 1 - 1
admin.ui.plus-master/src/views/admin/statement/BlackBox/index.vue

@@ -29,7 +29,7 @@
               </el-col> -->
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="安全装置状态">
-                  <el-select v-model="state.filter.DeviceStatus" placeholder="请输入在线状态">
+                  <el-select v-model="state.filter.DeviceStatus" placeholder="请选择安全装置状态">
                     <el-option label="所有" :value="''"></el-option>
                     <el-option v-for="(value, key) in FuelDispenserEnum" :key="key" :label="value" :value="key" />
                   </el-select>

+ 3 - 3
admin.ui.plus-master/src/views/admin/statement/displayControl/index.vue

@@ -9,12 +9,12 @@
             <el-form-item prop="name" style="width: 100%">
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="石油公司">
-                  <el-input v-model="state.filter.OilCompanyName" placeholder="请输入公司名称" clearable></el-input>
+                  <el-input v-model="state.filter.OilCompanyName" placeholder="请输入石油公司" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="显示屏编号">
-                  <el-input v-model="state.filter.SerialNumber" placeholder="请输入编号" clearable></el-input>
+                  <el-input v-model="state.filter.SerialNumber" placeholder="请输入显示屏编号" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
@@ -27,7 +27,7 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="在线状态">
-                  <el-select v-model="state.filter.onlineStatus" placeholder="请选择状态">
+                  <el-select v-model="state.filter.onlineStatus" placeholder="请选择在线状态">
                                    <el-option label="所有" :value="''"></el-option>
                                    <el-option v-for="(value, key) in OnlineStatus" :key="key" :label="value" :value="key" />
                                  </el-select>             

+ 1 - 1
admin.ui.plus-master/src/views/admin/statement/gasStationManagement/index.vue

@@ -13,7 +13,7 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="油站名称">
-                  <el-input v-model="Data.Filter.name" placeholder="请输入油站名称" clearable></el-input>
+                  <el-input v-model="Data.Filter.name" placeholder="请输入油站名称" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">

+ 1 - 1
admin.ui.plus-master/src/views/admin/statement/listOfOilEngines/index.vue

@@ -54,7 +54,7 @@
               </el-col>
                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="法制软件版本">
-                  <el-input v-model="oilEngineData.filterModel.lawSwv" placeholder="请输入版本号" clearable></el-input>
+                  <el-input v-model="oilEngineData.filterModel.lawSwv" placeholder="请输入法制软件版本号" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">

+ 1 - 1
admin.ui.plus-master/src/views/admin/statement/problemData/index.vue

@@ -19,7 +19,7 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="错误的严重程度">
-                <el-select placeholder="请输入严重程度">
+                <el-select placeholder="请选择错误的严重程度">
                   <el-option label="所有" :value="''"></el-option>
                   <el-option label="轻微" :value="'轻'"></el-option>
                   <el-option label="普通" :value="'普'"></el-option>

+ 1 - 1
admin.ui.plus-master/src/views/admin/statement/vxList/index.vue

@@ -19,7 +19,7 @@
               </el-col>
 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="用户手机号">
-                  <el-input v-model="state.filter.phone" placeholder="请输入手机号" clearable></el-input>
+                  <el-input v-model="state.filter.phone" placeholder="请输入用户手机号" clearable></el-input>
                 </el-form-item>
               </el-col>
 </el-form-item>

+ 2 - 2
admin.ui.plus-master/src/views/example/application/applicationManage/index.vue

@@ -3,7 +3,7 @@
     <el-card class="mt8" shadow="never" :body-style="{ paddingBottom: '0' }">
       <el-form :inline="true" @submit.stop.prevent>
         <el-form-item label="应用名称">
-          <el-input v-model="state.filter.name" placeholder="应用名称" @keyup.enter="onQuery" />
+          <el-input v-model="state.filter.name" placeholder="请输入应用名称" @keyup.enter="onQuery" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
@@ -114,7 +114,7 @@ const toViewPage = (row: OauthApply) => {
   router.push({path:`/platform/application/viewManage/${row.name}`})
 }
 const toPermissPage = (row: OauthApply) => {
-  router.push({path:`/platform/application/permissionManage/${row.name}`})
+  router.push({path:`/application/permissionManage/${row.name}`})
 }
 const toEquipmentPage = (row: OauthApply) => {
   router.push({path:`/platform/application/equipment/${row.name}`})

+ 8 - 2
admin.ui.plus-master/vite.config.ts

@@ -32,7 +32,7 @@ const viteConfig = defineConfig(({ mode, command }: ConfigEnv) => {
     hmr: true,
     optimizeDeps: { exclude: ['vue-demi'] },
     server: {
-      host: '0.0.0.0',
+      host: '0.0.0.0', 
       port: env.VITE_PORT,
       open: env.VITE_OPEN,
       proxy: {
@@ -41,7 +41,13 @@ const viteConfig = defineConfig(({ mode, command }: ConfigEnv) => {
           ws: true,
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/gitee/, ''),
-        }
+        },
+        '/app': {
+          target: 'http://dev.hsfuel.com:8000',
+          ws: true,
+          changeOrigin: true,
+          rewrite: (path) => path
+        },
       },
     },
     build: {

+ 16 - 0
admin.ui.plus-master/vite.config.ts.rej

@@ -0,0 +1,16 @@
+diff a/admin.ui.plus-master/vite.config.ts b/admin.ui.plus-master/vite.config.ts	(rejected hunks)
+@@ -41,13 +41,7 @@
+           ws: true,
+           changeOrigin: true,
+           rewrite: (path) => path.replace(/^\/gitee/, ''),
+-        },
+-        '/app': {
+-          target: 'http://dev.hsfuel.com:8000',
+-          ws: true,
+-          changeOrigin: true,
+-          rewrite: (path) => path
+-        },
++        }
+       },
+     },
+     build: {

Some files were not shown because too many files changed in this diff