Merge branch 'dev-yjl' into 'shenzhen-dev'

安全管理-项目自检页面修复、中建四新增质安管理安全轴数据 See merge request !123
2023-03-18 09:09:31 +08:00 · 2023-03-18 09:09:31 +08:00 · d8f93c14f8
commit d8f93c14f8
parent f08f9c3919 ea6562c25c
9 changed files with 306 additions and 259 deletions
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@ -41,8 +41,8 @@ if (process.env.NODE_ENV == 'development') {
  
  // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
  // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
-  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
-  axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
+  axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
  // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
  // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
  // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
--- a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
+++ b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
@ -29,79 +29,6 @@
          </el-col>
        </el-row>

-        <el-row :gutter="12">
-          <el-col :span="6">
-            <el-form-item :label="'登录页面logo'" prop="loginLogo">
-              <el-upload
-                :action="$store.state.UPLOADURL"
-                name="files"
-                list-type="picture-card"
-                :limit="1"
-                :on-preview="handlePictureCardPreview"
-                :on-success="handleAvatarSuccess"
-                :file-list="fileList"
-                :on-remove="handleDelete"
-              >
-                <i class="el-icon-plus"></i>
-                <div slot="tip" class="el-upload__tip">只能上传一张</div>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item :label="'数据看板logo'" prop="bigScreenLogo">
-              <el-upload
-                :action="$store.state.UPLOADURL"
-                name="files"
-                list-type="picture-card"
-                :limit="1"
-                :on-preview="handlePictureCardPreview"
-                :on-success="handleAvatarSuccess4"
-                :file-list="fileList4"
-                :on-remove="handleDelete4"
-              >
-                <i class="el-icon-plus"></i>
-                <div slot="tip" class="el-upload__tip">只能上传一张</div>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="12">
-          <el-col :span="6">
-            <el-form-item :label="'登录页面背景'" prop="loginBackgroundImage">
-              <el-upload
-                :action="$store.state.UPLOADURL"
-                name="files"
-                list-type="picture-card"
-                :on-preview="handlePictureCardPreview"
-                :on-success="handleAvatarSuccess2"
-                :file-list="fileList2"
-                :on-remove="handleDelete2"
-              >
-                <i class="el-icon-plus"></i>
-                <div slot="tip" class="el-upload__tip">
-                  只能上传一张,建议上传大小为1920 x 562的图片
-                </div>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item :label="'平台内部logo'" prop="platformLogo">
-              <el-upload
-                :action="$store.state.UPLOADURL"
-                name="files"
-                list-type="picture-card"
-                :on-preview="handlePictureCardPreview"
-                :on-success="handleAvatarSuccess3"
-                :file-list="fileList3"
-                :on-remove="handleDelete3"
-              >
-                <i class="el-icon-plus"></i>
-                <div slot="tip" class="el-upload__tip">只能上传一张</div>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
        <el-row :gutter="12">
          <el-col :span="6">
            <el-form-item :label="'是否开启缩放'" prop="platformLogo">
@ -181,6 +108,80 @@
          </el-col>
        </el-row>

+        <el-row :gutter="12">
+          <el-col :span="6">
+            <el-form-item :label="'登录页面logo'" prop="loginLogo">
+              <el-upload
+                :action="$store.state.UPLOADURL"
+                name="files"
+                list-type="picture-card"
+                :limit="1"
+                :on-preview="handlePictureCardPreview"
+                :on-success="handleAvatarSuccess"
+                :file-list="fileList"
+                :on-remove="handleDelete"
+              >
+                <i class="el-icon-plus"></i>
+                <div slot="tip" class="el-upload__tip">只能上传一张</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item :label="'数据看板logo'" prop="bigScreenLogo">
+              <el-upload
+                :action="$store.state.UPLOADURL"
+                name="files"
+                list-type="picture-card"
+                :limit="1"
+                :on-preview="handlePictureCardPreview"
+                :on-success="handleAvatarSuccess4"
+                :file-list="fileList4"
+                :on-remove="handleDelete4"
+              >
+                <i class="el-icon-plus"></i>
+                <div slot="tip" class="el-upload__tip">只能上传一张</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="12">
+          <el-col :span="6">
+            <el-form-item :label="'登录页面背景'" prop="loginBackgroundImage">
+              <el-upload
+                :action="$store.state.UPLOADURL"
+                name="files"
+                list-type="picture-card"
+                :on-preview="handlePictureCardPreview"
+                :on-success="handleAvatarSuccess2"
+                :file-list="fileList2"
+                :on-remove="handleDelete2"
+              >
+                <i class="el-icon-plus"></i>
+                <div slot="tip" class="el-upload__tip">
+                  只能上传一张,建议上传大小为1920 x 562的图片
+                </div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'平台内部logo'" prop="platformLogo">
+              <el-upload
+                :action="$store.state.UPLOADURL"
+                name="files"
+                list-type="picture-card"
+                :on-preview="handlePictureCardPreview"
+                :on-success="handleAvatarSuccess3"
+                :file-list="fileList3"
+                :on-remove="handleDelete3"
+              >
+                <i class="el-icon-plus"></i>
+                <div slot="tip" class="el-upload__tip">只能上传一张</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
        <!-- <el-form-item :label="''" >
                <el-button type="primary" style="width: 200px" @click="submitData">保存</el-button>
            </el-form-item> -->
@ -188,7 +189,7 @@

      <el-button
        type="primary"
-        style="width: 200px; margin: 140px 0px 0px 350px; position: absolute"
+        style="width: 11%; margin: 2% 0 0 18%; position: absolute"
        @click="submitData"
        >保存</el-button
      >
--- a/src/views/projectAdmin/fourEngin/govComp/Col2.vue
+++ b/src/views/projectAdmin/fourEngin/govComp/Col2.vue
@ -2,8 +2,14 @@
  <Card title="质安管理时间轴">
    <div class="timeline">
      <el-timeline>
-        <el-timeline-item v-for="(item,index) in contentList" :key="index" :timestamp="item.time" placement="top">
-          <div class="point"></div><span class="mintit"> 监督巡检 </span>
+        <el-timeline-item
+          v-for="(item, index) in contentList"
+          :key="index"
+          :timestamp="item.time"
+          placement="top"
+        >
+          <div class="point"></div>
+          <span class="mintit"> 监督巡检 </span>
          <div class="contentBox">
            <p>
              <span>是否发现问题</span>
@ -37,169 +43,187 @@
 </template>

 <script>
-import Card from "../components/Card.vue";
+import Card from '../components/Card.vue'
 export default {
  components: { Card },
  data() {
    return {
      contentList: [
        {
-          time: "2023-02-23",
+          time: '2023-03-16',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "李文心、王昊",
-          type: "安全",
-          position: "地下室",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '陈伟斌',
+          type: '安全',
+          position: '地下室',
+          change: '是'
        },
        {
-          time: "2023-02-13",
+          time: '2023-03-02',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王章浩",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王斌',
+          type: '安全',
+          position: '地下室',
+          change: '是'
        },
        {
-          time: "2023-02-10",
+          time: '2023-02-23',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "李文心",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '李文心、王昊',
+          type: '安全',
+          position: '地下室',
+          change: '是'
        },
        {
-          time: "2023-01-29",
+          time: '2023-02-13',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "郭光祥",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王章浩',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2023-01-23",
+          time: '2023-02-10',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "卢位昌",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '李文心',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2023-1-11",
+          time: '2023-01-29',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王斌",
-          type: "质量",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '郭光祥',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2023-01-03",
+          time: '2023-01-23',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "陈显豪",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '卢位昌',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2022-12-28",
+          time: '2023-1-11',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王斌",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王斌',
+          type: '质量',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2022-12-05",
+          time: '2023-01-03',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王章浩、陈伟斌",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '陈显豪',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2022-11-01",
+          time: '2022-12-28',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王章浩、陈伟斌",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王斌',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2022-10-24",
+          time: '2022-12-05',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王章浩、王斌",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王章浩、陈伟斌',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2022-10-11",
+          time: '2022-11-01',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "徐军、陈伟斌",
-          type: "安全",
-          position: "人工挖孔桩",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王章浩、陈伟斌',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2022-09-29",
+          time: '2022-10-24',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王斌",
-          type: "安全",
-          position: "人工挖孔桩",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王章浩、王斌',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2022-08-29",
+          time: '2022-10-11',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王章浩",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '徐军、陈伟斌',
+          type: '安全',
+          position: '人工挖孔桩',
+          change: '是'
        },
        {
-          time: "2022-08-15",
+          time: '2022-09-29',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王章浩、陈伟斌",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王斌',
+          type: '安全',
+          position: '人工挖孔桩',
+          change: '是'
        },
        {
-          time: "2022-07-19",
+          time: '2022-08-29',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王昊、余锋",
-          type: "安全",
-          position: "施工路面",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王章浩',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        },
        {
-          time: "2022-06-20",
+          time: '2022-08-15',
          question: 1,
-          utils: "中国建筑第四工程局有限公司",
-          safe: "王章浩",
-          type: "安全",
-          position: "基坑",
-          change: "是"
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王章浩、陈伟斌',
+          type: '安全',
+          position: '基坑',
+          change: '是'
+        },
+        {
+          time: '2022-07-19',
+          question: 1,
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王昊、余锋',
+          type: '安全',
+          position: '施工路面',
+          change: '是'
+        },
+        {
+          time: '2022-06-20',
+          question: 1,
+          utils: '中国建筑第四工程局有限公司',
+          safe: '王章浩',
+          type: '安全',
+          position: '基坑',
+          change: '是'
        }
      ]
-    };
    }
-};
+  }
+}
 </script>

 <style lang="less" scoped>
