lcw

2026-01-20 17:06:37 +08:00
parent 10853312f2
commit 96283c3a0e
35 changed files with 4306 additions and 419 deletions
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue
@ -14,7 +14,7 @@
            label-position="left">
            <div style="display: flex; align-items: center;margin-bottom: 10px;">
              <el-radio-group v-model="listQuery.bkDx" size="large" fill="#6cf" @change="shangeDx">
-                <el-radio-button :label="item.dm" v-for="(item, index) in props.dic.D_GS_BK_DX" :key="index">{{
+                <el-radio-button :label="item.dm" v-for="(item, index) in props.dic.D_GS_BK_NEWDX" :key="index">{{
                  item.zdmc }}</el-radio-button>
              </el-radio-group>
              <el-button type="primary" @click="handleAddPeo" v-if="!disabled" style="margin-left: 10px;">
@ -53,20 +53,37 @@
              </MyTable>
            </div>
            <div style="width: 100%;" class="mt25">
-              <el-form-item prop="bkSjKs" label="布控开始时间" label-width="120px">
+              <el-form-item prop="bkSjKs" label="布控开始时间">
                <MOSTY.Date v-model="listQuery.bkSjKs" type="datetime" format="YYYY-MM-DD HH:mm:ss"
                  placeholder="请选择布控开始时间" clearable />
              </el-form-item>
-              <el-form-item prop="bkSjJs" label="布控结束时间" label-width="120px">
+              <el-form-item prop="bkSjJs" label="布控结束时间">
                <MOSTY.Date v-model="listQuery.bkSjJs" type="datetime" format="YYYY-MM-DD HH:mm:ss"
                  placeholder="请选择布控结束时间" clearable />
              </el-form-item>
-              <el-form-item prop="czYq" label="处置要求" label-width="60px" style="width:18% ;">
+              <el-form-item prop="czYq" label="处置要求">
                <MOSTY.Select v-model="listQuery.czYq" :dictEnum="props.dic.D_GS_BK_CZYQ" placeholder="请选择处置要求"
                  clearable />
              </el-form-item>
-              <el-form-item prop="bkDj" label="布控等级" label-width="60px" style="width:18% ;">
-                <MOSTY.Select v-model="listQuery.bkDj" :dictEnum="props.dic.D_GS_BK_DJ" placeholder="请选择布控级别"
+
+            </div>
+            <div style="width: 100%;" class="mt10">
+              <el-form-item prop="bkDj" label="布控部门" v-if="props.name == 'myControl'">
+                <MOSTY.Select v-model="listQuery.bkDj" :dictEnum="props.dic.D_GS_SSYJ" placeholder="请选择布控级别"
+                  clearable />
+              </el-form-item>
+              <el-form-item prop="bkDj" label="布控等级" v-else>
+                <MOSTY.Select v-model="listQuery.bkDj" :dictEnum="props.dic.D_BZ_JQDJ" placeholder="请选择布控级别"
+                  clearable />
+              </el-form-item>
+              <el-form-item prop="bklylx" label="布控来源">
+                <MOSTY.Select v-model="listQuery.bklylx" :dictEnum="props.dic.D_BZ_BKLYS" placeholder="请选择布控来源"
+                  clearable />
+              </el-form-item>
+            </div>
+    <div style="width: 100%;" class="mt10">
+              <el-form-item prop="zfyj" label="执法依据" style="width: 100%;">
+                <MOSTY.Other v-model="listQuery.zfyj" placeholder="请输入执法依据" type="textarea" style="width: 100%;"
                  clearable />
              </el-form-item>
            </div>
@ -88,7 +105,7 @@
            <div class=" mapSearch flex">
              <el-select v-model="hzfs" placeholder="请选择布控范围" clearable @change="qhhzfs">
                <el-option label="区域选择" value="1"></el-option>
-                <el-option label="自定义范围" value="2"></el-option>
+                <!-- <el-option label="自定义范围" value="2"></el-option> -->
              </el-select>
              <el-select multiple style="margin-left: 10px;" v-model="bkqyList" placeholder="请选择布控范围" clearable
                @change="hzfsChage" v-if="hzfs == '1'">
@ -97,17 +114,17 @@
                }}</el-option>
              </el-select>

-              <el-button type="primary" @click="drawQy" style="margin-left: 10px;" v-else>
+              <!-- <el-button type="primary" @click="drawQy" style="margin-left: 10px;" v-else>
                <el-icon style="vertical-align: middle">
                  <CirclePlus />
                </el-icon>
                <span style="vertical-align: middle">自定义区域</span>
-              </el-button>
+              </el-button> -->
            </div>
-            <div class="ww100 relative mb10"
+            <!-- <div class="ww100 relative mb10"
              style="height: 60vh;border: 1px solid #dcdfe6;border-radius: 4px;overflow: hidden;">
              <GdMap></GdMap>
-            </div>
+            </div> -->
          </el-form>
        </div>
      </div>
