更改删除按钮固定颜色

src/app/fire/view/dispatch/index.vue

@@ -75,9 +75,8 @@
             复制
           </span> -->
           <span
-            class="oper-span"
+            class="oper-span delete-oper"
             @click="pagging.del(row)"
-            style="color: var(--primaryColor)"
             v-pdpath="['del']"
           >
             删除
@@ -97,10 +96,9 @@
           恢复
         </span>
         <span
-          class="oper-span"
+          class="oper-span delete-oper"
           @click="pagging.del(row)"
           v-pdpath="['del']"
-          style="color: var(--primaryColor)"
         >
           删除
         </span>

src/assets/style/public.scss

@@ -210,7 +210,9 @@ body {
     cursor: pointer;
   }
 }
-
+.delete-oper {
+  color: #D8000A !important;
+}
 .el-dropdown-menu {
   position : initial;
   transform: none;

src/components/company-select/index.vue

@@ -3,7 +3,7 @@
     style="width: 100%"
     v-model="state.path"
     :disabled="disabled"
-    placeholder="承办单位："
+    placeholder="请选择 "
     :options="state.options"
     :props="{ expandTrigger: 'hover', checkStrictly: true }"
   />

src/store/user.ts

@@ -41,6 +41,7 @@ export type UserInfo = {
 
 type Params = Pick<UserInfo, "nickName" | "status" | "userName"> & {
   deptId: string;
+  searchType: string;
 };
 export const getUserPagging = async (params: PaggingReq<Params>) =>
   (await axios.get<PaggingRes<UserInfo>>(getUserList, { params })).data;

src/view/mediaLibrary/index.vue

@@ -77,7 +77,7 @@
         <span class="oper-span" v-if="row.useType != 'animation'" @click="downloadMediaHandler(row)" v-pdpath="'view'">下载</span>
         <span class="oper-span" v-if="row.useType != 'animation'" @click="downloadHashHandler(row)" v-pdpath="'view'">hash</span>
         <span class="oper-span" v-if="row.useType != 'animation'" @click="editMediaHandler(row)" v-pdpath="'view'">编辑</span>
-        <span class="oper-span delBtn" v-if="row.useType != 'animation'" @click="confirmDelete(row)" v-pdpath="'view'"> 删除 </span>
+        <span class="oper-span delBtn delete-oper" v-if="row.useType != 'animation'" @click="confirmDelete(row)" v-pdpath="'view'"> 删除 </span>
       </el-table-column>
     </el-table>
 

src/view/newFireCase/dyManager/sceneContent.vue

@@ -38,7 +38,7 @@
       <span class="oper-span" v-if="pagging.state.query.searchType === '0'" @click="genMeshScene(row)">
         权限
       </span>
-      <span class="oper-span delBtn" @click="delSceneHandler(row)">
+      <span class="oper-span delBtn delete-oper" @click="delSceneHandler(row)">
         删除
       </span>
       <span

src/view/newFireCase/meshManager/sceneContent.vue

@@ -44,7 +44,7 @@
       <span class="oper-span" v-if="pagging.state.query.searchType === '0'" @click="genMeshScene(row)">
         权限
       </span>
-      <span class="oper-span delBtn" @click="delSceneHandler(row)">
+      <span class="oper-span delBtn delete-oper" @click="delSceneHandler(row)">
         删除
       </span>
       <span

src/view/newFireCase/mix3dManager/sceneContent.vue

@@ -34,7 +34,7 @@
       <span class="oper-span" v-if="pagging.state.query.searchType === '0'" @click="openSceneShare(row)">
         权限
       </span>
-      <span class="oper-span delBtn" @click="delSceneHandler(row)">
+      <span class="oper-span delBtn delete-oper" @click="delSceneHandler(row)">
         删除
       </span>
     </el-table-column>

src/view/newFireCase/newdispatch/example.vue

@@ -107,8 +107,7 @@ const head = computed(() => [
   { name: "全部", value: "2" },
 ]);
 watch(() => state.query.searchType, (newVal) => {
-  console.log(newVal, 666)
-  refresh();
+  queryReset();
 });
 const addHandler = async () => {
   if (await addExample({})) {

src/view/newFireCase/newdispatch/index.vue

@@ -26,7 +26,7 @@
       <template v-if="!isRecycle">
         <EditMenuToDetail :caseId="row.caseId" :fromRoute="'fire'" :row="row"></EditMenuToDetail>
         <MoreMenu :caseId="row.caseId" :title="row.projectSn" :projectName="row.projectName" :searchType="pagging.state.query.searchType" @copy="copy" />
-        <span class="oper-span" @click="pagging.del(row)" style="color: #D8000A;" v-pdpath="['del']">
+        <span class="oper-span delete-oper" @click="pagging.del(row)" v-pdpath="['del']">
           删除
         </span>
       </template>

src/view/organization/index.vue

@@ -28,7 +28,7 @@
                     v-pdpath="['edit']">
                     编辑
                   </a>
-                  <a v-if="!topDeptIds.includes(Number(data.id))" :class="{ disable: user.info.deptId === data.id }" style="color: var(--primaryColor)"
+                  <a v-if="!topDeptIds.includes(Number(data.id))" :class="{ disable: user.info.deptId === data.id, 'delete-oper': true }"
                     @click.stop="delHandler(data.id)" v-pdpath="['del']">
                     删除
                   </a>

src/view/user/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <com-head :options="[{ name: '用户管理', value: '2' }]">
+  <com-head :options="head" v-model="state.query.searchType">
     <el-form label-width="84px">
       <el-form-item label="所属架构：">
         <com-company v-model="state.query.deptId" />
@@ -65,8 +65,7 @@
           >{{ row.status ? "禁用" : "启用" }}</span
         >
         <span
-          class="oper-span"
-          style="color: var(--primaryColor)"
+          class="oper-span delete-oper"
           @click="delInfo(row)"
           :class="{ disable: user.info.id == row.id }"
           v-pdpath="['del']"
@@ -94,17 +93,31 @@ import { UserInfo, changeUserStatus, delUser, getUserPagging, user } from "@/sto
 import { ElMessage } from "element-plus";
 import { confirm } from "@/helper/message";
 import { addUser, editUser } from "./quisk";
-
-const { state, queryReset, refresh, changPageCurrent, changPageSize } = usePagging({
+import { computed, watch } from "vue";
+const head = computed(() => [
+  { name: "用户列表", value: "0" },
+  { name: "全部", value: "1" },
+]);
+let { state, queryReset, refresh, changPageCurrent, changPageSize } = usePagging({
   get: getUserPagging,
   paramsTemlate: {
     nickName: "",
     status: "" as any,
     deptId: "",
     userName: "",
+    searchType: "0",
   },
 });
-
+// 菜单切换时，重置查询参数，但是菜单不重置
+const queryResetRaw = queryReset;
+queryReset = () => {
+  const type = state.query.searchType;
+  queryResetRaw();
+  state.query.searchType = type;
+};
+watch(() => state.query.searchType, (newVal) => {
+  queryReset();
+});
 const delInfo = async (row: UserInfo) => {
   if (
     await confirm(