联调

src/api/basedata/eqpbook/channel.js

@@ -30,7 +30,7 @@ export function eqpbookList(query) {
 // 新增
 export function postAdd(query) {
   return request({
-    url: '/basedata/alg',
+    url: '/basedata/eqpbook/channel',
     method: 'post',
     data: query
   })
@@ -39,14 +39,14 @@ export function postAdd(query) {
 // 编辑查询
 export function getItem(query) {
   return request({
-    url: `/basedata/alg/${query}`,
+    url: `/basedata/eqpbook/channel/${query}`,
     method: 'get',
   })
 }
 // 编辑
 export function edit(query) {
   return request({
-    url: `/basedata/alg/edit`,
+    url: `/basedata/eqpbook/channel/edit`,
     method: 'post',
     data: query
   })

src/api/basedata/patrolpointmnt/patrolpoint.js

@@ -0,0 +1,42 @@
+import request from '@/utils/request';
+// 初始化list
+export function getList(query) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpoint/list',
+    method: 'get',
+    params: query
+  })
+}
+// 删除
+export function postRemove(query) {
+  return request({
+    url: `/basedata/patrolpointmnt/patrolpoint/remove/${query}`,
+    method: 'post',
+    // params: query
+  })
+}
+
+// 新增
+export function postAdd(query) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpoint',
+    method: 'post',
+    data: query
+  })
+}
+
+// 编辑查询
+export function getItem(query) {
+  return request({
+    url: `/basedata/patrolpointmnt/patrolpoint/${query}`,
+    method: 'get',
+  })
+}
+// 编辑
+export function edit(query) {
+  return request({
+    url: `/basedata/patrolpointmnt/patrolpoint/edit`,
+    method: 'post',
+    data: query
+  })
+}

src/views/basedata/eqpbook/channel/index.vue

@@ -50,7 +50,7 @@
           >{{ $t("share.search") }}</el-button
         >
         <el-button icon="el-icon-refresh" @click="resetQuery" size="mini">{{
-          $t("share.search")
+          $t("share.reset")
         }}</el-button>
       </el-form-item>
     </el-form>
@@ -99,30 +99,35 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column prop="channelId" :label="$t('channel.ChannelID')">
       </el-table-column>
+
       <el-table-column
         prop="channelCode"
         :label="$t('channel.ChannelCoding')"
         align="center"
       >
       </el-table-column>
+
       <el-table-column
         prop="channelName"
         :label="$t('channel.ChannelName')"
         align="center"
       >
       </el-table-column>
+
       <el-table-column
         prop="patroldeviceName"
         :label="$t('channel.device')"
         align="center"
       >
       </el-table-column>
+
       <el-table-column
         prop="patroldeviceCode"
         :label="$t('channel.EquipmentNumber')"
         align="center"
       >
       </el-table-column>
+
       <el-table-column
         prop="username"
         :label="$t('channel.user')"
@@ -165,7 +170,7 @@
           <el-button
             type="text"
             size="small"
-            @click="handleEdit(scope.$index, scope.row)"
+            @click="handleEdit(scope.row.channelId)"
             >{{ $t("share.edit") }}</el-button
           >
           <el-button
@@ -205,7 +210,8 @@
             "
           ></el-input>
         </el-form-item>
-        <el-form-item :label="$t('channel.ChannelName')" prop="ChannelName">
+
+        <el-form-item :label="$t('channel.ChannelName')" prop="channelName">
           <el-input
             v-model="dialogForm.channelName"
             :placeholder="
@@ -213,9 +219,10 @@
             "
           ></el-input>
         </el-form-item>
-        <el-form-item :label="$t('channel.ChannelType')" prop="ChannelType">
+
+        <el-form-item :label="$t('channel.ChannelType')" prop="channelType">
           <el-select
-            v-model="dialogForm.ChannelType"
+            v-model="dialogForm.channelType"
             :placeholder="
               $t('share.PleaseChoose') + ' ' + $t('channel.ChannelType')
             "
@@ -224,7 +231,8 @@
             <el-option label="可见光" value="vl"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('channel.device')" prop="device">