@ -143,14 +160,14 @@ import { qcckGet, qcckPost } from "@/api/qcckApi.js";
 import { tableColumnList, Zd } from '@/views/backOfficeSystem/ApprovalInformation/tableRow.js'
 import emitter from "@/utils/eventBus.js";
 import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, nextTick, watch, onMounted } from "vue";
-import { queryProcessNode, queryProcessNodeLog, queryProcess } from '@/api/spl'
 import ApprovalEcho from "@/components/flowPath/ApprovalEcho.vue";
 import { useRouter, useRoute } from 'vue-router'
 import { setAddress } from '@/utils/tools.js'
 import { tbGsxtBkId } from "@/api/commit.js";
 const emit = defineEmits(["change"]);
 const props = defineProps({
-  dic: Object
+  dic: Object,
+  name: String
 });
 const route = useRoute()
 const elform = ref()
@ -222,7 +239,7 @@ const init = (type, row) => {
  disabled.value = type == 'detail' ? true : false;
  dialogForm.value = true;
  if (row) tableDate.tableConfiger.haveControls = false;
-  Zd({ D_GS_BK_DJ: props.dic.D_GS_BK_DJ, BD_BK_CLYJBQ: props.dic.BD_BK_CLYJBQ })
+  Zd({ D_GS_SSYJ: props.dic.D_GS_SSYJ, BD_BK_CLYJBQ: props.dic.BD_BK_CLYJBQ })

  get_bkqy_list(row)
 };
