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

src/App.vue

@@ -23,7 +23,7 @@
     data () {
       return {
         transitionName: 'slide-left',
-        cachePage:["add-danger","change-info","affirm-danger","risk-affirm","manager-survey","super-survey","major-survey","risk-add","notice"]
+        cachePage:["add-danger","change-info","affirm-danger","risk-affirm","manager-survey","super-survey","major-survey","risk-add","noticeList"]
       }
     },
     watch: {

src/components/TabBar.vue

 <template>
   <div>
+      <!-- 占位导航栏div，防止导航栏挡住内容 -->
+    <div style="width:100%;height:2rem"></div>
     <van-tabbar v-model="active" @change="onChange">
-      <van-tabbar-item
+      <van-tabbar-item 
         v-for="(item,index) in tabBarList"
         :key="index"
         :icon="active==item.name?item.imgUrlActive: item.imgUrl"
@@ -71,4 +73,5 @@ export default {
 </script>
 <style scoped>
 /* @import url(); 引入css类 */
+
 </style>

src/components/header.vue

@@ -66,7 +66,7 @@ export default {
         color: white;
         font-size: 16px;
         margin: auto;
-        font-weight: 600;
+        font-weight: none;
         font-family: 'Microsoft YaHei';
     }
     .header .iconColorRight{

src/views/Category.vue

@@ -116,7 +116,7 @@ export default {
       }
       .icon-left {
         font-size: 25px;
-        font-weight: bold;
+        font-weight: none;
       }
       .header-search {
         display: flex;
@@ -190,7 +190,7 @@ export default {
             .catogory-title {
               width: 100%;
               font-size: 17px;
-              font-weight: 500;
+              font-weight: none;
               padding: 20px 0;
             }
             .product-item {

src/views/Home.vue

@@ -223,7 +223,7 @@ export default {
               padding: 0 10px;
               color: @primary;
               font-size: 20px;
-              font-weight: bold;
+              font-weight: none;
               border-right: 1px solid #666;
           }
           .icon-search {
@@ -274,7 +274,7 @@ export default {
       text-align: center;
       color: @primary;
       font-size: 16px;
-      font-weight: 500;
+      font-weight: none;
     }
     .good-box {
       display: flex;

src/views/Login2.vue

@@ -115,7 +115,7 @@ export default {
     margin-top: 20px;
     color: #fafbfe;
     font-size: 18px;
-    font-weight: bold;
+    font-weight: none;
   }
   .con {
     width: 345px;
@@ -128,7 +128,7 @@ export default {
     .hello {
       color: #004fb1;
       font-size: 20px;
-      font-weight: bold;
+      font-weight: none;
     }
     .welcome {
       margin: 15px 0;

src/views/ProductList.vue

@@ -162,7 +162,7 @@ export default {
       }
       .icon-left {
         font-size: 25px;
-        font-weight: bold;
+        font-weight: none;
       }
       .header-search {
         display: flex;

src/views/checked/index.vue

@@ -93,8 +93,10 @@ export default {
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
+        border-radius: 4%;
     }
     .card div{
         font-size: 0.4rem;
+        line-height: 0.8rem;
     }
 </style>

src/views/checked/problem/formwork/index.vue

@@ -17,16 +17,16 @@
                     <thead>
                         <tr>
                             <th>序号</th>
-                            <th>检查项目</th>
+                            <th>检查类型</th>
                             <th>检查内容</th>
-                            <th>法律依据/出处</th>
-                            <th>结果</th>
+                            <th>法规依据</th>
+                            <th>检查结果</th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr v-for="(item2,index2) in item.list" :key="index2">
                             <td align="center" v-text="index2+1" style="width:10%" ></td>
-                            <td align="center" v-text="item2.checkItem" style="width:15%"></td>
+                            <td align="center" v-text="item2.typeDictName" style="width:15%"></td>
                             <td align="center" v-text="item2.checkContent" style="width:20%"></td>
                             <td align="center" v-text="item2.checkBasis" style="width:30%"></td>
                             <td align="center">
@@ -104,9 +104,8 @@ export default {
         },
         /* 不合格跳转传参回显到检查问题清单 */
         noGrage(item2){
-            console.log(item2)
             //通过禁用状态来判断是否可以跳转
-            if(item2.isDisabled==false){
+            if(item2.isDisabled==false&&this.finish!='true'){
                 this.$router.push({
                     name: 'list',
                     query:{
@@ -124,16 +123,6 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-    .card{
-        width:90%;
-        box-shadow: 0px 0px 10px 2px #F3F3F3;
-        padding: 0.25rem;
-        margin:0.4rem auto;
-        background: white;
-    }
-    .card div{
-        font-size: 0.4rem;
-    }
     table{
         width: 100%;
     }

src/views/checked/problem/index.vue

@@ -124,9 +124,11 @@ export default {
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
+        border-radius: 4%;
     }
     .card div{
         font-size: 0.4rem;
+        line-height: 0.8rem;
     }
     .button-more{
         text-align: center;

src/views/checked/problem/list/index.vue

@@ -52,6 +52,7 @@
                 label="问题描述"
                 placeholder="问题描述"
                 :rules="[{ required: true, message: '请填写问题描述' }]"
+                :disabled="isFormwork"
             />
             <van-field
                 v-if="islay"
@@ -59,6 +60,7 @@
                 name="法律依据"
                 label="法律依据"
                 placeholder="法律依据"
+                :disabled="isFormwork"
                 :rules="[{ required: true, message: '请填写法律依据' }]"
             />
             <van-field name="uploader" label="图像上传" :rules="[{ required: true, message: '请上传图像' }]">
@@ -109,6 +111,7 @@ export default {
             planId:'',//不合格跳转进本页面所传列表id
             planItemId:'',//不合格跳转进本页面所传列id
             islay:false,//是否显示法律依据
+            isFormwork:false,//决定是否从不合格跳转到本页面是否禁用检查名称，内容，法律依据
         }
     },
     mounted() {
@@ -116,9 +119,10 @@ export default {
             this.id=this.$route.query.id
         }
         if(this.$route.query.name=='formwork'){
-            this.problemName=this.$route.query.checkitem,//检查项目
+            // this.problemName=this.$route.query.checkitem,//检查项目
             this.problemDescribe=this.$route.query.checkContent,//检查内容
-            this.checkBasis=this.$route.query.checkBasis//法律依据  
+            this.checkBasis=this.$route.query.checkBasis//法规依据  
+            this.isFormwork=true
             this.planId=this.$route.query.planId
             this.planItemId=this.$route.query.planItemId,
             this.islay=true

src/views/checked/problem/note/index.vue

@@ -13,7 +13,7 @@
         <LHeader v-bind:text="text"></LHeader>
         <van-checkbox-group v-model="result" @change="checkedEvent" ref="checkboxGroup">
             <div class="card" v-for="(item,index) in list"  :key="index" >
-                <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{item.id}}</van-checkbox>
+                <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
                 <div>问题名称：{{item.title}}</div>
                 <div>问题位置：{{item.address}}</div>
                 <div>问题内容：{{item.context}}</div>
@@ -22,7 +22,6 @@
         </van-checkbox-group>
         <div class="page-footer">
             <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick" :disabled="finish=='true'?true:false">全选</van-checkbox>
-            <van-button round type="defult" @click="cancel" :disabled="finish=='true'?true:false">取消</van-button>
             <van-button round type="info" @click="commit" :disabled="finish=='true'?true:false">提交</van-button>
         </div>
         <tab-bar :index="1"></tab-bar>
@@ -108,9 +107,6 @@ export default {
                 this.$refs.checkboxGroup.toggleAll(true);
             }
         },
-        cancel(){
-            this.$toast.success('取消')
-        },
         //提交问题
         commit(){
             var checkedList=[]
@@ -152,8 +148,6 @@ export default {
             }).catch(()=>{
                 this.$toast.success('取消')
             })
-            
-            
         }
     }
 }
@@ -165,9 +159,11 @@ export default {
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
+        border-radius: 4%;
     }
     .card div{
         font-size: 0.4rem;
+        line-height: 0.8rem;
     }
     .van-checkbox{
         margin-bottom: 0.1rem;

src/views/danger/addDanger/addDanger.vue

@@ -10,7 +10,7 @@
     >
       <van-field
         v-if="isShowreturnCause"
-        v-model="returnCause"
+        v-model.lazy="returnCause"
         readonly
         rows="1"
         autosize
@@ -24,10 +24,10 @@
         clickable
         name="proId"
         :value="projectName"
-        label="所属工程名称"
+        label="所属项目"
         placeholder="请选择"
         @click="showProjectName = true"
-        :rules="[{ required: true, message: '所属工程名称不能为空' }]"
+        :rules="[{ required: true, message: '所属项目不能为空' }]"
       />
       <van-popup v-model="showProjectName" position="bottom">
         <van-picker
@@ -258,7 +258,7 @@
 
       <div style="margin: 16px 16px 0">
         <van-button round block type="info" native-type="submit"
-          >保存</van-button
+          >上报</van-button
         >
       </div>
     </van-form>
@@ -395,6 +395,7 @@ export default {
  
   methods: {
     onSubmit(values) {
+
       let formdata = new FormData();
       formdata.append("proId", this.projectId);
       formdata.append("hdRange", values.hdRange);
@@ -410,12 +411,19 @@ export default {
       formdata.append("hdExpirationTime", values.hdExpirationTime);
       formdata.append("rectificationUser", values.rectificationUser);
       // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
+      
+      // return false;
       values.hdPicture1.forEach((item) => {
         formdata.append("hdPicture1[]", item.file);
       });
       values.hdVideo1.forEach((item) => {
         formdata.append("hdVideo1[]", item.file);
       });
+      // console.log(formdata)
+      // for (var [a, b] of formdata.entries()) {
+      //     console.log(a, b);
+      // } 
+      // return false;
       this.$toast.loading({
         message: "提交中...",
         forbidClick: true,
@@ -474,8 +482,28 @@ export default {
       dangerReturnEcho(`/hdreport/edit/${this.taskId}`)
         .then((res) => {
           this.$toast.clear();
+          
            // 对数据进行赋值
           this.returnCause = res.data.reason;
+          let msg = res.data.hdReport
+          console.log(msg)
+          this.projectId=msg.proId
+          this.projectName = msg.hdProjectName
+          this.range = msg.hdRange
+          this.type = msg.hdType
+          this.dangerName = msg.hdProjectName
+          this.dangerNum = msg.hdProjectId
+          this.dangerLevel = msg.hdLev
+          this.findTime = msg.hdDiscoveryTime
+          this.source = msg.dangerId
+          this.location = msg.hdPosition
+          this.describe = msg.hdDescribe
+          this.expireTime = msg.hdExpirationTime
+          this.recPeople = msg.rectificationUser
+          this.uploaderImg = msg.hdPictureList||[]
+          this.uploaderVideo = msg.hdVideoList||[]
+
+
         })
         .catch(() => {
           this.$toast.clear();
@@ -483,7 +511,7 @@ export default {
         });
     },
 
-    // 所属工程名称
+    // 所属项目
     onConProjectName(value) {
       if(!value){
         this.showProjectName = false;

src/views/danger/changeDanger/changeInfo.vue

@@ -23,10 +23,10 @@
         <van-col span="5">隐患类型:</van-col>
         <van-col span="19">{{ item.hdType }}</van-col>
       </van-row>
-      <van-row gutter="">
+      <!-- <van-row gutter="">
         <van-col span="5">发现时间:</van-col>
         <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-      </van-row>
+      </van-row> -->
       <van-row gutter="">
         <van-col span="5">超期标识:</van-col>
         <van-col span="19">{{ item.dueDate | formatTime }}</van-col>
@@ -245,7 +245,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/danger/changeDanger/index.vue

@@ -33,10 +33,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
             <van-row gutter="">
               <van-col span="5">适用范围:</van-col>
               <van-col span="19">{{ item.hdRange }}</van-col>

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -23,10 +23,10 @@
         <van-col span="5">隐患类型:</van-col>
         <van-col span="19">{{ item.hdType }}</van-col>
       </van-row>
-      <van-row gutter="">
+      <!-- <van-row gutter="">
         <van-col span="5">发现时间:</van-col>
         <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-      </van-row>
+      </van-row> -->
       <!-- 详情 -->
       <div class="detail">详情</div>
     </van-cell-group>
@@ -329,7 +329,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/danger/confirmeDanger/index.vue

@@ -22,10 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>

src/views/danger/delayApproval/index.vue

@@ -24,10 +24,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
    <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->

src/views/danger/insertDanger/list.vue

@@ -27,10 +27,10 @@
           <van-col span="5">隐患类型:</van-col>
           <van-col span="19">{{ item.hdType }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <!-- <van-row gutter="">
           <van-col span="5">状态:</van-col>
           <van-col span="19">{{ item.taskName }}</van-col>

src/views/danger/majorDanger/index.vue

@@ -24,10 +24,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
    <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->

src/views/danger/majorDanger/majorSurvey.vue

@@ -21,10 +21,10 @@
           <van-col span="7">隐患级别:</van-col>
           <van-col span="17">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="7">发现时间:</van-col>
           <van-col span="17">{{ item.startDate }}</van-col>
-        </van-row>
+        </van-row> -->
         <!-- 详情 -->
       <div class="detail">详情</div>
       </van-cell-group>
@@ -42,13 +42,13 @@
             @change="selectResult"
           >
             <van-radio name="1">同意</van-radio>
-            <van-radio name="0">退回</van-radio>
+            <van-radio name="0">重新认定隐患级别</van-radio>
           </van-radio-group>
         </template>
       </van-field>
 
       <!-- 同意时的选项 -->
-      <div class="agree" v-if="radio == 1">
+      <!-- <div class="agree" v-if="radio == 1">
         <van-field
           v-model="agreeOpinion"
           label="审批意见"
@@ -57,12 +57,13 @@
           type="textarea"
           placeholder="请输入"
         />
-      </div>
+      </div> -->
 
       <!-- 退回是的选项 -->
-      <div class="disagree" v-else>
+      <div class="disagree">
         <van-field
         readonly
+        v-if="radio==0"
         clickable
         name="thinkHdLev"
         :value="thinkLevel"
@@ -75,6 +76,7 @@
         <van-picker
           show-toolbar
           value-key="projectName"
+          :default-index="0"
           :columns="columnsThinkLevel"
           @confirm="onConThinkLevel"
           @cancel="showThinkLevel = false"
@@ -123,6 +125,7 @@ export default {
       agreeOpinion: "",
       disagreeOpinion: "",
       thinkLevel:'重大隐患', //因为隐患级别
+      thinkHdLev:'重大隐患',
       showThinkLevel: false,
       columnsThinkLevel:["重大隐患","一般隐患A","一般隐患B","一般隐患C",]
 
@@ -142,7 +145,7 @@ export default {
       }
     });
   },
-   created() {},
+  created() {},
   methods: {
     selectResult(val) {
       this.radio = val;
@@ -175,10 +178,11 @@ export default {
         });
     },
 
-    // 所属工程名称
+    // 所属项目
     onConThinkLevel(value) {
       this.thinkLevel = value;
       this.showProjectName = false;
+      this.showThinkLevel = false;
     },
      // 详情
     goDetail(taskId) {
@@ -224,7 +228,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/danger/managerDanger/index.vue

@@ -24,10 +24,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
    <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->

src/views/danger/managerDanger/managerSurvey.vue

@@ -19,10 +19,10 @@
         <van-col span="7">隐患级别:</van-col>
         <van-col span="17">{{ item.hdLev }}</van-col>
       </van-row>
-      <van-row gutter="">
+      <!-- <van-row gutter="">
         <van-col span="7">隐患发现时间:</van-col>
         <van-col span="17">{{ item.createTime }}</van-col>
-      </van-row>
+      </van-row> -->
       <!-- 详情 -->
       <div class="detail">详情</div>
     </van-cell-group>
@@ -153,7 +153,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/danger/reportReturn/index.vue

@@ -22,10 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>

src/views/danger/reviewDanger/index.vue

@@ -22,10 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>

src/views/danger/reviewDanger/reviewAdd.vue

@@ -23,10 +23,10 @@
           <van-col span="5">隐患类型:</van-col>
           <van-col span="19">{{ item.hdType }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">超期标识:</van-col>
           <van-col span="19">{{ item | formatTime }}</van-col>
@@ -236,7 +236,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/danger/standBook/index.vue

@@ -22,10 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>

src/views/danger/standBook/normalDetail.vue

@@ -8,7 +8,7 @@
         <van-cell-group inset>
           <van-row gutter="">
             <van-col span="7"
-              ><span class="field-title">所属工程名称:</span></van-col
+              ><span class="field-title">所属项目:</span></van-col
             >
             <van-col span="17">{{ hdReport.proId }}</van-col>
           </van-row>
@@ -35,7 +35,7 @@
           <div v-show="reportOpen">
             <van-row gutter="">
               <van-col span="7"
-                ><span class="field-title">试用范围:</span></van-col
+                ><span class="field-title">适用范围:</span></van-col
               >
               <van-col span="17">{{ hdReport.hdRange }}</van-col>
             </van-row>
@@ -579,7 +579,7 @@ export default {
   }
   p {
     font-size: 0.4rem;
-    font-weight: 600;
+    font-weight: none;
     padding-left: 0.16rem;
     margin: 0.186667rem 0;
     color: #7f7f7f;
@@ -606,18 +606,18 @@ export default {
   }
   .info-title {
     color: #2980f7;
-    font-weight: bolder;
+    font-weight: none;
   }
   .field-title {
     color: black;
-    font-weight: bolder;
+    font-weight: none;
   }
   .more {
     position: absolute;
     bottom: 0.32rem;
     right: 15px;
     color: #2a80f7;
-    font-weight: bolder;
+    font-weight: none;
     z-index: 99;
   }
   .detail_pic {

src/views/danger/superviseDanger/index.vue

@@ -23,10 +23,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->

src/views/danger/superviseDanger/superSurvey.vue

@@ -19,10 +19,10 @@
           <van-col span="7">隐患级别:</van-col>
           <van-col span="17">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="7">隐患发现时间:</van-col>
           <van-col span="17">{{ item.createTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <!-- *接口对接4 END -->
         <!-- 详情 -->
       <div class="detail">详情</div>
@@ -153,7 +153,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/messageCenter/index.vue

@@ -69,7 +69,7 @@ export default {
   font-size: 17px;
   line-height: 1.333333rem;
   color: white;
-  font-weight: 600;
+  font-weight: none;
   text-align: center;
 }
 .con {

src/views/my/index.vue

@@ -104,7 +104,7 @@ export default {
   font-size: 17px;
   line-height: 50px;
   color: white;
-  font-weight: 600;
+  font-weight: none;
   text-align: center;
 }
 .con {
@@ -118,7 +118,7 @@ export default {
     justify-content: space-between;
     .user-name {
       font-size: 17px;
-      font-weight: bold;
+      font-weight: none;
     }
 
     .tag-wrap {
@@ -139,7 +139,7 @@ export default {
       span {
         margin-left: 0.2666rem;
         font-size: 15px;
-        font-weight: bold;
+        font-weight: none;
       }
     }
   }
@@ -156,7 +156,7 @@ export default {
   border-radius: 5px;
   button {
     font-size: 15px;
-    font-weight: bold;
+    font-weight: none;
   }
 }
 .van-cell-group--inset {

src/views/notice/index.vue

@@ -80,8 +80,10 @@ export default {
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
+        border-radius: 4%;
     }
     .card div{
         font-size: 0.4rem;
+        line-height: 0.8rem;
     }
 </style>

src/views/notice/noticeList/index.vue

@@ -87,10 +87,10 @@
                 <div class="sign2"><span>项目经理签字确认：</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istext2" @click="sign2" >电子签字</p><img  class="sign-img2" v-show="isImg2" :src="resultImg2" alt=""></van-tag></div>
                 <div class="page-footer-button">
                     <van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:isFinish==true?true:false">生成整改通知单</van-button>
-                    <van-button round type="defult" size="large" @click="cancel" :disabled="finish=='true'?true:false">取消</van-button>
                 </div>
             </van-tab>
         </van-tabs>
+        <!-- <div></div> -->
         <tab-bar :index="1"></tab-bar>
         
     </div>
@@ -101,7 +101,7 @@ import tabBar from "@/components/TabBar";
 import LHeader from '@/components/header.vue'
 import { getFun,postFun } from '@/service/table'
 export default {
-    name: 'notice',
+    name: 'noticeList',
     components: {
         "LHeader":LHeader,
         "tabBar":tabBar
@@ -291,9 +291,6 @@ export default {
             this.value = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
             this.showCalendar = false;
         },
-        cancel(){
-            this.$toast('取消')
-        },
         //日期输入框点击事件
         calendarOpen(){
             if(this.finish=='false'){
@@ -427,6 +424,7 @@ export default {
         padding: 0.25rem;
         margin:0.4rem auto;
         background: white;
+        border-radius: 4%;
         .van-overlay {
             display:flex;
             justify-content: space-evenly;
@@ -441,6 +439,7 @@ export default {
     }
     .card div{
         font-size: 0.4rem;
+        line-height: 0.8rem;
     }
     table{
         width: 100%;

src/views/notice/noticeList/sign/index.vue

@@ -86,6 +86,6 @@ export default {
     }
     .page-footer p{
         font-size: 0.3rem;
-        font-weight: bolder;
+        font-weight: none;
     }
 </style>
\ No newline at end of file

src/views/risk/riskAccount/index.vue

@@ -24,10 +24,10 @@
           <van-col span="5">风险级别:</van-col>
           <van-col span="19">{{ item.riskLevel }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.startDate }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">风险源:</van-col>
           <van-col span="19">{{ item.riskSource }}</van-col>

src/views/risk/riskAccount/riskBigDetail.vue

@@ -8,7 +8,7 @@
         <van-cell-group inset >
           <van-row gutter="">
             <van-col span="7"
-              ><span class="field-title">所属工程名称:</span></van-col
+              ><span class="field-title">所属项目:</span></van-col
             >
             <van-col span="17">{{ riskMain.pId }}</van-col>
           </van-row>
@@ -316,7 +316,7 @@ export default {
   }
   p {
     font-size: 0.4rem;
-    font-weight: 600;
+    font-weight: none;
     padding-left: 0.16rem;
     margin: 0.186667rem 0;
     color: #7f7f7f;
@@ -340,18 +340,18 @@ export default {
   }
   .info-title {
     color: #2980f7;
-    font-weight: bolder;
+    font-weight: none;
   }
   .field-title {
     color: black;
-    font-weight: bolder;
+    font-weight: none;
   }
   .more {
     position: absolute;
     bottom: 0.32rem;
     right: 15px;
     color: #2a80f7;
-    font-weight: bolder;
+    font-weight: none;
     z-index: 99;
   }
 }

src/views/risk/riskAdd/index.vue

@@ -25,10 +25,10 @@
         clickable
         name="projectName"
         :value="projectName"
-        label="所属工程名称"
+        label="所属项目"
         placeholder="请选择"
         @click="showProjectName = true"
-        :rules="[{ required: true, message: '所属工程名称不能为空' }]"
+        :rules="[{ required: true, message: '所属项目不能为空' }]"
       />
       <van-popup v-model="showProjectName" position="bottom">
         <van-picker
@@ -544,7 +544,7 @@ export default {
         });
     },
 
-    // 所属工程名称
+    // 所属项目
     onConProjectName(value) {
       if (!value) {
         this.showProjectName = false;

src/views/risk/riskConfirme/index.vue

@@ -23,10 +23,10 @@
           <van-col span="5">风险级别:</van-col>
           <van-col span="19">{{ item.riskLevel }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.startDate }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">风险源:</van-col>
           <van-col span="19">{{ item.riskSource }}</van-col>

src/views/risk/riskConfirme/riskAffirm.vue

@@ -209,7 +209,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/risk/riskReturn/index.vue

@@ -22,10 +22,10 @@
           <van-col span="5">风险级别:</van-col>
           <van-col span="19">{{ item.riskLevel }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.startDate }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">风险源:</van-col>
           <van-col span="19">{{ item.riskSource }}</van-col>

src/views/saveWorkbench/index.vue

@@ -362,7 +362,7 @@ export default {
   font-size: 17px;
   line-height: 50px;
   color: white;
-  font-weight: 600;
+  font-weight: none;
   text-align: center;
 }
 .con {