feat: 同步2

src/components/MyComponents/ChooseUser/sbss.vue

@@ -155,20 +155,8 @@ const getListData = async () => {
   tableData.value = [];
   tableloading.value = true;
   const params = listQuery.value;
-  getApi(params, "/mosty-jcgl/aqsbssZb/getPage").then((res) => {
+  getApi(params, "/mosty-jcgl/sbglAqsbss/getPage").then((res) => {
     if (res) {
-      res.records.forEach(item => {
-        let card = item.idEntityCard
-        if (card) {
-          if (card.length == 18) {
-            item.sex = (card.substring(16, 17)) % 2 == 0 ? '2' : '1'
-          } else {
-            item.sex = '1'
-          }
-        } else {
-          item.sex = null
-        }
-      })
       tableData.value = res?.records;
       total.value = Number(res.total);
       tableloading.value = false;

src/components/MyComponents/TabList/Fssblb.vue

@@ -3,7 +3,7 @@
     <!-- 查询 -->
     <div class='tabox'>
       <div class="headBox3">
-        <el-input placeholder="请输入内部编号进行查询" v-model="pageData.listQuery.nbbh" clearable style='width:250px'></el-input>
+        <el-input placeholder="请输入设备编号进行查询" v-model="pageData.listQuery.sbbh" clearable style='width:250px'></el-input>
         <el-button type="primary" @click="Searchdata" class="ml6">
           <el-icon>
             <Search />
@@ -19,6 +19,9 @@
       </div>
       <MOSTY.Table :table-columns="pageData.tableColumns" :tableData="pageData.tableData" :tableloading="tableloading"
         :tableHeight="'40vh'" :isSort="true" @SortChange="SortChange">
+        <template #cameraType="{ row }">
+          <dict-tag :options="D_BZ_SXTLX" :value="row.cameraType" :tag="false" />
+        </template>
         <template #actions="{ row, $index }">
           <span class="operedit" @click="handlexg(row, $index)" v-if='props.isEdit'>
             <el-icon>
@@ -59,6 +62,7 @@ import { reactive, ref, getCurrentInstance, watchEffect } from "vue"
 import { getApi, postApi } from "@/api/tobAcco_api.js";
 import { ElMessage } from "element-plus";
 const { proxy } = getCurrentInstance();
+const { D_BZ_SXTLX } = proxy.$dict("D_BZ_SXTLX")
 const emits = defineEmits(["handleChange", 'tableChange']);
 const tableloading = ref(false);
 const addbpdShow = ref(false)
@@ -78,6 +82,11 @@ const props = defineProps({
   isEdit: {
     type: Boolean,
     default: true
+  },
+  // 设备类型
+  sblx: {
+    type: String,
+    default: ''
   }
 });
 const formData = ref({})
@@ -93,8 +102,8 @@ const pageData = reactive({
       sortable: true
     },
     {
-      title: "内部编号",
+      title: "设备编号",
-      prop: "nbbh",
+      prop: "sbbh",
       sortable: true
     },
     {
@@ -126,8 +135,15 @@ const pageData = reactive({
   tableData: []
 })
 watchEffect(() => {
-  if (props.obj.id) {
+  if (props.sblx == '200102010000') {
-    pageData.listQuery.zbid = props.obj.id
+    pageData.tableColumns.splice(2, 0, {
+      title: "类型",
+      prop: "cameraType",
+      slot: true
+    })
+  }
+  if (props.obj.parentid) {
+    pageData.listQuery.zbid = props.obj.parentid
     //获取子表
     getzblist()
   }
@@ -178,7 +194,7 @@ function handleSee(row) {
 function handledelete(row) {
   getApi({}, `/mosty-jcgl/aqsbssZb/del/${row.id}`).then(res => {
     ElMessage.success("删除成功");
-    emits("searchChange", true);
+    emits("tableChange", true);
     getzblist()
   })
 }

src/components/dialog/Addxfszb.vue

@@ -28,19 +28,25 @@
                                 :label="item.partname ? item.partname : item.qtmc" :value="item.id" />
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="设备编号:" prop="sbbh">
+                        <el-input v-model="fromObj.sbbh" clearable style="width: 337px"></el-input>
+                    </el-form-item>
                     <el-form-item label="设备名称:" prop="name">
                         <el-input v-model="fromObj.name" style="width: 337px" />
                     </el-form-item>
                     <el-form-item label="具体位置:" prop="location">
                         <el-input v-model="fromObj.location" clearable style="width: 337px"></el-input>
                     </el-form-item>
-                    <el-form-item label="摄像头国标编号:" prop="spbh" v-if="fromObj.sblx == '200102010000'">
+                    <el-form-item label="摄像头类型:" prop="cameraType" v-if="fromObj.sblx == '06'">
-                        <el-input v-model="fromObj.spbh" clearable type="number" style="width: 337px"></el-input>
+                        <el-select v-model="fromObj.cameraType" style="width: 337px;">
+                            <el-option v-for="item in D_BZ_SXTLX" :key="item.value" :label="item.label"
+                                :value="item.value" />
+                        </el-select>
                     </el-form-item>
-                    <el-form-item label="摄像头IP地址:" prop="ipaddr" v-if="fromObj.sblx == '200102010000'">
+                    <el-form-item label="摄像头IP地址:" prop="ipaddr" v-if="fromObj.sblx == '06'">
                         <el-input v-model="fromObj.ipaddr" clearable style="width: 337px"></el-input>
                     </el-form-item>
-                    <el-form-item label="摄像头端口号:" prop="port" v-if="fromObj.sblx == '200102010000'">
+                    <el-form-item label="摄像头端口号:" prop="port" v-if="fromObj.sblx == '06'">
                         <el-input v-model="fromObj.port" type="number" clearable style="width: 337px"></el-input>
                     </el-form-item>
                 </el-form>
@@ -65,13 +71,15 @@ import { ElMessage } from "element-plus";
 import { getApi, postApi } from "@/api/tobAcco_api.js";
 const { proxy } = getCurrentInstance();
 const saveloading = ref(false)
+const { D_BZ_SXTLX } = proxy.$dict("D_BZ_SXTLX")
 const rules = {
     sitename: [{ required: true, message: "请输入场所名称", trigger: "blur" }],
+    cameraType: [{ required: true, message: "请选择摄像头类型", trigger: "blur" }],
     buildingname: [{ required: true, message: "请选择所属建筑物", trigger: "blur" }],
     floorname: [{ required: true, message: "请选择所属楼层", trigger: "blur" }],
     partname: [{ required: true, message: "请选择所属部位", trigger: "blur" }],
     name: [{ required: true, message: "请输入名称", trigger: "blur" }],
-    spbh: [{ required: true, message: "请输入摄像头国标编号", trigger: "blur" }],
+    sbbh: [{ required: true, message: "请输入设备编号", trigger: "blur" }],
     ipaddr: [{ required: true, message: "请输入摄像头IP地址", trigger: "blur" }],
     port: [{ required: true, message: "请输入摄像头端口号", trigger: "blur" }],
     location: [{ required: true, message: "请输入具体位置", trigger: "blur" }],
@@ -89,10 +97,11 @@ const bwlist = ref([])
 const emit = defineEmits("saveSuccess");
 const ruleFormRef = ref();
 onMounted(() => {
+    console.log(props.formData.sblx)
     fromObj.value.sblx = props.formData.sblx
     fromObj.value.sitename = props.formData.sitename
     fromObj.value.siteid = props.formData.siteid
-    fromObj.value.zbid = props.formData.id
+    fromObj.value.zbid = props.formData.parentid
     getjzwlist(props.formData.siteid)
     if (props.formData.id) {
         getmain(props.formData.id)
@@ -203,24 +212,10 @@ function getmain(id) {
                 getlcxq(res.buildingid);
                 getjzwlist(res.siteid)
                 getbwdata(res.floorid)
-                gettotal()
             }
         });
     }
 }
-//获取统计
-function gettotal() {
-    postApi({
-        bizId: fromObj.value.id,
-        bizType: fromObj.value.sblx
-    }, '/mosty-jcgl/deviceUpkeepRecord/statistics').then(res => {
-        tablist2.value.forEach(item => {
-            if (item.title.includes(["维保记录"])) {
-                item.num = res ? res : 0
-            }
-        })
-    })
-}
 //获取建筑物详情
 function getlcxq(id) {
     getApi({}, `/mosty-jcgl/building/getBuildingById/${id}`).then(res => {
@@ -234,17 +229,11 @@ function getlcxq(id) {
 }
 const black = () => {
     if (props.formData.saveBtnShow) {
-        proxy.$modal.confirm('离开会丢失页面中修改的内容，确认离开吗？')
+        proxy.$modal.confirm('离开会丢失页面中修改的内容，确认离开吗？').then(() => {
-            .then(() => {
-                // 关闭上一次的表单校验
             ruleFormRef.value.clearValidate();
             emit("saveSuccess");
         })
-            .catch(() => {
-                // catch error
-            })
     } else {
-        // 关闭上一次的表单校验
         ruleFormRef.value.clearValidate();
         emit("saveSuccess");
     }

src/main.js

@@ -1,79 +1,77 @@
-import * as ElIcons from "@element-plus/icons-vue";
+import * as ElIcons from "@element-plus/icons-vue"
-import { createApp, reactive } from "vue";
+import { createApp } from "vue"
-import App from "./App.vue";
+import App from "./App.vue"
-import router from "./router";
+import router from "./router"
-import store from "./store";
+import store from "./store"
-import { getItem, removeAllItem } from "@/utils/storage";
+import { getItem } from "@/utils/storage"
-import installElementPlus from "./plugins/element";
+import installElementPlus from "./plugins/element"
-import plugins from "./plugins";
+import plugins from "./plugins"
-import "./assets/css/element-plus.scss";
+import "./assets/css/element-plus.scss"
-import "./assets/css/layout.scss";
+import "./assets/css/layout.scss"
-import "./assets/css/public.scss";
+import "./assets/css/public.scss"
-import ELMessage from "element-plus";
+import ELMessage from "element-plus"
-import InfiniteScroll from "./utils/lazyLoad";
+import InfiniteScroll from "./utils/lazyLoad"
-import DictTag from "@/components/DictTag/index";
+import DictTag from "@/components/DictTag/index"
-import * as echarts from "echarts";
+import * as echarts from "echarts"
-import percentageDirective from "@/utils/percentage";
+import percentageDirective from "@/utils/percentage"
-import VueUeditorWrap from "vue-ueditor-wrap";
+import VueUeditorWrap from "vue-ueditor-wrap"
-import { ElMessageBox, ElMessage } from "element-plus"
+const app = createApp(App)
-const app = createApp(App);
+app.directive("percentage", percentageDirective)
-app.directive("percentage", percentageDirective);
 //注册自定义指令
-// app.use(InfiniteScroll);
+app.use(VueUeditorWrap)
-app.use(VueUeditorWrap);
+Object.keys(ElIcons).forEach(key => {
-Object.keys(ElIcons).forEach((key) => {
   //全局注册 element 图标
-  app.component(key, ElIcons[key]);
+  app.component(key, ElIcons[key])
-});
+})
-
 
 //告诉前页面内的事件监听器内部是否会调用preventDefault函数来阻止事件的默认行为，以便浏览器根据这个信息更好地做出决策来优化页面性能
 // import "default-passive-events";
-import installDirective from "@/directives";
+import installDirective from "@/directives"
 
 // 初始化样式表
-import "@/styles/base.scss";
+import "@/styles/base.scss"
 
 // import "@/styles/common.scss";
 // 导入svgIcon
-import installIcons from "@/icons";
+import installIcons from "@/icons"
 
 //导入路由鉴权
-import "./permission";
+import "./permission"
 
 //全局属性(v2过滤器)
-import installFilter from "@/filters";
+import installFilter from "@/filters"
 //事件总线
-import mitt from "mitt";
+import mitt from "mitt"
 
-import { resetForm } from "@/utils/validate";
+import { resetForm } from "@/utils/validate"
-import { getDict, setCascader, getDictValue, setDict } from "@/utils/dict";
+import { getDict, setCascader, getDictValue, setDict } from "@/utils/dict"
 //挂载全局方法
-app.config.globalProperties.resetForm = resetForm;
+app.config.globalProperties.resetForm = resetForm
-app.config.globalProperties.InfiniteScroll = InfiniteScroll;
+app.config.globalProperties.InfiniteScroll = InfiniteScroll
-app.config.globalProperties.$dict = getDict; //字典公共函数
+app.config.globalProperties.$dict = getDict //字典公共函数
-app.config.globalProperties.$message = ELMessage; //element提示组件
+app.config.globalProperties.$message = ELMessage //element提示组件
-app.config.globalProperties.$set = setCascader; //设置级联选择器回显
+app.config.globalProperties.$set = setCascader //设置级联选择器回显
-app.config.globalProperties.$getDictVal = getDictValue; //翻译字典数据
+app.config.globalProperties.$getDictVal = getDictValue //翻译字典数据
-app.config.globalProperties.$setDict = setDict; //翻译字典数据
+app.config.globalProperties.$setDict = setDict //翻译字典数据
-app.config.globalProperties.mittBus = new mitt(); //配置事件总线
+app.config.globalProperties.mittBus = new mitt() //配置事件总线
-app.component("DictTag", DictTag); //字典组件
+app.config.globalProperties.$Hls = window.Hls //配置事件总线
+app.component("DictTag", DictTag) //字典组件
 // 将echarts挂载到全局中，这样组件就能通过 this.$echarts 访问了
-app.config.globalProperties.$echarts = echarts; //echarts图表
+app.config.globalProperties.$echarts = echarts //echarts图表
-installElementPlus(app);
+installElementPlus(app)
-installIcons(app);
+installIcons(app)
-installFilter(app);
+installFilter(app)
-installDirective(app);
+installDirective(app)
-app.use(store).use(router).use(plugins).mount("#app");
+app.use(store).use(router).use(plugins).mount("#app")
 
 // 路由的导航守卫，主要防止未登录时跳转到其他页面
 router.beforeEach((to, from, next) => {
-  let token = getItem("token");
+  let token = getItem("token")
   if (to.path === "/login") {
-    window.localStorage.removeItem("token");
+    window.localStorage.removeItem("token")
-    next();
+    next()
   } else {
-    if (!token) next("/login");
+    if (!token) next("/login")
-    else next();
+    else next()
   }
-});
+})

src/views/login/index.vue

@@ -100,7 +100,6 @@ function getlogin() {
             isTrue.value = true
           })
         } else {
-
           if (loginForm.value.checked) {
             localStorage.setItem("userName", loginForm.value.userName);
             localStorage.setItem("password", loginForm.value.password);
@@ -115,26 +114,20 @@ function getlogin() {
               fullPath: "/dutyBook/home/workbench",
               meta: {
                 meta: {
-                  title: "工作台"
+                  title: "消防管理大屏"
-                  // icon: "gerenzhongxin"
                 }
               },
               name: "dutyBook/home/workbench",
               params: {},
               path: "/dutyBook/home/workbench",
               query: {},
-              title: "工作台"
+              title: "消防管理大屏"
             },
             {
               immediate: true
             }
           );
-          // router.push('/editPassword')
           router.push('/dutyBook/home/workbench')
-          // router.push('/newsystem').then(() => {
-          //   // 如果路由已经切换完成，则刷新页面
-          //   location.reload();
-          // });
           getuserinfo()
         }
 

src/views/lps/bkq/AddOrEdite/index.vue

@@ -8,6 +8,12 @@
             <el-form-item label="设备名称：" prop="sbmc">
               <el-input v-model="data.fromObj.sbmc" placeholder="请输入设备名称" style="width: 220px"></el-input>
             </el-form-item>
+            <el-form-item label="设备类型：" prop="cameraType">
+              <el-select v-model="data.fromObj.cameraType" placeholder="请选择设备类型" clearable style="width: 220px">
+                <el-option v-for="item in D_BZ_SXTLX" :key="item.value" :label="item.label"
+                  :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="国标编号：" prop="sbbh">
               <el-input v-model="data.fromObj.sbbh" type="number" placeholder="请输入国标编号" style="width: 220px"></el-input>
             </el-form-item>
@@ -56,7 +62,7 @@ import ChooseUser from "@/components/MyComponents/ChooseUser/Leader.vue"
 import PageTitle from "@/components/PageTitle/PageTitle.vue"
 import MyTable from "@/components/aboutTable/MyTable/index.vue"
 const { proxy } = getCurrentInstance()
-const { D_BZ_DLSBZT } = proxy.$dict("D_BZ_DLSBZT")
+const { D_BZ_DLSBZT, D_BZ_SXTLX } = proxy.$dict("D_BZ_DLSBZT", "D_BZ_SXTLX")
 const ruleFormRef = ref()
 const props = defineProps({
   saveBtnShow: {
@@ -70,6 +76,7 @@ const props = defineProps({
 })
 const rules = reactive({
   sbmc: [{ required: true, message: "请输入设备名称" }],
+  cameraType: [{ required: true, message: "请选择设备类型" }],
   sbbh: [{ required: true, message: "请输入设备编号" }],
   sbzt: [{ required: true, message: "请选择设备状态" }],
   hosts: [{ required: true, message: "请输入IP地址" }],

src/views/lps/bkq/Main/index.vue

@@ -18,9 +18,14 @@
         <MOSTY.Table :table-columns="data.tableColumn" :tableData="data.tableData" :tableloading="tableloading"
           :isSort="true">
           <template #sbzt="{ row }">
-            <dict-tag v-if="row.sbzt" :options="D_BZ_DLSBZT" :value="row.sbzt" :tag="false" :color="row.sbzt == '01' ? 'green' : 'orange'" />
+            <dict-tag v-if="row.sbzt" :options="D_BZ_DLSBZT" :value="row.sbzt" :tag="false"
+              :color="row.sbzt == '01' ? 'green' : 'orange'" />
             <span v-else>无</span>
           </template>
+          <template #cameraType="{ row }">
+            <dict-tag v-if="row.cameraType" :options="D_BZ_SXTLX" :value="row.cameraType" :tag="false" />
+            <span v-else>--</span>
+          </template>
           <!--操作-->
           <template #actions="{ row }">
             <span class="operesee" @click="seeInfo(row)"><el-icon>
@@ -56,7 +61,7 @@ import { exportXlsx } from "@/excel/Export2Excel.js"
 import { ElMessage } from "element-plus"
 import { reactive, onMounted, ref, getCurrentInstance } from "vue"
 const { proxy } = getCurrentInstance()
-const { D_BZ_DLSBZT } = proxy.$dict("D_BZ_DLSBZT")
+const { D_BZ_DLSBZT, D_BZ_SXTLX } = proxy.$dict("D_BZ_DLSBZT", "D_BZ_SXTLX")
 const emit = defineEmits("changePage")
 const tableloading = ref(false)
 const listQuery = reactive({
@@ -72,6 +77,13 @@ const searchArr = reactive([
     width: "250px",
     placeholder: "请选择设备状态"
   },
+  {
+    showType: "select",
+    prop: "cameraType",
+    options: D_BZ_SXTLX,
+    width: "250px",
+    placeholder: "请选择设备类型"
+  },
   {
     showType: "input",
     prop: "keywords",
@@ -99,6 +111,11 @@ const data = reactive({
       title: "端口号",
       prop: "port"
     },
+    {
+      title: "设备类型",
+      prop: "cameraType",
+      slot: true
+    },
     {
       title: "设备状态",
       prop: "sbzt",
@@ -127,6 +144,7 @@ const changeSize = val => {
 const onSearch = obj => {
   listQuery.sbzt = obj.sbzt
   listQuery.keywords = obj.keywords
+  listQuery.cameraType = obj.cameraType
   getTableData()
 }
 // 查询表格数据

src/views/lps/yjsb/AddOrEdite/index.vue

@@ -1,67 +1,83 @@
 <template>
-  <MOSTY.FromPage :title="props.formData.title" @closeDialog="closepost">
+  <MOSTY.FromPage :title="props.editObj.title" @closeDialog="closepost">
     <template #content>
       <MOSTY.Assort :title="'基础信息'" />
-      <el-form :model="props.formData" ref="ruleFormRef" label-position="right" :rules="rules" label-width="150px"
+      <el-form :model="data.config" ref="ruleFormRef" label-position="right" :rules="rules" label-width="150px"
-        :disabled='!props.formData.saveBtnShow'>
+        :disabled='!props.editObj.saveBtnShow'>
         <el-form-item label="设备类型：" prop="sblx">
-          <el-select v-model="props.formData.sblx" placeholder="请选择设备类型" clearable style="width: 337px">
+          <el-select v-model="data.config.sblx" placeholder="请选择设备类型" clearable style="width: 337px">
             <el-option v-for="item in D_BZ_YJSBLX" :key="item.value" :label="item.label"
               :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="预警设备名称:" prop="sbmc">
-          <el-input v-model="props.formData.sbmc" style="width: 337px" />
+          <el-input v-model="data.config.sbmc" style="width: 337px" />
         </el-form-item>
         <el-form-item label="设备编号:" prop="sbbh">
-          <el-input v-model="props.formData.sbbh" style="width: 337px" />
+          <el-input v-model="data.config.sbbh" style="width: 337px" />
         </el-form-item>
         <el-form-item label="设备状态：" prop="sbzt">
-          <el-select v-model="props.formData.sbzt" placeholder="请选择设备状态" clearable style="width: 337px">
+          <el-select v-model="data.config.sbzt" placeholder="请选择设备状态" clearable style="width: 337px">
             <el-option v-for="item in D_BZ_DLSBZT" :key="item.value" :label="item.label"
               :value="item.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="IP地址：" prop="ipaddr">
+          <el-input v-model="data.config.ipaddr" placeholder="请输入IP地址" style="width: 337px"></el-input>
+        </el-form-item>
+        <el-form-item label="端口号：" prop="port">
+          <el-input v-model="data.config.port" type="number" placeholder="请输入端口号" style="width: 337px"></el-input>
+        </el-form-item>
         <el-form-item label="绑定设备:" prop="parentname">
-          <el-input v-model="props.formData.parentname" style="width: 337px" readonly clearable>
+          <el-input v-model="data.config.parentname" style="width: 337px" readonly clearable>
             <template #append>
               <el-button class='cursor' @click="chooseSb()">选择</el-button>
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item label="设备名称:" prop="name">
-          <el-input v-model="props.formData.name" style="width: 337px" disabled />
-        </el-form-item>
         <el-form-item label="所属场所:" prop="sitename">
-          <el-input v-model="props.formData.sitename" style="width: 337px" disabled />
+          <el-input v-model="data.config.sitename" style="width: 337px" disabled />
         </el-form-item>
-        <el-form-item :label="props.formData.publicarea == '1' ? '所属场区:' : '所属建筑物:'" prop="buildingname">
+        <el-form-item :label="data.config.publicarea == '1' ? '所属场区:' : '所属建筑物:'" prop="buildingname">
-          <el-input v-model="props.formData.buildingname" style="width: 337px" disabled />
+          <el-input v-model="data.config.buildingname" style="width: 337px" disabled />
         </el-form-item>
-        <el-form-item label="所属楼层:" prop="floorname" v-if="props.formData.publicarea != '1'">
+        <el-form-item label="所属楼层:" prop="floorname" v-if="data.config.publicarea != '1'">
-          <el-input v-model="props.formData.floorname" style="width: 337px" disabled />
+          <el-input v-model="data.config.floorname" style="width: 337px" disabled />
         </el-form-item>
         <el-form-item label="部位名称:" prop="partname">
-          <el-input v-model="props.formData.partname" style="width: 337px" disabled />
+          <el-input v-model="data.config.partname" style="width: 337px" disabled />
         </el-form-item>
         <el-form-item label="责任部门:" prop="deptname">
-          <el-input v-model="props.formData.deptname" style="width: 337px" disabled />
+          <el-input v-model="data.config.deptname" style="width: 337px" disabled />
         </el-form-item>
         <el-form-item label="责任人：" style="width: 100%; " prop="responsibilitypersonname">
-          <el-input v-model="props.formData.responsibilitypersonname" :rows="3" type="textarea" style="width:1310px"
+          <el-input v-model="data.config.responsibilitypersonname" :rows="3" type="textarea" style="width:1310px"
             disabled />
         </el-form-item>
         <el-form-item label="具体位置：" style="width: 100%; " prop="location">
-          <el-input v-model="props.formData.location" :rows="3" type="textarea" style="width:1310px" />
+          <el-input v-model="data.config.location" :rows="3" type="textarea" style="width:1310px" />
         </el-form-item>
         <el-form-item label="备注：" style="width: 100%; ">
-          <el-input v-model="props.formData.bz" :rows="3" type="textarea" style="width:1310px" />
+          <el-input v-model="data.config.bz" :rows="3" type="textarea" style="width:1310px" />
         </el-form-item>
       </el-form>
+      <MOSTY.Assort v-if="data.config.id" :title="'关联信息(固定信息)'" />
+      <div>
+        <div v-if="data.config.id">
+          <div class="table-lable">
+            <span>动态信息</span>
+            <img :src="getImgUrl('img/icon-jt.png')" style="cursor: pointer" @click="isShowdt = !isShowdt" />
+          </div>
+          <div v-if="data.config.id">
+            <MOSTY.TabList :tablist="tablist2" :obj="data.config" :showCount="true" :sblx="sblx"
+              :isEdit="props.editObj.saveBtnShow" @tableChange="tableChange" @resetChange="resetChange" />
+          </div>
+        </div>
+      </div>
     </template>
     <template #footer>
-      <el-button type="primary" @click="saveData(ruleFormRef)" v-loading="saveloading"
+      <el-button type="primary" @click="saveData(ruleFormRef)" v-loading="saveloading" v-if='props.editObj.saveBtnShow'>
-        v-if='props.formData.saveBtnShow'> <el-icon>
+        <el-icon>
           <DocumentChecked />
         </el-icon>保存 </el-button>
       <el-button @click="closepost"><el-icon>
@@ -70,18 +86,17 @@
     </template>
   </MOSTY.FromPage>
   <div>
-    <Sbss v-model="showSbss" :data="props.formData.parentid" :sbid="leaderid" :sblx="sblx" @choosedSbss="choosedSbss"
+    <Sbss v-model="showSbss" :data="data.config.parentid" :sbid="leaderid" :sblx="sblx" @choosedSbss="choosedSbss"
       searchType="04"></Sbss>
   </div>
 </template>
 
 <script setup>
-import { ref, getCurrentInstance, defineAsyncComponent, onMounted, watch } from "vue";
+import { getImgUrl } from "@/utils/tools.js"
+import { ref, getCurrentInstance, onMounted, watch, reactive, defineAsyncComponent } from "vue";
 import * as MOSTY from "@/components/MyComponents/index";
 import Sbss from "@/components/MyComponents/ChooseUser/sbss.vue";
 import { ElMessage } from "element-plus";
-import * as rule from "@/utils/rules.js";
-import { getItem } from "@/utils/storage";
 import { getApi, postApi } from "@/api/tobAcco_api.js";
 const { proxy } = getCurrentInstance();
 const { D_BZ_DLSBZT, D_BZ_YJSBLX } = proxy.$dict("D_BZ_DLSBZT", "D_BZ_YJSBLX")
@@ -93,39 +108,65 @@ const rules = {
   sbmc: [{ required: true, message: "请输入预警设备名称" }],
   sbbh: [{ required: true, message: "请输入设备编号" }],
   sbzt: [{ required: true, message: "请选择设备状态" }],
+  sblx: [{ required: true, message: "请选择设备类型" }],
   parentname: [{ required: true, message: "请选择绑定设备" }],
-  name: [{ required: true, message: "设备名称不能为空" }],
+  ipaddr: [{ required: true, message: "请输入IP地址" }],
+  port: [{ required: true, message: "请输入端口号" }],
   deptname: [{ required: true, message: "责任部门不能为空" }],
   responsibilitypersonname: [{ required: true, message: "责任人不能为空" }],
   location: [{ required: true, message: "请输入具体位置" }]
 };
+const tablist2 = ref([])
 const saveloading = ref(false)
 const showSbss = ref(false);
 const ruleFormRef = ref();
 const sblx = ref(null)
-const emits = defineEmits(["saveSuccess", '"update:modelValue"']);
+const emit = defineEmits(["saveSuccess", '"update:modelValue"']);
 // 接收子组件传来的
 const props = defineProps({
-  modelValue: {
+  editObj: {
-    type: Boolean,
-    required: true
-  },
-  formData: {
     type: Object,
-    default: {}
+    default: () => { }
   }
 });
+const data = reactive({
+  fromObj: {},
+  config: {
+    title: "",
+    saveBtnShow: true,
+    type: ""
+  }
+})
 watch(
-  () => props.formData.sblx,
+  () => data.config.sblx,
   (val) => {
     let arr = [['01', '200101030500'], ['02', '200101020200'], ['03', '200101020100'], ['04', '200101020300'],
-    ['05', '200101030100']];
+    ['05', '200101030100'], ['06', '200102010000']];
     for (let i = 0; i < arr.length; i++) {
       const item = arr[i];
       let zddm = item[0];
       let sblxdm = item[1];
       if (zddm == val) {
         sblx.value = sblxdm;
+        if (["200101060100", '200101060200', '200101030500', '200101020200',
+          '200101020100', '200101020300', '200102010000', "200101030100"].includes(sblx.value)) {
+          let title = '附属设备'
+          if (['200101020200', '200101020100'].includes(sblx.value)) {
+            title = '液位仪';
+          } else if ('200101020300' == sblx.value) {
+            title = '压力传感器'
+          } else if ('200102010000' == sblx.value) {
+            title = '视频摄像头'
+          }
+          tablist2.value.push({
+            title: title,
+            num: 0,
+            icon: "sbss2",
+            sblx: sblx.value,
+            actives: true,
+            components: defineAsyncComponent(() => import("@/components/MyComponents/TabList/Fssblb.vue"))
+          })
+        }
         break
       }
     }
@@ -136,45 +177,67 @@ watch(
   }
 );
 onMounted(() => {
-  props.formData.publicarea = '1'
+  data.config.publicarea = '1'
-  //获取建筑物详情
+  if (props.editObj) {
-  if (props.formData.buildingid) {
+    data.config = props.editObj
-    getApi({}, `/mosty-jcgl/building/getBuildingById/${props.formData.buildingid}`).then(res => {
-      props.formData.publicarea = res.publicarea ? res.publicarea : "2"
-    })
   }
+  getMain(data.config.id)
 })
-// 选择设备设施
+//子表总数
-function choosedSbss(data) {
+function gettabcount() {
-  props.formData.parentid = data.id
+  getApi({ id: data.config.parentid }, "/mosty-jcgl/aqsbssZb/countAll").then(res => {
-  props.formData.parentname = data.name
+    tablist2.value.forEach(item => {
-  props.formData.location = data.location
+      if (["附属设备", "液位仪", "压力传感器", "视频摄像头"].includes(item.title)) {
-  // 查询主设备信息
+        item.num = res ? res : 0
-  getApi({}, "/mosty-jcgl/sbglAqsbss/queryTbSbglAqsbssById?id=" + data.zbid).then((res) => {
-    if (res) {
-      props.formData.siteid = res.siteid
-      props.formData.sitename = res.sitename
-      props.formData.buildingid = res.buildingid
-      props.formData.buildingname = res.buildingname
-      // 查询建筑物
-      //获取建筑物详情
-      getApi({}, `/mosty-jcgl/building/getBuildingById/${res.buildingid}`).then(res => {
-        props.formData.publicarea = res.publicarea ? res.publicarea : "2"
-      })
-      props.formData.floorid = res.floorid
-      props.formData.floorname = res.floorname
-      props.formData.partid = res.partid
-      props.formData.partname = res.partname
-      props.formData.sbid = res.id
-      props.formData.name = res.name
-      props.formData.deptcode = res.responsibilitydeptid
-      props.formData.deptname = res.responsibilitydeptname
-      props.formData.responsibilitypersonname = res.responsibilitypersonname
-      props.formData.responsibilityperson = res.responsibilityperson
-    } else {
-      ElMessage.error("未找到设备信息");
       }
     })
+  })
+}
+// 获取详情
+function getMain(id) {
+  if (id) {
+    getApi({ id: id }, "/mosty-lps/yjsbInfo/getInfo").then(res => {
+      if (res) {
+        data.config = res
+        //获取建筑物详情
+        if (data.fromObj.buildingid) {
+          getApi({}, `/mosty-jcgl/building/getBuildingById/${data.fromObj.buildingid}`).then(res => {
+            data.config.publicarea = res.publicarea ? res.publicarea : "2"
+          })
+        }
+        //统计各类总数
+        gettabcount()
+      }
+    })
+  }
+}
+//获取子表数据
+function tableChange(val) {
+  gettabcount()
+}
+// 选择设备设施
+function choosedSbss(res) {
+  data.config.parentid = res.id
+  data.config.parentname = res.name
+  data.config.location = res.location
+  data.config.siteid = res.siteid
+  data.config.sitename = res.sitename
+  data.config.buildingid = res.buildingid
+  data.config.buildingname = res.buildingname
+  //获取建筑物详情
+  getApi({}, `/mosty-jcgl/building/getBuildingById/${res.buildingid}`).then(resp => {
+    data.config.publicarea = resp.publicarea ? resp.publicarea : "2"
+  })
+  data.config.floorid = res.floorid
+  data.config.floorname = res.floorname
+  data.config.partid = res.partid
+  data.config.partname = res.partname
+  data.config.sbid = res.id
+  data.config.name = res.name
+  data.config.deptcode = res.responsibilitydeptid
+  data.config.deptname = res.responsibilitydeptname
+  data.config.responsibilitypersonname = res.responsibilitypersonname
+  data.config.responsibilityperson = res.responsibilityperson
 }
 // 打开选择设备弹窗
 function chooseSb() {
@@ -185,12 +248,12 @@ function chooseSb() {
   showSbss.value = true
 }
 function closepost() {
-  if (props.formData.saveBtnShow) {
+  if (props.editObj.saveBtnShow) {
     proxy.$modal.confirm('离开会丢失页面中修改的内容，确认离开吗？').then(() => {
-      emits("saveSuccess");
+      emit("changePage", "Main")
     })
   } else {
-    emits("saveSuccess");
+    emit("changePage", "Main")
   }
 }
 // 保存数据
@@ -199,17 +262,17 @@ const saveData = async (ruleFormRef) => {
   if (!ruleFormRef) return
   ruleFormRef.validate((valid) => {
     if (valid) {
-      if (!props.formData.id) {
+      if (!props.editObj.id) {
-        postApi(props.formData, "/mosty-lps/yjsbInfo/add").then((res) => {
+        postApi(data.config, "/mosty-lps/yjsbInfo/add").then((res) => {
           ElMessage.success("新增成功");
-          emits("saveSuccess");
+          emit("changePage", "Main")
         }).finally(() => {
           saveloading.value = false
         })
       } else {
-        postApi(props.formData, "/mosty-lps/yjsbInfo/edit").then((res) => {
+        postApi(data.config, "/mosty-lps/yjsbInfo/edit").then((res) => {
           ElMessage.success("修改成功");
-          emits("saveSuccess");
+          emit("changePage", "Main")
         }).finally(() => {
           saveloading.value = false
         })

src/views/lps/yjsb/Main/index.vue

@@ -1,175 +1,243 @@
 <template>
-  <div>
+  <MOSTY.PageTree pageTitle="预警设备管理" @getDeptId="getdeptData" :isShowOrgTree="isShowLeftTree">
-    <div class="bigBox">
+    <template #serach>
-      <!-- 基础隐患排查 -->
+      <el-divider />
-      <div class="left" :style="{ width: lfBoxWid }">
+      <MOSTY.Search :searchArr="searchArr" @submit="onSearch" />
-        <div class="title">
+      <el-divider />
-          <div style="display: flex; align-items: center">
+      <div class="btnBox">
-            <div style="padding-top: 5px; margin-right: 5px">
+        <el-button @click="addInfo">
-              <el-icon style="color: var(--el-color-primary) !important">
+          <el-icon size="small">
-                <List />
+            <Plus />
           </el-icon>
+          新增
+        </el-button>
       </div>
-            <span class="zzjgxx" v-if="iconChange">场所部位</span>
+    </template>
-          </div>
+    <template #table>
-          <el-icon @click="handleCollapse" v-show="iconChange">
+      <section class="eltab9">
-            <DArrowLeft />
+        <MOSTY.Table :table-columns="data.tableColumn" :tableData="data.tableData" :tableloading="tableloading"
-          </el-icon>
+          :isSort="true" actionsW="300">
-          <el-icon @click="handleCollapse" v-show="!iconChange">
+          <template #sbzt="{ row }">
-            <DArrowRight />
+            <dict-tag v-if="row.sbzt" :options="D_BZ_DLSBZT" :value="row.sbzt" :tag="false"
+              :color="row.sbzt == '01' ? 'green' : 'orange'" />
+            <span v-else>无</span>
+          </template>
+          <template #ipaddr="{ row }">
+            <span v-if="row.ipaddr && row.port">{{ row.ipaddr + ":" + row.port }}</span>
+            <span v-else>--</span>
+          </template>
+          <template #sblx="{ row }">
+            <dict-tag v-if="row.sblx" :options="D_BZ_YJSBLX" :value="row.sblx" :tag="false" />
+            <span v-else>无</span>
+          </template>
+          <template #actions="{ row }">
+            <span class="operesee" @click="videoControl(row)" v-if="row.sblx == '06'">
+              <el-icon>
+                <Compass />
+              </el-icon>视频操作</span>
+            <span class="operesee" @click="showInfo(row)">
+              <el-icon>
+                <Compass />
+              </el-icon>查看</span>
+            <span class="operedit" @click="editInfo(row)">
+              <el-icon>
+                <EditPen />
+              </el-icon>修改</span>
+            <el-popconfirm confirm-button-text="是" cancel-button-text="否" icon-color="red" title="确定要删除?"
+              @confirm="delInfo(row)">
+              <template #reference>
+                <span class="operdel" size="small"><el-icon>
+                    <Delete />
                   </el-icon>
+                  删除</span>
+              </template>
+            </el-popconfirm>
+          </template>
+        </MOSTY.Table>
+      </section>
+      <div class="fenye">
+        <MOSTY.Pages :pageConfiger="listQuery" @changeNo="changeNo" @changeSize="changeSize"></MOSTY.Pages>
       </div>
-        <div class="treeBox" :style="{ height: treeHeight }">
+    </template>
-          <el-tree ref="treeRef" class="filter-tree" :props="endProps" node-key="id" :load="loadNode" lazy
+  </MOSTY.PageTree>
-            :default-expanded-keys="defaultExpandedKeys" @node-click="nodeClick" :filter-node-method="filterNode"
-            :data="treeData" />
-        </div>
-      </div>
-      <div class="right" :style="{ width: rgBoxWid }">
-        <div class="headBox">
-          <span class="title">预警设备列表</span>
-        </div>
-        <div class="box" style="flex: 1">
-          <YjsbList :searchObj="searchObj" />
-        </div>
-      </div>
-    </div>
-  </div>
 </template>
 
 <script setup>
-import { onMounted, ref, reactive, getCurrentInstance } from "vue";
+import * as MOSTY from "@/components/MyComponents/index"
-import { getItem } from "@/utils/storage"
 import { getApi, postApi } from "@/api/tobAcco_api.js"
-import YjsbList from "./yjsbList.vue";
+import { ElMessage } from "element-plus"
-const emits = defineEmits(["changePage"])
+import { reactive, ref, getCurrentInstance, onMounted } from "vue"
-const endProps = {
+const { proxy } = getCurrentInstance()
-  children: "childDeptList",
+const { D_BZ_DLSBZT, D_BZ_YJSBLX } = proxy.$dict("D_BZ_DLSBZT", "D_BZ_YJSBLX")
-  value: "id",
+const emit = defineEmits("changePage")
-  label: "name",
+const tableloading = ref(false)
-  isLeaf: "leaf"
+const listQuery = reactive({
-};
+  pageCurrent: 1,
-const defaultExpandedKeys = ref([])
+  pageSize: 10,
-const treeData = ref([]);
+  total: 0
-const node_had = ref([]);
+})
-const resolve_had = ref([]);
+const searchArr = reactive([
-const iconChange = ref(true);
+  {
-const lfBoxWid = ref("300px");
+    showType: "input",
-const rgBoxWid = ref("calc(100% - 300px)");
+    prop: "keywords",
-const treemrData = ref([]);
+    width: '250px',
-const treeRef = ref(null);
+    placeholder: '请输入设备名称或编号查询'
-const searchObj = ref({})
+  },
-const treeQuery = ref({
+  {
-  parentid: "",
+    showType: "select",
-  type: '01',
+    prop: "sblx",
+    options: D_BZ_YJSBLX,
+    width: "250px",
+    placeholder: "请选择设备类型"
+  },
+  {
+    showType: "select",
+    prop: "sbzt",
+    options: D_BZ_DLSBZT,
+    width: "250px",
+    placeholder: "请选择设备状态"
+  },
+])
+const data = reactive({
+  searchObj: {},
+  tableData: [],
+  tableColumn: [
+    {
+      title: "所属单位",
+      prop: "orgname"
+    },
+    {
+      title: "所属部门",
+      prop: "deptname"
+    },
+    {
+      title: "设备类型",
+      prop: "sblx",
+      slot: true
+    },
+    {
+      title: "设备名称",
+      prop: "sbmc"
+    },
+    {
+      title: "设备编号",
+      prop: "sbbh"
+    },
+    {
+      title: "设备状态",
+      prop: "sbzt",
+      slot: true
+    },
+    {
+      title: "物联IP端口",
+      prop: "ipaddr",
+      slot: true
+    },
+    {
+      title: "操作",
+      prop: "actions",
+      slot: true
+    }
+  ]
+})
+onMounted(() => {
+  // videoControl();
 });
-//获取场所树数据
+// 开启视频操作
-function getTreeData() {
+const videoControl = row => {
-  getApi(treeQuery.value, "/mosty-jcgl/site/querySceneTree").then((res) => {
+  console.log(row)
-    if (res.length == 1) {
+  let arr = {
-      res.forEach((element) => {
+    title: "视频",
-        treemrData.value = setTimeout(() => { treeRef.value.setCurrentKey(element.id) }, 200)
+    sbbh: row.sbbh,
-        defaultExpandedKeys.value = [element.id]
+    saveBtnShow: false,
-        if (element.siteid) {
+    type: "showVideo",
-          searchObj.value.siteid = element.siteid
+    id: (row && row.parentid) ? row.parentid : '5200316847792de043a5b2a9dbede8698677'
-          searchObj.value.deptId = null
-        } else {
-          searchObj.value.deptId = element.orgid ? element.orgid : element.id
-          searchObj.value.siteid = null
   }
-      });
+  emit("changePage", "VideoPlay", arr)
-    }
-    for (let i = 0; i < res.length; i++) {
-      res[i].leaf = !res[i].hasChildren;
-    }
-    if (res.length > 0) treeData.value = res;
-  });
 }
-//懒加载方法
+// 切换组织机构
-async function loadNode(node, resolve) {
+const getdeptData = val => {
-  treeQuery.value.parentid = node.data.id;
+  listQuery.deptId = val.id;
-  treeQuery.value.type = node.data.type;
+  listQuery.pageCurrent = 1;
-  if (node.level === 0) {
+  getTableData();
-    node_had.value = node;
-    resolve_had.value = resolve;
-    getTreeData();
-  }
-  if (node.level >= 1) {
-    getApi(treeQuery.value, "/mosty-jcgl/site/querySceneSiteTree").then(
-      (res) => {
-        for (let i = 0; i < res.length; i++) {
-          res[i].leaf = !res[i].hasChildren;
-        }
-        resolve(res);
-      }
-    );
-  }
 }
-const filterNode = (value, data) => {
+//分页
-  if (!value) return true;
+const changeNo = val => {
-  return data.name.includes(value);
+  listQuery.pageCurrent = val
-};
+  getTableData()
-const nodeClick = (node) => {
+}
-  if (node.siteid) {
+const changeSize = val => {
-    searchObj.value.siteid = node.siteid
+  listQuery.pageSize = val
-    searchObj.value.deptId = null
+  getTableData()
+}
+// 查询数据
+const onSearch = obj => {
+  listQuery.pageCurrent = 1;
+  listQuery.keywords = obj.keywords;
+  listQuery.sbzt = obj.sbzt;
+  listQuery.sblx = obj.sblx;
+  getTableData()
+}
+// 查询表格数据
+function getTableData() {
+  tableloading.value = true
+  getApi(listQuery, `/mosty-lps/yjsbInfo/getPageList`).then(res => {
+    if (res.records) {
+      data.tableData = res.records
+      tableloading.value = false
+      listQuery.total = res.total
     } else {
-    searchObj.value.deptId = node.orgid ? node.orgid : node.id
+      data.tableData = []
-    searchObj.value.siteid = null
+      tableloading.value = false
     }
-};
+  }).finally(() => {
-const handleCollapse = () => {
+    tableloading.value = false
-  iconChange.value = !iconChange.value;
+  })
-  if (iconChange.value) {
+}
-    lfBoxWid.value = "300px";
+//新增预警设备
-    rgBoxWid.value = "calc(100% - 300px)";
+const addInfo = () => {
-  } else {
+  let arr = {
-    lfBoxWid.value = "40px";
+    title: "新增预警设备",
-    rgBoxWid.value = "calc(100% - 40px)";
+    saveBtnShow: true,
+    type: "add"
   }
-};
+  emit("changePage", "AddOrEdite", arr)
+}
+//修改预警设备
+const editInfo = row => {
+  let arr = {
+    title: "修改预警设备",
+    saveBtnShow: true,
+    type: "edit",
+    id: row.id ? row.id : null
+  }
+  emit("changePage", "AddOrEdite", arr)
+}
+//查看
+const showInfo = row => {
+  let arr = {
+    title: "查看预警设备",
+    saveBtnShow: false,
+    id: row.id ? row.id : null
+  }
+  emit("changePage", "AddOrEdite", arr)
+}
+
+//删除
+const delInfo = row => {
+  postApi({}, "/mosty-lps/yjsbInfo/del/" + row.id).then(res => {
+    ElMessage.success("删除成功")
+    getTableData()
+  })
+}
+
 </script>
 
 <style lang="scss" scoped>
-.bigBox {
+.btnBox {
-  display: flex;
-
-  .title {
-    height: 39px;
-    line-height: 39px;
-    font-size: 18px;
-    color: var(--el-color-primary);
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .el-icon {
-      cursor: pointer;
-    }
-  }
-
-  .left {
-    width: 300px;
-    background: #ffffff;
-    box-shadow: 0px 2px 10px 0px rgba(107, 107, 107, 0.1);
-    border-radius: 0px 0px 0px 0px;
-    opacity: 1;
-
-    .treeBox {
-      height: calc(100vh - 164px);
-      overflow: auto;
-    }
-  }
-
-  .right {
-    padding: 0 10px;
-    margin: 0px 0 0 10px;
-    background: #fff;
-
-    .headBox {
   display: flex;
   align-items: center;
-    }
+  justify-content: flex-end;
-  }
+  margin-bottom: 12px;
 }
 </style>

src/views/lps/yjsb/index.vue

@@ -1,19 +1,22 @@
 <template>
   <div>
     <Main v-if="showPage === 'Main'" @changePage="changePage"></Main>
+    <AddOrEdite v-else-if="showPage === 'AddOrEdite'" @changePage="changePage" :editObj="editObj.editObj"></AddOrEdite>
+    <VideoPlay v-else-if="showPage === 'VideoPlay'" @changePage="changePage" :editObj="editObj.editObj"></VideoPlay>
   </div>
 </template>
 
 <script setup>
 import Main from "./Main/index.vue";
+import AddOrEdite from "./AddOrEdite/index.vue";
+import VideoPlay from "./videoPlay/index.vue";
 import { reactive, ref } from "vue";
-
 let showPage = ref('Main')
 let editObj = reactive({
   editObj: null
 })
-const changePage = (val, obj) =>{
+const changePage = (val, obj) => {
-  if(obj){
+  if (obj) {
     editObj.editObj = obj
   } else {
     editObj.editObj = null
@@ -22,5 +25,4 @@ const changePage = (val, obj) =>{
 }
 </script>
 
-<style lang = "scss" scoped>
+<style lang="scss" scoped></style>
-</style>