--- a/src/views/projectFront/examination/test.vue
+++ b/src/views/projectFront/examination/test.vue
@ -317,16 +317,16 @@ export default {
  z-index: 99999;
 }
 .resultImg {
-  width: 90%;
-  height: 180%;
-  margin: -30rem 6rem;
+  width: 100%;
+  height: 307%;
+  margin: -70rem 0rem;
 }
 .score {
  position: relative;
  left: 50%;
  top: -32%;
-  width: 55rem;
-  height: 55rem;
+  width: 80rem;
+  height: 80rem;
  border-radius: 50%;
  border: 4rem solid #fdcb05;
  text-align: center;
@ -338,8 +338,8 @@ export default {
    position: absolute;
    // display: inline-block;
    color: #fdcb05;
-    font-size: 20rem;
-    margin-top: -22rem;
+    font-size: 30rem;
+    margin-top: -12rem;
    margin-left: -28rem;
  }
 }
--- a/src/views/projectFront/highModulus/alarmInfo.vue
+++ b/src/views/projectFront/highModulus/alarmInfo.vue
@ -24,12 +24,16 @@
      >
      </el-table-column>
      <el-table-column prop="alarmType" label="类型" align="center">
-        <template slot-scope="scope" v-if="scope.row.alarmType === 1">
-          <span class="color1">{{ getStatus(scope.row.alarmType) }}</span>
+        <template slot-scope="scope">
+          <span
+            class="color1"
+            :class="scope.row.alarmType == 1 ? 'color1' : 'color2'"
+            >{{ getStatus(scope.row.alarmType) }}</span
+          >
        </template>
