Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_app into dev

src/assets/css/index.scss

@@ -14,3 +14,8 @@ body .app {
   padding-bottom: 100px;
   background-color: rgb(245, 245, 249);
 }
+
+.van-empty__image{
+  height: 223px;
+  width: 223px;
+}

src/components/dateCell/index.vue

@@ -3,7 +3,7 @@
     <van-cell v-if="disabled" :title="title" :label="selected" />
     <van-cell v-else :title="title" is-link :label="selected" @click="clickItem">
       <template #right-icon>
-        <van-icon name="underway-o" style="font-weight: 600;line-height: inherit;color:#008cd6;" />
+        <van-icon name="underway-o" class="date-icon"/>
       </template>
     </van-cell>
     <van-popup v-model="showPicker" round  position="bottom" :close-on-popstate="true" get-container="#app">
@@ -96,6 +96,13 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.date-icon{
+  font-weight: 500;
+  line-height: inherit;
+  width: 42px;
+  height: 42px;
+  color: #008cd6;
+  font-size: 42px;
+}
 </style>

src/components/orgTree/index.vue

@@ -8,7 +8,10 @@
       :backspaceRemoves="false"
       placeholder="请选择归属机构"
       :normalizer="tenantIdnormalizer"
-      :show-count="true">
+      :show-count="true"
+      :noChildrenText="''"
+      
+    >
     </tree-select>
   </div>
 </template>
@@ -65,7 +68,7 @@ export default {
         this.$nextTick(() => {
           this.treeData = res.data
         })
-        console.log(res, '3333')
+      
       })
     },
     onSelect(value) {
@@ -99,7 +102,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;

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'  //静态资源

src/utils/globalMixins.js

@@ -45,7 +45,8 @@ export default {
         getDict( dict ).then(res => {
           let { code, data } = res;
           if (code == 200) {
-            this[dict] = data;
+            this.observers[dict] = data;
+            //this[dict] = data;
             //return  this[dict].find(v=> s == v.dictValue).dictLabel;
           }
         })

src/views/home/menu.vue

@@ -3,9 +3,9 @@
     <top-bar></top-bar>
     <div class="menu-list">
       <div class="menu-list-item" v-for="(v,i) in menuList" :key="i">
-        <p @click="onclick">{{v.name}}</p>
+        <p @click="onclick">{{v.meta.title}}</p>
         <van-grid border :column-num="3">
-          <van-grid-item v-for="(item,index) in v.list" :key="index" icon="smile-o" :text="item.menu" :to="item.path" />
+          <van-grid-item v-for="(item,index) in v.children" :key="index" :icon="item.meta.icon" :text="item.meta.title" :to="item.path" />
         </van-grid>
 <!--          <li v-for="(item,index) in v.list" :key="index">-->
 <!--            <div></div>-->
@@ -141,7 +141,7 @@ export default {
     getMenuList(){
       getMenu().then(res=>{
         console.log(res,'res')
-        //this.menuList = res.data
+        this.menuList = res.data
       })
     },
     onclick(){

src/views/menu/educationStatistics/index.vue

@@ -73,6 +73,7 @@ export default {
     getPlanList(){
       planList(this.query.orgId).then(res=>{
         this.planList = res.data;
+        if(res.data.length === 0) return this.$toast('暂无教育计划');
         this.query.planId = res.data[0].id;
         this.query.date = formatDate(new Date(),'YYYY-MM');
         this.getDataList();
@@ -82,7 +83,7 @@ export default {
       let data = {
         ...this.query
       }
-      data.date = `${this.query.date}-01`;
+      data.date = this.query.date && `${this.query.date}-01`;
       if(!this.query.orgId) return this.$toast('请选择机构');
       dataList(data).then(res=>{
         this.dataList = res.data;

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获取通道列表

src/views/menu/monitoringCall/index.vue

@@ -2,6 +2,7 @@
   <div>
     <NavBar />
     <van-row>
+      
       <van-col span="24">
         <org-tree v-model="cascaderValue" @change="getDataList"></org-tree>
         <!-- <van-field
@@ -73,7 +74,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 +87,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)"
@@ -131,7 +134,7 @@ export default {
       value1: JSON.parse(sessionStorage.getItem('SET_USER_ORGNAME')) || '', //输入框model
       currentDate: newDateMonth(),
       presentDate: '', //当前时间
-      cascaderValue: JSON.parse(sessionStorage.getItem('SET_USER_ORGID')) || '',
+      cascaderValue: '',
       columns: ['全部'],
       statusList: [], //调阅状态字典数组
       show: false,
@@ -178,6 +181,7 @@ export default {
   },
   created() {
     this.init()
+   
     this.presentDate = this.presentDateCpd
   },
   computed: {
@@ -185,7 +189,10 @@ export default {
       return new Date(+newDateMonth().split('-')[0], +newDateMonth().split('-')[1] - 1)
     }
   },
-  mounted() {},
+  mounted() {
+    this.cascaderValue=(JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID'))+'')
+    console.log(this.cascaderValue);
+  },
   methods: {
     //机构变化
     getDataList(v) {
@@ -400,18 +407,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 +427,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 +559,8 @@ export default {
     text-decoration: underline;
   }
 }
+.bttons{
+  color: #1989fa;
+  border: none;
+}
 </style>