Quellcode durchsuchen

站内信消息通知

lipenghui vor 2 Monaten
Ursprung
Commit
8aa23f8bac

+ 0 - 2
src/components/UploadFile/src/useUpload.ts

@@ -66,7 +66,6 @@ export const useUpload = () => {
       // 1.2 获取文件预签名地址
       const presignedInfoPath = await FileApi.getFilePresignedUrl(fileName)
       // 1.3 上传文件(不能使用 ElUpload 的 ajaxUpload 方法的原因:其使用的是 FormData 上传,Minio 不支持)
-      debugger
       return axios
         .put(presignedInfoPath.uploadUrlPath, options.file, {
           headers: {
@@ -80,7 +79,6 @@ export const useUpload = () => {
           return { data: presignedInfo.url }
         })
     } else {
-      debugger
       // 模式二:后端上传
       // 重写 el-upload httpRequest 文件上传成功会走成功的钩子,失败走失败的钩子
       return new Promise((resolve, reject) => {

+ 21 - 2
src/layout/components/Message/src/Message.vue

@@ -31,7 +31,20 @@ const goMyList = () => {
     name: 'MyNotifyMessage'
   })
 }
-
+const routerDetail = (item) =>{
+  const id = item.businessId
+  debugger
+  if (item.businessType === 'generateInspect') {
+    push({ name:'InspectOrderWrite', params:{id} })
+  }else if(item.businessType === 'failureReport') {
+    push({
+      name: 'BpmProcessInstanceDetail',
+      query: {
+        id: id
+      }
+    })
+  }
+}
 // ========== 初始化 =========
 onMounted(() => {
   // 首次加载小红点
@@ -61,7 +74,7 @@ onMounted(() => {
         <ElTabPane label="我的站内信" name="notice">
           <el-scrollbar class="message-list">
             <template v-for="item in list" :key="item.id">
-              <div class="message-item">
+              <div class="message-item" @click="routerDetail(item)">
                 <img alt="" class="message-icon" src="@/assets/imgs/avatar.gif" />
                 <div class="message-content">
                   <span class="message-title">
@@ -103,6 +116,7 @@ onMounted(() => {
     align-items: center;
     padding: 20px 0;
     border-bottom: 1px solid var(--el-border-color-light);
+    cursor: pointer;
 
     &:last-child {
       border: none;
@@ -128,5 +142,10 @@ onMounted(() => {
       }
     }
   }
+  .message-item:hover {
+    transform: scale(0.95);
+    background-color: #dcf8e4;
+    box-shadow: 0 2px 5px rgba(0,0,0,0.2);
+  }
 }
 </style>

+ 0 - 1
src/views/Home/Index.vue

@@ -279,7 +279,6 @@ const getStats = async () => {
   })
   IotStatApi.getDeviceStatusCount().then((res) => {
     typeData.value = res
-    debugger
     initCharts()
   })
   IotStatApi.getSafeCount().then((res) => {

+ 9 - 11
src/views/pms/inspect/plan/InspectRouteList.vue

@@ -17,15 +17,13 @@
             class="!w-200px"
           />
         </el-form-item>
-        <el-form-item  :label="t('common.createTime')" prop="createTime">
-          <el-date-picker
-            v-model="queryParams.createTime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            type="daterange"
-            :start-placeholder="t('info.start')"
-            :end-placeholder="t('info.end')"
-            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-            class="!w-240px"
+        <el-form-item  :label="t('iotDevice.code')" prop="deviceCode">
+          <el-input
+            v-model="queryParams.deviceCode"
+            :placeholder="t('iotDevice.codeHolder')"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-200px"
           />
         </el-form-item>
         <el-form-item>
@@ -116,8 +114,8 @@ const queryParams = reactive({
   status: undefined,
   deptId: undefined,
   assetClass: undefined,
-  createTime: undefined,
   deviceName: undefined,
+  deviceCode: undefined,
 })
 
 const handleConfirm = () => {
@@ -188,7 +186,7 @@ const open = async (classify) => {
   dialogVisible.value = true
   queryParams.assetClass = classify
   queryParams.deviceName = undefined
-  queryParams.createTime = undefined
+  queryParams.deviceCode = undefined
   await getList()
   selectedRows.value = []
 }