-        <template slot-scope="scope" v-else>
+        <!-- <template slot-scope="scope" v-if="scope.row.alarmType === 2">
          <span class="color2">{{ getStatus(scope.row.alarmType) }}</span>
-        </template>
+        </template> -->
      </el-table-column>
      <el-table-column prop="type" label="报警类型" align="center">
        <template slot-scope="scope">
--- a/src/views/projectFront/safeManage/v2/checkStandingBook.vue
+++ b/src/views/projectFront/safeManage/v2/checkStandingBook.vue
@ -155,7 +155,8 @@
        </el-table-column>
        <!-- 检查人 -->
        <el-table-column
-          width="250"
+          width="300"
+          align="center"
          :label="
            $t('message.safeMangeCheck.checked') +
            $t('message.safeMangeCheck.people')
@ -163,12 +164,14 @@
        >
          <template slot-scope="scope">
            <p>{{ scope.row.createUserName }}</p>
-            <p>{{ scope.row.createEnterpriseName }}</p>
+            <!-- <p>{{ scope.row.createEnterpriseName }}</p> -->
            <p class="table_bottom_txt">{{ scope.row.createTime }}</p>
          </template>
        </el-table-column>
        <!-- 隐患信息 -->
        <el-table-column
+          width="400"
+          align="center"
          :label="
            $t('message.safeMangeCheck.hiddenDanger') +
            $t('message.safeMangeCheck.info')
