Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

package-lock.json

@@ -5984,7 +5984,7 @@
     },
     "global": {
       "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
+      "resolved": "https://registry.nlark.com/global/download/global-4.3.2.tgz",
       "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
       "dev": true,
       "requires": {
@@ -5994,7 +5994,7 @@
       "dependencies": {
         "process": {
           "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/process/download/process-0.5.2.tgz",
           "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
           "dev": true
         }
@@ -8048,8 +8048,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
@@ -9278,8 +9277,7 @@
     "process": {
       "version": "0.11.10",
       "resolved": "http://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
     "process-nextick-args": {
       "version": "2.0.1",
@@ -12457,8 +12455,7 @@
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz",
-      "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=",
-      "dev": true
+      "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q="
     },
     "y18n": {
       "version": "4.0.0",

src/router/index.js

@@ -544,30 +544,119 @@ const routes = [{
   },
   component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/managerDanger/managerSurvey'),
 },
-
-
-
-
-  {
-    path:'/insert-danger',
-    name:'insert-danger',
-    meta:{
-      title:'我的上报',
-      index:1
-    },
-    component:()=>import('@/views/danger/insertDanger/list')
-  },
-  {
-    path:'/video',
-    name:'video-play',
-    meta:{
-      title:'视屏播放',
-      index:1
-    },
-    component:()=>import('@/components/video')
+{
+  path: '/insert-danger',
+  name: 'insert-danger',
+  meta: {
+    title: '我的上报',
+    index: 1
   },
-
-
+  component: () => import('@/views/danger/insertDanger/list')
+},
+{
+  path: '/insert-risk',
+  name: 'insert-risk',
+  meta: {
+    title: '我的风险上报',
+    index: 1
+  },
+  component: () => import('@/views/risk/my-insert/index')
+},
+{
+  path: '/risk-add',
+  name: 'risk-add',
+  meta: {
+    title: '我的上报',
+    index: 1
+  },
+  component: () => import('@/views/risk/riskAdd/index')
+},
+{
+  path: '/risk-big-detail',
+  name: 'risk-big-detail',
+  meta: {
+    title: '风险详情',
+    index: 1
+  },
+  component: () => import('@/views/risk/riskAccount/riskBigDetail')
+},
+{
+  path: '/risk-confirme',
+  name: 'risk-confirme',
+  meta: {
+    title: '风险确认',
+    index: 1
+  },
+  component: () => import('@/views/risk/riskConfirme/index')
+},
+// risk-affirm
+{
+  path: '/risk-affirm',
+  name: 'risk-affirm',
+  meta: {
+    title: '风险确认',
+    index: 1
+  },
+  component: () => import('@/views/risk/riskConfirme/riskAffirm')
+},
+// risk-account
+{
+  path: '/risk-account',
+  name: 'risk-account',
+  meta: {
+    title: '风险台账',
+    index: 1
+  },
+  component: () => import('@/views/risk/riskAccount/index')
+},
+// risk-return
+{
+  path: '/risk-return',
+  name: 'risk-return',
+  meta: {
+    title: '上报退回',
+    index: 1
+  },
+  component: () => import('@/views/risk/riskReturn/index')
+},
+// risk-confirme
+{
+  path: '/my-role',
+  name: 'my-role',
+  meta: {
+    title: '我的权限',
+    index: 1
+  },
+  component: () => import('@/views/my/role')
+},
+{
+  path:'/message-details',
+  name: 'message-details',
+  meta: {
+    title: '消息详情',
+    index: 1
+  },
+  component: () => import('@/views/messageCenter/messageDetails/index')
+},
+{
+  path: '/my-reset-pas',
+  name: 'my-reset-pas',
+  meta: {
+    title: '重置密码',
+    index: 1
+  },
+  component: () => import('@/views/my/resetPas')
+},
+{
+  path: '/matrix-grad',
+  name: 'matrix-grad',
+  meta: {
+    title: '矩阵式定级',
+    index: 1
+  },
+  component: () => import('@/views/risk/riskAdd/matrixGrad/index')
+},
+// matrix-grad
 ]
 
 const router = new VueRouter({

src/views/checked/index.vue

@@ -14,7 +14,7 @@
        <van-search
             v-model="value"
             show-action
-            placeholder="请输入检查名称"
+            placeholder="请输入搜索内容"
             @search="onSearch" 
             >
             <template #action>

src/views/danger/addDanger/addDanger.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
+    <!-- 视屏 -->
+     <div v-if="videoUrl">
+        <custom-player :videoUrl="videoUrl" :videoImg="videoImg" @close="videoUrl=''"/>
+    </div>
     <van-form
       @submit="onSubmit"
       :scroll-to-error="true"
@@ -280,6 +284,7 @@
             upload-text="最多上传五个"
             v-model="uploaderVideo"
             accept="video/*"
+            @click-preview="clickPre"
           >
             <template slot="default">
               <!-- 11111111111 -->
@@ -362,6 +367,7 @@
 import LHeader from "@/components/header.vue";
 import { getFun, postFun } from "@/service/table.js";
 import { timestampToTime } from "@/utils/format";
+import customPlayer from "@/components/video"
 import {
   getFormList,
   postHdTyp,
@@ -376,6 +382,7 @@ export default {
   name: "add-danger",
   components: {
     LHeader,
+    customPlayer
   },
   activated() {
     this.taskId =
@@ -444,6 +451,9 @@ export default {
 
   data() {
     return {
+      // 视频预览地址
+      videoUrl:'',
+
       id: 0,
       text: "新增隐患",
       taskId: "",
@@ -486,6 +496,15 @@ export default {
   },
 
   methods: {
+    // 点击预览图
+    clickPre(e){
+      console.log(e)
+      if(e.filePath){
+        this.videoUrl=e.filePath;
+      }else{
+        this.videoUrl=e.content;
+      }
+    },
     async deleteFile(val,detail,key){
       // console.log(val,detail)
       if(val.fileId){

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -5,11 +5,12 @@
       inset
       v-for="(item, index) in messageList"
       :key="index"
-      @click="goDetail(item.taskId)"
+      @click="goDetail(item)"
     >
+      {{item}}
       <van-row gutter="">
         <van-col span="6">隐患编号：</van-col>
-        <van-col span="18">{{ item.businessId }}</van-col>
+        <van-col span="18">{{ item.businessId || item.id}}</van-col>
       </van-row>
       <van-row gutter="">
         <van-col span="6">所属项目：</van-col>
@@ -27,7 +28,7 @@
         <van-col span="6">隐患类型：</van-col>
         <van-col span="18">{{ item.hdType }}</van-col>
       </van-row>
-      <van-row gutter="">
+      <van-row gutter="" v-if="item.taskName">
         <van-col span="6">工单状态：</van-col>
         <van-col span="18">{{ item.taskName }}</van-col>
       </van-row>
@@ -176,6 +177,7 @@ export default {
   },
   data() {
     return {
+   
       taskId: "",
       messageList: [],
       radio: "1",
@@ -311,11 +313,11 @@ export default {
       this.showPickerReview = false;
     },
     // 详情
-    goDetail(taskId) {
+    goDetail(data) {
       this.$router.push({
         name: "normal-detail",
         params: {
-          id: taskId,
+          id: data.taskId||data.id,
         },
       });
     },

src/views/danger/delayApproval/index.vue

@@ -3,30 +3,30 @@
     <van-sticky offset-top="0">
       <LHeader :text="text"></LHeader>
     </van-sticky>
-    <van-sticky offset-top="1.5rem">
+    <!-- <van-sticky offset-top="1.5rem">
       <van-search
         v-model="searchValue"
         show-action
-        placeholder="请输入检查名称"
+        placeholder="请输入搜索内容"
         @search="onSearch"
       >
         <template #action>
           <div @click="onSearch">搜索</div>
         </template>
       </van-search>
-    </van-sticky>
+    </van-sticky> -->
     <!-- 内容列表 -->
     <!-- 接口对接4 START -->
     <van-tabs
       v-model="active"
       @change="
-        getList;
+        getList();
         showIndex = null;
       "
       color="#2980f7"
       animated
       :sticky="true"
-      offset-top="3rem"
+      offset-top="1.5rem"
     >
       <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
         <div
@@ -52,14 +52,27 @@
               <van-col span="6">隐患级别：</van-col>
               <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
             </van-row>
+             <van-row gutter="" v-show="item.examineResult">
+              <van-col span="6">是否通过：</van-col>
+              <van-col span="17">{{ item.examineResult==1?'是':'否'}}</van-col>
+            </van-row>
+             <van-row gutter="" v-show="item.examineReason">
+              <van-col span="6">意见：</van-col>
+              <van-col span="18">{{ item.examineReason }}</van-col>
+            </van-row>
+            <van-row gutter="" v-if="item.taskName">
+            <van-col span="6">工单状态：</van-col>
+            <van-col span="18">{{ item.taskName }}</van-col>
+          </van-row>
             <!-- 长按显示遮罩层 -->
-            <template v-if="active == 0">
+            <template>
               <van-overlay :show="showIndex == index">
                 <div class="wrapper" @click.stop="showIndex = null">
-                  <!-- <van-button round type="primary" @click="goDetail(item)"
+                  <van-button round type="primary" @click="goDetail(item)"
                     >详情</van-button
-                  > -->
+                  >
                   <van-button round type="info" @click="goConfirm(item)"
+                    v-if="active == 0"
                     >审批
                   </van-button>
                 </div>
@@ -144,15 +157,15 @@ export default {
     },
 
     // 详情
-    // goDetail(data) {
-    //   this.$router.push({
-    //     name: "normal-detail",
-    //     params: {
-    //       id: data.businessId,
-    //     },
-    //   });
-    //   this.showIndex = null;
-    // },
+    goDetail(data) {
+      this.$router.push({
+        name: "normal-detail",
+        params: {
+          id: data.businessId,
+        },
+      });
+      this.showIndex = null;
+    },
     // 审批
     goConfirm(data) {
       this.$router.push({

src/views/danger/reportReturn/index.vue

@@ -5,7 +5,7 @@
       <van-search
         v-model="searchValue"
         show-action
-        placeholder="请输入检查名称"
+        placeholder="请输入搜索内容"
         @search="onSearch"
       >
         <template #action>
@@ -73,7 +73,7 @@
         position: fixed;
         top: 30%;
       "
-      v-if="isHaveNews"
+      v-if="messageList.length==0"
     >
       暂无数据
     </div>

src/views/danger/standBook/index.vue

@@ -3,22 +3,22 @@
     <van-sticky>
     <LHeader :text="text"></LHeader>
     </van-sticky>
-    <van-sticky offset-top="1.5rem">
+    <!-- <van-sticky offset-top="1.5rem">
       <van-search
         v-model="searchValue"
         show-action
-        placeholder="请输入检查名称"
+        placeholder="请输入搜索内容"
         @search="onSearch"
       >
         <template #action>
           <div @click="onSearch">搜索</div>
         </template>
       </van-search>
-     </van-sticky>
+     </van-sticky> -->
       <!-- tab标签 -->
       <van-tabs v-model="active" @change="postList" color="#2980f7"  animated
       :sticky="true"
-      offset-top="3rem">
+      offset-top="1.5rem">
         <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
           <div v-show="key == active">
             <div class="con-list" @touchmove="showIndex = null">
@@ -223,4 +223,7 @@ export default {
     }
   }
 }
+/deep/.van-tab__pane{
+    min-height: 8rem;
+}
 </style>

src/views/danger/superviseDanger/index.vue

@@ -5,7 +5,7 @@
       <van-search
         v-model="searchValue"
         show-action
-        placeholder="请输入检查名称"
+        placeholder="请输入搜索内容"
         @search="onSearch"
       >
         <template #action>

src/views/messageCenter/index.vue

@@ -28,14 +28,20 @@
           name="消息信息"
           :badge="messageNewsNum.消息信息 > 0 ? messageNewsNum.消息信息 : ''"
         >
-          <message-news :actives="activeName"></message-news>
+          <message-news
+            :actives="activeName"
+            :messageNewsNum="messageNewsNum"
+          ></message-news>
         </van-tab>
         <van-tab
           title="通知公告"
           name="通知公告"
           :badge="messageNewsNum.通知公告 > 0 ? messageNewsNum.通知公告 : ''"
         >
-          <notice-info :actives="activeName"></notice-info>
+          <notice-info
+            :actives="activeName"
+            :messageNewsNum="messageNewsNum"
+          ></notice-info>
         </van-tab>
       </van-tabs>
     </div>

src/views/messageCenter/messageNews/index.vue

@@ -17,7 +17,12 @@
             >{{ item.category }}</span
           >
 
-          <span class="my-tag-style" @click="clearNo()">清除未读</span>
+          <span
+            class="my-tag-style"
+            v-if="messageNewsNum.消息信息 > 0"
+            @click="clearNo()"
+            >清除未读</span
+          >
         </div>
 
         <!-- 搜索 -->
@@ -63,6 +68,11 @@
               </div>
             </van-badge>
           </van-cell-group>
+          <van-image
+            v-if="messageList.length <= 0"
+            fit="contain"
+            :src="require('../../../assets/noMessage.png')"
+          />
         </div>
       </div>
     </van-pull-refresh>
@@ -78,8 +88,14 @@ import {
 } from "@/service/message";
 export default {
   props: {
-    actives: String,
-    default: () => "",
+    actives: {
+      type: String,
+      default: () => "",
+    },
+    messageNewsNum: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -198,10 +214,8 @@ export default {
     touchstart(index, item) {
       this.read(item);
       this.$router.push({
-        name: "message-details",
-        params: {
-          id: JSON.stringify(item),
-        },
+        path: item.appUrl,
+        query: {},
       });
     },
 

src/views/messageCenter/noticeInfo/index.vue

@@ -19,21 +19,26 @@
             @click="selectCategory(index, item.category)"
             >{{ item.category }}</span
           >
-          <span class="my-tag-style" @click="clearNo()">清除未读</span>
+          <span
+            class="my-tag-style"
+            v-if="messageNewsNum.通知公告 > 0"
+            @click="clearNo()"
+            >清除未读</span
+          >
         </div>
 
         <!-- 搜索 -->
         <div class="search-wrap">
-          <!-- <van-search
-          v-model="searchVal"
-          show-action
-          placeholder="请输入检查名称"
-          @search="onSearch"
-        >
-          <template #action>
-            <div @click="onSearch">搜索</div>
-          </template>
-        </van-search> -->
+          <van-search
+            v-model="searchVal"
+            show-action
+            placeholder="请输入搜索内容"
+            @search="onSearch"
+          >
+            <template #action>
+              <div @click="onSearch">搜索</div>
+            </template>
+          </van-search>
           <!-- <van-search
           v-model="searchVal"
           placeholder="搜索"
@@ -65,6 +70,11 @@
               </div>
             </van-badge>
           </van-cell-group>
+          <van-image
+            v-if="notificationList.length <= 0"
+            fit="contain"
+            :src="require('../../../assets/noMessage.png')"
+          />
         </div>
       </div>
     </van-pull-refresh>
@@ -81,8 +91,14 @@ import {
 } from "@/service/message";
 export default {
   props: {
-    actives: String,
-    default: () => "",
+    actives: {
+      type: String,
+      default: () => "",
+    },
+    messageNewsNum: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {

src/views/messageCenter/waitEvent/index.vue

@@ -26,7 +26,7 @@
           <van-search
             v-model="searchVal"
             show-action
-            placeholder="请输入检查名称"
+            placeholder="请输入搜索内容"
             @search="onSearch"
           >
             <template #action>
@@ -49,13 +49,20 @@
                   <span>{{ item.title }}</span>
                   <span>{{ item.createTime }}</span>
                 </div>
-                <div class="message-content">{{ item.content }}</div>
+                <div class="message-content">
+                  {{ item.content }},{{ item.createBy }}
+                </div>
                 <div class="bot_but">
                   <van-button color="#33CCFF" size="mini">立即处理</van-button>
                 </div>
               </div>
             </van-badge>
           </van-cell-group>
+          <van-image
+            v-if="waitList.length <= 0"
+            fit="contain"
+            :src="require('../../../assets/noMessage.png')"
+          />
         </div>
       </div>
     </van-pull-refresh>

src/views/my/index.vue

 <template>
-  <div>
-    <!-- 头部标签 -->
-    <van-sticky>
-      <header class="header-wrap">
-        首开集团安全管理平台
-      </header>
-    </van-sticky>
+    <div>
+        <!-- 头部标签 -->
+        <van-sticky>
+            <header class="header-wrap">首开集团安全管理平台</header>
+        </van-sticky>
 
-    <!-- 内容 -->
-    <div class="con">
-      <!-- 个人信息 -->
-      <van-cell-group inset>
-        <van-row gutter="20">
-          <van-col span="6">
-            <div>
-              <van-image
-                width="2rem"
-                height="2rem"
-                fit="fill"
-                :src="userInfo.portrait"
-              />
-            </div>
-          </van-col>
-          <van-col span="18">
-            <div class="user-info-wrap">
-              <div class="user-name">{{ userInfo.name }}</div>
-              <p>{{ userInfo.position }}</p>
-              <div class="tag-wrap">
-                <van-tag color="#cbcdfb">隐患上报人</van-tag>
-                <van-tag color="#b5e2f1">隐患整改人</van-tag>
-                <van-tag color="#bed9fd">检查专员</van-tag>
-              </div>
-            </div>
-          </van-col>
-        </van-row>
-      </van-cell-group>
+        <!-- 内容 -->
+        <div class="con">
+            <!-- 个人信息 -->
+            <van-cell-group inset>
+                <van-row gutter="20">
+                    <van-col span="6">
+                        <div>
+                            <van-image
+                                width="2rem"
+                                height="2rem"
+                                fit="fill"
+                                :src="userInfo.portrait"
+                            />
+                        </div>
+                    </van-col>
+                    <van-col span="18">
+                        <div class="user-info-wrap">
+                            <div class="user-name">{{ userInfo.name }}</div>
+                            <p>{{ userInfo.position }}</p>
+                            <div class="tag-wrap">
+                                <van-tag color="#cbcdfb">隐患上报人</van-tag>
+                                <van-tag color="#b5e2f1">隐患整改人</van-tag>
+                                <van-tag color="#bed9fd">检查专员</van-tag>
+                            </div>
+                        </div>
+                    </van-col>
+                </van-row>
+            </van-cell-group>
 
-      <!-- 设置 -->
-      <van-cell-group inset class="my-cell-group">
-        <div class="set-wrap">
-          <van-image
-            width="0.613rem"
-            height="0.613rem"
-            fit="fill"
-            :src="require('@/assets/myTerritory/set.png')"
-          />
-          <span>设置</span>
+            <!-- 设置 -->
+            <van-cell-group inset class="my-cell-group">
+                <div
+                    class="set-wrap"
+                    v-for="(item, key) in menus"
+                    :key="key"
+                    @click="$router.push({ name: item['name'] })"
+                >
+                    <van-image
+                        width="0.613rem"
+                        height="0.613rem"
+                        fit="fill"
+                        :src="item['img']"
+                    />
+                    <span>{{ item["title"] }}</span>
+                </div>
+            </van-cell-group>
+
+            <!-- 退出系统 -->
+            <footer class="sign-out">
+                <van-button type="info" block @click="logout"
+                    >退出系统</van-button
+                >
+            </footer>
         </div>
-      </van-cell-group>
 
-      <!-- 退出系统 -->
-      <footer class="sign-out">
-        <van-button type="info" block @click="logout">退出系统</van-button>
-      </footer>
+        <!-- tanBar -->
+        <tab-bar :index="2"></tab-bar>
     </div>
-
-    <!-- tanBar -->
-    <tab-bar :index="2"></tab-bar>
-  </div>
 </template>
 
 <script>
 import tabBar from "@/components/TabBar";
-import { removeToken } from '@/utils/auth' // get token from cookie
-import { getUserInfo} from '@/utils/userInfo'
+import { removeToken } from "@/utils/auth"; // get token from cookie
+import { getUserInfo } from "@/utils/userInfo";
 export default {
-  components: {
-    tabBar
-  },
-  data() {
-    return {
-      userInfo: {
-        portrait: require("@/assets/myTerritory/touxiang.png"),
-        name: getUserInfo()?getUserInfo().userName:"刘华强",
-        position: getUserInfo()?getUserInfo().deptName:"技术安全部",
-        // name: "刘华强",
-        // position: "技术安全部"
-        // jurisdiction: [
-        //   '隐患上报人',
-        //   '隐患整改人',
-        //   '检查专员'
-        // ]
-      }
-    };
-  },
-  mounted() {},
-  methods: {
-    logout() {
-        // localStorage.removeItem('admin_token');
-        this.$router.push("/Login2");
-        removeToken()
-        // location.reload();
-    }
-  }
+    components: {
+        tabBar,
+    },
+    data() {
+        return {
+            menus: [
+                // 菜单
+                {
+                    title: "我的权限",
+                    img:require("@/assets/myTerritory/role.png"),
+                    name: "my-role",
+                },
+                {
+                    title: "修改密码",
+                    img: require("@/assets/myTerritory/set.png"),
+                    name: "my-reset-pas",
+                },
+            ],
+            userInfo: {
+                portrait: require("@/assets/myTerritory/touxiang.png"),
+                name: getUserInfo() ? getUserInfo().userName : "刘华强",
+                position: getUserInfo() ? getUserInfo().deptName : "技术安全部",
+                // name: "刘华强",
+                // position: "技术安全部"
+                // jurisdiction: [
+                //   '隐患上报人',
+                //   '隐患整改人',
+                //   '检查专员'
+                // ]
+            },
+        };
+    },
+    mounted() {},
+    methods: {
+        logout() {
+            // localStorage.removeItem('admin_token');
+            this.$router.push("/Login2");
+            removeToken();
+            // location.reload();
+        },
+    },
 };
 </script>
 <style lang="less" scoped>
 /* @import url(); 引入css类 */
 .header-wrap {
-  width: 100%;
-  height: 50px;
-  background-color: #2980f7;
-  font-size: 17px;
-  line-height: 50px;
-  color: white;
-  font-weight: none;
-  text-align: center;
+    width: 100%;
+    height: 50px;
+    background-color: #2980f7;
+    font-size: 17px;
+    line-height: 50px;
+    color: white;
+    font-weight: none;
+    text-align: center;
 }
 .con {
-  height: calc(100% - 110px);
-  padding: 10px 0 50px 0;
-  background-color: #f0f1f5;
-  position: relative;
-  .user-info-wrap {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    .user-name {
-      font-size: 17px;
-      font-weight: none;
-    }
+    height: calc(100% - 110px);
+    padding: 10px 0 50px 0;
+    background-color: #f0f1f5;
+    position: relative;
+    .user-info-wrap {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        .user-name {
+            font-size: 17px;
+            font-weight: none;
+        }
 
-    .tag-wrap {
-      .van-tag {
-        margin-right: 10px;
-        margin-top: 3px;
-        padding: 2px 4px;
-      }
+        .tag-wrap {
+            .van-tag {
+                margin-right: 10px;
+                margin-top: 3px;
+                padding: 2px 4px;
+            }
+        }
     }
-  }
 
-  .my-cell-group {
-    padding: 10px 10px !important;
-    .set-wrap {
-      height: 0.8rem;
-      display: flex;
-      align-items: center;
-      span {
-        margin-left: 0.2666rem;
-        font-size: 15px;
-        font-weight: none;
-      }
+    .my-cell-group {
+        padding: 10px 10px !important;
+        .set-wrap {
+            height: 1.1rem;
+            display: flex;
+            align-items: center;
+            border-bottom: 1px solid #e8e8e8;
+            &:last-child {
+                border-bottom: none;
+            }
+            span {
+                margin-left: 0.2666rem;
+                font-size: 13px;
+                font-weight: none;
+            }
+        }
     }
-  }
 }
 
 .sign-out {
-  width: 96%;
-  position: absolute;
-  bottom: 1.86667rem;
-  left: 0px;
-  right: 0;
-  margin: auto;
-  overflow: hidden;
-  border-radius: 5px;
-  button {
-    font-size: 15px;
-    font-weight: none;
-  }
+    width: 96%;
+    position: absolute;
+    bottom: 1.86667rem;
+    left: 0px;
+    right: 0;
+    margin: auto;
+    overflow: hidden;
+    border-radius: 5px;
+    button {
+        font-size: 15px;
+        font-weight: none;
+    }
 }
 .van-cell-group--inset {
-  margin: 0 10px 10px;
-  padding: 10px 10px 15px;
+    margin: 0 10px 10px;
+    padding: 10px 10px 15px;
 }
 </style>

src/views/my/resetPas.vue

+<template>
+    <div>
+        <!-- 重置密码页面 -->
+        <!-- 头部标签 -->
+        <LHeader :text="$route.meta.title"></LHeader>
+
+        <van-form
+            @submit="onSubmit"
+            :scroll-to-error="true"
+            :show-error="false"
+            validate-trigger="onSubmit"
+        >
+            <van-field
+                v-model="form.oldPassword"
+                required
+                type="text"
+                name="oldPassword"
+                label="旧密码"
+                placeholder="请输入旧密码"
+                :rules="[
+                    { required: true, message: '请填写密码' }
+                ]"
+            />
+            <van-field
+                required
+                v-model="form.newPassword"
+                type="password"
+                name="newPassword"
+                label="新密码"
+                placeholder="请输入新密码"
+                :rules="[
+                    { required: true, message: '请填写密码' },
+                    {
+                        message: '密码必须大于6个字符小于20个字符',
+                        validator: (val) => {
+                            return val['length'] > 6 && val['length'] < 20;
+                        },
+                    },
+                ]"
+            />
+            <van-field
+                required
+                v-model="form.confirm"
+                type="password"
+                name="confirm"
+                label="再次输入"
+                placeholder="再次输入新密码"
+                :rules="[
+                    { validator, required: true, message: '二次输入不正确' },
+                    {
+                        message: '密码必须大于6个字符小于20个字符',
+                        validator: (val) => {
+                            return val['length'] > 6 && val['length'] < 20;
+                        },
+                    },
+                ]"
+            />
+
+            <div style="margin: 16px">
+                <van-button round block type="info" native-type="submit"
+                    >提交
+                </van-button>
+            </div>
+        </van-form>
+    </div>
+</template>
+
+<script>
+import LHeader from "@/components/header.vue";
+import { getFun, postFun } from "@/service/table.js";
+import { getUserInfo } from "@/utils/userInfo";
+import { removeToken } from "@/utils/auth"; // get token from cookie
+export default {
+    components: {
+        LHeader,
+    },
+    data() {
+        return {
+            form: {
+                oldPassword: "",
+                newPassword: "",
+                confirm: "",
+            }
+        };
+    },
+    mounted(){
+        console.log(getUserInfo())
+    },
+    methods: {
+        validator(val) {
+            return this.form.newPassword == val;
+        },
+        onSubmit(val) {
+            this.$toast.loading({
+                message: "请求中...",
+                forbidClick: true,
+                loadingType: "spinner",
+                duration: 0,
+            });
+            postFun(
+                "/mobile/resetPwd",
+                this.obj2formdata(val)
+            )
+                .then((data) => {
+                    this.$toast.clear();
+                    this.$dialog.alert({
+                        title:'提示',
+                        message:'密码重置成功，请重新登录',
+                    }).then(
+                        res=>{
+                            removeToken();
+                            this.$router.push('/login2')
+                        }
+                    )
+                    
+                })
+                .catch((err) => {
+                    this.$toast.clear();
+                    this.$toast.fail("操作失败,请稍后再试");
+                });
+        },
+        obj2formdata(data) {
+            console.log(data,'fasfasdfsd')
+            let fd = new FormData();
+            for (let k in data) {
+                if (data[k]) {
+                    fd.append(k, data[k]);
+                }
+            }
+            return fd;
+        },
+    },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/my/role.vue

+<template>
+    <div>
+        <!-- 我的权限页面 my-role -->
+        <LHeader :text="$route.meta.title"></LHeader>
+        <!-- 通知 -->
+        <van-sticky offset-top="1.5rem">
+            <van-notice-bar
+            left-icon="volume-o"
+            text="提示：系统使用时请核实应用权限如有问题请联系管理员。"
+        />
+        </van-sticky>
+        <!-- 权限卡片 -->
+        <div v-for="(item, key) in role_list" :key="key">
+            <template v-if="item">
+                <div class="title">{{ key }}</div>
+                <van-cell-group inset>
+                    <div class="tag-wrap">
+                        <van-tag
+                            :color="getColor()"
+                            v-for="(i, index) in item"
+                            :key="index"
+                             plain
+                             round
+                        >
+                            <template v-if="i">
+                                {{ i }}
+                            </template>
+                        </van-tag>
+                    </div>
+                </van-cell-group>
+            </template>
+        </div>
+    </div>
+</template>
+
+<script>
+import LHeader from "@/components/header.vue";
+import { getFun, postFun } from "@/service/table.js";
+export default {
+    components: {
+        LHeader,
+    },
+    data() {
+        return {
+            tabColor: ["red", "orange", "skyblue",'yellowgreen'],
+
+            role_list: {
+                "政务大数据项目cs-401": [],
+                "政务大数据项目cs-801": [],
+                朝阳区和平街14区简易住宅楼改造项目: [],
+                "项目工程cs-001": [],
+                "项目工程cs-002": [],
+            },
+        };
+    },
+    methods: {
+        async getRoleList() {
+            let res = await postFun("/mobile/userRoler");
+            // console.log(res)
+            if (res) {
+                this.role_list = res.data;
+            }else{
+                this.$toast.fail("加载失败,请稍后再试");
+            }
+        },
+        // 获得一个随机色
+        getColor() {
+            return this.tabColor[
+                Math.floor(Math.random() * [this.tabColor["length"]])
+            ];
+        },
+    },
+    mounted() {
+        this.getRoleList();
+    },
+};
+</script>
+
+<style scoped lang="less">
+/* @import url(); 引入css类 */
+.header-wrap {
+    width: 100%;
+    height: 50px;
+    background-color: #2980f7;
+    font-size: 17px;
+    line-height: 50px;
+    color: white;
+    font-weight: none;
+    text-align: center;
+}
+.con {
+    height: calc(100% - 110px);
+    padding: 10px 0 50px 0;
+    background-color: #f0f1f5;
+    position: relative;
+    .user-info-wrap {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        .user-name {
+            font-size: 17px;
+            font-weight: none;
+        }
+
+        .tag-wrap {
+            .van-tag {
+                margin-right: 10px;
+                margin-top: 3px;
+                padding: 2px 4px;
+            }
+        }
+    }
+
+    .my-cell-group {
+        padding: 10px 10px !important;
+        .set-wrap {
+            height: 1.1rem;
+            display: flex;
+            align-items: center;
+            border-bottom: 1px solid #e8e8e8;
+            &:last-child {
+                border-bottom: none;
+            }
+            span {
+                margin-left: 0.2666rem;
+                font-size: 13px;
+                font-weight: none;
+            }
+        }
+    }
+}
+
+.sign-out {
+    width: 96%;
+    position: absolute;
+    bottom: 1.86667rem;
+    left: 0px;
+    right: 0;
+    margin: auto;
+    overflow: hidden;
+    border-radius: 5px;
+    button {
+        font-size: 15px;
+        font-weight: none;
+    }
+}
+.van-cell-group--inset {
+    margin: 0 10px 10px;
+    padding: 10px 10px 8px;
+    min-height: 1.5rem;
+}
+
+.title {
+    padding: 0.2rem 0.5rem;
+    font-size: 0.4rem;
+}
+.tag-wrap > span {
+    margin-right: 0.3rem;
+    margin-bottom: 0.3rem;
+}
+.van-tag{
+    padding: 0.03rem 0.2rem;
+    font-size: 0.25rem;
+} 
+</style>
\ No newline at end of file

src/views/risk/my-insert/index.vue

+
+<template>
+    <div>
+        <van-sticky offset-top="0">
+            <LHeader :text="text"></LHeader>
+        </van-sticky>
+        <van-sticky offset-top="1.5rem">
+            <van-search
+                v-model="searchValue"
+                show-action
+                placeholder="请输入搜索内容"
+                @search="onSearch"
+            >
+                <template #action>
+                    <div @click="onSearch">搜索</div>
+                </template>
+            </van-search>
+        </van-sticky>
+        <div class="con-list" @touchmove="showIndex = null">
+            <van-cell-group
+                inset
+                v-for="(item, index) in messageList"
+                :key="index"
+                @click="touchstart(index, item)"
+            >
+                <van-row gutter="">
+                    <van-col span="6">风险编号：</van-col>
+                    <van-col span="18">{{ item.id }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                    <van-col span="6">所属项目：</van-col>
+                    <van-col span="18">{{ item.pId }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                    <van-col span="6">隐患级别：</van-col>
+                    <van-col span="18">{{ item.riskLevel | riskText }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                    <van-col span="6">风险源：</van-col>
+                    <van-col span="18">{{ item.riskSource }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                    <van-col span="6">事故类型：</van-col>
+                    <van-col span="18">{{ item.accidentType }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                    <van-col span="6">管控层级：</van-col>
+                    <van-col span="18">{{ item["controlLevel"] }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                    <van-col span="6">主责部门：</van-col>
+                    <van-col span="18">{{ item.responsibilityDept }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                    <van-col span="6">主责人员：</van-col>
+                    <van-col span="18">{{ item.responsibilityMember }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                    <van-col span="6">工单状态：</van-col>
+                    <van-col span="18">{{ item.taskName }}</van-col>
+                </van-row>
+                <!-- 长按显示遮罩层 -->
+                <van-overlay :show="showIndex == index">
+                    <div class="wrapper" @click.stop="showIndex = null">
+                        <van-button round type="primary" @click="goDetail(item)"
+                            >详情</van-button
+                        >
+                    </div>
+                </van-overlay>
+            </van-cell-group>
+        </div>
+        <div
+            style="
+                width: 100%;
+                text-align: center;
+                font-size: 0.48rem;
+                position: fixed;
+                top: 30%;
+            "
+            v-if="messageList['length'] == 0"
+        >
+            暂无数据
+        </div>
+    </div>
+</template>
+
+<script>
+import LHeader from "@/components/header.vue";
+import { getFun, postFun } from "@/service/table.js";
+import { dangerReturnDel, myHDList } from "@/service/danger";
+
+export default {
+    components: {
+        LHeader,
+    },
+    data() {
+        return {
+            value: "",
+            text: "我的上报",
+            searchValue: "",
+            messageList: [],
+            Loop: "", // 定时器
+            showIndex: null, // 是否显示遮罩层
+        };
+    },
+    created() {
+        this.postList();
+    },
+    methods: {
+        postList(select = "") {
+            this.$toast.loading({
+                message: "加载中...",
+                forbidClick: true,
+                loadingType: "spinner",
+                duration: 0,
+            });
+            let formdata = new FormData();
+            formdata.append("select", select);
+            postFun("/riskMain/myList", formdata)
+                .then((res) => {
+                    this.$toast.clear();
+                    this.messageList = res.rows || [];
+                })
+                .catch(() => {
+                    this.$toast.clear();
+                    this.$toast.fail("加载失败,请稍后再试");
+                });
+        },
+
+        onSearch() {
+            // console.log(this.value)
+            this.postList(this.value);
+        },
+        touchstart(index, item) {
+            if (this.showIndex != null) {
+                this.showIndex = null;
+                return;
+            }
+            this.showIndex = index;
+        },
+        goDetail(data) {
+            this.$router.push({
+                // name: "insert-danger-detail",
+                name: "risk-big-detail",
+                params: {
+                    id: data.id,
+                },
+            });
+            this.showIndex = null;
+        },
+        // 提交
+        goSubmit(data) {
+            this.$router.push({
+                name: "add-danger",
+                params: {
+                    status: "退回",
+                    taskId: data.taskId,
+                },
+            });
+            this.showIndex = null;
+        },
+        // 删除
+        goDelete(data) {
+            this.$toast.loading({
+                message: "删除中...",
+                forbidClick: true,
+                loadingType: "spinner",
+                duration: 0,
+            });
+            dangerReturnDel(`/hdreport/delete/${data.taskId}`)
+                .then((res) => {
+                    this.$toast.clear();
+                    this.$toast.success({
+                        message: "删除成功",
+                        duration: 2000,
+                    });
+                    this.postList();
+                })
+                .catch(() => {
+                    this.$toast.clear();
+                    this.$toast.fail("删除失败,请稍后再试");
+                });
+            this.showIndex = null;
+        },
+    },
+};
+</script>
+<style lang="less" scoped>
+/* @import url(); 引入css类 */
+#app {
+    font-family: "";
+    color: #2c3e50;
+}
+.con-list {
+    padding: 0;
+    background-color: #f0f1f5;
+    .van-cell-group--inset {
+        margin: 0;
+        margin-bottom: 0.26667rem;
+        padding: 0.25rem;
+        font-size: 0.4rem;
+        position: relative;
+        border-radius: 4%;
+        box-shadow: 0px 0px 10px 2px #f3f3f3;
+        width: 90%;
+        margin: 0.4rem auto;
+        .van-row {
+            font-size: 0.4rem;
+            line-height: 0.8rem;
+            margin-bottom: 0;
+        }
+        .van-overlay {
+            position: absolute;
+            .wrapper {
+                display: flex;
+                align-items: center;
+                justify-content: space-evenly;
+                height: 100%;
+            }
+        }
+    }
+}
+</style>