+
+        <el-form-item :label="$t('channel.device')" prop="eqpbookId">
           <el-select
             v-model="dialogForm.eqpbookId"
             :placeholder="$t('share.PleaseChoose') + ' ' + $t('channel.device')"
@@ -233,21 +241,24 @@
               :label="item.patroldeviceName"
               :value="item.eqpbookId"
               v-for="item in eqpbookListData"
-              :key="item.areaId"
+              :key="item.eqpbookId"
             ></el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item :label="$t('channel.state')">
           <el-select
-            v-model="dialogForm.state"
+            v-model="dialogForm.onlineState"
             :placeholder="$t('share.PleaseChoose') + ' ' + $t('channel.state')"
           >
-            <!-- <el-option label="选项一" value="shanghai"></el-option> -->
+            <el-option label="在线" value="1"></el-option>
+            <el-option label="离线" value="2"></el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item :label="$t('channel.SpecificContentOfTheChannel')">
           <el-input
-            v-model="dialogForm.SpecificContentOfTheChannel"
+            v-model="dialogForm.channelConten"
             :placeholder="
               $t('share.PleaseEnter') +
               ' ' +
@@ -256,32 +267,37 @@
             type="textarea"
           ></el-input>
         </el-form-item>
+        <!--  -->
         <el-form-item :label="$t('channel.HOSTIP')">
           <el-input
-            v-model="dialogForm.HOSTiP"
+            v-model="dialogForm.host"
             :placeholder="$t('share.PleaseEnter') + ' ' + $t('channel.HOSTIP')"
           ></el-input>
         </el-form-item>
+
         <el-form-item :label="$t('channel.port')">
           <el-input
             v-model="dialogForm.port"
             :placeholder="$t('share.PleaseEnter') + ' ' + $t('channel.port')"
           ></el-input>
         </el-form-item>
+
         <el-form-item :label="$t('channel.EquipmentNumber')">
           <el-input
-            v-model="dialogForm.EquipmentNumber"
+            v-model="dialogForm.patroldeviceCode"
             :placeholder="
               $t('share.PleaseEnter') + ' ' + $t('channel.EquipmentNumber')
             "
           ></el-input>
         </el-form-item>
+
         <el-form-item :label="$t('channel.user')">
           <el-input
-            v-model="dialogForm.user"
+            v-model="dialogForm.username"
             :placeholder="$t('share.PleaseEnter') + ' ' + $t('channel.user')"
           ></el-input>
         </el-form-item>
+
         <el-form-item :label="$t('channel.password')">
           <el-input
             v-model="dialogForm.password"
@@ -290,11 +306,18 @@
             "
           ></el-input>
         </el-form-item>