@ -426,44 +443,44 @@ const close = () => {
 // 选择身份证
 const chooseVisible_SFZ = ref(false)
 // 获取布控信息的工作流
-const workflow = ref()
-const getWorkflow = async (id) => {
-  const promes = {
-    processId: id
-  }
-  const proNode = await queryProcessNode(promes)
-  const proNodeLog = await queryProcessNodeLog(promes)
-  const process = await queryProcess(promes)
-  workflow.value = proNode.rows.map(item => {
-    const log = proNodeLog.rows.filter(items => item.nodeId == items.nodeId)
+// const workflow = ref()
+// const getWorkflow = async (id) => {
+//   const promes = {
+//     processId: id
+//   }
+//   const proNode = await queryProcessNode(promes)
+//   const proNodeLog = await queryProcessNodeLog(promes)
+//   const process = await queryProcess(promes)
+//   workflow.value = proNode.rows.map(item => {
+//     const log = proNodeLog.rows.filter(items => item.nodeId == items.nodeId)

-    if (item.eventType == '0') {
-      return {
-        ...item,
-        log: {
-          userData: item.userData ? JSON.parse(item.userData) : JSON.parse(process.rows[0].processData).orgNameData,
-          userName: process.rows[0].userName,
-          xtLrsj: process.rows[0].xtLrsj,
-          processStatus: process.rows[0].processStatus,
-        }
-      }
-    } else {
-      return {
-        ...item,
-        orgNameData: JSON.parse(log[0].userData),
-        log: log
-      }
-    }
-  })
+//     if (item.eventType == '0') {
+//       return {
+//         ...item,
+//         log: {
+//           userData: item.userData ? JSON.parse(item.userData) : JSON.parse(process.rows[0].processData).orgNameData,
+//           userName: process.rows[0].userName,
+//           xtLrsj: process.rows[0].xtLrsj,
+//           processStatus: process.rows[0].processStatus,
+//         }
+//       }
+//     } else {
+//       return {
+//         ...item,
+//         orgNameData: JSON.parse(log[0].userData),
+//         log: log
+//       }
+//     }
+//   })

-};
-const drawQy = () => {
-  emitter.emit("drawShape", {
-    flag: "select_point",
-    type: "polygon",
-    isclear: true
-  });
-}
+// };
+// const drawQy = () => {
+//   emitter.emit("drawShape", {
+//     flag: "select_point",
+//     type: "polygon",
+//     isclear: true
+//   });
+// }
 const hzfs = ref('1')
 const bkqyList = ref()
 const qhhzfs = () => {
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/dolog/sfzLog.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/dolog/sfzLog.vue
@ -135,6 +135,9 @@ const rulesList = {
    dh: [{ required: true, message: "请输入电话号码", trigger: "blur" }],
    ssbmdm: [{ required: true, message: "请选择责任部门", trigger: "blur" }],
    yjdj: [{ required: true, message: "请输入身份证号", trigger: "blur" }],
+  },
+    '10': {
+ fjZp: [{ required: true, message: "请传人员照片", trigger: "blur" }],
  }
 }
 watch(() => props.bkDx, (val, oldval) => {
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue
@ -20,10 +20,11 @@
            <DictTag :tag="false" :value="row.bkZt" :options="D_GS_BK_ZT" />
          </template>
          <template #bkDj="{ row }">
-            <DictTag :tag="false" :value="row.bkDj" :options="D_GS_BK_DJ" />
+            <DictTag :tag="false" :value="row.bkDj" :options="D_GS_SSYJ" v-if="route.name=='myControl'" />
+              <DictTag :tag="false" :value="row.bkDj" :options="D_BZ_JQDJ" v-else/>
          </template>
          <template #bkDx="{ row }">
-            <DictTag :tag="false" :value="row.bkDx" :options="D_GS_BK_DX" />
+            <DictTag :tag="false" :value="row.bkDx" :options="D_GS_BK_NEWDX" />
          </template>
          <template #bkdxList="{ row }">
            <span v-if="row.bkdxList"><span class="nowrap" v-for="(it, idx) in row.bkdxList" :key="idx">
@ -67,9 +68,9 @@
    </div>
  </div>
  <!-- 布控类型 -->
-  <AddBkdx ref="addBkdxForm" @change="getList" :dic="{
-    D_GS_BK_DX, D_GS_BK_BKYS, D_BZ_XB, D_GS_BK_CZYQ,
-    D_GS_BK_DJ, BD_BK_CLYJBQ, D_GS_BK_CZJSDWLX, D_GS_BK_TJFS, D_GS_ZDR_YJDJ
+  <AddBkdx ref="addBkdxForm" @change="getList" :name="route.name" :dic="{
+    D_GS_BK_NEWDX, D_GS_BK_BKYS, D_BZ_XB, D_GS_BK_CZYQ,D_BZ_JQDJ,D_BZ_BKLYS,
+    D_GS_SSYJ, BD_BK_CLYJBQ, D_GS_BK_CZJSDWLX, D_GS_BK_TJFS, D_GS_ZDR_YJDJ,
  }" />
  <!-- 预警弹窗 -->
  <YjDialog ref="warningkdxForm"></YjDialog>
@ -89,11 +90,15 @@ import SubmissionProcess from '@/components/flowPath/submissionProcess.vue'
 import {tbGsxtBkQuash} from '@/api/zdr.js'
 import { useRouter, useRoute } from 'vue-router'
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import { rotate } from "ol/transform";
 const router = useRouter()
 const route = useRoute()
 const { proxy } = getCurrentInstance();
-const { D_GS_BK_BKYS, D_BZ_XB, D_GS_BK_SJLX, D_GS_BK_DJ, BD_BK_CLYJBQ, D_GS_ZDR_YJDJ,
-  D_GS_BK_DX, D_GS_BK_ZT, D_GS_BK_CZYQ, D_GS_BK_CZJSDWLX, D_GS_BK_TJFS } = proxy.$dict("D_GS_ZDR_YJDJ", "D_GS_BK_BKYS", "D_BZ_XB", "D_GS_BK_SJLX", "D_GS_BK_DJ", "D_GS_BK_DX", "D_GS_BK_ZT", "D_GS_BK_CZYQ", "D_GS_BK_CZJSDWLX", "D_GS_BK_TJFS", 'BD_BK_CLYJBQ'); //获取字典数据
+const { D_GS_BK_BKYS, D_BZ_XB, D_GS_BK_SJLX, D_GS_SSYJ, BD_BK_CLYJBQ, D_GS_ZDR_YJDJ,
+  D_GS_BK_NEWDX, D_GS_BK_ZT, D_GS_BK_CZYQ, D_GS_BK_CZJSDWLX, D_GS_BK_TJFS,D_BZ_BKLYS,
+  D_BZ_JQDJ } = proxy.$dict("D_GS_ZDR_YJDJ", "D_GS_BK_BKYS", "D_BZ_XB", "D_GS_BK_SJLX",
+    "D_GS_SSYJ", "D_GS_BK_NEWDX", "D_GS_BK_ZT", "D_GS_BK_CZYQ", "D_GS_BK_CZJSDWLX", "D_GS_BK_TJFS",
+    'BD_BK_CLYJBQ', 'D_BZ_JQDJ',"D_BZ_BKLYS"); //获取字典数据
 const addBkdxForm = ref(null); //布控对象组件
 const warningkdxForm = ref(); //布控对象组件
 const searchBox = ref(); //搜索框
@ -103,14 +108,14 @@ const searchConfiger = ref([
    prop: "bkDj",
    placeholder: "请选择布控等级",
    showType: "select",
-    options: D_GS_BK_DJ
+    options: route.name == 'myControl' ? D_GS_SSYJ : D_BZ_JQDJ
  },
  {
    label: "布控类型",
    prop: "bkDx",
    placeholder: "请选择布控类型",
    showType: "select",
-    options: D_GS_BK_DX
+    options: D_GS_BK_NEWDX
  },
  {
    label: "布控状态",
@ -119,6 +124,12 @@ const searchConfiger = ref([
    showType: "select",
    options: D_GS_BK_ZT
  },
+   {
+    label: "布控时间",
+    prop: "startTime",
+    placeholder: "请选择布控时间",
+    showType: "datetimerange",
+  },
 ]);
 const queryFrom = ref({});
 const pageData = reactive({
@ -166,7 +177,11 @@ onMounted(() => {

 // 搜索
 const onSearch = (val) => {
-  queryFrom.value = { ...val };
+  queryFrom.value = {
+    ...val,
+    startTime: val.startTime? val.startTime[0]: '',
+    endTime: val.startTime? val.startTime[1]: ''
+  };
  pageData.pageConfiger.pageCurrent = 1;
  getList();
 };