소스 검색

修改bug

bill 1 년 전
부모
커밋
6f7721baf3

+ 1 - 1
src/app/criminal/view/example/edit.vue

@@ -3,7 +3,7 @@
     <el-form-item label="案件名称">
       <el-input
         v-model="bindExample.caseTitle"
-        maxlength="18"
+        maxlength="50"
         placeholder="请输入案件名称"
       />
     </el-form-item>

+ 8 - 3
src/app/fire/view/dispatch/index.vue

@@ -7,7 +7,7 @@
           type="primary"
           @click="revokeTeaching()"
           v-pdpath="'cancel'"
-          :class="{ disabled: pagging.state.table.selectRows.length }"
+          :class="{ disable: !pagging.state.table.selectRows.length }"
         >
           撤销教学
         </el-button>
@@ -16,7 +16,12 @@
         <el-button type="primary" @click="addHandler" v-pdpath="'add'">
           新增火调项目
         </el-button>
-        <el-button type="primary" @click="setTeaching" v-pdpath="'teach'">
+        <el-button
+          type="primary"
+          @click="setTeaching"
+          v-pdpath="'teach'"
+          :class="{ disable: !pagging.state.table.selectRows.length }"
+        >
           设为教学项目
         </el-button>
       </template>
@@ -109,7 +114,7 @@ const setTeaching = async () => {
   }
   if (
     !(await confirm(
-      "将火调场景设为教学项目后,所有用户均可查看。设置后可在教学平台取消设置。"
+      "将火调项目设为教学项目后,总队及以下全部队伍均可查看。设置后可在教学平台取消设置。"
     ))
   ) {
     return;

+ 9 - 0
src/app/fire/view/dispatch/pagging.ts

@@ -43,6 +43,15 @@ export const useFirePagging = () => {
     },
     { flush: "sync", immediate: true }
   );
+
+  const params = [{ ...pagging.state.query }, { ...pagging.state.query }];
+  watchEffect(
+    () => {
+      pagging.state.query = params[isTeached.value ? 0 : 1];
+    },
+    { flush: "post" }
+  );
+
   return { pagging, isTeached };
 };
 export type FirePagging = ReturnType<typeof useFirePagging>["pagging"];

+ 1 - 1
src/view/case/addCaseFile.vue

@@ -73,7 +73,7 @@ const formatDesc = computed(() =>
 
 watchEffect(() => {
   if (file.value?.name) {
-    caseFile.value.filesTitle = file.value?.name;
+    caseFile.value.filesTitle = file.value?.name.substring(0, 50);
   }
 });
 

+ 1 - 1
src/view/organization/edit.vue

@@ -103,7 +103,7 @@ defineExpose<QuiskExpose>({
     } else if (!parentId) {
       ElMessage.error("上级组织不能为空!");
       throw "上级组织不能为空!";
-    } else if (!phone || !PHONE.REG.test(phone)) {
+    } else if (phone && !PHONE.REG.test(phone)) {
       ElMessage.error("请输入11位正确手机号。");
       throw "请输入11位正确手机号。";
     }

+ 3 - 6
src/view/vrmodel/pagging.ts

@@ -1,6 +1,6 @@
 import { usePagging } from "@/hook/pagging";
 import { SceneType, getScenePagging } from "@/store/scene";
-import { computed, watch } from "vue";
+import { computed, watch, watchEffect } from "vue";
 
 export const useScenePagging = () => {
   const pagging = usePagging({
@@ -19,11 +19,8 @@ export const useScenePagging = () => {
         ? pagging.state.query.modelTitle
         : pagging.state.query.sceneName,
     set: (val: string) => {
-      if (isSwmx.value) {
-        pagging.state.query.modelTitle = val;
-      } else {
-        pagging.state.query.sceneName = val;
-      }
+      pagging.state.query.modelTitle = val;
+      pagging.state.query.sceneName = val;
     },
   });
 

+ 1 - 1
vite.config.ts

@@ -3,7 +3,7 @@ import vue from "@vitejs/plugin-vue";
 import { resolve } from "path";
 import ElementPlus from "unplugin-element-plus/vite";
 
-let app = "fire";
+let app = "criminal";
 if (process.argv.length > 3) {
   app = process.argv[process.argv.length - 1].trim();
 }