+        
+        <el-form-item label="设备来源">
+          <el-input
+            v-model="dialogForm.deviceSource"
+            placeholder="请输入设备来源"
+          ></el-input>
+        </el-form-item>
       </el-form>
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose">{{ $t("share.cancel") }}</el-button>
-        <el-button type="primary" @click="submitForm">{{
+        <el-button type="primary" @click="submitForm('ruleForm')">{{
           $t("share.confirm")
         }}</el-button>
       </span>
@@ -323,9 +346,13 @@ export default {
       total: 10,
       dialogVisible: false,
       title: this.$t("channel.AddDeviceChannel"),
-      dialogForm: {},
+      dialogForm: {
+        channelName: "",
+        channelType: "",
+        eqpbookId: "",
+      }, // 只保留一次定义
       rules: {
-        ChannelName: [
+        channelName: [
           {
             required: true,
             message:
@@ -335,26 +362,25 @@ export default {
             trigger: "blur",
           },
         ],
-        ChannelType: [
+        channelType: [
           {
             required: true,
             message:
               this.$t("share.PleaseChoose") +
               " " +
               this.$t("channel.ChannelType"),
-            trigger: "blur",
+            trigger: "change",
           },
         ],
-        device: [
+        eqpbookId: [
           {
             required: true,
             message:
               this.$t("share.PleaseChoose") + " " + this.$t("channel.device"),
-            trigger: "blur",
+            trigger: "change",
           },
         ],
       },
-      dialogForm: {},
       type: 0,
       ids: [],
       eqpbookListData: [],
@@ -394,21 +420,22 @@ export default {
       this.dialogVisible = false;
     },
     add() {
+      this.type=0;
+      this.dialogForm = {
+        channelName: "",
+        channelType: "",
+        eqpbookId: "",
+      };
       this.dialogVisible = true;
       this.title = this.$t("channel.AddDeviceChannel");
     },
-    handleEdit() {
+    handleEdit(id) {
+      this.type=1;
       this.dialogVisible = true;
       this.title = this.$t("channel.EditDeviceChannel");
-    },
-    onSubmit() {
-      this.$refs["ruleForm"].validate((v) => {
-        if (v) {
-          this.$message({
-            message: this.$t("share.success"),
-            type: "success",
-          });
-          this.dialogVisible = false;
+      getItem(id).then((res) => {
+        if(res.code==200){
+          this.dialogForm = res.data;
         }
       });
     },
@@ -447,31 +474,35 @@ export default {
       this.ids = selection.map((item) => item.channelId);
     },
     // 弹框确定
-    submitForm() {
-      return;
-      if (this.type == 0) {
-        postAdd(this.dialogForm).then((res) => {
-          if (res.code == 200) {
-            this.$message({
-              type: "success",
-              message: "添加成功!",
+    submitForm(ruleForm) {
+      console.log(this.dialogForm);
+      this.$refs[ruleForm].validate((v) => {
+        if (v) {
+          if (this.type == 0) {
+            postAdd(this.dialogForm).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "添加成功!",
+                });
+                this.dialogVisible = false;
+                this.init();
+              }
             });
-            this.dialogVisible = false;
-            this.init();
-          }
-        });
-      } else {
-        edit(this.dialogForm).then((res) => {
-          if (res.code == 200) {
-            this.$message({
-              type: "success",
-              message: "编辑成功!",
+          } else {
+            edit(this.dialogForm).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "编辑成功!",
+                });
+                this.dialogVisible = false;
+                this.init();
+              }
             });
-            this.dialogVisible = false;
-            this.init();
           }
-        });
-      }
+        }
+      });
     },
   },
 };

src/views/basedata/patrolpointmnt/patrolpoint/index.vue

@@ -3,6 +3,7 @@
     <el-form v-model="queryParams" :inline="true">
       <el-form-item :label="$t('patrolpoint.PointCode')">
         <el-input
+          v-model="queryParams.patrolpointCode"
           :placeholder="
             $t('share.PleaseEnter') + ' ' + $t('patrolpoint.PointCode')
           "
@@ -10,6 +11,7 @@
       </el-form-item>
       <el-form-item :label="$t('patrolpoint.PointName')">
         <el-input
+          v-model="queryParams.patrolpointName"
           :placeholder="
             $t('share.PleaseEnter') + ' ' + $t('patrolpoint.PointName')
           "
@@ -40,16 +42,21 @@
           >{{ $t("share.new") }}</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" icon="el-icon-edit" plain size="mini"  @click="handleEdit()">{{
-          $t("share.edit")
-        }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          plain
+          size="mini"
+          @click="handleEdit()"
+          >{{ $t("share.edit") }}</el-button
+        >
+      </el-col> -->
+      <!-- <el-col :span="1.5">
         <el-button type="danger" icon="el-icon-delete" plain size="mini">{{
           $t("share.delete")
         }}</el-button>
-      </el-col>
+      </el-col> -->
     </el-row>
     <el-table :data="tableData" style="width: 100%; margin-bottom: 20px">
       <el-table-column
@@ -59,13 +66,13 @@
         align="center"
       />
       <el-table-column
-        prop="date"
+        prop="patrolpointCode"
         :label="$t('patrolpoint.PointCode')"
         align="center"
       >
       </el-table-column>
       <el-table-column
-        prop="date"
+        prop="patrolpointName"
         :label="$t('patrolpoint.PointName')"
         align="center"
       >
@@ -75,38 +82,40 @@
         align="center"
       >
         <template slot-scope="scope">
-          <span @click="tableTyle()" class="intelligenceType">11111</span>
+          <span @click="tableTyle()" class="intelligenceType">
+            {{
+              scope.row.algSubtypeName
+                ? scope.row.algSubtypeName
+                : "无法设置阈值"
+            }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column
-        prop="date"
+        prop="patrolContent"
         :label="$t('patrolpoint.InspectionContent')"
         align="center"
       >
       </el-table-column>
       <el-table-column
-        prop="date"
+        prop="purpose"
         :label="$t('patrolpoint.purpose')"
         align="center"
       >
       </el-table-column>
-      <el-table-column
-        prop="address"
-        :label="$t('share.operate')"
-        width="180"
-        align="center"
-      >
+
+      <el-table-column :label="$t('share.operate')" width="180" align="center">
         <template slot-scope="scope">
           <el-button
             type="text"
             size="small"
-            @click="handleEdit(scope.$index, scope.row)"
+            @click="handleEdit(scope.row.patrolpointId)"
             >{{ $t("share.edit") }}</el-button
           >
           <el-button
             type="text"
             size="small"
-            @click="handleDelete(scope.$index, scope.row)"
+            @click="handleDelete(scope.row.patrolpointId)"
             >{{ $t("share.delete") }}</el-button
           >
         </template>
@@ -117,6 +126,7 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      @pagination="init"
     />
 
     <el-dialog
@@ -125,16 +135,21 @@
       width="30%"
       :before-close="handleClose"
     >
-      <el-form v-model="dialogForm" :rules="rules" ref="ruleForm">
+      <el-form :model="dialogForm" :rules="rules" ref="ruleForm">
         <el-form-item :label="$t('patrolpoint.PointCode')">
           <el-input
+            v-model="dialogForm.patrolpointCode"
             :placeholder="
               $t('share.PleaseEnter') + ' ' + $t('patrolpoint.PointCode')
             "
           ></el-input>
         </el-form-item>
-        <el-form-item :label="$t('patrolpoint.PointName')" prop="PointName">
+        <el-form-item
+          :label="$t('patrolpoint.PointName')"
+          prop="patrolpointName"
+        >
           <el-input
+            v-model="dialogForm.patrolpointName"
             :placeholder="
               $t('share.PleaseEnter') + ' ' + $t('patrolpoint.PointName')
             "
@@ -142,6 +157,7 @@
         </el-form-item>
         <el-form-item :label="$t('patrolpoint.MainDeviceTypeID')">
           <el-input
+            v-model="dialogForm.devicetypeId"
             :placeholder="
               $t('share.PleaseEnter') + ' ' + $t('patrolpoint.MainDeviceTypeID')
             "
@@ -149,37 +165,47 @@
         </el-form-item>
         <el-form-item :label="$t('patrolpoint.MainDeviceID')">
           <el-input
+            v-model="dialogForm.mainDeviceId"
             :placeholder="
               $t('share.PleaseEnter') + ' ' + $t('patrolpoint.MainDeviceID')
             "
           ></el-input>
         </el-form-item>
         <el-form-item :label="$t('patrolpoint.deviceID')">
-          <el-input :placeholder="$t('patrolpoint.deviceIDMsg')"></el-input>
+          <el-input
+            v-model="dialogForm.deviceId"
+            :placeholder="$t('patrolpoint.deviceIDMsg')"
+          ></el-input>
         </el-form-item>
-        <el-form-item
-          :label="$t('patrolpoint.InspectionContent')"
-        >
-          <Editor :height="200" style="margin-top: 30px;"/>
+        <el-form-item :label="$t('patrolpoint.InspectionContent')">
+          <Editor
+            v-model="dialogForm.patrolContent"
+            :height="200"
+            style="margin-top: 30px"
+          />
         </el-form-item>
 
         <el-form-item :label="$t('patrolpoint.purpose')">
           <el-input
+            v-model="dialogForm.purpose"
             :placeholder="
               $t('share.PleaseEnter') + ' ' + $t('patrolpoint.purpose')
             "
           ></el-input>
         </el-form-item>
-        <el-form-item :label="$t('patrolpoint.DeleteFlag')" >
-          <el-input :placeholder="$t('patrolpoint.DeleteFlagMsg')"></el-input>
+        <el-form-item :label="$t('patrolpoint.DeleteFlag')">
+          <el-input
+            v-model="dialogForm.deleteFlag"
+            :placeholder="$t('patrolpoint.DeleteFlagMsg')"
+          ></el-input>
         </el-form-item>
       </el-form>
 
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">{{ $t('share.cancel') }}</el-button>
-        <el-button type="primary" @click="dialogVisible = false"
-          >{{ $t('share.confirm') }}</el-button
-        >
+        <el-button @click="handleClose">{{ $t("share.cancel") }}</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">{{
+          $t("share.confirm")
+        }}</el-button>
       </span>
     </el-dialog>
 
@@ -196,7 +222,12 @@
         height="500px"
       >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column type="index"  :label="$t('patrolpoint.index')" width="55" align="center" />
+        <el-table-column
+          type="index"
+          :label="$t('patrolpoint.index')"
+          width="55"
+          align="center"
+        />
         <el-table-column :label="$t('patrolpoint.AlgorithmName')" prop="name" />
         <el-table-column
           :label="$t('patrolpoint.ThresholdUpperLimit')"
@@ -225,26 +256,59 @@
 
 <script>
 // import Editor from "@/components/Editor";
+import {
+  getList,
+  getItem,
+  postAdd,
+  postRemove,
+  edit,
+  postUpdate,
+} from "@/api/basedata/patrolpointmnt/patrolpoint";
 export default {
   data() {
     return {
-      queryParams: {},
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
       tableData: [],
       total: 10,
       dialogVisible: false,
-      title: this.$t('patrolpoint.AddInspectionPoints'),
-      typeTitle: this.$t('patrolpoint.SetIntelligentRecognitionType'),
+      title: this.$t("patrolpoint.AddInspectionPoints"),
+      typeTitle: this.$t("patrolpoint.SetIntelligentRecognitionType"),
       typedialogVisible: false,
-      rules:{
-        PointName: [
-          { required: true, message:this.$t('share.PleaseEnter')+' '+ this.$t('share.PointName'), trigger: 'blur' }
-        
-        ]
-      }
+      dialogForm: {},
+      rules: {
+        patrolpointName: [
+          {
+            required: true,
+            message: "请输入点位名称",
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
-  mounted() {},
+  mounted() {
+    this.init();
+  },
   methods: {
+    // 初始化
+    init() {
+      getList(this.queryParams).then((res) => {
+        this.tableData = res.rows;
+        this.total = res.data.total;
+      });
+    },
+    // 查询
+    handleQuery() {
+      this.init();
+    },
+    // 重置
+    resetQuery() {
+      this.queryParams = {};
+      this.init();
+    },
     // 给表头加必填符号*
     addRedStar(h, { column }) {
       return [
@@ -253,16 +317,83 @@ export default {
       ];
     },
     add() {
+      this.dialogForm = {};
+      this.type = 0;
       this.dialogVisible = true;
-      this.title=this.$t('patrolpoint.AddInspectionPoints')
+      this.title = this.$t("patrolpoint.AddInspectionPoints");
     },
-    handleEdit(){
+    handleEdit(id) {
+      this.type = 1;
       this.dialogVisible = true;
-      this.title=this.$t('patrolpoint.EditInspectionPoints')
+      this.title = this.$t("patrolpoint.EditInspectionPoints");
+      getItem(id).then((res) => {
+        if(res.code==200){
+          this.dialogForm = res.data;
+        }
+      });
     },
     tableTyle() {
       this.typedialogVisible = true;
     },
+    // 新增修改弹框确认
+    submitForm(ruleForm) {
+      this.$refs[ruleForm].validate((v) => {
+        if (v) {
+          if (this.type == 0) {
+            postAdd(this.dialogForm).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "添加成功!",
+                });
+                this.dialogVisible = false;
+                this.init();
+              }
+            });
+          } else {
+            edit(this.dialogForm).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "编辑成功!",
+                });
+                this.dialogVisible = false;
+                this.init();
+              }
+            });
+          }
+        }
+      });
+    },
+    handleClose() {
+      this.dialogVisible = false;
+    },
+    // 删除
+    // 删除
+    handleDelete(id) {
+      this.$confirm(`确定要删除Id为${id}的数据吗？`, "删除", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          postRemove(id).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+              this.init();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
   },
 };
 </script>