coys пре 2 година
родитељ
комит
9a9e288438

+ 1 - 1
src/config/env.development.js

@@ -2,7 +2,7 @@
 module.exports = {
   title: 'soc-app-dev',
   baseUrl: 'http://localhost:9018', // 项目地址
-  baseApi: '/dev', // 本地api请求地址,注意:如果你使用了代理,请设置成'/'
+  baseApi: '/luowei', // 本地api请求地址,注意:如果你使用了代理,请设置成'/'
   APPID: 'xxx',
   APPSECRET: 'xxx',
   $cdn: 'https://www.sunniejs.cn/static'  //静态资源

+ 18 - 18
src/router/router.config.js

@@ -29,24 +29,24 @@ export let routers = [
     component: () => import('@/views/menu/monitoringCall/components/consultInfo'),
     meta: { title: '监控调阅', keepAlive: true }
   },
-  {
-    path: '/addInfo/:id',
-    name: 'addInfo',
-    component: () => import('@/views/menu/monitoringCall/components/addInfo'),
-    meta: { title: '添加监控调阅', keepAlive: false }
-  },
-  {
-    path: '/update/:id',
-    name: 'update',
-    component: () => import('@/views/menu/monitoringCall/components/addInfo'),
-    meta: { title: '编辑监控调阅', keepAlive: false }
-  },
-  {
-    path: '/info/:id',
-    name: 'info',
-    component: () => import('@/views/menu/monitoringCall/components/addInfo'),
-    meta: { title: '监控调阅详情', keepAlive: false }
-  },
+  // {
+  //   path: '/addInfo/:id',
+  //   name: 'addInfo',
+  //   component: () => import('@/views/menu/monitoringCall/components/addInfo'),
+  //   meta: { title: '添加监控调阅', keepAlive: false }
+  // },
+  // {
+  //   path: '/update/:id',
+  //   name: 'update',
+  //   component: () => import('@/views/menu/monitoringCall/components/addInfo'),
+  //   meta: { title: '编辑监控调阅', keepAlive: false }
+  // },
+  // {
+  //   path: '/info/:id',
+  //   name: 'info',
+  //   component: () => import('@/views/menu/monitoringCall/components/addInfo'),
+  //   meta: { title: '监控调阅详情', keepAlive: false }
+  // },
   {
     path: '/training',
     name: 'training',

+ 0 - 465
src/views/menu/monitoringCall/components/addInfo.vue

@@ -1,465 +0,0 @@
-<template>
-  <div>
-    <NavBar />
-    <div :class="disabled? 'bigBoxInfo':'bigBox'">
-      <van-row>
-        <van-col span="24">
-          <!-- <van-cell title="任务名称" value="每周监控调阅(0501~0507)" /> -->
-          <div class="textTitle">任务名称:{{ taskData?.taskName }}</div>
-        </van-col>
-        <van-col span="24">
-          <!-- <van-cell title="调阅开始时间" value="2023-05-05 10:12" /> -->
-          <div class="text">调阅开始时间:{{ taskData?.taskStartTime }}</div>
-        </van-col>
-      </van-row>
-     
-      
-      <!-- <van-row>
-          <van-col class="vancol" span="6">{{ item.project | proJectListFilter(this_) }}</van-col>
-          <van-col class="vancol" span="18"
-            ><span :style="{ color: item.situation == 1 ? '#ffa05c' : '#12b533' }">{{
-              item.situation | dictFilter(this_)
-            }}</span></van-col
-          >
-        </van-row> -->
-      <!-- 主机选择 -->
-      <van-row>
-        <van-col span="24">
-          <van-field
-            required
-            v-model="host"
-            is-link
-            readonly
-            label="监控主机"
-            placeholder=""
-            :disabled="disabled"
-            @click="showHost = true"
-          />
-          <van-popup v-model="showHost" round position="bottom">
-            <van-picker
-              title="监控主机"
-              show-toolbar
-              :columns="hostList"
-              @confirm="onConfirm"
-              @cancel="showHost = false"
-              @change="onChange"
-            >
-              <template #option="option">
-                <div style="display: flex; flex-direction: column; align-items: center">
-                  <div>{{ option.deviceName }}</div>
-                </div>
-              </template>
-            </van-picker>
-          </van-popup></van-col
-        >
-      </van-row>
-      <!-- 视频通道 -->
-      <van-row>
-        <van-col span="24">
-          <van-field
-            required
-            v-model="fieldValue"
-            :disabled="disabled || ishost"
-            is-link
-            readonly
-            label="视频通道"
-            placeholder=""
-            @click="showStatus = true"
-          />
-          <van-popup v-model="showStatus" :disabled="ishost" round position="bottom">
-            <van-picker
-              title="视频通道"
-              show-toolbar
-              :columns="columns"
-              @confirm="onConfirmPassage"
-              @cancel="showStatus = false"
-              @change="onChange"
-            >
-              <template #option="option">
-                <div style="display: flex; flex-direction: column; align-items: center">
-                  <div>{{ option.deviceName }}</div>
-                </div>
-              </template>
-            </van-picker>
-          </van-popup></van-col
-        >
-      </van-row>
-      <van-row>
-        <van-col span="24" v-if="!disabled">
-          <van-notice-bar color="#1989fa" background="#ecf9ff" left-icon="info-o">
-            请选择实际调阅项目进行填写,不需要编辑所有项目
-          </van-notice-bar>
-        </van-col>
-      </van-row>
-
-      <div>
-        <van-form ref="vform">
-          <!-- 主体选择项 -->
-          <van-collapse v-model="activeNames" :is-link="false">
-            <van-collapse-item :name="item.dictValue" v-for="item in dataList" :key="item.dictValue">
-              <template #title>
-                <div>
-                  <van-checkbox :disabled="disabled" @change="checkHandler($event, item)"  v-model="item.isChecked" shape="square">{{
-                    item.dictLabel
-                  }}</van-checkbox>
-                </div>
-              </template>
-
-              <van-row>
-                <van-col span="24">
-                  <van-dropdown-menu>
-                    <van-dropdown-item
-                      :disabled ="disabled"
-                      v-model="item.situation"
-                      @change="changeHandler($event, item)"
-                      :options="dictList"
-                    />
-                  </van-dropdown-menu>
-                </van-col>
-              </van-row>
-              <van-form>
-                <van-row v-if="item.situation == '1'">
-                  <van-col span="24">
-                    <van-field
-                      v-model="item.abnormalIllustrate"
-                      rows="2"
-                      autosize
-                      :disabled="disabled"
-                      required
-                      :maxlength="50"
-                      label="异常说明"
-                      type="textarea"
-                      placeholder="请输入异常说明"
-                      show-word-limit
-                      :rules="[{ required: true, message: '内容不能为空' }]"
-                    />
-                  </van-col>
-                </van-row>
-              </van-form>
-            </van-collapse-item>
-          </van-collapse>
-        </van-form>
-      </div>
-
-      <!-- 底部按钮 -->
-      <div class="bottomClass" >
-        <van-row>
-          <van-col span="24">
-            <van-button type="info" v-if="!disabled"  @click="addForm">{{
-              $route.params.id.split('_')[2] == 'edit' ? '修改' : '添加'
-            }}</van-button>
-          </van-col>
-        </van-row>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import NavBar from '@/components/NavBar'
-// 主机列表组件
-import MonitoingList from './monitoringList.vue'
-import { Col, Row, Dialog, Icon, Toast, Picker } from 'vant'
-import {
-  registrationList,
-  addInfo,
-  updateInfo,
-  getEditInfo,
-  getSysDeviceByHostId,
-  getorgHost
-} from '@/api/toConsult.js'
-import { mapGetters } from 'vuex'
-
-export default {
-  props:{
-    //主机ID
-    hostId:{
-      type:String,
-      default:''
-    },
-    //通道
-    videoChannel:{
-      type:String,
-      default:''
-    }
-  },
-  data() {
-    return {
-      disabled: '', //是否禁用
-      taskId: '', //任务ID
-      falg: false, //校验是否通过
-      dictList: [], //异常正常字典
-      columns: [], //通道列表
-      hostList: [], //主机列表
-      showStatus: false, //通道显示隐藏
-      showHost: false, //主机显示隐藏
-      checked: false,
-      checked1: false,
-      message: '',
-      ishost: true,
-      fieldValue: '',
-      host: '', //主机名称
-      hostId: '', //主机ID
-      videoChannel: '', //通道ID
-      value1: 0,
-      dicts: ['core_registration_project'],
-      option1: [
-        { text: '异常', value: 0 },
-        { text: '正常', value: 1 }
-      ],
-      activeNames: [''],
-      dataList: [], //列表
-      taskData: []
-    }
-  },
-  components: {
-    NavBar,
-    Dialog,
-    Icon,
-    Picker,
-    Col,
-    Row,
-    MonitoingList
-  },
-  computed: {
-    monitor() {
-      return 'monitor'
-    },
-    ...mapGetters(['orgName', 'orgId'])
-  },
-  created() {
-    this.init()
-    this.disabled = +this.$route.params.id.split('_')[3] ? true : false
-    console.log(this.disabled)
-  },
-
-  mounted() {},
-  methods: {
-    //根据卡片ID获取详情数据
-    getInfoHandler() {
-      console.log(this.dataList);
-      //判断当前路由的信息是新增还是编辑
-      if ((this.$route.params.id.split('_')[2] == 'edit') && this.dataList.length > 0) {
-        //当前是编辑
-        //获取卡片详情数据
-        getEditInfo(this.$route.params.id.split('_')[1]).then(res => {
-          let { data, msg, code } = res
-          if (code == 200) {
-            
-            ;(this.activeNames = ['']), //滞空选中
-              this.dataList.forEach(item => {
-                data.coreMonitoringTaskMonitorInfoList.forEach(i => {
-                  if (i.project == item.dictValue) {
-                    //查询赋值
-                    this.$set(item, 'isChecked', true)
-                    this.$set(item, 'situation', i.situation)
-                    this.$set(item, 'abnormalIllustrate', i.abnormalIllustrate)
-                    this.activeNames.push(i.project)
-                  }
-                })
-              })
-            //赋值主机&通道名称
-            this.host = data.hostName
-            this.hostId = data.host
-            this.fieldValue = data.videoChannelName
-            this.videoChannel = data.videoChannel
-            console.log(this.hostId)
-            this.getHostTDlist(this.hostId)
-          }
-        })
-      }
-    },
-    //项目初始化获取数据
-    init() {
-      //获取组织机构数据
-      registrationList({ taskId: this.$route.params.id.split('_')[0] }).then(res => {
-        let { code, data, msg } = res
-        if (code == 200) {
-          this.taskData = data
-          
-          this.getHostList()
-        }
-      })
-      
-      this.getDictHandler('core_registration_project', res => {
-        this.dataList = JSON.parse(JSON.stringify(res))
-        this.dataList.forEach(item => {
-          this.$set(item, 'situation', '0') //异常情况初始化默认值
-          this.$set(item, 'abnormalIllustrate', '') //情况说明初始化默认值
-        })
-        this.getInfoHandler() //获取详情
-      })
-      //获取异常情况字典
-      this.getDictHandler('core_check_type', res => {
-        this.dictList = res
-        this.dictList.forEach(item => {
-          item.text = item.dictLabel
-          item.value = item.dictValue
-        })
-      })
-    },
-
-    onConfirm(value, index) {
-      this.host = this.hostList[index].deviceName
-      this.hostId = this.hostList[index].id
-      this.getHostTDlist(this.hostId)
-    },
-    //通过机构ID获取主机
-    getHostList(){
-//获取当前任务机构下主机列表
-     
-getorgHost({ orgId: this.taskData.orgId, monitorId: this.$route.params.id.split('_')[1] }).then(res => {
-        let { code, data, msg } = res
-        if (code == 200) {
-          this.hostList = data
-        }
-      })
-    },
-    //通过主机ID获取通道列表
-    getHostTDlist(id) {
-      //通过主机ID获取通道列表
-      getSysDeviceByHostId({ hostId: id, monitorId: this.$route.params.id.split('_')[1] }).then(res => {
-        let { code, data, msg } = res
-        if (code == 200) {
-          this.columns = data
-          console.log(data)
-          this.ishost = false
-          this.showHost = false
-        }
-      })
-    },
-    onConfirmPassage(value, index) {
-      this.fieldValue = this.columns[index].deviceName
-      this.videoChannel = this.columns[index].id
-      this.showStatus = false
-    },
-
-    onChange(picker, value, index) {},
-
-    onFailed(errorInfo) {
-      this.falg = true
-    },
-    changeHandler(val, item) {
-      
-      if (val == '0') {
-        item.abnormalIllustrate = ''
-      }
-    },
-    checkHandler(val,item){
-      if (!val) {
-        item.abnormalIllustrate = ''
-        item.situation = '0'
-      }
-    },
-    onCancel() {
-      Toast('取消')
-    },
-    //表单提交前校验
-    beforSubmitV() {
-      this.falg = false
-      if (this.host == '' && this.hostId == '') {
-        Toast('监控主机不能为空!')
-        this.falg = true
-        return
-      }
-      if (this.fieldValue == '' && this.videoChannel == '') {
-        Toast('视频通道不能为空!')
-        this.falg = true
-        return
-      }
-      console.log(this.dataList)
-
-      this.dataList.forEach(item => {
-        if (item.situation == '1' && item.abnormalIllustrate == '') {
-          Toast(`${item.dictLabel}的异常情况说明不能为空!`)
-          this.falg = true
-        }
-      })
-    },
-    //表单提交
-    addForm() {
-      this.beforSubmitV()
-
-      if (this.falg) {
-        //校验不通过
-      } else {
-        let list = []
-        this.activeNames.forEach(item => {
-          this.dataList.forEach(i => {
-            if (item == i.dictValue) {
-              i.project = i.dictValue
-              list.push(i)
-            }
-          })
-        })
-        if (this.$route.params.id.split('_')[2] == 'edit') {
-          //编辑提交
-          updateInfo({
-            host: this.hostId,
-            // taskRegistrationId:+this.$route.params.id.split('_')[1],
-            videoChannel: this.videoChannel,
-            id: this.$route.params.id.split('_')[1],
-            coreMonitoringTaskMonitorInfoList: list
-          }).then(res => {
-            let { data, msg, code } = res
-            if (code == 200) {
-              Toast('编辑成功!')
-              this.$router.push('/consultInfo/' + this.$route.params.id.split('_')[0])
-            }
-            this.falg = false
-          })
-        } else {
-          //新增提交
-          addInfo({
-            host: this.hostId,
-            // taskRegistrationId:+this.$route.params.id.split('_')[1],
-            videoChannel: this.videoChannel,
-            taskRegistrationId: this.$route.params.id.split('_')[1],
-            coreMonitoringTaskMonitorInfoList: list
-          }).then(res => {
-            let { data, msg, code } = res
-            if (code == 200) {
-              Toast('添加成功!')
-              this.$router.push('/consultInfo/' + this.$route.params.id.split('_')[0])
-            }
-            this.falg = false
-          })
-        }
-      }
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.bigBox {
-  height: calc(100vh - 260px);
-  overflow: scroll;
-}
-.bigBoxInfo {
-  height: calc(100vh);
-  overflow: scroll;
-}
-.van-button {
-  width: 100%;
-  margin-top: 10px;
-  border-radius: 10px;
-}
-.bottomClass {
-  position: fixed;
-  width: 100%;
-  bottom: 0%;
-}
-.condition {
-  font-size: 50px !important;
-  line-height: 50px;
-  color: #1989fa;
-}
-.textTitle {
-  font-size: 40px;
-  font-weight: bold;
-  padding: 20px;
-}
-.text {
-  padding: 20px;
-  font-size: 26px;
-}
-</style>

+ 1 - 0
src/views/menu/monitoringCall/components/consultInfo.vue

@@ -7,6 +7,7 @@
 
           <div class="textTitle">{{ taskData?.taskName }}</div>
           <div class="text">调阅开始时间:{{ taskData?.taskStartTime }}</div>
+          <div class="text" v-if="taskData?.taskStatus == 2">调阅结束时间:{{ taskData?.taskEndTime }}</div>
         </div>
           
           <!-- 进行调阅 -->

+ 2 - 6
src/views/menu/monitoringCall/components/monitoringList.vue

@@ -1,12 +1,7 @@
 <template>
   <div>
     <div class="topBox">
-      <!-- <div>
-        <van-button class="buttoncls" size="mini" type="info" v-if="taskStatus == '2'" @click="editHandler(1)"
-          >详情</van-button
-        >
-        <img class="img" v-else @click="editHandler(0)" src="../../../../assets/img/icon/edit-square.png" alt="" />
-      </div> -->
+      
       <div class="title" style="padding-top: 10px; margin-top: 0px">监控主机:{{ list?.hostName }}</div>
       <div class="title">视频通道:{{ list?.videoChannelName }}</div>
       <van-row class="List titleList">
@@ -122,6 +117,7 @@ export default {
 .title {
   margin-top: 10px;
   margin-bottom: 10px;
+  margin-left: 20px;
 }
 .van-row {
   

+ 3 - 0
src/views/menu/monitoringCall/components/taskInfo.vue

@@ -141,6 +141,9 @@ export default {
           item.situation='0'
         } 
           
+      }else{
+        item.situation=''
+        item.abnormalIllustrate=''
       }
       
     },

+ 1 - 1
src/views/menu/monitoringCall/index.vue

@@ -157,7 +157,7 @@ export default {
   mounted() {
     setTimeout(() => {
       this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
-    }, 1000)
+    }, 1500)
     
     this.init()
   },