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

src/components/SearchSelectCell/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="search-select-cell">
-    <van-cell v-if="disabled" :required="required" :title="title" :label="nameListStr"/>
-    <van-cell v-else  :required="required" :title="title" :label="nameListStr" is-link  @click="clickItem"/>
+    <van-cell v-if="disabled" :required="required" :title="title" :border="border" :label="nameListStr"/>
+    <van-cell v-else  :required="required" :title="title" :label="nameListStr" :border="border" is-link  @click="clickItem"/>
     <van-popup
       class="search-data-popup"
       round lazy-render
@@ -74,6 +74,10 @@ export default {
       type:Boolean,
       default:true
     },
+    border:{
+      type:Boolean,
+      default:true
+    },
     //自定义字段
     prop:{
       type: Object,
@@ -116,8 +120,12 @@ export default {
   },
   computed: {
     nameListStr() {
-      const list = this.dataList.filter(item => this.selected.includes(item.id));
-      return list.map(item => item.name).join(',')
+      if(this.selected.length == 0) {
+        return '无';
+      }else {
+        const list = this.dataList.filter(item => this.selected.includes(item.id));
+        return list.map(item => item.name).join(',')
+      }
     },
   },
   methods:{

src/components/TopBar.vue

@@ -163,7 +163,7 @@ export default {
   background-size: 100% 100%;
   padding: 40px 40px 20px 40px;
   text-shadow: 0 1px 3px #666;
-  box-shadow: 0 1px 8px #ccc;
+  box-shadow: 0 1px 10px #5ebaee;
   color: #fff;
   > div {
     width: 100%;

src/components/scroll/scroll.vue

@@ -78,7 +78,7 @@ export default {
         console.log('刷新滚动容器')
         this.bs.finishPullUp(); //  加载更多完成
         this.bs.refresh();
-      },200)
+      },500)
     },
     // 初始化 better-scroll
     initScroll() {

src/router/router.config.js

@@ -122,7 +122,7 @@ export let routers = [
         path: '/menu',
         name: 'menu',
         component: () => import('@/views/home/menu'),
-        meta: { title: '菜单', keepAlive: true },
+        meta: { title: '菜单', keepAlive: false },
       },
       {
         path: '/isMy',

src/views/menu/NFCmanage/api.js

@@ -0,0 +1,47 @@
+import request from "@/utils/request";
+//获取列表
+export function dataList(data) {
+  return request({
+    url: "/core/question/list",
+    method: "get",
+    params: data,
+  });
+}
+
+//获取详情
+export function taskDetails(orgId){
+  return request({
+    url: "/core/question/info/"+orgId,
+    method: "get",
+  });
+}
+
+// 问题确认
+export function confirm(data) {
+  return request({
+    url: "/core/question/confirm/" + data.id,
+    method: "put",
+    data,
+    showLoading: true,
+  });
+}
+
+// 异议审批
+export function confirmDissent(data) {
+  return request({
+    url: "/core/question/confirmDissent/" + data.id,
+    method: "put",
+    data,
+    showLoading: true,
+  });
+}
+
+// 整改
+export function reform(data) {
+  return request({
+    url: "/core/question/reform/" + data.id,
+    method: "put",
+    data,
+  });
+}
+

src/views/menu/NFCmanage/index.vue

@@ -1,20 +1,40 @@
 <template>
-  <div class="works-time">
+  <div class="Nfc">
     <nav-bar></nav-bar>
-
+    <div class="nfc-container">
+      <div class="nfc-box">
+        <div class="nfc-btn" @touchend="getNfc">
+          <span>点击扫描</span>
+        </div>
+      </div>
+      <Card>
+        <p class="card-title blue">标签信息</p>
+        <van-cell-group v-if="!disable" :border="false">
+          <van-cell title="NFC编码" value="内容" />
+          <van-cell title="所属机构" value="内容" is-link/>
+          <van-cell title="区域名称" value="内容" is-link/>
+          <van-cell title="采集点名称" value="内容" is-link/>
+        </van-cell-group>
+        <van-cell-group v-else :border="false">
+          <van-cell title="NFC编码" value="内容" />
+          <van-cell title="所属机构" value="内容" />
+          <van-cell title="区域名称" value="内容" />
+          <van-cell title="采集点名称" value="内容" />
+        </van-cell-group>
+      </Card>
+    </div>
   </div>
 </template>
 
 <script>
 import NavBar from '@/components/NavBar';
+import Card from '@/components/card';
 import {mapGetters} from "vuex";
-import {deptTreeList} from "@/api/public";
-import {editWorkTime} from "@/views/menu/workTime/api";
 export default {
-  components:{NavBar},
+  components:{NavBar,Card},
   data(){
     return{
-
+      disable:false,
     }
   },
   mounted() {
@@ -24,28 +44,83 @@ export default {
     ...mapGetters(['orgName','orgId']),
   },
   methods:{
-
+    getNfc(){
+     alert('扫描')
+    },
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  .works-time{
-    background-color: #fff;
-  }
-  .form-box{
-    height: calc(100vh - 180px);
-    padding: 0 30px 50px 30px;
+  .nfc-container{
+    padding:0 20px 20px 20px;
+    height: calc(100vh - 192px);
+    -border: 1px solid red;
     overflow: auto;
   }
-  .radio-box{
-    height: 100px;
-    padding: 30px;
+  .card-title{
+    height: 60px;
+    line-height: 40px;
+    font-size: 32px;
+    border-bottom: 1px solid #f5f5f5;
+  }
+  .nfc-box{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding:0 20px;
+    margin-top:24px;
+    >div{
+      width: 500px;
+      height: 500px;
+      background-color: rgba(0, 140, 214, 0.69);
+      border-radius: 50%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      >span{
+        font-size: 32px;
+        color: #fff;
+      }
+    }
+  }
+
+  .blue{
+    color:#008cd6;
   }
-  .org-name{
-    font-size: 30px;
-    line-height: 80px;
-    height: 80px;
-    text-align: center;
+  .nfc-btn {
+    /* 应用动画flowCss 12秒速度 无限循环 线性匀速动画*/
+    animation: donghua 2.4s infinite;
+  }
+
+  .nfc-btn {
+    margin: 60px;
+    width: 32%;
+    height: 48vh;
+    background: linear-gradient(-45deg, #dae, #3c9, #09f, #66f);
+    background-size: 200% 200%;
   }
+  .nfc-btn:active {
+    animation: none;
+    background: #09f;
+  }
+
+  @keyframes donghua {
+    0% {
+      transform: scale(1);
+      /* 注意rgba中的a的设置 */
+      box-shadow: 0 0 0 0 rgba(204, 73, 152, 60%);
+    }
+
+    60% {
+      transform: scale(1);
+      box-shadow: 0 0 0 18px rgba(204, 73, 152, 0%);
+    }
+
+    100% {
+      transform: scale(1);
+      box-shadow: 0 0 0 0 rgba(204, 73, 152, 0%);
+    }
+  }
+
 </style>

src/views/menu/securityCheckRegister/index.vue

@@ -22,6 +22,7 @@
             <search-select-cell
               class="van-hairline--right"
               title="检查角色"
+              :border="false"
               v-model="query.roldIds"
               :dataList="rolesList"
               :prop="prop"