数据预警

src/views/GATHERWARNING/index.vue

@@ -71,12 +71,18 @@
           <span v-else-if="scope.row.type == 1">月报表数据</span>
         </template>
       </el-table-column>
-      <el-table-column label="异常数据名称" align="center" prop="gatherFeeName">
+      <el-table-column label="指标名称" align="center" prop="gatherFeeName">
         <template slot-scope="scope">
           {{ scope.row.gatherFeeName }}
         </template>
       </el-table-column>
-      <el-table-column label="异常详细数据值" align="center" prop="errValue">
+      <el-table-column label="采集参考值" align="center" prop="gatherFeeName">
+        <template slot-scope="scope">
+          <span v-if="scope.row.collValue">{{ scope.row.collValue }}</span>
+          <span v-else>无</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="实际值" align="center" prop="errValue">
         <template slot-scope="scope">
           {{ scope.row.errValue }}
         </template>
@@ -119,31 +125,54 @@
         class-name="small-padding fixed-width"
       >
         <!-- 状态是“已解除”时不显示 -->
-        <template slot-scope="scope" v-if="scope.row.status != '1'">
-          <el-popconfirm title="确定处理吗？" @confirm="handleDeal(scope.row)">
-            <el-button
-              size="mini"
-              type="text"
-              slot="reference"
-              v-hasPermi="['business:GATHERWARNING:edit']"
-              >处理</el-button
-            >
-          </el-popconfirm>
 
+        <template slot-scope="scope" v-if="scope.row.status != '1'">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:GATHERWARNING:edit']"
+          >处理</el-button
+          >
           <el-popconfirm
             title="确定取消吗？"
             @confirm="handleCancel(scope.row)"
           >
             <el-button
-            style="margin-left: 5px;"
+              style="margin-left: 5px;"
               size="mini"
               type="text"
               slot="reference"
               v-hasPermi="['business:GATHERWARNING:remove']"
-              >取消</el-button
+            >取消</el-button
             >
           </el-popconfirm>
         </template>
+<!--        <template slot-scope="scope" v-if="scope.row.status != '1'">-->
+<!--          <el-popconfirm title="确定处理吗？" @confirm="handleDeal(scope.row)">-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              slot="reference"-->
+<!--              v-hasPermi="['business:GATHERWARNING:edit']"-->
+<!--              >处理</el-button-->
+<!--            >-->
+<!--          </el-popconfirm>-->
+
+<!--          <el-popconfirm-->
+<!--            title="确定取消吗？"-->
+<!--            @confirm="handleCancel(scope.row)"-->
+<!--          >-->
+<!--            <el-button-->
+<!--            style="margin-left: 5px;"-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              slot="reference"-->
+<!--              v-hasPermi="['business:GATHERWARNING:remove']"-->
+<!--              >取消</el-button-->
+<!--            >-->
+<!--          </el-popconfirm>-->
+<!--        </template>-->
       </el-table-column>
     </el-table>
 
@@ -157,18 +186,36 @@
 
     <!-- 添加或修改数据采集预警对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="数据类型(0=量化指标数据,1=月报表数据)" prop="type">
-          <el-select v-model="form.type" placeholder="请选择数据类型(0=量化指标数据,1=月报表数据)" filterable>
-            <el-option
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-              :label="dict.label"
-:value="dict.value"
-            ></el-option>
-          </el-select>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+<!--        <el-form-item label="数据类型(0=量化指标数据,1=月报表数据)" prop="type">-->
+<!--          <el-select v-model="form.type" placeholder="请选择数据类型(0=量化指标数据,1=月报表数据)" filterable>-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.${dictType}"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--:value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="数据类型">
+          <template slot-scope="scope">
+            <span v-if="form.type == 0">量化指标数据</span>
+            <span v-else-if="form.type == 1">月报表数据</span>
+          </template>
+        </el-form-item>
+        <el-form-item label="异常数据名称">
+          {{form.gatherFeeName}}
+        </el-form-item>
+        <el-form-item label="采集参考值">
+          <template slot-scope="scope">
+            <span v-if="form.collValue">{{ form.collValue }}</span>
+            <span v-else>无</span>
+          </template>
         </el-form-item>
-      </el-form> -->
+        <el-form-item label="实际值" prop="errValue">
+          <el-input v-model="form.errValue" type="number"></el-input>
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -291,6 +338,7 @@ export default {
           { required: true, message: "取消时间不能为空", trigger: "blur" },
         ],
         remark: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        collValue:[{ required: true, message: "修改值不能为空", trigger: "blur" }],
       },
     };
   },
@@ -309,10 +357,13 @@ export default {
     },
     //处理预警
     handleDeal(row) {
-      deal(row.id).then((res) => {
-        this.$modal.msgSuccess("处理成功");
-        this.getList();
-      });
+      this.title = "处理预警";
+        // 是否显示弹出层
+      this.open =  true;
+      // deal(row.id).then((res) => {
+      //   this.$modal.msgSuccess("处理成功");
+      //   this.getList();
+      // });
     },
     //取消预警
     handleCancel(row) {
@@ -368,7 +419,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
       const id = row.id || this.ids;
       getGATHERWARNING(id).then((response) => {
         this.form = response.data;
@@ -381,8 +431,8 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateGATHERWARNING(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+            deal(this.form.id).then((response) => {
+              this.$modal.msgSuccess("处理成功");
               this.open = false;
               this.getList();
             });