历史页面导出功能对接联调

src/views/environmentMonitor/historyData/index.vue

@@ -139,9 +139,13 @@
             <span>{{ parseTime(scope.row.time) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="测量值(m)，" align="center" prop="svalue" />
-        <el-table-column label="是否报警，" align="center" prop="state" />
-        <el-table-column label="数据来源,1在线设备，0人工巡检，" align="center" prop="datasource" />
+        <el-table-column label="测量值(m)" align="center" prop="svalue" />
+        <el-table-column label="是否报警" align="center" prop="state" />
+        <el-table-column label="数据来源" align="center" >
+          <template slot-scope="scope">
+            <span>{{ scope.row.datasource==='0' ? '人工巡检': '在线设备' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="报警级别" align="center" prop="bjjb" />
         <!-- <el-table-column label="创建时间" align="center" prop="createtime" width="180">
           <template slot-scope="scope">
@@ -204,8 +208,8 @@
           <el-form-item label="是否报警，" prop="state">
             <el-input v-model="form.state" placeholder="请输入是否报警，" />
           </el-form-item>
-          <el-form-item label="数据来源,1在线设备，0人工巡检，" prop="datasource">
-            <el-input v-model="form.datasource" placeholder="请输入数据来源,1在线设备，0人工巡检，" />
+          <el-form-item label="数据来源" prop="datasource">
+            <el-input v-model="form.datasource" placeholder="请输入数据来源" />
           </el-form-item>
           <el-form-item label="报警级别" prop="bjjb">
             <el-input v-model="form.bjjb" placeholder="请输入报警级别" />

src/views/environmentMonitor/machine/index.vue

@@ -51,7 +51,7 @@
             >新增</el-button
           >
         </el-col>
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
           <el-button
             type="success"
             plain
@@ -74,7 +74,7 @@
             v-hasPermi="['business:drybeachequipinfor:remove']"
             >删除</el-button
           >
-        </el-col>
+        </el-col> -->
         <el-col :span="1.5">
           <el-button
             type="warning"
@@ -100,12 +100,12 @@
         border
         header-cell-style="background-color: #08267d; color: #96dcdf;border:1px solid #409EFF;"
       >
-        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <!-- <el-table-column label="自动增长 " align="center" prop="id" /> -->
         <el-table-column label="设备编号" align="center" prop="equipno"  width="200"/>
         <el-table-column label="设备名称" align="center" prop="equipname" />
         <el-table-column label="数值单位" align="center" prop="eqdanwei" width="80" />
-        <el-table-column label="监控类型" align="center" prop="devicetype"  width="120" />
+        <el-table-column label="监控类型" align="center" prop="deviceTypeText"  width="120" />
    
         <el-table-column label="报警状态" align="center" prop="state"  width="90"/>
         <el-table-column
@@ -127,7 +127,7 @@
         <el-table-column
           label="创建时间"
           align="center"
-          prop="createtime"
+          prop="createTime"
           width="180"
         >
           <template slot-scope="scope">
@@ -227,23 +227,18 @@
                 <el-input
                   v-model="form.eqdanwei"
                   placeholder="请输入数值单位"
-                  maxlength="20"
+                  maxlength="50"
                 />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <!-- <el-form-item label="设备码" prop="initialstateno">
-              <el-input
-                v-model="form.initialstateno"
-                placeholder="请输入设备码"
-              />
-            </el-form-item> -->
               <el-form-item label="安装位置 " prop="installationlocate">
                 <el-input
                   v-model="form.installationlocate"
-                  placeholder="请输入安装位置 "
+                  placeholder="请输入安装位置"
+                  maxlength="100"
                 />
               </el-form-item>
             </el-col>
@@ -253,7 +248,7 @@
                   clearable
                   v-model="form.installationdata"
                   type="date"
-                  value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd"
                   placeholder="请选择安装日期"
                 >
                 </el-date-picker>
@@ -266,7 +261,8 @@
               <el-form-item label="生产厂家 " prop="manufacture">
                 <el-input
                   v-model="form.manufacture"
-                  placeholder="请输入生产厂家 "
+                  placeholder="请输入生产厂家"
+                  maxlength="100"
                 />
               </el-form-item>
             </el-col>
@@ -275,6 +271,7 @@
                 <el-input
                   v-model="form.pslspeed"
                   placeholder="排水量流速（m/s）"
+                  maxlength="8"
                 />
               </el-form-item>
             </el-col>
@@ -317,25 +314,6 @@
             </el-col>
           </el-row>
 
-          <!-- <el-row>
-          <el-col :span="12">
-            <el-form-item label="所属尾矿库编码" prop="tailingid">
-              <el-input
-                v-model="form.tailingid"
-                placeholder="请输入所属尾矿库编码"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="报警状态是否报警1，报警" prop="state">
-              <el-input
-                v-model="form.state"
-                placeholder="请输入报警状态是否报警1，报警"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-
           <el-row>
             <el-col :span="12">
               <el-form-item label="供电和通讯方式" prop="">

src/views/environmentMonitor/warnData/index.vue

@@ -89,11 +89,11 @@
   
       <el-table v-loading="loading" :data="equipBjList" @selection-change="handleSelectionChange" height="535" 
 			 border
-			 header-cell-style="background-color: #08267d; color: #96dcdf;border:1px solid #409EFF;">>
-        <el-table-column type="selection" width="55" align="center" />
+			 header-cell-style="background-color: #08267d; color: #96dcdf;border:1px solid #409EFF;">
+        <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <!-- <el-table-column label="主键，自增" align="center" prop="id" /> -->
         <el-table-column label="设备编号" align="center" prop="equipno" />
-        <el-table-column label="类型" align="center" prop="devicetype" />
+        <el-table-column label="报警类型" align="center" prop="devicetype" />
         <el-table-column label="报警级别" align="center" prop="bjjb" />
         <el-table-column label="报警时间" align="center" prop="time" width="180">
           <template slot-scope="scope">
@@ -102,12 +102,12 @@
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createtime" width="180">
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createtime) }}</span>
+            <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="修改时间" align="center" prop="updatetime" width="180">
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.updatetime) }}</span>
+            <span>{{ parseTime(scope.row.updateTime) }}</span>
           </template>
         </el-table-column>
         <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">