安全检查登记删除检查机构、检查角色条件

package.json

@@ -19,6 +19,7 @@
     "browser-fs-access": "^0.34.1",
     "core-js": "^3.23.3",
     "dayjs": "^1.11.9",
+    "echarts": "^5.4.3",
     "js-image-compressor": "^2.0.0",
     "liquor-tree": "^0.2.70",
     "pdfjs-dist": "2.5.207",

src/config/env.development.js

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

src/views/menu/cockpit/index.vue

@@ -0,0 +1,32 @@
+<template>
+    <div class="index-container">   
+
+    </div>
+</template>
+
+<script>  
+import TopBar from '@/components/TopBar'  
+export default {
+    name: 'works',
+    components: { TopBar },
+    data(){
+        return {
+            tabOptions:[
+                {
+                    value:1,
+                    label:'履职情况'
+                },
+                {
+                    value:2,
+                    label:'机构统计'
+                },
+                {
+                    value:3,
+                    label:'隐患整改'
+                },
+            ]
+        }
+    }
+}
+</script>
+

src/views/menu/securityCheckRegister/index.vue

@@ -4,31 +4,35 @@
     <div class="statistics-container">
       <!--   搜索   -->
       <div style="background-color: #fff;">
-        <div class="org-line van-hairline--bottom">
+        <!--需求改为只查看本检查机构、登录角色的任务-->
+        <!-- <div class="org-line van-hairline--bottom">
           <van-row>
             <van-col span="24">
               <org-tree v-model="query.checkOrgId" placeholder="选择检查机构" @change="changeOrgId"></org-tree>
             </van-col>
           </van-row>
-        </div>
+        </div> -->
+        
         <div class="org-line van-hairline--bottom">
             <van-row>
-              <van-col span="24">
+              <van-col span="12">
                 <org-tree v-model="query.beCheckedOrgId" clearable placeholder="选择受检机构" @change="refreshData"></org-tree>
               </van-col>
+              <van-col span="12">
+                <date-cell title="日期"  v-model="query.taskTime" date-type="date" @change="refreshData"/>
+              </van-col>
             </van-row>
           </div>
-        <div class='search-flex'>
-            <search-select-cell
+        <!-- <div class='search-flex'> -->
+            <!-- <search-select-cell
               class="van-hairline--right"
               title="检查角色"
               :border="false"
               v-model="query.roleIds"
               :dataList="rolesList"
               :prop="prop"
-              @change="refreshData"/>
-            <date-cell title="日期"  v-model="query.taskTime" date-type="date" @change="refreshData"/>
-        </div>
+              @change="refreshData"/> </div> -->
+           
       </div>
 
       <div class="card-list">
@@ -131,11 +135,11 @@ export default {
   },
   mounted() {
     this.initData();
-    this.query.checkOrgId = this.orgId;
-    this.getRoleList();
+    this.query.checkOrgId = this.orgId;  
+    // this.getRoleList();
   },
   computed:{
-    ...mapGetters(['orgId','dictionary']),
+    ...mapGetters(['orgId','dictionary','roleList']),
   },
   methods: {
     formatDate,
@@ -187,6 +191,7 @@ export default {
         ...this.query
       }
       if(!this.query.checkOrgId) return this.$toast('请选择机构');
+      data.roleIds= this.roleList.map(v=>{return v.roleId})
       dataList(data).then(res=>{
         console.log(res,'ressssssss')
         if(res.total === '0'){
@@ -257,7 +262,7 @@ export default {
     >div{
       width: 50%;
     }
-  }
+  } 
   .org-label{
     height: 90px;
     width: 100%;

yarn.lock

@@ -3154,6 +3154,14 @@ easy-stack@1.0.1:
   resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz#8afe4264626988cabb11f3c704ccd0c835411066"
   integrity sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==
 
+echarts@^5.4.3:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.4.3.tgz#f5522ef24419164903eedcfd2b506c6fc91fb20c"
+  integrity sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==
+  dependencies:
+    tslib "2.3.0"
+    zrender "5.4.4"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -5865,6 +5873,11 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
+tslib@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+
 tslib@^2.0.3:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
@@ -6380,3 +6393,10 @@ yargs@^16.0.0:
     string-width "^4.2.0"
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
+
+zrender@5.4.4:
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.4.4.tgz#8854f1d95ecc82cf8912f5a11f86657cb8c9e261"
+  integrity sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==
+  dependencies:
+    tslib "2.3.0"