@ -218,14 +221,14 @@
        ></el-table-column>
        <!-- 整改人 -->
        <el-table-column
-          width="100"
+          width="200"
          prop="changeUserName"
          align="center"
          :label="$t('message.safeMangeCheck.changePeople')"
        ></el-table-column>
        <!-- 复查人 -->
        <el-table-column
-          width="100"
+          width="200"
          prop="reviewUserName"
          align="center"
          :label="$t('message.safeMangeCheck.examinePeople')"
@ -1651,7 +1654,7 @@ export default {
        this.searchForm.pageNo = 1
      }
      gethiddenDangerInspectRecordApi(this.searchForm).then((result) => {
-        console.log(result)
+        console.log('表格数据', result)
        this.recordList = result.result.records
        this.pageTotal = result.result.total
      })
--- a/src/views/projectFront/safeManage/v2/inspectionRecord.vue
+++ b/src/views/projectFront/safeManage/v2/inspectionRecord.vue
@ -1,5 +1,5 @@
 <template>
-  <!-- 检查台账 -->
+  <!-- 项目自检记录 -->
  <div class="fullHeight">
    <el-page-header
      class="backText"
@ -93,7 +93,8 @@
        </el-table-column>
        <!-- 检查人 -->
        <el-table-column
-          width="250"
+          width="300"
+          align="center"
          :label="
            $t('message.safeMangeCheck.checked') +
            $t('message.safeMangeCheck.people')
@ -101,12 +102,14 @@
        >
          <template slot-scope="scope">
            <p>{{ scope.row.createUserName }}</p>
-            <p>{{ scope.row.createEnterpriseName }}</p>
+            <!-- <p>{{ scope.row.createEnterpriseName }}</p> -->
            <p class="table_bottom_txt">{{ scope.row.createTime }}</p>
          </template>
        </el-table-column>
        <!-- 隐患信息 -->
        <el-table-column
+          width="400"
+          align="center"
          :label="
            $t('message.safeMangeCheck.hiddenDanger') +
            $t('message.safeMangeCheck.info')
@ -156,20 +159,20 @@
        ></el-table-column>
        <!-- 整改人 -->
        <el-table-column
-          width="100"
+          width="200"
          prop="changeUserName"
          align="center"
          :label="$t('message.safeMangeCheck.changePeople')"
        ></el-table-column>
        <!-- 复查人 -->
        <el-table-column
-          width="100"
+          width="200"
          prop="reviewUserName"
          align="center"
          :label="$t('message.safeMangeCheck.examinePeople')"
        ></el-table-column>
        <!-- 检查类型 -->
-        <el-table-column
+        <!-- <el-table-column
          width="200"
          prop="inspectTypeName"
          align="center"
@ -177,7 +180,7 @@
            $t('message.safeMangeCheck.checked') +
            $t('message.safeMangeCheck.type')
          "
-        ></el-table-column>
+        ></el-table-column> -->
        <!-- 操作 -->
        <el-table-column
          width="80"
@ -1075,7 +1078,8 @@ export default {
        pageNo: 1,
        pageSize: 10,
        projectSn: this.$store.state.projectSn,
-        itemId: ''
+        itemId: '', //子任务ID
+        taskId: '' //任务ID
      },
      daterange: [],
      // checkType:[],
