更新页面

src/components/aboutTable/FormMessage.vue

@@ -1,36 +1,29 @@
 <template>
-  <el-form ref="elform" :model="listQuery" :label-width="props.labelWidth" :rules="props.rules" :inline="props.inline"
+  <el-form ref="elform" :model="listQuery" :label-width="props.labelWidth" :rules="props.rules" :inline="props.inline" label-position="right" :disabled="props.disabled">
-    label-position="right" :disabled="props.disabled">
 
-    <el-form-item v-for="(item, idx) in props.formList" :style="item.width && { width: item.width }" :prop="item.prop"
+    <el-form-item v-for="(item, idx) in props.formList" :style="item.width && { width: item.width }" :prop="item.prop"  :label="item.label" :label-width="item.labelWidth" :key="idx">
-      :label="item.label" :label-width="item.labelWidth" :key="idx">
       <!-- input表单 input-->
-      <MOSTY.Other v-if="item.type == 'input'" width="100%" clearable v-model="listQuery[item.prop]"
+      <MOSTY.Other v-if="item.type == 'input'" width="100%" clearable v-model="listQuery[item.prop]"  :placeholder="`请输入${item.label}`" :disabled="item.disabled" />
-        :placeholder="`请输入${item.label}`" :disabled="item.disabled" />
+      
-      <el-input v-model="listQuery[item.prop]" v-else-if="item.type == 'textarea'" type="textarea" :rows="3"
+      <el-input v-model="listQuery[item.prop]" v-else-if="item.type == 'textarea'" type="textarea" :rows="3"  :placeholder="`请输入${item.label}`" :disabled="item.disabled" />
-        :placeholder="`请输入${item.label}`" :disabled="item.disabled" />
       <!-- 数值 inputNumber-->
-      <el-input type="number" v-model="listQuery[item.prop]" v-else-if="item.type == 'inputNumber'"
+      <el-input type="number" v-model="listQuery[item.prop]" v-else-if="item.type == 'inputNumber'" :placeholder="`请输入${item.label}`" :disabled="item.disabled" />
-        :placeholder="`请输入${item.label}`" :disabled="item.disabled" />
       <!-- 数值 number-->
-      <el-input-number v-model="listQuery[item.prop]" v-else-if="item.type == 'number'" style="width: 100%"
+      <el-input-number v-model="listQuery[item.prop]" v-else-if="item.type == 'number'" style="width: 100%" :min="item.min || 0" :max="item.max || 1000" :disabled="item.disabled" />
-        :min="item.min || 0" :max="item.max || 1000" :disabled="item.disabled" />
+
       <!--选择 select-->
-      <MOSTY.Select v-else-if="item.type == 'select'" filterable :multiple="item.multiple"
+      <MOSTY.Select v-else-if="item.type == 'select'" filterable :multiple="item.multiple" v-model="listQuery[item.prop]" :dictEnum="item.options" width="100%" clearable :placeholder="`请选择${item.label}`" :disabled="item.disabled" />
-        v-model="listQuery[item.prop]" :dictEnum="item.options" width="100%" clearable :placeholder="`请选择${item.label}`"
+
-        :disabled="item.disabled" />
       <!-- 部门department -->
       <template v-else-if="item.type === 'department'">
-        <MOSTY.Department style="width: 100%;" clearable :isAll="item.isAll" @getDepValue="getdep($event, item.depMc)"
+        <MOSTY.Department style="width: 100%;" clearable :isAll="item.isAll" @getDepValue="getdep($event, item.depMc)" :multiple="item.multiple"  v-model="listQuery[item.prop]" :placeholder="listQuery[item.depMc] ? listQuery[item.depMc] : '请选择'" />
-         :multiple="item.multiple"  v-model="listQuery[item.prop]" :placeholder="listQuery[item.depMc] ? listQuery[item.depMc] : '请选择'" />
       </template>
 
       <!-- 上传 upload -->
