Merge branch 'develop' into dev-lv

src/App.vue

@@ -63,7 +63,7 @@ export default {
         "riskAssess",
         "riskApprove",
         "taskList",
-        "taskDetail",
+        "taskDetail"
       ],
       // cachePage预先定义的缓存页面
       otherCache: [],

src/components/selectFloor.vue

@@ -42,8 +42,6 @@ export default {
     components: {
         // LHeader
     },
-    created() {
-    },
     data() {
         return {
             text: "选择人员",
@@ -52,6 +50,9 @@ export default {
             seletedItem:{}
         };
     },
+    mounted(){
+        this.seletedItem = this.listdata[0].children[0]
+    },
     methods: {
         // 待搜索框内容发生变化
         onInput: debounce(function () {
@@ -62,7 +63,6 @@ export default {
             this.itemSel = e
         },
         clickItem(data) {
-            console.log(data, 'llll')
             this.seletedItem = data
         },
         save() {

src/views/drawCanvas/riskView.vue

@@ -2,9 +2,9 @@
     <div class="wrap" ref="mapmidbox">
         <van-sticky v-if="showHeader">
             <header class="header">
-                <span @click="close" class="iconLeft"> 关闭</span>
+                <span @click="close" class="iconLeft"> 返回</span>
                 <span>{{text}}</span>
-                <span  @click="confim" class="iconRight" v-show="!isViews">确定</span>
+                <span  @click="confim" class="iconRight" v-show="!isViews">保存</span>
                 <span  class="iconRight" v-show="isViews"></span>
             </header>
         </van-sticky>

src/views/riskProject/add/index.vue

@@ -205,9 +205,13 @@
           </van-checkbox-group>
         </div>
         <div style="display: flex;justify-content: space-around;">
-            <van-button native-type="button" type="primary"  v-on:click="checkAll">全选</van-button>
-            <van-button  native-type="button" type="info" @click="toggleAll">反选</van-button>
-          </div>
+          <van-button native-type="button" type="primary" v-on:click="checkAll"
+            >全选</van-button
+          >
+          <van-button native-type="button" type="info" @click="toggleAll"
+            >反选</van-button
+          >
+        </div>
       </van-popup>
 
       <!-- 选择项目小组 -->
@@ -243,7 +247,7 @@
       <!-- 选择时间弹出层 -->
       <van-popup v-model="showTime" position="bottom">
         <van-datetime-picker
-          type="datetime"
+          type="date"
           @confirm="onConTime"
           @cancel="showTime = false"
           :min-date="minDate"
@@ -253,7 +257,7 @@
 
       <div style="margin: 16px 16px 0">
         <van-button round block type="info" native-type="submit"
-          >上报</van-button
+          >提交</van-button
         >
       </div>
     </van-form>
@@ -374,7 +378,7 @@ export default {
         "font-size:13px; background:pink; color:#bf2c9f;",
         date
       );
-      let time = timestampToTime(date, "DT1", true);
+      let time = timestampToTime(date, "DT2", true);
       this.form[this.timeName] = time;
       this.showTime = false;
     },

src/views/riskProject/add/taskList.vue

@@ -179,7 +179,7 @@
                   <van-col span="5">
                     <van-image
                       width="46"
-                      height="76"
+                      height="74"
                       src="http://rongtongpc.censoft.com.cn/dev-api/profile/upload/2023/07/08/guyou.png"
                     />
                     <!-- <van-image width="46" height="46" :src="item.avatar" /> -->
@@ -191,11 +191,11 @@
                     </van-row>
                     <van-row gutter="">
                       <van-col span="9">风险等级：</van-col>
-                      <van-col span="15">{{ item.level}}</van-col>
+                      <van-col span="15">{{ item.level }}</van-col>
                     </van-row>
                     <van-row gutter="">
                       <van-col span="9">上报时间：</van-col>
-                      <van-col span="15">{{timestampToTimes(item.createTime, 'DT2') }}</van-col>
+                      <van-col span="15">{{ timestampToTimes(item.createTime, "DT2") }}</van-col>
                     </van-row>
                   </van-col>
                 </van-col>
@@ -236,15 +236,22 @@
                       <van-col span="7"
                         ><span class="field-title">任务节点：</span></van-col
                       >
-                      <van-col span="17">{{ item.taskName }}{{
-                         item.taskResult  && item.taskResult == 1 ? "（审批通过）" : "（审批否决）"
-                      }}</van-col>
+                      <van-col span="17"
+                        >{{ item.taskName
+                        }}{{
+                          item.taskResult
+                            ? item.taskResult == 1
+                              ? "（审批通过）"
+                              : "（审批否决）"
+                            : ""
+                        }}</van-col
+                      >
                     </van-row>
                     <van-row v-show="item.taskResult">
                       <van-col span="7"
                         ><span class="field-title">审批意见：</span></van-col
                       >
-                      <van-col span="17">{{item.taskOpinion}}</van-col>
+                      <van-col span="17">{{ item.taskOpinion }}</van-col>
                     </van-row>
                     <!-- <van-row>
                     <van-col span="7"
@@ -261,7 +268,7 @@
             </van-cell-group>
           </div>
         </van-tab>
-        <van-tab title="风险评估报告">
+        <van-tab title="评估报告">
           <div
             style="height: 1.5rem;
            background-color: #fff;
@@ -766,7 +773,7 @@ export default {
         name: "taskDetail",
         params: {
           id: item.id,
-          floorId:item.floorId
+          floorId: item.floorId
         }
       });
     }

src/views/riskProject/manage/index.vue

@@ -145,7 +145,7 @@ export default {
   },
   methods: {
     timestampToTimes(time) {
-      return timestampToTime(new Date(time), "DT1", true);
+      return timestampToTime(new Date(time), "DT2", true);
     },
     handadd() {
       this.$router.push({
@@ -200,6 +200,7 @@ export default {
       });
       sessionStorage.setItem("pathAuth", "riskManage");
       sessionStorage.setItem("planId", data.id);
+      sessionStorage.setItem("buildingId", "");
       this.showIndex = null;
     },
     // 确认

src/views/riskProject/taskLedger/index.vue

@@ -4,34 +4,48 @@
       <LHeader :text="text"></LHeader>
     </van-sticky>
     <van-sticky offset-top="1.5rem">
-      <van-search v-model="searchValue" show-action placeholder="请输入搜索内容" @search="onSearch">
+      <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">
-      <van-cell-group v-for="(item, index) in taskList" :key="index" inset @click="touchstart(index, item)">
+      <van-cell-group
+        v-for="(item, index) in taskList"
+        :key="index"
+        inset
+        @click="touchstart(index, item)"
+      >
         <div style="font-size: 0.45rem;padding: 5px 0;">{{ item.name }}</div>
         <van-row gutter="">
           <van-col span="17">
             <van-row gutter="">
               <van-col span="9">发起时间：</van-col>
-              <van-col span="15">{{ timestampToTimes(item.startTime) }}</van-col>
+              <van-col span="15">{{
+                timestampToTimes(item.startTime)
+              }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="9">处理人员：</van-col>
               <van-col span="15">{{ item.leaderUserName }}</van-col>
             </van-row>
           </van-col>
-          <van-col span="7" :style="{ 'color': '#03b615' }">
+          <van-col span="7" :style="{ color: '#03b615' }">
             {{ item.state }}
           </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>
+            <van-button round type="primary" @click="goDetail(item)"
+              >详情</van-button
+            >
           </div>
         </van-overlay>
       </van-cell-group>
@@ -86,7 +100,8 @@ export default {
           id: item.id,
         },
       });
-     
+      sessionStorage.setItem("buildingId", "");
+
     },
     onSearch(searchValue) {