@ -1185,26 +1189,27 @@ export default {
    this.getPeopleList()
  },
  mounted() {
+    this.searchForm.itemId = this.$route.query.id
+    this.searchForm.taskId = this.$route.query.taskId
+    this.getStatictisData()
+    this.loadList()
+  },
+  watch: {
+    $route(to, from) {
+      // console.log('watch')
+      // console.log(from.path); //从哪来
      if (this.$route.query.id) {
-      // this.searchForm.itemId = this.$route.query.id
+        this.searchForm.itemId = this.$route.query.id
+      } else if (this.$route.query.taskId) {
+        this.searchForm.taskId = this.$route.query.taskId
      } else {
+        this.searchForm.itemId = ''
+        this.searchForm.taskId = ''
        this.getStatictisData()
      }
      this.loadList()
+    }
  },
-  // watch: {
-  //   $route(to, from) {
-  //     // console.log('watch')
-  //     // console.log(from.path); //从哪来
-  //     if (this.$route.query.id) {
-  //       this.searchForm.itemId = this.$route.query.id
-  //     } else {
-  //       this.searchForm.itemId = ''
-  //       this.getStatictisData()
-  //     }
-  //     this.loadList()
-  //   }
-  // },
  methods: {
    //导出
    exportData() {
@ -1223,7 +1228,9 @@ export default {
        '&pageSize=' +
        this.searchForm.pageSize +
        '&itemId=' +
-        this.searchForm.itemId
+        this.searchForm.itemId +
+        '&taskId=' +
+        this.searchForm.taskId
    },
    //提交
    submitForm() {
@ -1313,7 +1320,9 @@ export default {
        recordType: 1,
        rectifyRequire: this.formData.rectifyRequire,
        reviewId: this.$store.state.userInfo.userId,
-        status: this.formData.status
+        status: this.formData.status,
+        taskId: this.searchForm.taskId,
+        itemId: this.searchForm.itemId
      }
      console.log(data)
      addHiddenDangerInspectRecordApi(data).then((res) => {
--- a/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
+++ b/src/views/projectFront/safeManage/v2/projectSelfInspection.vue
@ -59,14 +59,14 @@
          align="center"
        ></el-table-column>
        <!-- 检查类型 -->
-        <el-table-column
+        <!-- <el-table-column
          prop="inspectTypeName"
          :label="
            $t('message.safeMangeCheck.checked') +
            $t('message.safeMangeCheck.type')
          "
          align="center"
-        ></el-table-column>
+        ></el-table-column> -->
        <!-- 创建人 -->
        <el-table-column
          prop="createUserName"
@ -90,6 +90,7 @@
        <!-- 计划检查时间 -->
        <el-table-column
          prop="startTime"
+          align="center"
          :label="
            $t('message.safeMangeCheck.plan') +
            $t('message.safeMangeCheck.checked') +
@ -197,7 +198,7 @@
          :rules="addEditFormRules"
        >
          <!-- 检查类型 -->
-          <el-form-item
+          <!-- <el-form-item
            :label="
              $t('message.safeMangeCheck.checked') +
              $t('message.safeMangeCheck.type')
@ -216,7 +217,7 @@
              >
              </el-option>
            </el-select>
-          </el-form-item>
+          </el-form-item> -->
          <!-- 任务名称 -->
          <el-form-item
            :label="
--- a/src/views/projectFront/safeManage/v2/subTasklist.vue
+++ b/src/views/projectFront/safeManage/v2/subTasklist.vue
@ -198,7 +198,12 @@ export default {
    },
    detailsPoint(item) {
      // this.$router.push('/project/safeManage/checkStandingBook?id=' + item.id)
-      this.$router.push('/project/safeManage/inspectionRecord?id=' + item.id)
+      this.$router.push(
+        '/project/safeManage/inspectionRecord?id=' +
+          item.id +
+          '&taskId=' +
+          item.taskId
+      )
    }
  }
 }