Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/assetReport/index.vue

@@ -0,0 +1,336 @@
+<!--
+ * @Author: hisense.guoyue
+ * @LastEditors: hisense.guoyue
+ * @LastEditTime: 2022-09-27 14:23:29
+ * @Description: 设备审批
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill" style="position: relative">
+    <div>
+      <div
+        style="
+          text-align: center;
+          font-size: 26px;
+          font-weight: bold;
+          margin-bottom: 14px;
+        "
+      >
+        累计节省财政资金约{{ saveMoney }}万元
+      </div>
+      <div
+        style="
+          text-align: center;
+          font-size: 14px;
+          font-weight: bold;
+          margin-bottom: 14px;
+        "
+      >
+        注：资源参考价格由部门提供或参考市场价格设定
+      </div>
+    </div>
+    <el-form :inline="true">
+      <el-form-item>
+        <span>日期：</span>
+        <el-date-picker
+          v-model="dataList"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+      <!--提供部门-->
+      <el-form-item>
+        <span>提供部门：</span>
+        <el-select
+          v-model="dataForm.offerDepartment"
+          placeholder="请选择提供部门"
+          filterable
+          clearable
+        >
+          <el-option label="全部" value=""></el-option>
+          <el-option
+            v-for="item in offerDepartSelects"
+            :key="item.label"
+            :label="item.label"
+            :value="item.value"
+            v-bind="item"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <!--申请部门-->
+      <el-form-item>
+        <span>申请部门：</span>
+        <el-select
+          v-model="dataForm.applyDepartment"
+          placeholder="请选择申请部门"
+          filterable
+          clearable
+        >
+          <el-option label="全部" value=""></el-option>
+          <el-option
+            v-for="item in applyDepartSelects"
+            :key="item.label"
+            :label="item.label"
+            :value="item.value"
+            v-bind="item"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <!--类型-->
+      <el-form-item>
+        <span>类型：</span>
+        <el-select
+          @change="changeIiem"
+          v-model="dataForm.type"
+          placeholder="请选择类型"
+          clearable
+        >
+          <el-option label="全部" value=""></el-option>
+          <el-option
+            v-for="(item, i) in typeOptions"
+            :key="`${item.name}${i}`"
+            :label="item.name"
+            :value="item.name"
+            v-bind="item"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!--名称-->
+      <el-form-item>
+        <span>名称：</span>
+        <el-input
+          style="width: 80%"
+          v-model="dataForm.name"
+          placeholder="请输入资源名称"
+          clearable
+        ></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" style="margin-right: 40px">
+      <!--操作按钮查询-->
+      <el-form-item>
+        <el-button type="primary" @click="init()">{{
+          $t("query")
+        }}</el-button>
+      </el-form-item>
+      <!--操作按钮重置-->
+      <el-form-item>
+        <el-button type="primary" @click="resetDataList()">{{
+          $t("reset")
+        }}</el-button>
+      </el-form-item>
+      <!-- 导出 -->
+      <a
+        class="export"
+        :href="
+          exportExcel +
+          exportExcelType +
+          '?' +
+          exportExcelCondition +
+          '&token=' +
+          token
+        "
+        >导出全部</a
+      >
+    </el-form>
+
+    <div class="mod-activiti__process">
+      <el-table
+        :data="dataList"
+        :header-cell-style="{ textAlign: 'center', height: '40px' }"
+        :cell-style="{ textAlign: 'center' }"
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="title"
+          label="序号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="name"
+          label="资源名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="createDate"
+          label="类型"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="auditTime"
+          label="提供部门"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="auditTime"
+          label="提供部门"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="auditTime"
+          label="申请部门"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="auditTime"
+          label="申请时间"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="auditTime"
+          label="参考价格(元)"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+      </el-table>
+      <el-pagination
+        @current-change="handleCurrentChange"
+        layout="total, prev, pager, next, jumper"
+        :total="total"
+        :page-size="pageSize"
+        :current-page="currentPage"
+      >
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+  
+<script>
+
+import Cookies from 'js-cookie'
+
+export default {
+
+  data() {
+    return {
+        token: Cookies.get('ucsToken'),
+        //导出全部
+      exportExcelCondition: '',
+      exportExcelType: '',
+      saveMoney: 3243,
+      offerDepartSelects: [],
+      applyDepartSelects: [],
+      typeOptions: [
+        { name: "智能算法", value: 1 },
+        { name: "图层服务", value: 2 },
+        { name: "开发组件", value: 3 },
+        { name: "业务组件", value: 4 },
+        { name: "应用资源", value: 5 },
+      ], // 类型备选列表
+      dataList: [],
+      dataForm: {
+        // date: '',
+        startDate: "",
+        endDate: "",
+        offerDepartment: "",
+        applyDepartment: "",
+        type: "",
+        name: "",
+      },
+      currentPage: 1,
+      pageSize: 10,
+      total: null,
+    };
+  },
+  methods: {
+    init() {
+      if (this.value1 && this.value1.length > 0) {
+        this.dataForm.startDate = this.value1[0];
+        this.dataForm.endDate = this.value1[1];
+      } else {
+        this.dataForm.startDate = "";
+        this.dataForm.endDate = "";
+      }
+      let params = this.dataForm;
+      this.$http
+        .get("/census/center/v3/treeList/", {
+          params,
+        })
+        .then((res) => {
+          this.tableData = res.data.data;
+        });
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.init();
+    },
+    resetDataList() {
+      this.dataList = [];
+      this.dataForm.startDate = "";
+      this.dataForm.endDate = "";
+      this.dataForm.type = "";
+      this.dataForm.name = "";
+      this.dataForm.applyDepartment = "";
+      this.dataForm.offerDepartment = "";
+      this.currentPage = 1;
+      this.init();
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  created() {
+    this.$http.get("/sys/dept/all").then((res) => {
+      this.applyDepartSelects = [];
+      this.offerDepartSelects = [];
+      res.data.data.map((val) => {
+        this.applyDepartSelects.push({ label: val.name, value: val.id });
+        this.offerDepartSelects.push({ label: val.name, value: val.id });
+      });
+    });
+  },
+};
+</script>
+<style scoped>
+.demand-text {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.area-text {
+  padding: 0 4px;
+}
+
+.tooltip-box {
+  width: 400px;
+}
+.export {
+  margin-top: 6px;
+  display: inline-block;
+  width: 80px;
+  height: 32px;
+  line-height: 32px;
+  text-align: center;
+  border-radius: 2px;
+  background: #fff;
+  border: 2px solid #dcdfe6;
+  color: #000;
+  color: #fff;
+  background-color: #0058e1;
+  border-color: #0058e1;
+  text-decoration: none;
+}
+
+.export:hover {
+  background: #65a5f9;
+  border-color: #65a5f9;
+  color: #fff;
+}
+</style>
+  

front/public/static/config/basicConfig.js

@@ -1,15 +1,15 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: Light
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-14 18:00:12
+ * @LastEditTime: 2022-11-22 14:37:59
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  // version: 'xihaian', // 西海岸
+  version: 'xihaian', // 西海岸
-  version: 'dev', // 开发
+  // version: 'dev', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透
@@ -68,6 +68,8 @@ var CONFIGITEM = {
         cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
       },
       backUrl: 'http://10.134.135.9:9797',
+      // apiURL: 'http://10.134.135.92:8888/renren-admin',
+      apiURL: 'http://192.168.124.233:8888/ucs-admin',
       previewUrl: 'http://10.134.135.9:9796/',
       // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
       // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境

front/src/views/home/apply.vue

@@ -166,7 +166,7 @@
               </div>
 
               <!-- 西海岸--附件上传  -->
-              <div v-if="iskfq && isXiHaiAn">
+              <div v-if="isXiHaiAn">
                 <a-row style="margin-top: 0.4rem">
                   <a-col :span="24">
                     <a-form-item
@@ -991,7 +991,7 @@
 
     .form-container {
       padding: 20px 20px 30px 20px;
-
+      overflow: hidden;
       .title {
         font-size: 20px;
         color: #000;

front/src/views/home/components/H5Player.vue

@@ -2,37 +2,20 @@
 海康H5Player
 -->
 <template>
-<div class="video-player">
+  <div id="player" style="width: 800px; height: 600px; z-index: 9999"></div>
-    <!--<div class="play-button">
-    <img
-     v-show="!state.playing && !state.isLoading"
-     src="../../assets/video/content_btn_play.svg"
-    >
-    <img
-     v-show="state.playing && !state.isLoading"
-     src="../../assets/video/content_btn_pause.svg"
-    >
-    <div class="loader" v-show="state.isLoading">
-     <div class="loader-inner ball-clip-rotate">
-      <div></div>
-     </div>
-    </div> 
-   </div>-->
-    <div id='player' style="width:800px;height:600px;z-index:9999"></div>
-</div>
 </template>
 <script>
-const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
+  const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
-const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
+  const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
-import { message } from 'ant-design-vue'
+  import { message } from 'ant-design-vue'
   export default {
     name: 'H5Player',
     props: {
-     videoUrl:{
+      videoUrl: {
         type: String,
         default: '',
       },
-     index:{
+      index: {
         type: Number,
         default: 0,
      },
@@ -51,36 +34,38 @@ import { message } from 'ant-design-vue'
         urls: {
           realplay: 'ws://10.19.147.22:559/EUrl/q2jQie4',
           talk: 'wss://10.41.163.126:6014/proxy/10.41.163.126:559/EUrl/6gFx47S',
-     playback: 'wss://10.41.163.126:6014/proxy/10.41.163.126:559/EUrl/6gFx47S'
+          playback:
+            'wss://10.41.163.126:6014/proxy/10.41.163.126:559/EUrl/6gFx47S',
         },
         playback: {
           startTime: '2021-07-26T00:00:00',
           endTime: '2021-07-26T23:59:59',
           valueFormat: '',
           seekStart: '2021-07-26T12:00:00',
-     rate: ''
+          rate: '',
         },
         muted: true,
         volume: 50,
         volumeOnSvg: {
-     template: '<svg t="1624453273744" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1421" width="200" height="200"><path d="M597.994667 138.005333q130.005333 28.010667 213.994667 132.992t84.010667 241.002667-84.010667 241.002667-213.994667 132.992l0-88q93.994667-28.010667 153.002667-106.005333t59.008-180.010667-59.008-180.010667-153.002667-106.005333l0-88zM704 512q0 120-106.005333 172.010667l0-344q106.005333 52.010667 106.005333 172.010667zM128 384l170.005333 0 213.994667-213.994667 0 684.010667-213.994667-213.994667-170.005333 0 0-256z" p-id="1422"></path></svg>'
+          template:
+            '<svg t="1624453273744" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1421" width="200" height="200"><path d="M597.994667 138.005333q130.005333 28.010667 213.994667 132.992t84.010667 241.002667-84.010667 241.002667-213.994667 132.992l0-88q93.994667-28.010667 153.002667-106.005333t59.008-180.010667-59.008-180.010667-153.002667-106.005333l0-88zM704 512q0 120-106.005333 172.010667l0-344q106.005333 52.010667 106.005333 172.010667zM128 384l170.005333 0 213.994667-213.994667 0 684.010667-213.994667-213.994667-170.005333 0 0-256z" p-id="1422"></path></svg>',
         },
         volumeOffSvg: {
-     template: '<svg t="1624453193279" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9147" width="200" height="200"><path d="M512 170.005333l0 180.010667-90.005333-90.005333zM181.994667 128l714.005333 714.005333-53.994667 53.994667-88-88q-74.005333 58.005333-156.010667 77.994667l0-88q50.005333-13.994667 96-50.005333l-181.994667-181.994667 0 288-213.994667-213.994667-170.005333 0 0-256 202.005333 0-202.005333-202.005333zM810.005333 512q0-101.994667-59.008-180.010667t-153.002667-106.005333l0-88q130.005333 28.010667 213.994667 132.992t84.010667 241.002667q0 96-44.010667 178.005333l-64-66.005333q21.994667-53.994667 21.994667-112zM704 512q0 18.005333-2.005333 26.005333l-104-104 0-93.994667q106.005333 52.010667 106.005333 172.010667z" p-id="9148"></path></svg>'
+          template:
+            '<svg t="1624453193279" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9147" width="200" height="200"><path d="M512 170.005333l0 180.010667-90.005333-90.005333zM181.994667 128l714.005333 714.005333-53.994667 53.994667-88-88q-74.005333 58.005333-156.010667 77.994667l0-88q50.005333-13.994667 96-50.005333l-181.994667-181.994667 0 288-213.994667-213.994667-170.005333 0 0-256 202.005333 0-202.005333-202.005333zM810.005333 512q0-101.994667-59.008-180.010667t-153.002667-106.005333l0-88q130.005333 28.010667 213.994667 132.992t84.010667 241.002667q0 96-44.010667 178.005333l-64-66.005333q21.994667-53.994667 21.994667-112zM704 512q0 18.005333-2.005333 26.005333l-104-104 0-93.994667q106.005333 52.010667 106.005333 172.010667z" p-id="9148"></path></svg>',
         },
         recordStartState: 0,
-   recordStartText: '录像'
+        recordStartText: '录像',
       }
     },
-    created(){
+    created() {},
-    },
     mounted() {
       this.init()
       this.createPlayer()
       this.arrangeWindow()
       //videoUrl this.realplay(this.videoUrl,0);//循环传过来的数组进行播放，index根据选中的个数
-      //this.realplay(this.videoUrl,0);
+      this.realplay(this.videoUrl, 0)
-      //this.realplay('wss://10.134.135.44:6014/proxy/10.10.20.14:559/openUrl/RekxIQ0',0);
+      //this.realplay('wss://10.134.135.44:6014/proxy/10.10.20.14:559/openUrl/y3mFfcA',0);
     },
     watch: {
       videoUrl: {
@@ -88,103 +73,120 @@ import { message } from 'ant-design-vue'
         handler(newVal, oldVal) {
           console.log('oldVal:', oldVal)
           console.log('newVal:', newVal)
-                   //this.realplay(newVal,0);   
+          if (newVal) {
+            this.realplay(newVal, 0)
+          }
         },
         // 立即处理 进入页面就触发
-                immediate: true
+        immediate: true,
-            }
+      },
     },
     methods: {
       // 海康视频初始化加载
-     init () {
+      init() {
         // 设置播放容器的宽高并监听窗口大小变化
         window.addEventListener('resize', () => {
           this.player.JS_Resize()
         })
       },
-     createPlayer () {
+      createPlayer() {
         //console.log('this.index',this.index);
         this.player = new window.JSPlugin({
           //szId: 'player'+this.index,
           szId: 'player',
-       szBasePath: "/util/",  //引入静态资源地址，我这里静态资源在public/js文件存放，所以设置为js
+          szBasePath: '/util/', //引入静态资源地址，我这里静态资源在public/js文件存放，所以设置为js
           iMaxSplit: 4,
           iCurrentSplit: 4,
           openDebug: true,
           oStyle: {
             borderSelect: '#FFCC00',
-       }
+          },
         })
         // 事件回调绑定
         this.player.JS_SetWindowControlCallback({
-       windowEventSelect: function (iWndIndex) {  //插件选中窗口回调
+          windowEventSelect: function (iWndIndex) {
-         console.log('windowSelect callback: ', iWndIndex);
+            //插件选中窗口回调
+            console.log('windowSelect callback: ', iWndIndex)
           },
-       pluginErrorHandler: function (iWndIndex, iErrorCode, oError) {  //插件错误回调
+          pluginErrorHandler: function (iWndIndex, iErrorCode, oError) {
-         console.log('pluginError callback: ', iWndIndex, iErrorCode, oError);
+            //插件错误回调
+            console.log('pluginError callback: ', iWndIndex, iErrorCode, oError)
           },
-       windowEventOver: function (iWndIndex) {  //鼠标移过回调
+          windowEventOver: function (iWndIndex) {
+            //鼠标移过回调
             //console.log(iWndIndex);
           },
-       windowEventOut: function (iWndIndex) {  //鼠标移出回调
+          windowEventOut: function (iWndIndex) {
+            //鼠标移出回调
             //console.log(iWndIndex);
           },
-       windowEventUp: function (iWndIndex) {  //鼠标mouseup事件回调
+          windowEventUp: function (iWndIndex) {
+            //鼠标mouseup事件回调
             //console.log(iWndIndex);
           },
-       windowFullCcreenChange: function (bFull) {  //全屏切换回调
+          windowFullCcreenChange: function (bFull) {
-         console.log('fullScreen callback: ', bFull);
+            //全屏切换回调
+            console.log('fullScreen callback: ', bFull)
           },
-       firstFrameDisplay: function (iWndIndex, iWidth, iHeight) {  //首帧显示回调
+          firstFrameDisplay: function (iWndIndex, iWidth, iHeight) {
-         console.log('firstFrame loaded callback: ', iWndIndex, iWidth, iHeight);
+            //首帧显示回调
-       },
+            console.log(
-       performanceLack: function () {  //性能不足回调
+              'firstFrame loaded callback: ',
-         console.log('performanceLack callback: ');
+              iWndIndex,
-       }
+              iWidth,
-     });
+              iHeight
-     },
-   arrangeWindow () {
-     const splitNum = this.splitNum
-     this.player.JS_ArrangeWindow(splitNum).then(
-       () => { console.log(`arrangeWindow to ${splitNum}x${splitNum} success`) },
-        e => { console.error(e) }
             )
           },
-// 初始化结束
+          performanceLack: function () {
-// 视频预览
+            //性能不足回调
-   realplay (playURL, index1) {
+            console.log('performanceLack callback: ')
+          },
+        })
+      },
+      arrangeWindow() {
+        const splitNum = this.splitNum
+        this.player.JS_ArrangeWindow(splitNum).then(
+          () => {
+            console.log(`arrangeWindow to ${splitNum}x${splitNum} success`)
+          },
+          (e) => {
+            console.error(e)
+          }
+        )
+      },
+      // 初始化结束
+      // 视频预览
+      realplay(playURL, index1) {
         this.mode = 1 //解码方式：0普通模式 1高级模式
         const { player, mode, urls } = this,
           index = player.currentWindowIndex
         // playURL = this.realplay
-
+        console.log('视频播放地址', playURL)
         player.JS_Play(playURL, { playURL, mode }, index1).then(
           () => {
             console.log('realplay success')
-         if(!stopFlag){
-          console.log("暂停住pause");
-          this.stopPlay();
-         }
           },
-       e => { 
+          (e) => {
-        console.error(e);
+            console.error(e)
-        message.error('请联系视频提供方!')
+            // message.error('请联系视频提供方!')
           }
         )
       },
       // 关闭所有视频
-   stopAllPlay () {
+      stopAllPlay() {
         this.player.JS_StopRealPlayAll().then(
           () => {
             this.playback.rate = 0
             console.log('stopAllPlay success')
             this.closeVideoTree()
           },
-       e => { console.error(e) }
+          (e) => {
+            console.error(e)
+          }
         )
       },
       // 关闭单个视频
-   stopPlay () {
+      stopPlay() {
         this.player.JS_Stop().then(
           () => {
             this.playback.rate = 0
@@ -193,10 +195,16 @@ import { message } from 'ant-design-vue'
             const index = this.player.currentWindowIndex
             this.selectAisle(this.videoList[index], index)
           },
-         e => { console.error(e) }
+          (e) => {
+            console.error(e)
+          }
         )
       },
     },
+    beforeUnmount() {
+      console.log('关闭所有视频')
+      this.stopAllPlay()
+    },
   }
 </script>
 <style lang="less">

front/src/views/home/detailsPageInfrastructureTreeXha.vue

@@ -217,8 +217,7 @@ export default defineComponent({
     })
     const onSelect = async (item, val, child) => {
 
-        let res = {}
+        let res = {}  
-         mybus.emit('getCameraByParentId', val.id)
         res = await getCameraInfoByAreaId({ areaId: val.id })
       treeData.value.map((treeDataItem, index) => {
         if (item.id == treeDataItem.id) {
@@ -231,12 +230,11 @@ export default defineComponent({
         }
       })
       if (child) {
-        
           if(selectId.value===child.id){
            selectId.value=''    
-        
       }else{
         selectId.value = child.id
+        mybus.emit('getCameraByParentId', val.id)
       }
       
       }
@@ -245,11 +243,8 @@ export default defineComponent({
     }
 
     watch(selectId, (newVal) => {
-
       if (newVal == '') { 
           mybus.emit('clearLeftSelect')
-        // mybus.emit('getCameraByParentId', '')
-        // mybus.emit('getListByParentId', '')
       }
     })
 
@@ -268,13 +263,15 @@ export default defineComponent({
     const showDown = (item, val) => {
       
       selectId.value = val.id
-     
+      //mybus.emit('getCameraByParentId', val.id)
       if (item.children) {
         val.show = !val.show
         // 取消选中
         if (!val.show) {
           selectId.value = ''
          // mybus.emit('clearLeftSelect')
+        }else{
+          mybus.emit('getCameraByParentId', val.id)
         }
       }
     }

front/src/views/home/infrastructureApplication.vue

@@ -2,7 +2,7 @@
  * @Author: Light
  * @Date: 2022-11-18 11:53:43
  * @LastEditors: Light
- * @LastEditTime: 2022-11-22 11:57:18
+ * @LastEditTime: 2022-11-22 14:50:32
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -39,7 +39,7 @@
       <a-list size="small" bordered :data-source="dataList.requested">
         <template #renderItem="{ item }">
           <a-list-item>
-            <div class="name">
+            <div class="name" @click="selectItem(item)">
               <a-tooltip>
                 <template #title>{{ item.cameraInfo.channelName }}</template>
                 {{ item.cameraInfo.channelName }}
@@ -96,6 +96,17 @@
       </template>
     </a-table>
   </a-modal>
+  <a-modal
+    v-if="dataList.selectItem.cameraInfo"
+    v-model:visible="showVisible"
+    :title="dataList.selectItem.cameraInfo.channelName"
+    :footer="null"
+    @cancel="clear"
+  >
+    <p>Some contents...</p>
+    <p>Some contents...</p>
+    <p>Some contents...</p>
+  </a-modal>
 </template>
 <script setup>
   import {
@@ -110,7 +121,8 @@
   import { message } from 'ant-design-vue'
   import mybus from '@/myplugins/mybus'
   import { useRouter } from 'vue-router'
-  const dataList = reactive({ toBeApplied: [], requested: [] })
+  const dataList = reactive({ toBeApplied: [], requested: [], selectItem: {} })
+  const showVisible = ref(false)
   // 待办
   const addWacFlag = ref(true)
   const delWacFlag = ref(true)
@@ -214,6 +226,15 @@
       }
     }
   }
+  const selectItem = (item) => {
+    if (item.approveStatus == '通过') {
+      dataList.selectItem = item
+      showVisible.value = true
+    } else {
+      dataList.selectItem = {}
+      showVisible.value = false
+    }
+  }
   const handleOk = () => {
     endProcess({ instanceId: instanceId.value }).then((res) => {
       if (res.data.code == 0) {
@@ -226,10 +247,13 @@
     })
   }
   const clear = () => {
+    console.log('清空')
     instanceId.value = ''
     showArr.value = []
     visible.value = false
     delApply.value = true
+    dataList.selectItem = {}
+    showVisible.value = false
   }
   const init = () => {
     willApplyCameraSelect().then((res) => {

front/src/views/home/infrastructurePageXha.vue

@@ -619,7 +619,8 @@
         v-model:visible="operationPopupFlag"
         :width="1000"
         :title="'视频监控点选择'"
-        footer={null}
+        destroyOnClose
+        footer="{null}"
       >
        <div style="width: 100%; display: flex; justify-content: center">
           <div
@@ -986,8 +987,8 @@
     mybus.off('openOperationPopup')
     mybus.on('openOperationPopup', (data) => {
       //console.log('pppppppppppppp',data);
-          cameraDataList.value = data;
+      cameraDataList.value = data
-           operationPopupFlag.value = true;
+      operationPopupFlag.value = true
     })
   })
   const selectedList = ref([])
@@ -2414,7 +2415,7 @@
     .map-contain {
       // width: 9.46rem;
       height: 6.9rem;
-      margin-left:0;
+      margin-left: 0;
       position: relative;
     }
   }
@@ -2623,14 +2624,14 @@
       overflow-y: auto;
     }
   }
-  .camera-popup{
+  .camera-popup {
     .ant-modal-body {
       height: 720px !important;
       overflow-y: hidden;
       overflow-x: hidden;
-      padding:14px;
+      padding: 14px;
     }
-    .ant-modal-footer{
+    .ant-modal-footer {
       display: none;
     }
   }