-      <MOSTY.Upload v-else-if="item.type == 'upload'" width="100%" v-model="listQuery[item.prop]" :isImg="item.isImg"
+      <MOSTY.Upload v-else-if="item.type == 'upload'" width="100%" v-model="listQuery[item.prop]" :isImg="item.isImg" :disabled="item.disabled" />
-        :disabled="item.disabled" />
+
       <!--选择checkbox -->
-      <MOSTY.CheckBox v-else-if="item.type == 'checkbox'" width="100%" clearable v-model="listQuery[item.prop]"
+      <MOSTY.CheckBox v-else-if="item.type == 'checkbox'" width="100%" clearable v-model="listQuery[item.prop]" :checkList="item.options" :placeholder="`请选择${item.label}`" :disabled="item.disabled" />
-        :checkList="item.options" :placeholder="`请选择${item.label}`" :disabled="item.disabled" />
 
       <!-- 单选radio -->
       <el-radio-group v-model="listQuery[item.prop]" v-else-if="item.type == 'radio'" :disabled="item.disabled">
@@ -38,21 +31,13 @@
       </el-radio-group>
 
       <!-- 时间选择 -->
-      <el-time-picker v-else-if="item.type == 'time'" v-model="listQuery[item.prop]" placeholder="选择时间"
+      <el-time-picker v-else-if="item.type == 'time'" v-model="listQuery[item.prop]" placeholder="选择时间" style="width: 100%" :disabled="item.disabled" />
-        style="width: 100%" :disabled="item.disabled" />
+      <el-date-picker v-else-if="item.type == 'date'" v-model="listQuery[item.prop]" type="date" value-format="YYYY-MM-DD" placeholder="请选择日期" style="width: 100%" :disabled="item.disabled" />
-      <el-date-picker v-else-if="item.type == 'date'" v-model="listQuery[item.prop]" type="date"
+      <el-date-picker v-else-if="item.type == 'datetime'" v-model="listQuery[item.prop]" type="datetime"  value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间" style="width: 100%" :disabled="item.disabled" />
-        value-format="YYYY-MM-DD" placeholder="请选择日期" style="width: 100%" :disabled="item.disabled" />
+      <el-date-picker v-else-if="item.type == 'datetimerange'" v-model="listQuery[item.prop]" type="datetimerange" :shortcuts="shortcuts" range-separator="To" value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="选择开始时间" end-placeholder="选择结束时间" style="width: 100%" :disabled="item.disabled" />
-      <el-date-picker v-else-if="item.type == 'datetime'" v-model="listQuery[item.prop]" type="datetime"
+      <el-date-picker v-else-if="item.type == 'daterange'" v-model="listQuery[item.prop]" type="daterange" range-separator="To" value-format="YYYY-MM-DD" start-placeholder="选择开始日期" end-placeholder="选择开始日期" style="width: 100%" :disabled="item.disabled" />
-        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间" style="width: 100%" :disabled="item.disabled" />
-      <el-date-picker v-else-if="item.type == 'datetimerange'" v-model="listQuery[item.prop]" type="datetimerange"
-        :shortcuts="shortcuts" range-separator="To" value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="选择开始时间"
-        end-placeholder="选择结束时间" style="width: 100%" :disabled="item.disabled" />
-      <el-date-picker v-else-if="item.type == 'daterange'" v-model="listQuery[item.prop]" type="daterange"
-        range-separator="To" value-format="YYYY-MM-DD" start-placeholder="选择开始日期" end-placeholder="选择开始日期"
-        style="width: 100%" :disabled="item.disabled" />
 
-      <el-switch v-else-if="item.type == 'switch'" v-model="listQuery[item.prop]" class="ml-2" :disabled="item.disabled"
+      <el-switch v-else-if="item.type == 'switch'" v-model="listQuery[item.prop]" class="ml-2" :disabled="item.disabled" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" />
-        style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" />
 
       <template v-else-if="item.type === 'slot'">
         <slot :name="item.prop"></slot>

src/views/backOfficeSystem/IntelligentControl/warningControl/components/dict.js

