lcw

src/views/home/index.vue

@@ -49,13 +49,13 @@
 import GdMap from "@/components/GdMap/index.vue";
 import Head from "./layout/head.vue";
 import Collection from "./components/collection.vue";
-// import Warning from "./components/warning.vue";
 import CarWarning from "./components/CarWarning.vue";
 import PeoWarning from "./components/PeoWarning.vue";
 import BeOnDuty from "./components/beonDuty.vue";
 import Entrance from "./components/entrance.vue";
 import WanringAnyse from "./components/wanringAnyse.vue";
 import { jczgetJczList } from "@/api/mosty-jcz";
+import {ysSxtGetList} from '@/api/yszx.js'
 import emitter from "@/utils/eventBus.js";
 
 import { ref, onMounted } from "vue";
@@ -80,6 +80,17 @@ onMounted(() => {
     }
   });
 });
+const sxtGetList = () => {
+  ysSxtGetList().then(res => {
+    emitter.emit("addPointArea", {
+      coords: res,
+      icon: require("@/assets/point/sp.png"),
+      flag: "jczMap_Gzy"
+    });
+
+  })
+}
+sxtGetList()
 </script>
 
 <style lang="scss" scoped>
@@ -146,4 +157,5 @@ onMounted(() => {
     box-sizing: border-box;
   }
 }
+
 </style>

src/views/home/layout/head.vue

@@ -12,7 +12,7 @@
     <div class="zbbb" v-if="query" @click="show = true">值班报备</div>
   </div>
   <el-dialog v-model="show" title="Shipping address">
-    <div style="height: 50vh; overflow: auto">
+    <div style="height: 50vh; overflow: auto" v-if="show">
       <zbbb
         :row="row"
         @close="close"

src/views/home/layout/zbbb.vue

@@ -1,6 +1,4 @@
 <template>
-  <div></div>
-
   <div class="cntinfo">
     <div class="flex align-center just-between box">
       <div class="flex align-center">
@@ -12,7 +10,7 @@
         />
       </div>
       <!-- v-if="['add', 'edit'].includes(pageType)" -->
-      <el-button size="small" type="primary" @click="_onSave">保存</el-button>
+      <el-button size="small" type="primary" @click="_onSave" :disabled="loding">保存</el-button>
     </div>
     <el-form
       ref="formRef"
@@ -51,7 +49,7 @@
       <div class="bblxItem">
         <div class="btItem">班次设置</div>
         <div class="info">
-          <el-form-item prop="kssj">
+          <el-form-item prop="bcKssj" label=" ">
             <el-time-picker
               v-model="listQuery.bcKssj"
               :disabled="isDetail"
@@ -60,7 +58,7 @@
               value-format="HH:mm:ss"
             />
           </el-form-item>
-          <el-form-item prop="bcKts">
+          <el-form-item prop="bcKtsDict" label=" ">
             <el-select
               clearable
               v-model="listQuery.bcKtsDict"
@@ -75,7 +73,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="jssj">
+          <el-form-item prop="bcJssj" label=" ">
             <el-time-picker
               v-model="listQuery.bcJssj"
               :disabled="isDetail"
@@ -103,7 +101,7 @@
               :dic="props.dic"
             />
           </el-form-item>
-          <el-form-item prop="fzrXm">
+          <el-form-item prop="fzrXm" label=" ">
             <el-input
               readonly
               v-model="listQuery.fzrXm"
@@ -111,7 +109,7 @@
               clearable
             />
           </el-form-item>
-          <el-form-item prop="fzrSfzh">
+          <el-form-item prop="fzrSfzh" label=" ">
             <el-input
               readonly
               v-model="listQuery.fzrSfzh"
@@ -119,7 +117,7 @@
               clearable
             />
           </el-form-item>
-          <el-form-item prop="fzrLxdh">
+          <el-form-item prop="fzrLxdh" label=" ">
             <el-input
               readonly
               v-model="listQuery.fzrLxdh"
@@ -307,11 +305,13 @@
 <script setup>
 import { ref, reactive, getCurrentInstance, onMounted, watch } from "vue";
 import * as MOSTY from "@/components/MyComponents/index";
