Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

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/components/upload/gxuploader.vue

@@ -70,7 +70,7 @@ export default {
   },
   methods: {
     openCameraCallBack(data) {
-
+      //alert(data);
       let params = {};
       try{
         let img = JSON.parse(data);
@@ -97,6 +97,10 @@ export default {
       });
     },
     useCamera(actionType) {
+      if(this.fileList.length >= this.maxCount){
+        this.$toast('最多上传'+this.maxCount+'张图片')
+        return
+      }
       window.openCameraCallBack = null;
       window.openCameraCallBack = this.openCameraCallBack;
       let parms = {};

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/problemItem/api.js

@@ -39,7 +39,7 @@ export function confirmDissent(data) {
 // 整改
 export function reform(data) {
   return request({
-    url: "/core/question/reform/" + data.id,
+    url: "/core/questionreform/reform/" + data.id,
     method: "put",
     data,
   });

src/views/menu/problemItem/detail.vue

@@ -61,8 +61,8 @@
             <van-cell title="整改日期" :label="formatDate(taskInfo.reform.executeTime,'YYYY-MM-DD')"></van-cell>
 <!--            <van-cell title="审核结果" :label="taskInfo.reform.executeStatus === 0 ? '已整改' : '未整改'"></van-cell>-->
             <van-cell title="整改描述" :label="taskInfo.reform.description"></van-cell>
-            <van-cell title="上传信息" v-if="taskInfo.reform.images.length > 0">
-              <div slot="label" v-if="taskInfo.reform.images.length > 0">
+            <van-cell title="上传信息" v-if="taskInfo.reform.images">
+              <div slot="label" v-if="taskInfo.reform.images && taskInfo.reform.images.length > 0">
                 <div class="nfc-img van-hairline--surround" v-for="(v,i) in taskInfo.reform.images" :key="v" @click="clickImage(taskInfo.reform.images,i)">
                   <img :src="imgUrl(v)" alt="" >
                 </div>
@@ -256,11 +256,8 @@ export default {
       }
       data.id = this.taskInfo.id;
       queryMethod(data).then((r) => {
-        if (r.data) {
-          this.$toast("提交成功");
-          this.$emit("success");
-          this.$router.go(-1);
-        }
+        this.$toast("提交成功");
+        this.$router.go(-1);
       });
     },
 

src/views/menu/problemItem/index.vue

@@ -2,7 +2,7 @@
   <div class="problem-item">
     <NavBar />
     <div class="page-container">
-      <van-search v-model="query.searchKey" class="van-hairline--bottom" placeholder="请输入搜索关键词" />
+<!--      <van-search v-model="query.searchKey" class="van-hairline&#45;&#45;bottom" placeholder="请输入搜索关键词" @search="refreshData" />-->
       <org-tree v-model="query.orgId"  @change="refreshData"></org-tree>
       <div class="search-flex">
         <select-cell
@@ -13,7 +13,7 @@
           v-model="query.confirmStatus"
           :data-list="getDictItem('question_confirm_status')"
           @change="refreshData"/>
-        <date-cell title="日期"  v-model="query.submitTime" @change="refreshData"/>
+        <date-cell title="日期"  v-model="query.reformDate" @change="refreshData"/>
       </div>
       <div class="card-list">
         <Scroll
@@ -97,7 +97,7 @@ export default {
   data() {
     return {
       query:{
-        submitTime:`${formatDate(new Date(),'YYYY-MM-DD')}`,
+        reformDate:`${formatDate(new Date(),'YYYY-MM-DD')}`,
         orgId:null,
         confirmStatus:null,
         pageSize:10,
@@ -144,7 +144,7 @@ export default {
     //初始化数据
     initData(){
       this.query.orgId = this.orgId;
-      this.query.submitTime = formatDate(new Date(),'YYYY-MM-DD');
+      this.query.reformDate = formatDate(new Date(),'YYYY-MM-DD');
       this.getDataList();
     },
     //获取数据列表
@@ -210,8 +210,9 @@ export default {
 }
 .card-list{
   padding:0 20px 20px 20px;
-  height: calc(100vh - 514px);
+  height: calc(100vh - 408px);
   overflow:  auto;
+  -border:1px solid red;
 }
 .card-num{
   display: flex;

src/views/menu/securityCheckRegister/addCheck.vue

@@ -119,6 +119,7 @@ export default {
           return
         }
         res.rows.forEach(v=>{
+          v.isAdd = 1;
           v.checked = false;
           v.pointId = v.id;
         });

src/views/menu/securityCheckRegister/detail.vue

@@ -86,12 +86,13 @@
                   />
                   <van-field
                     required
+                    :maxlength="200"
                     v-model="item.remark"
                     rows="1"
                     autosize
                     label="情况描述："
                     type="textarea"
-                    placeholder="请输入"
+                    placeholder="请输入(200字以内)"
                   />
                   <div class="upload-box">
                     <uploader v-if="enable" :maxCount="5" v-model="item.imgData" />
@@ -197,6 +198,16 @@ export default {
     window.openNFCScanCallBack = null
   },
   methods: {
+    //长度校验
+    validator(val) {
+      let len = val.length;
+      if( len > 5) {
+        this.$toast.fail('问题情况输入长度不能超过200');
+        return true
+      }else {
+        return false
+      }
+    },
     getNfcState(arr){
         arr = arr || [];
         let num = 0;
@@ -312,6 +323,7 @@ export default {
           if (!existingPoint) {
             console.log(existingItem, 'point添加成功')
             this.$nextTick(() => {
+              valItem.isAdd = 1;
               existingItem.pointList.push(valItem)
               this.active = true
             })
@@ -321,6 +333,7 @@ export default {
         } else {
           console.log(valItem, 'item添加成功')
           this.checkList.push({
+            isAdd:1,
             itemId: valItem.itemId,
             itemName: valItem.itemName,
             pointList: [valItem]

src/views/menu/securityCheckRegister/index.vue

@@ -4,31 +4,37 @@
     <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 class="org-line van-hairline--bottom">
-            <van-row>
-              <van-col span="24">
-                <org-tree v-model="query.beCheckedOrgId" clearable placeholder="选择受检机构" @change="refreshData"></org-tree>
-              </van-col>
-            </van-row>
+        </div> -->
+
+<!--        <div class="org-line van-hairline&#45;&#45;bottom">-->
+<!--            <van-row>-->
+<!--              <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'>
+           <org-tree v-model="query.beCheckedOrgId" clearable placeholder="选择受检机构" @change="refreshData"></org-tree>
+           <date-cell title="日期"  v-model="query.taskTime" date-type="date" @change="refreshData"/>
+<!--           <search-select-cell-->
+<!--            class="van-hairline&#45;&#45;right"-->
+<!--            title="检查角色"-->
+<!--            :border="false"-->
+<!--            v-model="query.roleIds"-->
+<!--            :dataList="rolesList"-->
+<!--            :prop="prop"-->
+<!--            @change="refreshData"/> </div> -->
           </div>
-        <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>
       </div>
 
       <div class="card-list">
@@ -132,10 +138,10 @@ export default {
   mounted() {
     this.initData();
     this.query.checkOrgId = this.orgId;
-    this.getRoleList();
+    // this.getRoleList();
   },
   computed:{
-    ...mapGetters(['orgId','dictionary']),
+    ...mapGetters(['orgId','dictionary','roleList']),
   },
   methods: {
     formatDate,
@@ -187,6 +193,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'){
@@ -267,7 +274,7 @@ export default {
   }
   .card-list{
     padding:0 20px 20px 20px;
-    height: calc(100vh - 496px);
+    height: calc(100vh - 318px);
     overflow: auto;
   }
   .list-item{

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"