Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet

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-row>
-            <el-form-item label-width="50px">
+        <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()
     }
   }

src/views/threeSystems/safetyOperationRegulations/components/textLibraryInfo.vue

@@ -99,7 +99,6 @@ export default {
         this.loading = false
         this.form = data.data
         this.form.FILE = []
-        this.remoteControl.keyOne = !(this.form.CATEGORY_LIST[0].CATEGORY_ID === '8051d985a2bc406a83ea9360b64182b2')
       }).catch((e) => {
         this.$message.error(e)
         this.loading = false

src/views/threeSystems/safetyProductionManagementSystem/components/textLibraryInfo.vue

@@ -99,7 +99,6 @@ export default {
         this.loading = false
         this.form = data.data
         this.form.FILE = []
-        this.remoteControl.keyOne = !(this.form.CATEGORY_LIST[0].CATEGORY_ID === '691346658ed744a1bda2ed3a755f606c')
       }).catch((e) => {
         this.$message.error(e)
         this.loading = false

src/views/threeSystems/safetyProductionResponsibilitySystem/components/textLibraryInfo.vue

@@ -103,7 +103,6 @@ export default {
         this.loading = false
         this.form = data.data
         this.form.FILE = []
-        this.remoteControl.keyOne = !(this.form.CATEGORY_LIST[0].CATEGORY_ID === '7158f688d0f34054a28a9275139298df')
       }).catch((e) => {
         this.$message.error(e)
         this.loading = false