Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev

ALOps_sys_fe/alops-ui/src/views/QandA/knowledge/index.vue

@@ -7,7 +7,7 @@
           <el-col>
             <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="['QandA:knowledge:add']">新增</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['QandA:knowledge:uploadfile']">新增</el-button>
               </el-col>
               <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> -->
             </el-row>
@@ -27,8 +27,8 @@
               </el-table-column>
               <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
                 <template slot-scope="scope" v-if="scope.row.id !== 1">
-                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['QandA:knowledge:edit']">修改</el-button>
+                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['QandA:knowledge:update']">修改</el-button>
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['QandA:knowledge:remove']">删除</el-button>
+                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['QandA:knowledge:del']">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>

ALOps_sys_fe/alops-ui/src/views/device/deviceManufacturer/index.vue

@@ -23,7 +23,7 @@
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['device:deviceManu:add']">新增</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="['device:deviceManu:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['device:deviceManu:delete']">删除</el-button>
               </el-col>
               <!-- <el-col :span="1.5">
                 <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['device:deviceManu:import']">导入</el-button>

ALOps_sys_fe/alops-ui/src/views/device/deviceType/index.vue

@@ -21,6 +21,9 @@
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['device:deviceType:add']">新增</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="['device:deviceType:delete']">删除</el-button>
+              </el-col>
               <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> -->
             </el-row>
 
@@ -36,7 +39,7 @@
               <el-table-column label="描述" align="center" key="description" prop="description" :show-overflow-tooltip="true" />
               <el-table-column label="图片" align="center" key="image" prop="image" :show-overflow-tooltip="true" >
                 <template slot-scope="scope">
-                  <ImagePreview :src="scope.row.image"/>
+                  <ImagePreview height="100px" :src="scope.row.image"/>
                 </template>
               </el-table-column>
               <el-table-column label="创建人" align="center" key="createBy" prop="createBy" :show-overflow-tooltip="true" />

ALOps_sys_fe/alops-ui/src/views/device/supplier/index.vue

@@ -7,9 +7,9 @@
         <!--类型类型管理-->
         <pane size="84">
           <el-col>
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-              <el-form-item label="类型名称" prop="name">
+              <el-form-item label="供应商名称" prop="name">
-                <el-input v-model="queryParams.name" placeholder="请输入类型名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.name" placeholder="请输入供应商名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -22,7 +22,7 @@
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['device:supplier:add']">新增</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="['device:supplier:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['device:supplier:delete']">删除</el-button>
               </el-col>
               <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> -->
             </el-row>
@@ -53,7 +53,7 @@
               <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
                 <template slot-scope="scope" v-if="scope.row.id !== 1">
                   <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['device:supplier:edit']">修改</el-button>
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['device:supplier:remove']">删除</el-button>
+                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['device:supplier:delete']">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>

ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/message/index.vue

@@ -237,6 +237,14 @@ export default {
     if (level) {
       this.queryParams.level = level;
     }
+    
+    // 检查路由参数是否有时间范围
+    const startTime = this.$route.query.startTime;
+    const endTime = this.$route.query.endTime;
+    if (startTime && endTime) {
+      this.dateRange = [startTime, endTime];
+    }
+    
     this.getList()
   },
   methods: {

ALOps_sys_fe/alops-ui/src/views/index.vue

@@ -903,6 +903,29 @@ export default {
                     // 年度预警跳转到预警信息页面
                     if (level === 'annual') {
                         this.$router.push('/inMonitoring/inMonitoring/message');
+                    }else if (level === 'monthly') {
+                        const today = new Date();
+                        // 当前月的第一天
+                        const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+                        
+                        // 格式化日期为YYYY-MM-DD HH:mm:ss格式
+                        const formatDate = (date) => {
+                            const year = date.getFullYear();
+                            const month = String(date.getMonth() + 1).padStart(2, '0');
+                            const day = String(date.getDate()).padStart(2, '0');
+                            const hours = String(date.getHours()).padStart(2, '0');
+                            const minutes = String(date.getMinutes()).padStart(2, '0');
+                            const seconds = String(date.getSeconds()).padStart(2, '0');
+                            return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+                        };
+                        
+                        this.$router.push({
+                            path: '/inMonitoring/inMonitoring/message',
+                            query: {
+                                startTime: formatDate(firstDayOfMonth),
+                                endTime: formatDate(today)
+                            }
+                        });
                     }
                     // 1-3级预警跳转到预警信息页面并传递级别参数
                     else if (level === 'level1') {