预案、设备修改为政府端

dcit-hcsystem-hcsystem-master/src/views/Plans/PlansMg.vue

@@ -188,11 +188,11 @@ export default class CamerasMg extends Vue {
   }
   created() {
     this.enterpriseId = METHOD.enterpriseId;
-    if( this.enterpriseId ){
-      this.qyvisble = true;
-    }else{
-      this.qyvisble = false;
-    }
+    // if( this.enterpriseId ){
+    //   this.qyvisble = true;
+    // }else{
+    //   this.qyvisble = false;
+    // }
     this.getTableData();
   }
 }

dcit-hcsystem-hcsystem-master/src/views/Plans/PlansMgEdit.vue

@@ -59,7 +59,7 @@
           <el-col :span="12" class="flcolum">
             <div>
               <div class="yatit">预案内容</div>
-              <textarea id="editorA" v-model="editForm.planContents"></textarea>
+              <textarea id="editorA" v-model="editForm.planContents" height="100%"></textarea>
             </div>
           </el-col>
         </el-row>
@@ -242,7 +242,7 @@ export default class PlansMgEdit extends Vue {
       "insertUnorderedList",
       "indent",
     ];
-    this.editorA.height = "200px";
+    this.editorA.height = "413px";
     this.editorA.create();
   }
   deleteList() {
@@ -255,15 +255,15 @@ export default class PlansMgEdit extends Vue {
   created() {
     let that = this;
     that.enterpriseId = METHOD.enterpriseId;
-    if (that.enterpriseId) {
-      that.qyvisble = true;
+    // if (that.enterpriseId) {
+    //   that.qyvisble = true;
       that.$nextTick(() => {
         that.creatEditor();
       })
-    } else {
-      that.qyvisble = false;
-    }
-    if (that.editForm.id && that.enterpriseId) {
+    // } else {
+    //   that.qyvisble = false;
+    // }
+    // if (that.editForm.id && that.enterpriseId) {
       that.$nextTick(() => {
         //编辑
         if (that.editForm.planContents) {
@@ -276,7 +276,7 @@ export default class PlansMgEdit extends Vue {
           });
         }
       });
-    }
+    // }
     that.actionUrl = METHOD.URL + "/file/uploadFile";
   }
 }

dcit-hcsystem-hcsystem-master/src/views/SafetyDevice/SafetyDeviceMg.vue

@@ -36,6 +36,7 @@
     </el-row>
     <el-table :data="tableData.pageData" stripe border style="width:100%;" :loading="loading">
         <el-table-column width="50" type="index" label="序号"></el-table-column>
+		<el-table-column prop="enterpriseName" label="企业名称"></el-table-column>
         <el-table-column prop="deviceName" label="设备名称"></el-table-column>
         <el-table-column prop="deviceName" label="设备类型">
             <template slot-scope="scope">
@@ -46,8 +47,8 @@
         <el-table-column prop="deviceNumber" label="设备编号"></el-table-column>
         <el-table-column prop="shortNum" label="设备短号"></el-table-column>
         <el-table-column prop="goodsName" label="所在厂区位置"></el-table-column>
-        <el-table-column prop="stockNum" label="库存数量"></el-table-column>
-        <el-table-column prop="dangerGrade" label="危险等级"></el-table-column>
+        <!-- <el-table-column prop="stockNum" label="库存数量"></el-table-column> -->
+        <!-- <el-table-column prop="dangerGrade" label="危险等级"></el-table-column> -->
         <el-table-column label="操作" width="150">
             <template slot-scope="scope">
                 <el-button @click="editFun(scope.row)" size="small">编辑</el-button>
@@ -97,12 +98,13 @@ export default class SafetyDeviceMg extends Vue {
         enterpriseId: ""
     };
     @Provide() zjKey: any = 0;
-    @Provide() enterpriseId: string = "";
+    @Provide() enterpriseId: string = "all";
     @Provide() dataType: string = "";
 
     getTableData() {
         let that = this,
             param = Object.assign({}, that.PAGE, that.searchData);
+		that.enterpriseId="all";
         that.loading = true;
         METHOD.axiosPost(
             that,