no message

admin.ui.plus-master/package.json

@@ -23,6 +23,8 @@
     "echarts-gl": "^2.0.9",
     "echarts-wordcloud": "^2.1.0",
     "element-plus": "^2.3.6",
+    "exceljs": "^4.4.0",
+    "file-saver": "^2.0.5",
     "js-cookie": "^3.0.5",
     "js-table2excel": "^1.1.2",
     "jsplumb": "^2.15.6",

admin.ui.plus-master/src/layout/component/columnsAside.vue

@@ -131,6 +131,7 @@ const onColumnsAsideDown = (k: number) => {
 // 设置/过滤路由（非静态路由/是否显示在菜单中）
 const setFilterRoutes = () => {
   state.columnsAsideList = filterRoutesFun(routesList.value)
+  state.columnsAsideList=state.columnsAsideList.filter(route=>route.meta.title!=='个人中心'&&route.meta.title!=='帮助文档')
   const resData: MittMenu = setSendChildren(route.path)
   if (Object.keys(resData).length <= 0) return false
   onColumnsAsideDown(resData.item?.k)

admin.ui.plus-master/src/views/admin/authorize/fuelingsdk/components/form-edit.vue

@@ -23,11 +23,11 @@
               <el-input v-model="formData.editData.sn" placeholder="请输入设备SN号" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+          <!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="授权码" prop="key">
               <el-input v-model="formData.editData.key" placeholder="请输入授权码" clearable></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="有效时间" prop="expiedTime">
               <el-date-picker

admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/components/table-download.vue

@@ -0,0 +1,69 @@
+<template>
+    <div class="admin-authorize-editInfo">
+      <el-dialog :title="formData.titleText" v-model="formData.isShowDialog" draggable width="769px">
+        <el-table :model="formData.downloadData"
+               v-loading="formData.loading"
+               size="default">
+        <el-table-column prop="field1" label="字段1" align="center"></el-table-column>
+        <el-table-column prop="field2" label="字段2" align="center"></el-table-column>
+        <el-table-column prop="field3" label="字段3" align="center"></el-table-column>
+      </el-table>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button type="primary" icon="ele-CircleClose" @click="onClose" size="default">关闭</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </template>
+
+  <script setup lang="ts">
+  import { reactive, ref, watch} from "vue";
+  import {softwarePackageManagement_TableData} from "/@/api/admin/deviceAuthorization/softwarePackageManagementDto";
+
+
+  /**获取全局缓存*/
+
+
+
+  /**数据对象 */
+  const formData = reactive({
+    loading: false,
+    titleText:'下载记录',
+    isShowDialog: false,
+    downloadData:{} as softwarePackageManagement_TableData,
+  })
+
+
+  /**
+   * 表单对象
+   */
+  const formRef = ref()
+
+  const openDialog = (val) => {
+    if(val){
+      formData.downloadData = JSON.parse(JSON.stringify(val))
+    }else {
+      formData.downloadData = {} as softwarePackageManagement_TableData
+    }
+    formData.isShowDialog = true
+    formData.isShowDialog = true
+  }
+  //关闭弹窗
+  const onClose = () => {
+    formData.downloadData = {} as softwarePackageManagement_TableData
+    formData.isShowDialog = false
+  }
+
+  /***监听弹窗关   闭表单验证*/
+  watch(() => formData.isShowDialog,(newVal) => {
+    if(newVal) formRef.value?.resetFields()
+  })
+
+  defineExpose({
+    openDialog,
+  })
+  </script>
+  <style scoped lang="scss">
+
+  </style>

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

@@ -142,6 +142,7 @@
       </el-col>
     </el-row>
     <EditDialog ref="editDialogRef" />
+    <DownloadDialog ref="downloadDialogRef" />
   </div>
 </template>
 
@@ -159,8 +160,11 @@ import eventBus from "/@/utils/mitt";
 import {SoftwarePackageManagementApi} from "/@/api/admin/deviceAuthorization/softwarePackageManagementApi";
 /**引入组件*/
 const EditDialog = defineAsyncComponent(() => import('./components/form-edit.vue'))
+const DownloadDialog = defineAsyncComponent(() => import('./components/table-download.vue'))
 // import {pageInput} from "/@/api/admin/shareDto/shareDto";
 const editDialogRef = ref()
+const downloadDialogRef=ref()
+
 
 /**获取全局缓存*/
 const globalCacheStore = useGlobalCacheStore()
@@ -319,7 +323,8 @@ const onFailure = (row) => {
 
 /**下载记录*/
 const onDownloadRecord = (row) => {
-  alert('下载记录')
+  downloadDialogRef.value.openDialog(row)
+  //alert('下载记录')
 }
 
 /**页条数变化*/

admin.ui.plus-master/src/views/admin/product/goodInfo/index.vue

@@ -230,7 +230,7 @@
       </el-col>
 
       <!-- 报警日志 -->
-      <el-col :span="24" >
+      <!-- <el-col :span="24" >
         <el-card style="height: 40vh" class="my-fill mt8" shadow="hover" header="报警日志">
           <el-table v-loading="goods.loadingAlarm" stripe :data="goods.alarmLog.tableData" row-key="id" style="width: 100%">
             <el-table-column v-for="column in goods.alarmLog.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label"  />
@@ -250,7 +250,7 @@
             />
           </div>
         </el-card>
-      </el-col>
+      </el-col> -->
     </el-row>
     <!--大图显示-->
     <el-dialog

admin.ui.plus-master/src/views/admin/product/record/index.vue

@@ -59,23 +59,25 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="key_name" label="中化密钥"  >
+            <!-- <el-table-column prop="key_name" label="中化密钥"  >
               <template #default="{ row }">
                 <div :style="{color:getComponentStatus(row.key_name).color}" class="bold-font">
                   {{getComponentStatus(row.key_name).name}}
                 </div>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="tqcKeyState" label="团标状态" >
               <template #default="{ row }">
-                <div :style="{color:getComponentStatus(row.key_name).color}" class="bold-font">
+                <!-- <div :style="{color:getComponentStatus(row.key_name).color}" class="bold-font"> -->
+                  <div :style="{color:getColor(getComponentStatus(row.tqcKeyState).name)}" class="bold-font">
                   {{getComponentStatus(row.tqcKeyState).name}}
                 </div>
               </template>
             </el-table-column>
             <el-table-column prop="ecvrKeyState" label="油气回收" >
               <template #default="{ row }">
-                <div :style="{color:getComponentStatus(row.key_name).color}" class="bold-font">
+                <!-- <div :style="{color:getComponentStatus(row.key_name).color}" class="bold-font"> -->
+                <div :style="{color:getColor(getComponentStatus(row.ecvrKeyState).name)}" class="bold-font">
                   {{getComponentStatus(row.ecvrKeyState).name}}
                 </div>
               </template>
@@ -107,7 +109,7 @@
 <!--                {{ formatterTime(row.modifiedTime || row.createdTime || '') }}-->
 <!--              </template>-->
 <!--            </el-table-column>-->
-            <el-table-column label="操作"  fixed="right" header-align="center" align="center">
+            <el-table-column label="操作"  fixed="right" header-align="center" align="center" class="right-operation" width="100">
               <template #default="{ row }">
                 <!-- <el-popover :width="220">
                   <p>{{ row.linkUrl }}</p>
@@ -221,6 +223,16 @@ const getComponentStatus = (val) => {
   }
 }
 
+//设置不同团标状态、油气回收字体颜色
+const getColor = (value: string): string => {
+  if (value === '备案') {
+    return '#41b584';
+  } else if (value === '灌注') {
+      return '#409eff';
+  } else {
+    return '#E6A23C';
+  }
+}
 //const { copyText } = commonFunction()
 
 //const previewImglist = computed(() => {

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

@@ -90,7 +90,7 @@
 <!--                {{ formatterTime(row.modifiedTime || row.createdTime || '') }}-->
 <!--              </template>-->
 <!--            </el-table-column>-->
-            <el-table-column label="操作"  fixed="right" header-align="center" align="center">
+            <el-table-column label="操作"  fixed="right" header-align="center" align="center" class="right-operation" width="100">
               <template #default="{ row }">
                 <!-- <el-popover :width="220">
                   <p>{{ row.linkUrl }}</p>

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

@@ -46,7 +46,7 @@
             <el-table-column prop="startTime" label="启动时间" />
             <el-table-column prop="equipmentStatus" label="设备状态" />
             <el-table-column prop="onlineStatus" label="在线状态" />
-            <el-table-column label="操作"  fixed="right" header-align="center" align="center">
+            <el-table-column label="操作"  fixed="right" header-align="center" align="center" class="right-operation" width="100">
               <template #default="{ row }">
                 <el-link
                   class="my-el-link mr12 ml12"

admin.ui.plus-master/src/views/admin/visualization/digitalMap/mockData/allCity.ts

@@ -1,171 +1,171 @@
 export const allCity = [
   {
-    name: '北京市',
+    name: '北京',
     value: 1,
     code: 'beijing'
   },
   {
-    name: '天津市',
+    name: '天津',
     value: 2,
     code: 'tianjin'
   },
   {
-    name: '河北省',
+    name: '河北',
     value: 3,
     code: 'hebei'
   },
   {
-    name: '山西省',
+    name: '山西',
     value: 4,
     code: 'shanxi'
   },
   {
-    name: '内蒙古自治区',
+    name: '内蒙古',
     value: 5,
     code: 'neimenggu'
   },
   {
-    name: '辽宁省',
+    name: '辽宁',
     value: 6,
     code: 'liaoning'
   },
   {
-    name: '吉林省',
+    name: '吉林',
     value: 7,
     code: 'jilin'
   },
   {
-    name: '黑龙江省',
+    name: '黑龙江',
     value: 8,
     code: 'heilongjiang'
   },
   {
-    name: '上海市',
+    name: '上海',
     value: 9,
     code: 'shanghai'
   },
   {
-    name: '江苏省',
+    name: '江苏',
     value: 10,
     code: 'jiangsu'
   },
   {
-    name: '浙江省',
+    name: '浙江',
     value: 11,
     code: 'zhejiang'
   },
   {
-    name: '安徽省',
+    name: '安徽',
     value: 12,
     code: 'anhui'
   },
   {
-    name: '福建省',
+    name: '福建',
     value: 13,
     code: 'fujian'
   },
   {
-    name: '江西省',
+    name: '江西',
     value: 14,
     code: 'jiangxi'
   },
   {
-    name: '山东省',
+    name: '山东',
     value: 15,
     code: 'shandong'
   },
   {
-    name: '河南省',
+    name: '河南',
     value: 16,
     code: 'henan'
   },
   {
-    name: '湖北省',
+    name: '湖北',
     value: 17,
     code: 'hubei'
   },
   {
-    name: '湖南省',
+    name: '湖南',
     value: 18,
     code: 'hunan'
   },
   {
-    name: '广东省',
+    name: '广东',
     value: 19,
     code: 'guangdong'
   },
   {
-    name: '广西壮族自治区',
+    name: '广西',
     value: 20,
     code: 'guangxi'
   },
   {
-    name: '海南省',
+    name: '海南',
     value: 21,
     code: 'hainan'
   },
   {
-    name: '重庆市',
+    name: '重庆',
     value: 22,
     code: 'chongqing'
   },
   {
-    name: '四川省',
+    name: '四川',
     value: 23,
     code: 'sichuan'
   },
   {
-    name: '贵州省',
+    name: '贵州',
     value: 24,
     code: 'guizhou'
   },
   {
-    name: '云南省',
+    name: '云南',
     value: 25,
     code: 'yunnan'
   },
   {
-    name: '西藏自治区',
+    name: '西藏',
     value: 26,
     code: 'xizang'
   },
   {
-    name: '陕西省',
+    name: '陕西',
     value: 27,
     code: 'shanxi1'
   },
   {
-    name: '甘肃省',
+    name: '甘肃',
     value: 28,
     code: 'gansu'
   },
   {
-    name: '青海省',
+    name: '青海',
     value: 29,
     code: 'qinghai'
   },
   {
-    name: '宁夏回族自治区',
+    name: '宁夏',
     value: 30,
     code: 'ningxia'
   },
   {
-    name: '新疆维吾尔自治区',
+    name: '新疆',
     value: 31,
     code: 'xinjiang'
   },
   {
-    name: '台湾省',
+    name: '台湾',
     value: 32,
     code: 'taiwan'
   },
   {
-    name: '香港特别行政区',
+    name: '香港',
     value: 33,
     code: 'hongkong'
   },
   {
-    name: '澳门特别行政区',
+    name: '澳门',
     value: 34,
     code: 'macao'
   }