@@ -1,4 +0,0 @@
-export const ZL_LX_BM = [{ label: 'ZLLX10', value: 'ZLLX10' }, { label: 'ZLLX11', value: 'ZLLX11' }, { label: 'ZLLX12', value: 'ZLLX12' }, { label: 'ZLLX13', value: 'ZLLX13' }, { label: 'ZLLX14', value: 'ZLLX14' }]
-export const ZL_LX_MC = [{ label: '普通预警', value: '普通预警' }, { label: '疲劳预警', value: '疲劳预警' }, { label: '超速预警', value: '超速预警' }, { label: '疲劳预警', value: '疲劳预警' }, { label: '疲劳预警', value: '疲劳预警' }]
-export const ZL_JB_BM = [{ label: 'XTDJ10', value: 'XTDJ10' }, { label: 'XTDJ11', value: 'XTDJ11' }, { label: 'XTDJ12', value: 'XTDJ12' }, { label: 'XTDJ13', value: 'XTDJ13' }, { label: 'XTDJ14', value: 'XTDJ14' }]
-export const ZL_JB_MC = [{ label: '一级', value: '一级' }, { label: '二级', value: '二级' }, { label: '三级', value: '三级' }, { label: '四级', value: '四级' }]

src/views/backOfficeSystem/IntelligentControl/warningControl/components/fkDialog.vue

@@ -0,0 +1,89 @@
+<template>
+    <el-dialog v-model="showDialog" :append-to-body="true" :destroy-on-close="true" title="新增人员" :close-on-click-modal="false">
+        <FormMessage v-model="listQuery" :formList="formData" labelWidth="160px" ref="elform" :rules="rules">
+        </FormMessage>
+        <template #footer>
+            <div class="flex just-center">
+                <el-button @click="close">取消</el-button>
+                <el-button type="primary" @click="submitForm">确认</el-button>
+            </div>
+        </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import emitter from "@/utils/eventBus.js";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { onMounted, reactive, ref ,getCurrentInstance} from 'vue';
+const { proxy } = getCurrentInstance();
+const { D_BZ_SF } = proxy.$dict('D_BZ_SF')
+const elform = ref()
+const showDialog = ref(false)
+const listQuery = ref({})
+const formData = ref([
+  { label: "发现目标状态", prop: "fxmbzt", type: "select",options: D_BZ_SF },
+  { label: "发现目标责任单位", prop: "fxmbzedw", type: "department" },
+  { label: "发现目标责任民警", prop: "fxzrmj", type: "input" },
+  { label: "是否本人", prop: "sfbr", type: "select",options: D_BZ_SF },
+  { label: "处置时间", prop: "czsj", type: "datetime" },
+  { label: "处置地址", prop: "czdz", type: "textarea",width:'100%'},
+  { label: "详细地址", prop: "xxdz", type: "textarea",width:'100%' },
+  { label: "处置责任单位", prop: "czzrdw", type: "department" },
+  { label: "处置责任民警", prop: "czzrmj", type: "input" },
+  { label: "常控处置措施类型", prop: "ckczcslx", type: "select" },
+  { label: "常控处置措施细类", prop: "ckczcsxl", type: "select" },
+  { label: "常控处置结果", prop: "ckczjg", type: "input" },
+  { label: "常控立线侦察评估", prop: "cklxzcpg", type: "input" },
+  { label: "常控立线侦察依据", prop: "cklxzcpgyj", type: "input" },
+  { label: "常控从事职业类型", prop: "cszylx", type: "select" },
+  { label: "是否尿检", prop: "sfnj", type: "radio",options:  D_BZ_SF  },
+  { label: "常控不尿检理由", prop: "fjdz", type: "textarea",width:'100%' },
+  { label: "常控处置反馈补充信息", prop: "fjdz", type: "input" },
+])
+const rules = reactive({
+  fxmbzt: [{ required: true, message: "请选择发现目标状态", trigger: "change" }],
+  fxmbzedw: [{ required: true, message: "请选择发现目标责任单位", trigger: "change" }],
+  fxzrmj: [{ required: true, message: "请选择发现目标责任民警", trigger: "change" }],
+  sfbr:[{ required: true, message: "请选择是否本人", trigger: "change" }],
+  czsj:[{ required: true, message: "请选择处置时间", trigger: "change" }],
+  czdz:[{ required: true, message: "请选择处置地址", trigger: "blur" }],
+  xxdz:[{ required: true, message: "请选择详细地址", trigger: "blur" }],
+  czzrdw:[{ required: true, message: "请选择处置责任单位", trigger: "change" }],
+  czzrmj:[{ required: true, message: "请选择处置责任民警", trigger: "change" }],
+  ckczcslx:[{ required: true, message: "请选择常控处置措施类型", trigger: "change" }],
+  ckczcsxl:[{ required: true, message: "请选择常控处置措施细类", trigger: "change" }],
+  ckczjg:[{ required: true, message: "请输入常控处置结果", trigger: "blur" }],
+  cklxzcpg:[{ required: true, message: "请输入常控立线侦察评估", trigger: "blur" }],
+  cklxzcpgyj:[{ required: true, message: "请输入常控立线侦察依据", trigger: "blur" }],
+  cszylx:[{ required: true, message: "请选择常控从事职业类型", trigger: "change" }],
+  sfnj:[{ required: true, message: "请选择是否尿检", trigger: "change" }],
+})
+
+onMounted(() => {
+  emitter.on("openFkDialog", () => {
+    showDialog.value = true
+  })
+})
+
+const submitForm = () =>{
+    elform.value.submit((val)=>{
+        // let obj = { data:val,type:title.value ,index:order.value}
+        // emit('change',obj)
+        // emit('update:modelValue',false)
+    })
+}
+
+const close = () => {
+  elform.value.reset();
+  listQuery.value = {}
+  showDialog.value = false;
+}
+</script>
+
+<style lang="scss" scoped>
+.el-form{
+    max-height: 60vh;
+    overflow: hidden;
+    overflow-y: auto;
+}
+</style>

