coys пре 2 година
родитељ
комит
304ab3870f

+ 5 - 1
src/components/orgTree/index.vue

@@ -7,6 +7,8 @@
       placeholder="请选择归属机构"
       :normalizer="tenantIdnormalizer"
       :show-count="true"
+      :noChildrenText="''"
+      
     >
     </tree-select>
   </div>
@@ -95,7 +97,9 @@ export default {
     border: none;
     border-bottom: 1px solid #dcdfe6;
   }
-
+  .vue-treeselect__icon-warning{
+    display: none;
+  }
   .vue-treeselect__placeholder,
   .vue-treeselect__single-value {
     height: 90px;

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

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

+ 14 - 8
src/views/menu/monitoringCall/components/addInfo.vue

@@ -254,16 +254,11 @@ export default {
         let { code, data, msg } = res
         if (code == 200) {
           this.taskData = data
+          
+          this.getHostList()
         }
       })
-      //获取当前登录人机构下主机列表
-
-      getorgHost({ orgId: this.orgId, monitorId: this.$route.params.id.split('_')[1] }).then(res => {
-        let { code, data, msg } = res
-        if (code == 200) {
-          this.hostList = data
-        }
-      })
+      
       this.getDictHandler('core_registration_project', res => {
         this.dataList = JSON.parse(JSON.stringify(res))
         this.dataList.forEach(item => {
@@ -287,6 +282,17 @@ export default {
       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获取通道列表

+ 17 - 10
src/views/menu/monitoringCall/index.vue

@@ -73,7 +73,9 @@
     <!-- 调阅列表 -->
     <div class="bigbox">
       <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+        <!-- <van-cell :title="item.title"  v-for="item in taskList" :key="item.id" is-link :value="item.taskName" arrow-direction="down" /> -->
         <van-panel :title="item.title" v-for="item in taskList" :key="item.id" class="card" status="状态">
+
           <template #header>
             <div class="titleClass">
               <div class="title">
@@ -84,7 +86,7 @@
                   >开始调阅</van-button
                 >
                 <van-button
-                  type="info"
+                  class="bttons"
                   size="small"
                   v-else-if="item.status != 0 && item.status != 3"
                   @click="lookInfoHandler(item.id, item.status)"
@@ -400,18 +402,19 @@ export default {
   }
 }
 .monitor {
-  color: white;
+  color: #ed6a0c;
   padding-left: 10px;
   padding-right: 10px;
   font-size: 20px;
   bottom: 5%;
   right: 2%;
   position: absolute;
-  border-radius: 10px;
-  background-color: #8cb585;
+  // border-radius: 10px;
+  // background-color: #8cb585;
 }
 .monitored {
-  color: white;
+  color: #1989fa;
+ 
   padding-left: 10px;
   padding-right: 10px;
   bottom: 5%;
@@ -419,19 +422,19 @@ export default {
 
   position: absolute;
   font-size: 20px;
-  border-radius: 10px;
-  background-color: #1989fa;
+  // border-radius: 10px;
+  // background-color: #1989fa;
 }
 .monitoring {
-  color: white;
+  color: #25da0b;
   padding-left: 10px;
   padding-right: 10px;
   bottom: 5%;
   right: 2%;
   position: absolute;
   font-size: 20px;
-  border-radius: 10px;
-  background-color: #25da0b;
+  // border-radius: 10px;
+  // background-color: #25da0b;
 }
 .waringtoring {
   color: white;
@@ -551,4 +554,8 @@ export default {
     text-decoration: underline;
   }
 }
+.bttons{
+  color: #1989fa;
+  border: none;
+}
 </style>