Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/types/components.d.ts

src/types/components.d.ts

@@ -24,15 +24,21 @@ declare module 'vue' {
     DistributionMap: typeof import('./../components/Map/YztMap/DistributionMap.vue')['default']
     DrawMap: typeof import('./../components/Map/YztMap/DrawMap.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
+    ElAnchor: typeof import('element-plus/es')['ElAnchor']
+    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxButton: typeof import('element-plus/es')['ElCheckboxButton']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
+    ElCollapse: typeof import('element-plus/es')['ElCollapse']
+    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
     ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
@@ -45,29 +51,42 @@ declare module 'vue' {
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
+    ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
+    ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
+    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
@@ -83,6 +102,9 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
+    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
+    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

src/views/riskPrevention/SafetyProductionManagement/IndexSystem.vue

@@ -12,11 +12,14 @@
       </el-form>
     </div>
     <div class="card-container">
-      <div v-for="(item, index) in cards" :key="index" class="card">
-        <div class="icon-placeholder">icon</div>
-        <div class="card-title">{{ item.title }}</div>
-        <el-button type="primary" @click="viewDetails(item)">查看详情</el-button>
-      </div>
+      <template v-if="showCards.length > 0">
+        <div v-for="(item, index) in showCards" :key="index" class="card">
+          <div class="icon-placeholder">icon</div>
+          <div class="card-title">{{ item.title }}</div>
+          <el-button type="primary" @click="viewDetails(item)">查看详情</el-button>
+        </div>
+      </template>
+      <div v-else class="no-data">没有找到匹配的模型</div>
     </div>
   </div>
 </template>
@@ -28,19 +31,28 @@ const queryParams = ref({
   search: ''
 });
 
-const cards = ref([
+const allCards = [
   { title: '安全生产综合指数风险评估模型' },
   { title: '风险指数风险评估模型' },
   { title: '强度评估模型' },
   { title: '减灾能力评估模型' }
-]);
+];
+
+const showCards = ref([...allCards]);
 
 const handleQuery = () => {
-  console.log('搜索', queryParams.value.search);
+  if (!queryParams.value.search) {
+    showCards.value = [...allCards];
+    return;
+  }
+
+  const searchText = queryParams.value.search.toLowerCase();
+  showCards.value = allCards.filter((card) => card.title.toLowerCase().includes(searchText));
 };
 
 const resetQuery = () => {
   queryParams.value.search = '';
+  showCards.value = [...allCards];
 };
 
 const viewDetails = (item: any) => {
@@ -61,8 +73,8 @@ const viewDetails = (item: any) => {
 
 .card-container {
   display: flex;
-  justify-content: space-between;
   flex-wrap: wrap;
+  gap: 2.66%;
 }
 
 .card {
@@ -90,4 +102,11 @@ const viewDetails = (item: any) => {
 .card-title {
   margin-bottom: 10px;
 }
+
+.no-data {
+  width: 100%;
+  text-align: center;
+  padding: 20px;
+  color: #999;
+}
 </style>

src/views/system/role/authUser.vue

@@ -2,11 +2,11 @@
   <div class="app-container">
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="search">
-        <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-          <el-form-item label="用户名称" prop="userName">
+        <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+          <el-form-item label="用户名称：" prop="userName">
             <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
+          <el-form-item label="手机号码：" prop="phonenumber">
             <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
           </el-form-item>
           <el-form-item>

src/views/system/role/index.vue

@@ -14,6 +14,7 @@
               <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
+          <!--
           <el-form-item label="创建时间：" style="width: 308px" label-width="auto">
             <el-date-picker
               v-model="dateRange"
@@ -25,7 +26,7 @@
               :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
             ></el-date-picker>
           </el-form-item>
-
+          -->
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -44,13 +45,15 @@
       <el-col :span="1.5">
         <el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">删除</el-button>
       </el-col>
+      <!--
       <el-col :span="1.5">
         <el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
       </el-col>
+      
       <el-col :span="1.5">
         <el-button v-hasPermi="['system:role:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
       </el-col>
-      <!--      <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>-->
+      <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>-->
     </el-row>
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
@@ -58,13 +61,18 @@
       <el-table-column v-if="false" label="角色编号" prop="roleId" width="200" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="200" />
       <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="200" />
-      <el-table-column label="显示顺序" prop="roleSort" width="200" />
+      <el-table-column label="显示顺序" prop="roleSort" width="100" />
       <el-table-column label="状态" align="center" width="200">
+        <!--
         <template #default="scope">
           <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
             <span>{{ scope.row.dictType }}</span>
           </router-link>
         </template>
+        -->
+        <template #default="scope">
+            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+          </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="200">
         <template #default="scope">
@@ -125,14 +133,14 @@
               <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
               <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
               <el-tree
-                ref="deptRef"
+                ref="menuRef"
                 class="tree-border"
-                :data="deptOptions"
+                :data="menuOptions"
                 show-checkbox
                 default-expand-all
                 node-key="id"
-                :check-strictly="!form.deptCheckStrictly"
-                empty-text="加载中，请稍候"
+                :check-strictly="!form.menuCheckStrictly"
+                empty-text="加载中，请稍候..."
                 :props="{ label: 'label', children: 'children' }"
               ></el-tree>
             </el-form-item>

src/views/system/role/selectUser.vue

@@ -1,11 +1,11 @@
 <template>
   <el-row>
     <el-dialog v-model="visible" title="选择用户" width="800px" top="5vh" append-to-body>
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="用户名称" prop="userName">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+        <el-form-item label="用户名称：" prop="userName">
           <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="手机号码" prop="phonenumber">
+        <el-form-item label="手机号码：" prop="phonenumber">
           <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item>
@@ -18,7 +18,9 @@
           <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+          <!--
           <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+          -->
           <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
           <el-table-column label="状态" align="center" prop="status">
             <template #default="scope">

src/views/system/user/authRole.vue

@@ -2,15 +2,15 @@
   <div class="p-2">
     <div class="panel">
       <h4 class="panel-title">基本信息</h4>
-      <el-form :model="form" :inline="true">
+      <el-form :model="form" :inline="true" label-width="auto">
         <el-row :gutter="10">
           <el-col :span="2.5">
-            <el-form-item label="用户昵称" prop="nickName">
+            <el-form-item label="用户昵称：" prop="nickName">
               <el-input v-model="form.nickName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="2.5">
-            <el-form-item label="登录账号" prop="userName">
+            <el-form-item label="登录账号：" prop="userName">
               <el-input v-model="form.userName" disabled />
             </el-form-item>
           </el-col>

src/views/system/user/index.vue

@@ -65,6 +65,7 @@
               删除
             </el-button>
           </el-col>
+          <!--
           <el-col :span="1.5">
             <el-dropdown class="mt-[1px]">
               <el-button plain type="info">
@@ -80,9 +81,10 @@
               </template>
             </el-dropdown>
           </el-col>
-          <!--          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>-->
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
+          -->
         </el-row>
-
+        
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column v-if="columns[0].visible" key="userId" label="用户编号" align="center" prop="userId" />