src/views/backOfficeSystem/IntelligentControl/warningControl/components/yjItem.vue

@@ -1,8 +1,5 @@
 <template>
   <div class="personCard relative flex mb10 pointer" >
-    <div class="cxbq f14 lh50 tc absolute" v-if="props.item.czzt == '03'">已完成</div>
-    <el-button color="#0072ff" size="small" @click.stop="handleQs(props.item)" v-if="props.item.czzt == '01'" class="btn_qs f14 tc absolute">签收</el-button>
-    <el-button color="#0072ff" size="small" v-if="props.item.czzt == '02'" ref="buttonRef" @click.stop="isShowVisble = !isShowVisble;" class="btn_qs f14 tc absolute">反馈</el-button>
     <div class="avatarBox relative">
       <div class="marks f12 absolute" :class="changeBg(props.item.yjJb)">
         <span>{{ changetText(props.item.yjJb) }}</span>
@@ -10,7 +7,9 @@
       <div>
         <el-image :preview-teleported="true" style="width: 80px; height: 110px" :src="props.item.yjTp" :preview-src-list="[props.item.yjTp]"/>
       </div>
-      <div>  <span class="smallbtn" @click.stop="()=>{}">全息档案</span></div>
+      <div>  
+        <span class="smallbtn" @click.stop="()=>{}">全息档案</span>
+      </div>
     </div>
     <div class="infoBox">
       <div class="items">
@@ -20,6 +19,10 @@
         <div class="infoItem ellipsis">出生日期：<span class="value">{{ IdCard(props.item.yjRysfzh , 1 )}}</span></div>
         <div class="infoItem ellipsis">相似度：<span class="value">{{ props.item.xsd * 100 }}%</span></div>
         <div class="infoItem ellipsis">预警次数：<span class="value"><span class="num">{{ props.item.yjCs }}</span> 次</span></div>
+        <div class="infoItem flex nowrap">
+          <span class="smllbtn" @click.stop="handleQs(props.item)" >签收</span>
+          <span class="smllbtn" @click.stop="handleFK('反馈')" ref="buttonRef" > {{ props.item.sffk ? '查看反馈':'反馈' }} </span>
+        </div>
       </div>
       <div class="items">
         <div class="infoItem ellipsis">预警级别：<span class="value">{{ props.item.yjJb }}</span></div>
