消防点位标点后 地图没有标点 只有名称 15510

src/views/firefighting/checklist/components/edit.vue

@@ -235,6 +235,19 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="负责部门" label-width="80px">
+                <SelectTree
+                  ref="deptTree_Select"
+                  :clearable="false"
+                  :key="waitFor.DEPARTMENT_ID"
+                  :options="treeDataDepart"
+                  :props="defaultProps"
+                  v-model="waitFor.DEPARTMENT_ID"
+                  placeholder="请选择部门"
+                  style="width: 100%;"/>
+              </el-form-item>
+            </el-col>
             <el-col :span="4" label-width="80px">
               <el-form-item>
                 <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="getDevice">
@@ -404,8 +417,10 @@ export default {
         POSTNAME: '',
         USERNAME: '',
         varList: [],
-        idListFcS: []
+        idListFcS: [],
+        DEPARTMENT_ID: ''
       },
+      treeDataDepart: [],
       pointList: [],
       pointCode: '',
       // ------------end
@@ -531,7 +546,8 @@ export default {
           FIRE_DEVICE_TYPE_ID: this.waitFor.FIRE_DEVICE_TYPE_ID,
           FIRE_POINT_ID: this.waitFor.FIRE_POINT_ID,
           FIRE_DEVICE_CODE: this.waitFor.FIRE_DEVICE_CODE,
-          FIRE_REGION_ID: this.waitFor.FIRE_REGION_ID
+          FIRE_REGION_ID: this.waitFor.FIRE_REGION_ID,
+          DEPARTMENT_ID: this.waitFor.DEPARTMENT_ID
         }
       ).then((data) => {
         this.listLoading = false
@@ -587,6 +603,7 @@ export default {
           this.treeData.forEach((item) => {
             item.isDisabled = true
           })
+          this.treeDataDepart = JSON.parse(data.zTreeNodes)
           resolve()
         }).catch((e) => {
         })
@@ -828,6 +845,7 @@ export default {
       this.waitFor.FIRE_DEVICE_ID = ''
       this.waitFor.FIRE_DEVICE_CODE = ''
       this.waitFor.FIRE_POINT_NAME = ''
+      this.waitFor.DEPARTMENT_ID = ''
       this.pointList = []
       this.getList()
       this.getDevice()

src/views/firefighting/points/components/edit.vue

@@ -489,7 +489,7 @@ export default {
           'data_id': '00002',
           'MAP_POINT_NAME': dianweiName,
           'name': '',
-          'point_type': '',
+          'point_type': '港口',
           'type': '',
           'descr': '',
           'position': {

src/views/firefighting/points/components/list.vue

@@ -26,6 +26,13 @@
                 style="width: 100%;"/>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="是否标点" label-width="110px">
+              <el-select v-model="IS_PUNCTUATION" clearable placeholder="请选择" style="width: 100%;">
+                <el-option v-for="item in punctuationStatusList" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label-width="10px">
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@@ -60,6 +67,12 @@
           <el-table-column prop="DEVICE_COUNT" label="点位下消防器材数"/>
           <el-table-column prop="DEPARTMENT_NAME" label="负责部门"/>
           <el-table-column prop="USERNAME" label="负责人"/>
+          <el-table-column prop="ISPUNCTUATION" label="是否标点">
+            <template slot-scope="{row}">
+              <el-tag v-if="row.ISPUNCTUATION == 0" type="success">是</el-tag>
+              <el-tag v-else type="danger">否</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="380">
             <template slot-scope="{row}">
               <el-button
@@ -204,7 +217,18 @@ export default {
         USER_ID: [{ required: true, message: '请选择负责人', trigger: 'change' }]
       },
       deptTreeData: [],
-      userList: []
+      userList: [],
+      punctuationStatusList: [
+        {
+          value: 0,
+          label: '是'
+        },
+        {
+          value: 1,
+          label: '否'
+        }
+      ],
+      IS_PUNCTUATION: ''
     }
   },
   watch: {
@@ -263,7 +287,8 @@ export default {
         {
           FIRE_POINT_NAME: this.FIRE_POINT_NAME,
           FIRE_POINT_CODE: this.FIRE_POINT_CODE,
-          DEPARTMENT_ID: this.selectForm.DEPARTMENT_ID
+          DEPARTMENT_ID: this.selectForm.DEPARTMENT_ID,
+          IS_PUNCTUATION: this.IS_PUNCTUATION
         }
       ).then((data) => {
         this.listLoading = false
@@ -276,6 +301,7 @@ export default {
     }, goKeyReset() {
       this.FIRE_POINT_NAME = ''
       this.FIRE_POINT_CODE = ''
+      this.IS_PUNCTUATION = ''
       this.selectForm = {
         DEPARTMENT_ID: ''
       }

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

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

src/views/map/components/bianjieruqin.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="shipin">
     <div class="block1">
-      <layout-title title="视频状态"/>
+      <layout-title title="视频定位"/>
       <div class="options">
         <div class="option">
           <div class="leftimg"/>
@@ -15,7 +15,7 @@
       </div>
     </div>
     <div class="block2">
-      <layout-title title="区域报警数"/>
+      <layout-title title="重点工程"/>
       <div class="options">
         <div v-for="(item,index) in block2OptionsList" :key="index" class="option">
           <div class="circular"><img :src="item.img" alt=""></div>
@@ -26,26 +26,25 @@
         </div>
       </div>
     </div>
-    <div class="block3">
-      <layout-title title="报警记录"/>
-      <div class="content">
-
-        <div class="table">
-          <div class="tr">
-            <div class="td">防区</div>
-            <div class="td">摄像头名称</div>
-            <div class="td">时间</div>
-          </div>
-          <div class="scroll">
-            <div v-for="(item,index) in block3List" :key="index" class="tr">
-              <div class="td line1">{{ item.region }}</div>
-              <div class="td">{{ item.name }}</div>
-              <div class="td">{{ item.time }}</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
+    <!--    <div class="block3">-->
+    <!--      <layout-title title="报警记录"/>-->
+    <!--      <div class="content">-->
+    <!--        <div class="table">-->
+    <!--          <div class="tr">-->
+    <!--            <div class="td">防区</div>-->
+    <!--            <div class="td">摄像头名称</div>-->
+    <!--            <div class="td">时间</div>-->
+    <!--          </div>-->
+    <!--          <div class="scroll">-->
+    <!--            <div v-for="(item,index) in block3List" :key="index" class="tr">-->
+    <!--              <div class="td line1">{{ item.region }}</div>-->
+    <!--              <div class="td">{{ item.name }}</div>-->
+    <!--              <div class="td">{{ item.time }}</div>-->
+    <!--            </div>-->
+    <!--          </div>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -79,17 +78,25 @@ export default {
         {
           lable: '视频总数',
           count: 0
+        },
+        {
+          lable: '在线数量',
+          count: 0
+        },
+        {
+          lable: '离线数量',
+          count: 0
         }
       ],
       block2OptionsList: [
         {
-          img: require('../../../assets/map/bianjie/img1.png'),
-          label: '码头',
+          img: require('../../../assets/map/gangkou_index/point/ico15.png'),
+          label: '重点工程总数',
           count: 0
         },
         {
-          img: require('../../../assets/map/bianjie/img2.png'),
-          label: '油罐区域',
+          img: require('../../../assets/map/gangkou_index/point/ico30.png'),
+          label: '重点工程开工数量',
           count: 0
         }
       ],
@@ -163,33 +170,70 @@ export default {
     this.initgetTable()
   },
   methods: {
+    // 初始化总摄像头数
+    // initCount() {
+    //   requestFN(
+    //     '/map/mapPlatformelectronic/listAll',
+    //     {
+    //       CORPINFO_ID: this.corpInfoId,
+    //       AREA: this.area
+    //     }
+    //   ).then((data) => {
+    //     this.block1OptionsList[0].count = data.allForMap
+    //   })
+    // },
     // 初始化总摄像头数
     initCount() {
       requestFN(
-        '/map/mapPlatformelectronic/listAll',
+        '/map/keyProject/listAllLocation',
         {
           CORPINFO_ID: this.corpInfoId,
-          AREA: this.area
+          AREA: this.area,
+          TYPE: 'VIDEO',
+          GANGKOU: this.gangkou
         }
       ).then((data) => {
-        this.block1OptionsList[0].count = data.allForMap
+        this.block1OptionsList[0].count = data.varList.length
+        data.varList.forEach((item) => {
+          if (item.ONLINE_STATUS === '0') {
+            this.block1OptionsList[1].count++
+          } else {
+            this.block1OptionsList[2].count++
+          }
+        })
       })
     },
 
+    // 初始化港口摄像头数
+    // initgetTable() {
+    //   requestFN(
+    //     '/map/mapPlatformelectronic/listAllByArea',
+    //     {
+    //       CORPINFO_ID: this.corpInfoId,
+    //       AREA: this.area
+    //     }
+    //   ).then((data) => {
+    //     data.varList.forEach(item => {
+    //       if (item.SUOSHUQUYU === '2') {
+    //         this.block2OptionsList[0].count = item.co
+    //       } else if (item.SUOSHUQUYU === '1') {
+    //         this.block2OptionsList[1].count = item.co
+    //       }
+    //     })
+    //   })
+    // },
     // 初始化港口摄像头数
     initgetTable() {
       requestFN(
-        '/map/mapPlatformelectronic/listAllByArea',
+        '/outsourced/listForCount',
         {
-          CORPINFO_ID: this.corpInfoId,
-          AREA: this.area
+          CORPINFO_ID: this.corpInfoId
         }
       ).then((data) => {
+        this.block2OptionsList[0].count = data.varList.length
         data.varList.forEach(item => {
-          if (item.SUOSHUQUYU === '2') {
-            this.block2OptionsList[0].count = item.co
-          } else if (item.SUOSHUQUYU === '1') {
-            this.block2OptionsList[1].count = item.co
+          if (item.STATE == 1) {
+            this.block2OptionsList[1].count++
           }
         })
       })

src/views/map/dialog/outSourceVideoInfo.vue

@@ -7,7 +7,9 @@
     <table class="table-ui">
       <tr>
         <td class="bbg-transparent">视频名称</td>
-        <td colspan="3">{{ pd.VIDEONAME }}</td>
+        <td>{{ pd.VIDEONAME }}</td>
+        <td class="bbg-transparent">在线状态</td>
+        <td>{{ pd.ONLINE_STATUS }}</td>
       </tr>
       <tr>
         <td class="bbg-transparent">所属重点工程</td>

src/views/map/index.vue

@@ -1826,6 +1826,14 @@ export default {
               } else {
                 point.infoname = varList[i].NAME
               }
+              // 摄像头是否在线
+              if (point.icon_type.indexOf('6_1') > -1) {
+                if (varList[i].ONLINE_STATUS === '0') {
+                  point.icon_type = point.icon_type + '_online'
+                } else {
+                  point.icon_type = point.icon_type + '_offline'
+                }
+              }
               points.push(point)
             }
             if (this.gangkouActive === '00004' && urlType === 'carPosition') {

src/views/map/js/dragentity.js

@@ -43,6 +43,8 @@ const img5_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
 
 const img6_0 = require('../../../assets/map/gangkou_index/point/ico30.png')
 const img6_1 = require('../../../assets/map/gangkou_index/point/ico31.png')
+const img6_1_online = require('../../../assets/map/gangkou_index/point/ico31_online.png')
+const img6_1_offline = require('../../../assets/map/gangkou_index/point/ico31_offline.png')
 
 const img7_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
 
@@ -61,7 +63,8 @@ const imgMap = {
   img6_0, img6_1,
   img7_0,
   img8_0, img8_1, img8_2, img8_3,
-  cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3
+  cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3,
+  img6_1_online, img6_1_offline
 }
 export { imgMap }
 

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

@@ -7,7 +7,7 @@
       <el-form-item label="安全操作规程名称:" prop="REMARKS">
         <el-input v-model="form.REMARKS" style="width: 100%"/>
       </el-form-item>
-      <el-form-item label="类型:" prop="TYPES">
+      <el-form-item v-if="false" label="类型:" prop="TYPES">
         <multiple-choice :dynamic-tags.sync="form.TYPES" :labels="typeList" :row-key="key.typeKey" :row-name="key.typeName"/>
       </el-form-item>
       <el-form-item v-if="false" label="国民经济行业类型:" prop="SPECIFICATION_TYPES">

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

@@ -13,7 +13,7 @@
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
                 搜索
               </el-button>
-              <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
+              <el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
                 添加其他搜索条件
               </el-button>
               <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@@ -47,7 +47,7 @@
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column align="center" prop="REMARKS" label="安全操作规程名称" />
-      <el-table-column align="center" prop="TYPES" label="类型" >
+      <el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.TYPES"
@@ -71,7 +71,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
+      <el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
         <template slot-scope="{row}">
           <div v-if="(row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0) && ((!row.CATEGORY_LIST) || (!row.CATEGORY_LIST[0]) || (row.CATEGORY_LIST[0].CATEGORY_ID !== '8051d985a2bc406a83ea9360b64182b2')) ">
             <el-tag
@@ -88,7 +88,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
+      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
       <el-table-column v-if="false" :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" width="100px" label="数据来源" >
         <template slot-scope="{row}">
           {{ '资源库数据' }}

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

@@ -13,7 +13,7 @@
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
                 搜索
               </el-button>
-              <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
+              <el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
                 添加其他搜索条件
               </el-button>
               <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@@ -48,7 +48,7 @@
       />
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column align="center" prop="REMARKS" label="安全操作规程名称" />
-      <el-table-column align="center" prop="TYPES" label="类型" >
+      <el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.TYPES"
@@ -72,7 +72,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
+      <el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
         <template slot-scope="{row}">
           <div v-if="row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0">
             <el-tag
@@ -89,7 +89,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
+      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
       <el-table-column v-if="false" :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" width="100px" label="数据来源" >
         <template slot-scope="{row}">
           {{ !row.CORP_NAME === '' ? '资源库数据' : row.CORP_NAME }}

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

@@ -4,7 +4,7 @@
       <el-form-item label="安全操作规程名称:" prop="FILE_NAME">
         <el-input v-model="form.REMARKS" disabled style="width: 70%"/>
       </el-form-item>
-      <el-form-item label="规程属性:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.CATEGORY_LIST"
           :key="tag.value"
@@ -13,7 +13,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item label="类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="类型:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.TYPES"
           :key="tag.value"
@@ -22,7 +22,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
         <el-tag v-for="tag in form.SPECIFICATION_TYPES" :key="tag.value" :disable-transitions="false" style="margin-right: 10px">
           {{ tag.CATEGORY_NAME }}
         </el-tag>
@@ -95,7 +95,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/editTextLibrary.vue

@@ -7,7 +7,7 @@
       <el-form-item label="安全管理制度名称:" prop="REMARKS">
         <el-input v-model="form.REMARKS" style="width: 100%"/>
       </el-form-item>
-      <el-form-item label="类型:" prop="TYPES">
+      <el-form-item v-if="false" label="类型:" prop="TYPES">
         <multiple-choice :dynamic-tags.sync="form.TYPES" :labels="typeList" :row-key="key.typeKey" :row-name="key.typeName"/>
       </el-form-item>
       <el-form-item v-if="false" label="国民经济行业类型:" prop="SPECIFICATION_TYPES">

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

@@ -13,7 +13,7 @@
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
                 搜索
               </el-button>
-              <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
+              <el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
                 添加其他搜索条件
               </el-button>
               <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@@ -48,7 +48,7 @@
       />
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column align="center" prop="REMARKS" label="安全生产管理制度名称" />
-      <el-table-column align="center" prop="TYPES" label="类型" >
+      <el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.TYPES"
@@ -72,7 +72,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
+      <el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
         <template slot-scope="{row}">
           <div v-if="(row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0) && ((!row.CATEGORY_LIST) || (!row.CATEGORY_LIST[0]) || (row.CATEGORY_LIST[0].CATEGORY_ID !== '691346658ed744a1bda2ed3a755f606c')) ">
             <el-tag
@@ -89,7 +89,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
+      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
       <el-table-column v-if="false" :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" width="100px" label="数据来源" >
         <template slot-scope="{row}">
           {{ '资源库数据' }}

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

@@ -13,7 +13,7 @@
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
                 搜索
               </el-button>
-              <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
+              <el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
                 添加其他搜索条件
               </el-button>
               <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@@ -48,7 +48,7 @@
       />
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column align="center" prop="REMARKS" label="安全生产管理制度名称" />
-      <el-table-column align="center" prop="TYPES" label="类型" >
+      <el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.TYPES"
@@ -72,7 +72,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
+      <el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
         <template slot-scope="{row}">
           <div v-if="row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0">
             <el-tag
@@ -89,7 +89,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
+      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
       <el-table-column v-if="false" :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" width="100px" label="数据来源" >
         <template slot-scope="{row}">
           {{ !row.CORP_NAME ? '资源库数据' : row.CORP_NAME }}

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

@@ -4,7 +4,7 @@
       <el-form-item label="安全管理制度名称:" prop="FILE_NAME">
         <el-input v-model="form.REMARKS" disabled style="width: 70%"/>
       </el-form-item>
-      <el-form-item label="规程属性:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.CATEGORY_LIST"
           :key="tag.value"
@@ -13,7 +13,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item label="类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="类型:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.TYPES"
           :key="tag.value"
@@ -22,7 +22,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
         <el-tag v-for="tag in form.SPECIFICATION_TYPES" :key="tag.value" :disable-transitions="false" style="margin-right: 10px">
           {{ tag.CATEGORY_NAME }}
         </el-tag>
@@ -95,7 +95,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/editTextLibrary.vue

@@ -7,7 +7,7 @@
       <el-form-item label="安全生产责任制名称:" prop="REMARKS">
         <el-input v-model="form.REMARKS" style="width: 100%"/>
       </el-form-item>
-      <el-form-item label="类型:" prop="TYPES">
+      <el-form-item v-if="false" label="类型:" prop="TYPES">
         <multiple-choice :dynamic-tags.sync="form.TYPES" :labels="typeList" :row-key="key.typeKey" :row-name="key.typeName"/>
       </el-form-item>
       <el-form-item v-if="false" label="国民经济行业类型:" prop="SPECIFICATION_TYPES">

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

@@ -13,7 +13,7 @@
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
                 搜索
               </el-button>
-              <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
+              <el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
                 添加其他搜索条件
               </el-button>
               <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@@ -48,7 +48,7 @@
       />
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column align="center" prop="REMARKS" label="安全生产责任制名称" />
-      <el-table-column align="center" prop="TYPES" label="类型" >
+      <el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.TYPES"
@@ -72,7 +72,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
+      <el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
         <template slot-scope="{row}">
           <div v-if="(row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0) && ((!row.CATEGORY_LIST) || (!row.CATEGORY_LIST[0]) || (row.CATEGORY_LIST[0].CATEGORY_ID !== '7158f688d0f34054a28a9275139298df'))">
             <el-tag
@@ -89,7 +89,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
+      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
       <el-table-column v-if="false" :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" width="100px" label="数据来源" >
         <template slot-scope="{row}">
           {{ !row.CORP_NAME ? '资源库数据' : row.CORP_NAME }}

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

@@ -13,7 +13,7 @@
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
                 搜索
               </el-button>
-              <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
+              <el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
                 添加其他搜索条件
               </el-button>
               <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@@ -48,7 +48,7 @@
       />
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column align="center" prop="REMARKS" label="安全生产管理制度名称" />
-      <el-table-column align="center" prop="TYPES" label="类型" >
+      <el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.TYPES"
@@ -72,7 +72,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
+      <el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
         <template slot-scope="{row}">
           <div v-if="row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0">
             <el-tag
@@ -89,7 +89,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
+      <el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
       <el-table-column v-if="false" :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" width="100px" label="数据来源" >
         <template slot-scope="{row}">
           {{ !row.CORP_NAME ? '资源库数据' : row.CORP_NAME }}

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

@@ -4,7 +4,7 @@
       <el-form-item label="安全生产责任制名称:" prop="FILE_NAME">
         <el-input v-model="form.REMARKS" disabled style="width: 70%"/>
       </el-form-item>
-      <el-form-item label="规程属性:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.CATEGORY_LIST"
           :key="tag.value"
@@ -13,7 +13,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item label="类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="类型:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.TYPES"
           :key="tag.value"
@@ -22,7 +22,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
         <el-tag v-for="tag in form.SPECIFICATION_TYPES" :key="tag.value" :disable-transitions="false" style="margin-right: 10px">
           {{ tag.CATEGORY_NAME }}
         </el-tag>
@@ -95,7 +95,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

src/views/threeSystems/soLibrary/components/list.vue

@@ -13,7 +13,7 @@
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
                 搜索
               </el-button>
-              <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
+              <el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
                 添加其他搜索条件
               </el-button>
               <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@@ -40,7 +40,7 @@
       highlight-current-row
       @cell-mouse-enter="enterSelectionRows"
       @cell-mouse-leave="leaveSelectionRows">
-      <el-table-column type="expand">
+      <el-table-column v-if="false" type="expand">
         <template slot-scope="props">
           <div style="text-align: left;padding: 10px;">
             <el-form label-position="left" inline>
@@ -81,7 +81,7 @@
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column align="center" prop="REMARKS" label="安全操作规程名称" />
-      <el-table-column align="center" prop="TYPES" label="类型" >
+      <el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.TYPES"
@@ -93,7 +93,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" prop="LABEL" align="center" label="标签" >
+      <el-table-column prop="LABEL" align="center" label="标签" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.labels"

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

@@ -4,7 +4,7 @@
       <el-form-item label="安全操作规程名称:" prop="FILE_NAME">
         <el-input v-model="form.REMARKS" disabled style="width: 70%"/>
       </el-form-item>
-      <el-form-item label="规程属性:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.CATEGORY_LIST"
           :key="tag.value"
@@ -13,7 +13,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item label="类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="类型:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.TYPES"
           :key="tag.value"
@@ -22,7 +22,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
         <el-tag v-for="tag in form.SPECIFICATION_TYPES" :key="tag.value" :disable-transitions="false" style="margin-right: 10px">
           {{ tag.CATEGORY_NAME }}
         </el-tag>

src/views/threeSystems/spmLibrary/components/list.vue

@@ -13,7 +13,7 @@
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
                 搜索
               </el-button>
-              <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
+              <el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
                 添加其他搜索条件
               </el-button>
               <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@@ -47,7 +47,7 @@
         width="55"
         align="center"
       />
-      <el-table-column type="expand">
+      <el-table-column v-if="false" type="expand">
         <template slot-scope="props">
           <div style="text-align: left;padding: 10px;">
             <el-form label-position="left" inline>
@@ -82,7 +82,7 @@
       </el-table-column>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column align="center" prop="REMARKS" label="安全生产管理制度名称" />
-      <el-table-column align="center" prop="TYPES" label="类型" >
+      <el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.TYPES"
@@ -94,7 +94,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" prop="LABEL" align="center" label="标签" >
+      <el-table-column prop="LABEL" align="center" label="标签" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.labels"

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

@@ -4,7 +4,7 @@
       <el-form-item label="安全管理制度名称:" prop="FILE_NAME">
         <el-input v-model="form.REMARKS" disabled style="width: 70%"/>
       </el-form-item>
-      <el-form-item label="规程属性:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.CATEGORY_LIST"
           :key="tag.value"
@@ -13,7 +13,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item label="类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="类型:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.TYPES"
           :key="tag.value"
@@ -22,7 +22,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
         <el-tag v-for="tag in form.SPECIFICATION_TYPES" :key="tag.value" :disable-transitions="false" style="margin-right: 10px">
           {{ tag.CATEGORY_NAME }}
         </el-tag>

src/views/threeSystems/sprLibrary/components/list.vue

@@ -13,7 +13,7 @@
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
                 搜索
               </el-button>
-              <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
+              <el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
                 添加其他搜索条件
               </el-button>
               <el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@@ -47,7 +47,7 @@
         width="55"
         align="center"
       />
-      <el-table-column type="expand">
+      <el-table-column v-if="false" type="expand">
         <template slot-scope="props">
           <div style="text-align: left;padding: 10px;">
             <el-form label-position="left" inline>
@@ -82,7 +82,7 @@
       </el-table-column>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column align="center" prop="REMARKS" label="安全生产责任制名称" />
-      <el-table-column align="center" prop="TYPES" label="类型" >
+      <el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.TYPES"
@@ -94,7 +94,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" align="center" prop="LABEL" label="标签" >
+      <el-table-column align="center" prop="LABEL" label="标签" >
         <template slot-scope="{row}">
           <el-tag
             v-for="tag in row.labels"
@@ -132,10 +132,10 @@
       <el-table-column label="操作" align="center" width="200px">
         <template slot-scope="{row}">
           <el-row>
-            <el-col :span="14">
+            <el-col :span="12">
               <el-button v-show="!row.LOCKTOOL" type="primary" icon="el-icon-edit" size="mini" @click="handleExport(row)">导出</el-button>
             </el-col>
-            <el-col :span="10">
+            <el-col :span="12">
               <el-button type="primary" icon="el-icon-edit" size="mini" @click="getInformation(row)">查看</el-button>
             </el-col>
           </el-row>

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

@@ -4,7 +4,7 @@
       <el-form-item label="安全生产责任制名称:" prop="FILE_NAME">
         <el-input v-model="form.REMARKS" disabled style="width: 70%"/>
       </el-form-item>
-      <el-form-item label="规程属性:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.CATEGORY_LIST"
           :key="tag.value"
@@ -13,7 +13,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item label="类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="类型:" prop="FILE_NAME">
         <el-tag
           v-for="tag in form.TYPES"
           :key="tag.value"
@@ -22,7 +22,7 @@
           {{ tag.CATEGORY_NAME }}
         </el-tag>
       </el-form-item>
-      <el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
+      <el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
         <el-tag v-for="tag in form.SPECIFICATION_TYPES" :key="tag.value" :disable-transitions="false" style="margin-right: 10px">
           {{ tag.CATEGORY_NAME }}
         </el-tag>