+import { jczqueryById } from "@/api/mosty-jcz";
 import { jczsavel, Xfbbupdate } from "@/api/mosty-jcz.js";
 import { ElMessage } from "element-plus";
 import ChooseTable from "@/components/chooseList/chooseTable.vue";
 import { timeValidate } from "@/utils/tools.js";
 import { useRoute } from "vue-router";
+import emitter from "@/utils/eventBus.js";
 const { proxy } = getCurrentInstance();
 // const { D_BZ_JYQXFL } = proxy.$dict("D_BZ_JYQXFL");
 const props = defineProps({
@@ -394,7 +394,6 @@ const init = (type) => {
     }
   } else {
     pageType.value = "add";
-
     listQuery.value.qxList = props.dic.D_BZ_JYQXFL.map((item) => {
       return { qxmc: item.label, qxsl: 0 };
     });
@@ -416,17 +415,43 @@ onMounted(() => {
 });
 // 验证规则
 const rules = ref({
-  spbt: [
+  bcKtsDict: [
     {
       required: true,
-      message: "请输入标题",
+      message: "请选择班次",
       trigger: "blur"
     }
-  ]
+  ],
+  bcKssj: [
+    {
+      required: true,
+      message: "请选择开始时间",
+      trigger: "blur"
+    }
+  ], bcJssj: [
+    {
+      required: true,
+      message: "请选择结束时间",
+      trigger: "blur"
+    }
+  ], fzrXm: [
+    {
+      required: true,
+      message: "请输入负责人",
+      trigger: "blur"
+    }
+  ], fzrSfzh: [
+    {
+      required: true,
+      message: "请输入身份证",
+      trigger: "blur"
+    }
+  ],
 });
 //保存
-
+const loding = ref(false);
 const _onSave = () => {
+  formRef.value.validate().then( async() => {
   const data = [...mjData.value, ...fjData.value];
 
   listQuery.value.ryList = ChegeMj(data);
@@ -438,33 +463,61 @@ const _onSave = () => {
       break;
     case "02":
       listQuery.value.bcKts = 2;
+      break;
     case "03":
       listQuery.value.bcKts = 4;
+      break;
     case "04":
       listQuery.value.bcKts = 5;
+      break;
     case "05":
       listQuery.value.bcKts = 6;
+      break;
     case "06":
       listQuery.value.bcKts = 7;
+      break;
     case "07":
       listQuery.value.bcKts = 8;
+       break;
   }
-
   listQuery.value.jczid = routerList.value.id?routerList.value.id:"";
   listQuery.value.jczmc = routerList.value.name?routerList.value.name:"";
   if (pageType.value == "add") {
     jczsavel(listQuery.value).then((res) => {
       ElMessage({ message: "新增成功", type: "success" });
+          getjczqueryById()
       emit("close");
+    }).finally(()=>{
+      loding.value=false
     });
   } else {
     Xfbbupdate(listQuery.value).then((res) => {
       ElMessage({ message: "修改成功", type: "success" });
+      getjczqueryById()
       emit("close");
+    }).finally(()=>{
+      loding.value=false
     });
-  }
-};
+    }
 
+  }).catch(() => { });
+};
+const getjczqueryById = () => {
+  jczqueryById({ jczid: props.jczId }).then((res) => {
+    if (res) {
+      emitter.emit("getjczqueryById",res);
+    //   warningList.value.qxList =res.qxList&&res.qxList.length>0
+    //     ? res.qxList.filter((item) => item.qxsl > 0)
+    //     : [];
+    //   warningList.value.ryList = res.ryList.length>0 ? res.ryList : [];
+    //   warningList.value.clList = res.clList.length>0 ? res.clList : [];
+    //   warningList.value.sbList = [...res.tcList, ...res.zdList]
+    //  emitter.emit("chengZ", res);
+    } else {
+      // warningList.value = res;
+    }
+  });
+};
 //
 const close = () => {
   dialogForm.value = false;
@@ -621,4 +674,7 @@ const changeJCZ = (val) => {
 .box {
   margin-bottom: 10px;
 }
+::v-deep .el-form-item__label{
+padding: 0;
+}
 </style>