Merge remote-tracking branch 'origin/pet' into pet

src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue

@@ -389,3 +389,34 @@ export default {
       width: 100%
       height: 100%
 </style>
+<style scoped lang="scss">
+.table-ui td{
+  line-height: unset;
+}
+.app-container{
+  margin-bottom: 50px;
+}
+.level-title {
+  display: flex;
+  justify-content: space-between;
+}
+
+.pdf-content[name=pdf-box]{
+  position: absolute;
+  left: -999999px;
+  .level-title {
+    h1{
+      font-size: 20px;
+    }
+    .level-code{
+      font-size: 20px;
+    }
+  }
+  td{
+    font-size: 20px;
+  }
+  .bbg {
+    width: 180px;
+  }
+}
+</style>

src/views/keyprojects/outsourced/components/edit.vue

@@ -690,7 +690,7 @@ export default {
           const corpId = data.varList[i].CORPINFO_ID
           if (corpId === '1e6dbbe16004402f8d2c0e52afd9a676' ||
             corpId === '3a854eefa7894e06aaa1a2611bca80f6' ||
-            corpId === '969fbd8ac42079a203f9e077ede888c1' ||
+            corpId === '5cee11f6152d42e0a08ae38dc6abcfdf' ||
             corpId === '020578a4c1f04bc692ee25145c2efbe5' || corpId === '90966974de3c4b83aca6f8fd6432d5c2') {
             this.groupCorpList.push(data.varList[i])
           }

src/views/keyprojects/videoinfomanager/components/list.vue

@@ -25,8 +25,17 @@
               <el-input v-model="form.UNITS_USER_ID" style="width:206px" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label-width="50px">
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="5">
+            <el-form-item label="在线状态：" >
+              <el-select v-model="form.ONLINE_STATUS" filterable clearable placeholder="请选择施工相关方">
+                <el-option v-for="item in onlineStatusList" :key="item.ID" :label="item.NAME" :value="item.ID" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label-width="50px" style="margin-left: -50px">
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
                 搜索
               </el-button>
@@ -251,7 +260,8 @@ export default {
         VIDEONAME: '',
         UNITS_USER_ID: '',
         UNIT_USE: '',
-        UNITS_ID: ''
+        UNITS_ID: '',
+        ONLINE_STATUS: ''
       },
       unitsList: [],
       addForm: {
@@ -316,7 +326,16 @@ export default {
         value: 'id',
         children: 'children',
         label: 'name'
+      },
+      onlineStatusList: [
+        {
+          ID: 0,
+          NAME: '在线'
+        }, {
+          ID: 1,
+          NAME: '离线'
         }
+      ]
     }
   },
   computed: {
@@ -630,7 +649,8 @@ export default {
           VIDEONAME: this.form.VIDEONAME,
           PERSONNELMANAGEMENT_ID: this.form.UNITS_USER_ID,
           UNIT_USE: this.form.UNIT_USE,
-          UNITS_ID: this.form.UNITS_ID
+          UNITS_ID: this.form.UNITS_ID,
+          ONLINE_STATUS: this.form.ONLINE_STATUS
         }
       ).then((data) => {
         this.listLoading = false
@@ -645,6 +665,7 @@ export default {
       this.form.UNITS_USER_ID = ''
       this.form.UNIT_USE = ''
       this.form.UNITS_ID = ''
+      this.form.ONLINE_STATUS = ''
       this.getList()
     }
   }