Merge remote-tracking branch 'origin/master'

王震

2023-09-09 c37e4efb8a78a0f1bf85cf29a9286cc312469dbe

 src/components/view/record-content.vue

@@ -39,7 +39,6 @@
      height: calc(100% - 120px);
      background-color: #fff;
      display: flex;
		
   }

   .thing .left {
@@ -47,7 +46,6 @@
      height: calc(100% - 20px);
      border-right: 3px solid rgb(245, 247, 251);
      padding: 16px;
      /* height:calc(50vh - 250px) */
   }

   .thing .left .custom-tree-node span {
@@ -199,6 +197,8 @@
                  <template>
                        <el-select v-model="edit.techFather" 
                  placeholder="请选择" 
                        <el-select v-model="edit.techFather"
                  placeholder="请选择"
                  disabled
                  @change="workevent"
                  style="width: 310px;">