@@ -34,7 +37,7 @@
   </div>
 
   <!-- 虚拟触发 -->
-  <el-popover ref="popoverRef" :visible="isShowVisble" :width="400" :virtual-ref="buttonRef" trigger="click" title="反馈" virtual-triggering >
+  <!-- <el-popover ref="popoverRef" :visible="isShowVisble" :width="400" :virtual-ref="buttonRef" trigger="click" title="反馈" virtual-triggering >
     <el-form :model="chooseRow" ref="elRowForm" :inline="true" label-width="100px" :rules="rules">
       <el-form-item label="反馈内容" prop="fknr" style="width: 100%;">
         <MOSTY.Other style="width: 100%;" clearable v-model="chooseRow.fknr" type="textarea" placeholder="请输入不通过原因"/>
@@ -44,10 +47,11 @@
       <el-button @click.stop="cancelRowSp">取消</el-button>
       <el-button type="primary"  @click.stop="handleSendSp(props.item)"  v-loading="btnloading">确定</el-button>
     </div>
-  </el-popover>
+  </el-popover> -->
 </template>
 
 <script setup>
+import emitter from "@/utils/eventBus.js";
 import { qcckGet, qcckPost } from "@/api/qcckApi.js";
 import * as MOSTY from "@/components/MyComponents/index";
 import { IdCard } from '@/utils/validate.js'
@@ -88,23 +92,12 @@ const handleQs = (val) =>{
   })
 }
 
-// 签收
+// 反馈
-const handleSendSp = (val) =>{
+const handleFK = (val) =>{
-  elRowForm.value.validate((valid) => {
+  emitter.emit("openFkDialog", {id:props.item.id,type:val});
-    if(!valid) return;
-    let data = { id:val.id,...chooseRow.value }
-    qcckPost(data, "/mosty-gsxt/tbYjxx/yjfk").then(() => {
-      val.czzt = '03';
-      proxy.$message({ type: "success", message: "反馈成功" });
-      cancelRowSp()
-    });
-  })
-}
-const cancelRowSp = () =>{
-  chooseRow.value.fknr = '';
-  isShowVisble.value = false;
 }
 
+
 // 切换背景
 const changeBg = (type) => {
   switch (type) {
@@ -154,22 +147,6 @@ const showDetail = () => {
     background: rgba(17, 66, 96, 0.8);
   }
 
-  .cxbq {
-    right: 5px;
-    top: 5px;
-    width: 50px;
-    height: 50px;
-    border-radius: 50%;
-    background: rgba(0, 255, 255, 0.3);
-    border: 1px solid #00ffff;
-    color: #00ffff;
-    transform: rotate(-48deg);
-  }
-
-  .btn_qs {
-    left: 94px;
-    bottom: 11px;
-  }
   ::v-deep .el-button{
     span{
       color: #fff;
@@ -232,6 +209,18 @@ const showDetail = () => {
         .value {
           color: #89afcf;
         }
+        .smllbtn {
+          display: inline-block;
+          padding: 4px 8px;
+          box-sizing: border-box;
+          border-radius: 4px;
+          background: #0072ff;
+          border-radius: 5px 5px 5px 5px;
+          margin-right: 6px;
+          margin-top: 4px;
+          cursor: pointer;
+          
+        }
       }
   }
 }

src/views/backOfficeSystem/IntelligentControl/warningControl/index.vue

@@ -66,9 +66,14 @@
   <Information v-model="showDialog" title="发送指令" @submit='submit'  @close='close'>
    <SemdFqzl ref="semdFqzlRef" :itemData="itemData" @handleClose="handleClose" identification="yj" :tacitly="tacitly"/>
   </Information>
+
+  <!-- 反馈按钮 -->
+  <FkDialog ></FkDialog>
+
 </template>
 
 <script setup>
+import FkDialog from './components/fkDialog.vue'
 import * as MOSTY from "@/components/MyComponents/index";
 import { qcckPost,qcckGet } from "@/api/qcckApi.js";
 import GdMap from "@/components/GdMap/index.vue";