111

src/api/basedata/patrolpointmnt/patrolpointpreset.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request';
+// 初始化list
+export function getList(query) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpointpreset/list',
+    method: 'get',
+    params: query
+  })
+}
+// 巡检点位
+export function patrolpoint_list(query) {
+    return request({
+      url: 'basedata/patrolpointmnt/patrolpoint/list',
+      method: 'get',
+      params: query
+    })
+  }
+//   新增
+export function postAdd(query) {
+    return request({
+      url: '/basedata/patrolpointmnt/patrolpointpreset',
+      method: 'post',
+      data: query
+    })
+  }

src/api/equipment/entry.js

@@ -39,3 +39,11 @@ export function deviceRemove(id) {
     method: 'post',
   })
 }
+// 修改
+export function deviceEdit(data) {
+  return request({
+    url: `/basedata/prodevmnt/device/edit`,
+    method: 'post',
+    data: data
+  })
+}

src/api/equipment/equipment.js

@@ -37,4 +37,34 @@ export function getEqpbook(query) {
     url: `/basedata/eqpbook/${query}`,
     method: 'get',
   })
+}
+// 设备来源
+export function use_mode(query) {
+  return request({
+    url: `/system/dict/data/type/use_mode`,
+    method: 'get',
+  })
+}
+// 视频类型
+export function video_mode(query) {
+  return request({
+    url: `/system/dict/data/type/video_mode`,
+    method: 'get',
+  })
+}
+// 新增
+export function eqpbook(query) {
+  return request({
+    url: `/basedata/eqpbook`,
+    method: 'post',
+    data: query
+  })
+}
+// 编辑
+export function edit(query) {
+  return request({
+    url: `/basedata/eqpbook/edit`,
+    method: 'post',
+    data: query
+  })
 }

src/api/equipment/equipment_type.js

@@ -5,4 +5,35 @@ export function getProDeviceTypeTreeSelect(query) {
     method: 'get',
     // params: query
   })
+}
+//所属专业
+export function profession_type(query) {
+  return request({
+    url: '/system/dict/data/type/profession_type',
+    method: 'get',
+    // params: query
+  })
+}
+// 修改
+export function update(query) {
+  return request({
+    url: '/basedata/devicetype/update',
+    method: 'post',
+    data: query
+  })
+}
+// 删除
+export function remove(query) {
+  return request({
+    url: `/basedata/devicetype/delete/${query}`,
+    method: 'post',
+  })
+}
+// 新增
+export function add(query) {
+  return request({
+    url: '/basedata/devicetype/add',
+    method: 'post',
+    data: query
+  })
 }

src/api/point/site_management.js

@@ -35,7 +35,7 @@ export function postAdd(query) {
   return request({
     url: `/basedata/patrolpointmnt/patrolpoint`,
     method: 'post',
-    data:query
+    data: query
   })
 }
 
@@ -44,7 +44,7 @@ export function edit(query) {
   return request({
     url: `/basedata/patrolpointmnt/patrolpoint/edit`,
     method: 'post',
-    data:query
+    data: query
   })
 }
 export function editItem(id) {
@@ -61,4 +61,20 @@ export function postRemove(id) {
     method: 'POST',
     // data:query
   })
+}
+
+// 设置智能识别类型
+export function subtypeList(id) {
+  return request({
+    url: `/basedata/subtype/list`,
+    method: 'get',
+    // data:query
+  })
+}
+export function algList(id) {
+  return request({
+    url: `/basedata/alg/list`,
+    method: 'get',
+    // data:query
+  })
 }

src/views/basedata/bdconfig/mainsystem/index.vue

@@ -153,7 +153,7 @@
         }}</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" plain size="mini">{{
+        <el-button type="warning" icon="el-icon-download" plain size="mini" @click="handleExport">{{
           $t("share.export")
         }}</el-button>
       </el-col>

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

@@ -115,7 +115,7 @@
       </el-table-column>
 
       <el-table-column
-        prop="patroldeviceName"
+        prop="eqpbookName"
         :label="$t('channel.device')"
         align="center"
       >

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

@@ -68,7 +68,7 @@
           >{{ $t("share.new") }}</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           icon="el-icon-edit"
@@ -77,16 +77,21 @@
           @click="handleEdit"
           >{{ $t("share.edit") }}</el-button
         >
-      </el-col>
+      </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 :span="1.5">
-        <el-button type="warning" icon="el-icon-download" plain size="mini">{{
-          $t("share.export")
-        }}</el-button>
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          plain
+          size="mini"
+          @click="handleExport"
+          >{{ $t("share.export") }}</el-button
+        >
       </el-col>
     </el-row>
     <el-table :data="tableData" style="width: 100%; margin-bottom: 20px">
@@ -143,32 +148,37 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      @pagination="init"
     />
     <el-dialog
       :title="title"
       :visible.sync="dialogVisible"
       width="30%"
       :before-close="handleClose"
+      ref="ruleForm"
     >
-      <el-form v-model="dialogForm" :rules="rules" ref="ruleForm">
+      <el-form :model="dialogForm" :rules="rules" ref="ruleForm">
         <el-form-item :label="$t('patrolpointpreset.ParentPointID')">
-          <span class="fatherID" @click="fatherIDFn">{{ fatherID }}</span>
+          <span class="fatherID" @click="fatherIDFn">{{
+            dialogForm.patrolpointId || fatherID
+          }}</span>
           <i
             class="el-icon-close"
             style="color: red; cursor: pointer; margin-left: 5px"
           ></i>
         </el-form-item>
         <el-form-item :label="$t('patrolpointpreset.ParentPointCode')">
-          <span>{{ fatherID }}</span>
+          <span>{{ dialogForm.patrolpointCode }}</span>
         </el-form-item>
         <el-form-item :label="$t('patrolpointpreset.ParentPointName')">
-          <span>{{ fatherID }}</span>
+          <span>{{ dialogForm.patrolpointName }}</span>
         </el-form-item>
         <el-form-item
           :label="$t('patrolpointpreset.InspectionEquipmentID')"
-          prop="InspectionEquipmentID"
+          prop="eqpbookId"
         >
           <el-input
+            v-model="dialogForm.eqpbookId"
             :placeholder="
               $t('share.PleaseEnter') +
               ' ' +
@@ -178,6 +188,7 @@
         </el-form-item>
         <el-form-item :label="$t('patrolpointpreset.ChannelNumber')">
           <el-input
+            v-model="dialogForm.channelId"
             :placeholder="
               $t('share.PleaseEnter') +
               ' ' +
@@ -187,6 +198,7 @@
         </el-form-item>
         <el-form-item :label="$t('patrolpointpreset.PresetPointNumber')">
           <el-input
+            v-model="dialogForm.presetCode"
             :placeholder="
               $t('share.PleaseEnter') +
               ' ' +
@@ -196,6 +208,7 @@
         </el-form-item>
         <el-form-item :label="$t('patrolpointpreset.PresetPointName')">
           <el-input
+            v-model="dialogForm.presetName"
             :placeholder="
               $t('share.PleaseEnter') +
               ' ' +
@@ -205,10 +218,8 @@
         </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">{{
+        <el-button @click="handleClose">{{ $t("share.cancel") }}</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">{{
           $t("share.confirm")
         }}</el-button>
       </span>
@@ -217,12 +228,13 @@
       :title="tableTitle"
       :visible.sync="tableDialogVisible"
       width="60%"
-      :before-close="handleClose"
+      :before-close="tableDialogHandleClose"
       append-to-body
     >
-      <el-form v-model="dialogForm" :inline="true">
+      <el-form v-model="tableDialogForm" :inline="true">
         <el-form-item :label="$t('patrolpointpreset.PointCode')">
           <el-input
+            v-model="tableDialogForm.patrolpointCode"
             :placeholder="
               $t('share.PleaseEnter') + ' ' + $t('patrolpointpreset.PointCode')
             "
@@ -230,6 +242,7 @@
         </el-form-item>
         <el-form-item :label="$t('patrolpointpreset.PointName')">
           <el-input
+            v-model="tableDialogForm.patrolpointName"
             :placeholder="
               $t('share.PleaseEnter') + ' ' + $t('patrolpointpreset.PointName')
             "
@@ -239,70 +252,100 @@
           <el-button
             type="primary"
             icon="el-icon-search"
-            @click="handleQuery"
+            @click="tableDialogHandleQuery"
             size="mini"
             >{{ $t("share.search") }}</el-button
           >
-          <el-button icon="el-icon-refresh" @click="resetQuery" size="mini">{{
-            $t("share.reset")
-          }}</el-button>
+          <el-button
+            icon="el-icon-refresh"
+            @click="tableDialogResetQuery"
+            size="mini"
+            >{{ $t("share.reset") }}</el-button
+          >
         </el-form-item>
       </el-form>
-      <el-table :data="tableData" style="width: 100%; margin-bottom: 20px">
+      <el-table
+        :data="dialogTableData"
+        style="width: 100%; margin-bottom: 20px"
+        height="500px"
+        :row-style="rowStyle"
+        @row-click="changeCurrentRow"
+      >
         <el-table-column type="index" width="55" align="center" />
         <el-table-column
           :label="$t('patrolpointpreset.PointCode')"
-          prop="name"
+          prop="patrolpointCode"
           align="center"
         />
         <el-table-column
           :label="$t('patrolpointpreset.PointName')"
-          prop="name"
+          prop="patrolpointName"
           align="center"
         />
         <el-table-column
           :label="$t('patrolpointpreset.IntelligentRecognitionType')"
-          prop="name"
+          prop="algSubtypeName"
           align="center"
-        />
+        >
+          <template slot-scope="scope">
+            {{ scope.row.algSubtypeName || "无法设置阈值" }}
+          </template>
+        </el-table-column>
         <el-table-column
           :label="$t('patrolpointpreset.InspectionContent')"
-          prop="name"
+          prop="patrolContent"
           align="center"
         />
         <el-table-column
           :label="$t('patrolpointpreset.purpose')"
-          prop="name"
+          prop="purpose"
           align="center"
         />
       </el-table>
       <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        v-show="tableDialogFormTotal > 0"
+        :total="tableDialogFormTotal"
+        :page.sync="tableDialogForm.pageNum"
+        :limit.sync="tableDialogForm.pageSize"
+        @pagination="patrolpointList"
       />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="tableDialogHandleClose()">{{
+          $t("share.cancel")
+        }}</el-button>
+        <el-button type="primary" @click="tableDialogVisibleBtn()">{{
+          $t("share.confirm")
+        }}</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
+import {
+  getList,
+  patrolpoint_list,
+  postAdd,
+} from "@/api/basedata/patrolpointmnt/patrolpointpreset";
 export default {
   data() {
     return {
-      queryParams: {},
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
       tableData: [],
       total: 10,
       dialogVisible: false,
       title: this.$t("patrolpointpreset.AddPresetInspectionPoints"),
       dialogForm: {},
-      fatherID: "1111",
+      fatherID: "选择",
       tableTitle: this.$t(
         "patrolpointpreset.EditInspectionPointPresetPositions"
       ),
       tableDialogVisible: false,
       rules: {
-        InspectionEquipmentID: [
+        eqpbookId: [
           {
             required: true,
             message:
@@ -313,15 +356,35 @@ export default {
           },
         ],
       },
+      dialogTableData: [],
+      deviceId: null, // 当前点击的行ID
+      deviceItem: null,
+      type: 0,
+      tableDialogForm: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      tableDialogFormTotal:10
     };
   },
-  mounted() {},
+  mounted() {
+    this.init();
+  },
   methods: {
+    init() {
+      getList(this.queryParams).then((res) => {
+        if (res.code == 200) {
+          this.tableData = res.rows;
+        }
+      });
+    },
     add() {
       this.dialogVisible = true;
+      this.type = 0;
       this.title = this.$t("patrolpointpreset.AddPresetInspectionPoints");
     },
     handleEdit() {
+      this.type = 1;
       this.dialogVisible = true;
       this.title = this.$t(
         "patrolpointpreset.EditInspectionPointPresetPositions"
@@ -329,7 +392,80 @@ export default {
     },
     fatherIDFn() {
       this.tableDialogVisible = true;
+      this.patrolpointList();
+    },
+    patrolpointList() {
+      patrolpoint_list(this.tableDialogForm).then((res) => {
+        if (res.code == 200) {
+          this.dialogTableData = res.rows;
+          this.tableDialogFormTotal = res.total;
+        }
+      });
     },
+    tableDialogVisibleBtn() {
+      this.dialogForm = {
+        patrolpointName: this.deviceItem.patrolpointName,
+        patrolpointCode: this.deviceItem.patrolpointCode,
+        patrolpointId: this.deviceItem.patrolpointId,
+      };
+      this.tableDialogVisible = false;
+    },
+    rowStyle({ row }) {
+      // return
+      if (this.deviceId === row.deviceId) {
+        return {
+          "background-color": "rgb(94, 180, 251)",
+        }; // 返回选中行的样式
+      }
+      return {};
+    },
+    changeCurrentRow(row) {
+      this.deviceId = row.deviceId; // 更新当前点击的行ID
+      this.deviceItem = row;
+    },
+    // 新增
+    submitForm(ruleForm) {
+      this.$refs[ruleForm].validate((v) => {
+        if (v) {
+          console.log(this.dialogForm, 111111111);
+          if (this.type == 0) {
+            postAdd(this.dialogForm).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "添加成功",
+                });
+                this.dialogVisible = false;
+                this.init();
+              }
+            });
+          } else {
+            // 修改
+          }
+        }
+      });
+    },
+    handleQuery() {},
+    resetQuery() {},
+    handleClose() {
+      this.dialogVisible = false;
+    },
+    tableDialogHandleQuery() {
+      console.log(this.tableDialogForm)
+      this.patrolpointList()
+      // patrolpoint_list(this.tableDialogForm).then((res) => {
+      //   if (res.code == 200) {
+      //     this.dialogTableData = res.rows;
+      //     this.tableDialogFormTotal = res.total;
+      //   }
+      // });
+    },
+    tableDialogResetQuery() {},
+    tableDialogHandleClose() {
+      this.tableDialogVisible = false;
+    },
+
+    handleExport() {},
   },
 };
 </script>

src/views/equipment/entry.vue

@@ -34,7 +34,7 @@
               :content="$t('share.export')"
               placement="top-start"
             >
-              <i class="el-icon-download"></i>
+              <i class="el-icon-download" @click="handleExport"></i>
             </el-tooltip>
             <el-tooltip
               class="item"
@@ -55,6 +55,7 @@
             :props="defaultProps"
             @node-click="handleNodeClick"
             ref="tree"
+            default-expand-all
           >
             <span slot-scope="{ node, data }" class="slot-node">
               <template>
@@ -104,12 +105,13 @@
               <el-select
                 v-model="form.devicetypeId"
                 :placeholder="$t('share.PleaseEnter') + $t('entry.DeviceType')"
+                :disabled="disabled"
               >
                 <el-option
-                  :label="item.deviceTypeName"
-                  :value="item.deviceTypeId"
+                  :label="item.devicetypeName"
+                  :value="item.devicetypeId"
                   v-for="item in deviceTypeData"
-                  :key="item.deviceTypeId"
+                  :key="item.devicetypeId"
                 ></el-option>
                 <!-- deviceTypeData -->
               </el-select>
@@ -128,7 +130,7 @@
                 $t("entry.EquipmentNumberPrompt")
               }}</span>
             </el-form-item>
-            <el-form-item :label="$t('entry.DisplaySorting')">
+            <el-form-item :label="$t('entry.DisplaySorting')" prop="orderNum">
               <el-input-number
                 v-model="form.orderNum"
                 controls-position="right"
@@ -177,8 +179,9 @@
                 :step="0.1"
               ></el-input-number>
               <span class="number-title"
-                >({{ $t("entry.suggestion")+" "  + $t("entry.minimumValue") }}-20
-                {{ $t("entry.minimumValue") }}20 )</span
+                >({{
+                  $t("entry.suggestion") + " " + $t("entry.minimumValue")
+                }}-20 {{ $t("entry.minimumValue") }}20 )</span
               >
             </el-form-item>
             <!-- 建议最小值-20，最大值20 -->
@@ -201,8 +204,9 @@
                 :step="0.1"
               ></el-input-number>
               <span class="number-title"
-                >({{ $t("entry.suggestion")+" " + $t("entry.minimumValue") }}-6
-                {{ $t("entry.minimumValue") }}20 )</span
+                >({{
+                  $t("entry.suggestion") + " " + $t("entry.minimumValue")
+                }}-6 {{ $t("entry.minimumValue") }}20 )</span
               >
             </el-form-item>
 
@@ -225,6 +229,7 @@ import {
   deviceQuery,
   insertMainDeviceAndCommByDeviceType,
   deviceRemove,
+  deviceEdit
 } from "@/api/equipment/entry";
 export default {
   name: "entry",
@@ -279,15 +284,24 @@ export default {
             trigger: "blur",
           },
         ],
+        orderNum:[
+        {
+            required: true,
+            message:"请输入排序",
+            trigger: "blur",
+          },
+        ]
       },
+      type: 0,
+      disabled: false,
     };
   },
   mounted() {
     this.init();
     devicetypeList().then((res) => {
-      console.log(res);
+      console.log(res, 111);
       if (res.code == 200) {
-        let arr = res.data.filter((item) => item.deviceTypeId !== 1);
+        let arr = res.data.filter((item) => item.devicetypeName !== '设备类型');
         this.deviceTypeData = arr;
       }
     });
@@ -301,10 +315,9 @@ export default {
       });
     },
     handleNodeClick(data, e) {
-      console.log(data, e);
       this.deviceId = data.deviceId;
       this.titleName = data.areaName || data.deviceName;
-      // this.form.boolAdd = 1;
+      this.disabled=true;
       (this.form.parentName = data.areaName), (this.form.areaId = data.areaId);
 
       if (data.areaName) {
@@ -317,15 +330,17 @@ export default {
         this.deleteIcon = false;
         this.addIcon = true;
         deviceQuery(data.deviceId).then((res) => {
-          console.log(res, 1111);
           if (res.code == 200) {
-            // this.form=res.data;
+            this.type = 1;
+            this.form = res.data;
           }
         });
       }
     },
     add() {
       this.show = true;
+      this.type = 0;
+      this.disabled=false;
     },
     remove() {
       this.$confirm("是否确定删除", "系统提示", {
@@ -348,28 +363,62 @@ export default {
     onSubmit() {
       this.$refs["ruleForm"].validate((v) => {
         if (v) {
-          insertMainDeviceAndCommByDeviceType(this.form).then((res) => {
-            if (res.code == 200) {
-              this.$message({
-                type: "success",
-                message: "新增成功",
-              });
-              // this.show = false;
-              this.form = {
-                orderNum: 0,
-                positionX: 0,
-                positionY: 66,
-                positionZ: 0,
-                handerType: 0,
-                boolAdd: 1,
-                deviceId: "",
-              };
-              this.init();
-            }
-          });
+          if (this.type == 0) {
+            insertMainDeviceAndCommByDeviceType(this.form).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "新增成功",
+                });
+                this.form={}
+                this.form = {
+                  orderNum: 0,
+                  positionX: 0,
+                  positionY: 66,
+                  positionZ: 0,
+                  handerType: 0,
+                  boolAdd: 1,
+                  deviceId: "",
+                };
+                this.init();
+              }
+            });
+          } else {
+            // this.form.handerType=2;
+            // this.form.updateTime=null;
+            deviceEdit(this.form).then(res=>{
+              if(res.code==200){
+                this.$message({
+                  type: "success",
+                  message: "编辑成功",
+                });
+                this.form={}
+                this.form = {
+                  orderNum: 0,
+                  positionX: 0,
+                  positionY: 66,
+                  positionZ: 0,
+                  handerType: 0,
+                  boolAdd: 1,
+                }
+                this.init();
+              }
+            })
+          }
+          this.show = false;
         }
       });
     },
+     // 导出
+     handleExport() {
+      this.download(
+        "/basedata/prodevmnt/device/export",
+        {
+          ...this.queryParams,
+        },
+        `entry_${new Date().getTime()}.xlsx`
+      );
+    },
   },
 };
 </script>

src/views/equipment/equipment.vue

@@ -67,7 +67,7 @@
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
-          @click="handleEdit(null,0)"
+          @click="handleEdit(null, 0)"
           >{{ $t("share.edit") }}</el-button
         >
       </el-col>
@@ -83,13 +83,9 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleExport"
-          >{{ $t("share.import") }}</el-button
-        >
+        <el-button plain icon="el-icon-upload2" size="mini">{{
+          $t("share.import")
+        }}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -102,9 +98,14 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-upload" size="mini"  :disabled="uploadBtn">{{
-          $t("equipment.ModelSynchronization")
-        }}</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-upload"
+          size="mini"
+          :disabled="uploadBtn"
+          >{{ $t("equipment.ModelSynchronization") }}</el-button
+        >
       </el-col>
     </el-row>
     <el-table
@@ -328,10 +329,10 @@
             @click="handleDelete(scope.row.eqpbookId)"
             >{{ $t("share.delete") }}</el-button
           >
-          <el-button size="mini" type="text" icon="el-icon-s-promotion">{{
+          <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="goToAboutPage(scope.row.eqpbookId)">{{
             $t("equipment.thoroughfare")
           }}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-upload">{{
+          <el-button size="mini" type="text" icon="el-icon-upload" @click="uploadImg">{{
             $t("equipment.uploadPictures")
           }}</el-button>
         </template>
@@ -386,7 +387,7 @@
           <el-col span="8">
             <el-form-item :label="$t('equipment.EquipmentName')">
               <el-input
-                v-model="dialogForm.type"
+                v-model="dialogForm.patroldeviceName"
                 :placeholder="
                   $t('share.PleaseEnter') + $t('equipment.EquipmentName')
                 "
@@ -496,8 +497,8 @@
                 "
                 style="display: block; width: 100%"
               >
-                <!-- <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option> -->
+                <el-option label="是" value="1"></el-option>
+                <el-option label="否" value="0"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -513,8 +514,12 @@
                 "
                 style="display: block; width: 100%"
               >
-                <!-- <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option> -->
+                <el-option
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                  v-for="item in useModeData"
+                  :key="item.dictValue"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -527,8 +532,13 @@
                 "
                 style="display: block; width: 100%"
               >
-                <!-- <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option> -->
+                <el-option
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                  v-for="item in videoModeData"
+                  :key="item.dictValue"
+                ></el-option>
+                <!-- <el-option label="区域二" value="beijing"></el-option> -->
               </el-select>
             </el-form-item>
           </el-col>
@@ -652,10 +662,8 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false"
-          >确 定</el-button
-        >
+        <el-button @click="handleClose">取 消</el-button>
+        <el-button type="primary" @click="onSubmit">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -668,6 +676,10 @@ import {
   getTreeselect,
   postRemove,
   getEqpbook,
+  use_mode,
+  video_mode,
+  eqpbook,
+  edit,
 } from "@/api/equipment/equipment";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -695,7 +707,10 @@ export default {
       ids: [],
       single: true,
       multiple: true,
-      uploadBtn:true,
+      uploadBtn: true,
+      useModeData: [],
+      videoModeData: [],
+      type: 0,
     };
   },
   mounted() {
@@ -706,6 +721,16 @@ export default {
         this.areaNameOptions = res.data;
       }
     });
+    use_mode().then((res) => {
+      if (res.code == 200) {
+        this.useModeData = res.data;
+      }
+    });
+    video_mode().then((res) => {
+      if (res.code == 200) {
+        this.videoModeData = res.data;
+      }
+    });
   },
   methods: {
     init() {
@@ -731,7 +756,9 @@ export default {
       this.dialogVisible = false;
     },
     handleAdd() {
+      this.dialogForm = {};
       this.dialogVisible = true;
+      this.type = 0;
     },
     // 查询
     handleQuery() {
@@ -747,11 +774,14 @@ export default {
       this.init();
     },
     typeFn(type) {
-      for (let i = 0; i <= this.deviceTypeOptions.length; i++) {
-        if (this.deviceTypeOptions[i].dictValue == type) {
-          return this.deviceTypeOptions[i].dictLabel;
+      console.log(type, 111111);
+      let src = null;
+      this.deviceTypeOptions.forEach((item) => {
+        if (item.dictValue == type) {
+          return (src = item.dictLabel);
         }
-      }
+      });
+      return src;
     },
     // 单删
     handleDelete(eqpbookId) {
@@ -807,7 +837,8 @@ export default {
       }
     },
     // 编辑弹框打开
-    handleEdit(id=null,type) {
+    handleEdit(id = null, type) {
+      this.dialogForm = {};
       if (type == 0) {
         let eqpbookId = this.ids[0];
         this.getEqpbookFn(eqpbookId);
@@ -823,6 +854,41 @@ export default {
         }
       });
     },
+    // 保存
+    onSubmit() {
+      if (this.type == 0) {
+        // 新增
+        eqpbook(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();
+          }
+        });
+      }
+    },
+    // 导出
+    handleExport() {},
+    goToAboutPage(id){
+      this.$router.push('/basedata/eqpbook/channel')
+    },
+    // 图片上传弹框
+    uploadImg(){}
   },
 };
 </script>

src/views/equipment/equipment_type.vue

@@ -3,8 +3,8 @@
     <el-row :gutter="20">
       <el-col :span="5">
         <div class="operate-left">
-          <i class="el-icon-plus" @click="add"></i>
-          <i class="el-icon-delete"></i>
+          <i class="el-icon-plus" @click="addBtn"></i>
+          <i class="el-icon-delete" @click="handleDelete"></i>
         </div>
         <el-input
           :placeholder="$t('equipment_type.EnterKeywordsForFiltering')"
@@ -16,7 +16,7 @@
             :props="defaultProps"
             @node-click="handleNodeClick"
           >
-            <span slot-scope="{ node, data }" class="slot-node">
+            <!-- <span slot-scope="{ node, data }" class="slot-node">
               <template>
                 <i
                   class="el-icon-box"
@@ -33,33 +33,26 @@
                 ></i>
                 <span>{{ node.label }}</span>
               </template>
-            </span>
+            </span> -->
           </el-tree>
         </div>
       </el-col>
       <el-col :span="19">
         <div class="right">
-          <el-button
-            type="primary"
-            @click="add"
-            v-if="!show && (type == 0 || type == 1)"
-            >{{ $t("equipment_type.AddDevice") }}</el-button
-          >
-          <i
-            class="el-icon-close closeBtn"
-            v-if="show && type == 0"
-            @click="close"
-          ></i>
+          <el-button type="primary" @click="addBtn" v-if="!show">{{
+            $t("equipment_type.AddDevice")
+          }}</el-button>
+          <i class="el-icon-close closeBtn" v-if="show" @click="close"></i>
           <div v-if="show">
             <div class="right-title">{{ rightTitle }}</div>
 
             <el-form :model="formData" :rules="rules" ref="ruleForm">
               <el-form-item
                 :label="$t('equipment_type.EquipmentTypeName')"
-                prop="EquipmentTypeName"
+                prop="devicetypeName"
               >
                 <el-input
-                  v-model="formData.EquipmentTypeName"
+                  v-model="formData.devicetypeName"
                   :placeholder="
                     $t('share.PleaseEnter') +
                     $t('equipment_type.EnterKeywordsForFiltering')
@@ -68,10 +61,10 @@
               </el-form-item>
               <el-form-item
                 :label="$t('equipment_type.EquipmentCategoryNumber')"
-                prop="EquipmentCategoryNumber"
+                prop="devicetypeCode"
               >
                 <el-input
-                  v-model="formData.EquipmentCategoryNumber"
+                  v-model="formData.devicetypeCode"
                   :placeholder="
                     $t('share.PleaseEnter') +
                     $t('equipment_type.EquipmentCategoryNumber')
@@ -80,22 +73,32 @@
               </el-form-item>
               <el-form-item
                 :label="$t('equipment_type.ProfessionalAffiliation')"
-                prop="ProfessionalAffiliation"
+                prop="professionType"
               >
-                <el-input
-                  v-model="formData.ProfessionalAffiliation"
+                <!-- <el-input
+                  v-model="formData.professionTypeData"
                   :placeholder="
                     $t('share.PleaseEnter') +
                     $t('equipment_type.ProfessionalAffiliation')
                   "
-                ></el-input>
+                ></el-input> -->
+                <el-select
+                  v-model="formData.professionType"
+                  placeholder="请选择"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in professionTypeData"
+                    :key="item.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
 
-              <el-form-item
-                :label="$t('equipment_type.NumberOfPhases')"
-                v-if="type !== 0 && type !== 1"
-              >
-                <el-radio-group v-model="formData.resource">
+              <el-form-item :label="$t('equipment_type.NumberOfPhases')">
+                <el-radio-group v-model="formData.phaseNum">
                   <el-radio
                     :label="$t('equipment_type.NoPhaseNumber')"
                   ></el-radio>
@@ -108,12 +111,12 @@
 
               <el-form-item
                 :label="$t('equipment_type.Farewell')"
-                v-if="type !== 0 && type !== 1"
+                v-if="formData.phaseNum == '单相'"
               >
-                <el-radio-group v-model="formData.resource">
-                  <el-radio
+                <el-radio-group v-model="formData.phase">
+                  <!-- <el-radio
                     :label="$t('equipment_type.NoPhaseNumber')"
-                  ></el-radio>
+                  ></el-radio> -->
                   <el-radio label="A"></el-radio>
                   <el-radio label="B"></el-radio>
                   <el-radio label="C"></el-radio>
@@ -133,39 +136,18 @@
 </template>
 
 <script>
-import { getProDeviceTypeTreeSelect } from "@/api/equipment/equipment_type";
+import {
+  getProDeviceTypeTreeSelect,
+  profession_type,
+  update,
+  remove,
+  add,
+} from "@/api/equipment/equipment_type";
 export default {
   name: "equipment_type",
   data() {
     return {
-      treeData: [
-        {
-          label: "一级 1",
-          type: 1,
-          children: [
-            {
-              label: "二级 1-1",
-              type: 2,
-              children: [
-                {
-                  label: "三级 1-1-1",
-                  type: 3,
-                  children: [
-                    {
-                      label: "四级 1-1-1-1",
-                      type: 4,
-                    },
-                    {
-                      label: "四级 1-1-1-2",
-                      type: 4,
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-        },
-      ],
+      treeData: [],
       defaultProps: {
         children: "children",
         label: "devicetypeName",
@@ -176,62 +158,73 @@ export default {
       show: false,
       type: 0,
       rules: {
-        EquipmentTypeName: [
+        devicetypeName: [
           {
             required: true,
             message:
-              this.$t("share.PleaseEnter") + this.$t("share.EquipmentTypeName"),
+              this.$t("share.PleaseEnter") +
+              this.$t("equipment_type.EquipmentTypeName"),
             trigger: "blur",
           },
         ],
-        EquipmentCategoryNumber: [
+        devicetypeCode: [
           {
             required: true,
             message:
               this.$t("share.PleaseEnter") +
-              this.$t("share.EquipmentCategoryNumber"),
+              this.$t("equipment_type.EquipmentCategoryNumber"),
             trigger: "blur",
           },
         ],
-        ProfessionalAffiliation: [
+        professionType: [
           {
             required: true,
             message:
               this.$t("share.PleaseEnter") +
-              this.$t("share.ProfessionalAffiliation"),
-            trigger: "blur",
+              this.$t("equipment_type.ProfessionalAffiliation"),
+            trigger: "change",
           },
         ],
       },
+      professionTypeData: [],
     };
   },
   mounted() {
-    getProDeviceTypeTreeSelect().then((res) => {
-      if (res.code == 200) {
-        this.treeData = res.data;
-        this.$message({
-          message: "查询成功",
-          type: "success",
-        });
-      }
-    });
+    this.init();
   },
   methods: {
+    init() {
+      getProDeviceTypeTreeSelect().then((res) => {
+        if (res.code == 200) {
+          this.treeData = res.data;
+          this.$message({
+            message: "查询成功",
+            type: "success",
+          });
+        }
+      });
+      profession_type().then((res) => {
+        if (res.code == 200) {
+          this.professionTypeData = res.data;
+        }
+      });
+    },
     handleNodeClick(data) {
-      console.log(data.type);
-      this.type = data.type;
-
-      if (data.type == 0) {
+      console.log(data);
+      // this.type = data.type;
+      if (data.devicetypeId == 1) {
         this.rightTitle = this.$t("equipment_type.AddDevice");
-        this.show = true;
-      } else if (data.type !== 0 && data.type !== 1) {
-        this.show = true;
-        this.rightTitle = this.$t("equipment_type.EditEquipment");
-      } else if (data.type == 1) {
         this.show = false;
+        this.type = 0;
+      } else {
+        this.type = 1;
+        this.rightTitle = this.$t("equipment_type.EditEquipment");
+        this.formData = JSON.parse(JSON.stringify(data));
+        this.show = true;
       }
     },
-    add() {
+    addBtn() {
+      this.formData = {};
       this.show = true;
       this.type = 0;
       this.rightTitle = this.$t("equipment_type.AddDevice");
@@ -242,13 +235,60 @@ export default {
     subunit() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
-          alert("submit!");
-        } else {
-          console.log("error submit!!");
-          return false;
+          if (this.formData.phaseNum == "无相数") {
+            this.formData.phase = 0;
+          } else if (this.formData.phaseNum == "三相") {
+            this.formData.phase = "ABC";
+          }
+          this.formData.powerMainEquFlag="Yes";
+          if (this.type == 0) {
+            this.formData.parentId = 1;
+            add(this.formData).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  message: "添加成功",
+                  type: "success",
+                });
+                this.init();
+                this.show = false;
+              }
+            });
+          } else {
+            update(this.formData).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  message: "修改成功",
+                  type: "success",
+                });
+                this.init();
+                this.show = false;
+              }
+            });
+          }
         }
       });
     },
+    // 删除
+    handleDelete() {
+      if (this.show) {
+        this.$confirm("是否确定删除", "系统提示", {
+          confirmButtonText: this.$t("share.confirm"),
+          cancelButtonText: this.$t("share.cancel"),
+          type: "warning",
+        }).then(() => {
+          remove(this.formData.devicetypeId).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+              this.init();
+              this.show = false;
+            }
+          });
+        });
+      }
+    },
   },
 };
 </script>

src/views/point/site_management.vue

@@ -80,6 +80,7 @@
                 :placeholder="
                   $t('share.PleaseEnter') + $t('site_management.PointName')
                 "
+                disabled
               ></el-input>
             </template>
           </el-table-column>
@@ -106,6 +107,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.patrolpointCode"
+                disabled
                 :placeholder="
                   $t('share.PleaseEnter') +
                   $t('site_management.MonitoringPointNumber')
@@ -128,6 +130,7 @@
                   $t('share.PleaseChoose') +
                   $t('site_management.InspectionType')
                 "
+                disabled
               >
                 <el-option
                   v-for="item in InspectionTypeData"
@@ -152,6 +155,7 @@
                   $t('site_management.ImportantLevel')
                 "
                 v-model="scope.row.pointImptLevel"
+                disabled
               >
                 <el-option
                   v-for="item in pointImptLevelData"
@@ -173,14 +177,17 @@
                 <el-input
                   placeholder="x(-20,20)"
                   v-model="scope.row.positionX"
+                  disabled
                 ></el-input>
                 <el-input
                   placeholder="y(66)"
                   v-model="scope.row.positionY"
+                  disabled
                 ></el-input>
                 <el-input
                   placeholder="z(-6,20)"
                   v-model="scope.row.positionZ"
+                  disabled
                 ></el-input>
               </div>
             </template>
@@ -196,6 +203,9 @@
             width="220"
             align="center"
           >
+            <template slot-scope="scope">
+              <span class="intelligenceType">设置</span>
+            </template>
           </el-table-column>
           <el-table-column
             :label="$t('site_management.DiscriminantBenchmarkImage')"
@@ -1324,4 +1334,8 @@ export default {
     cursor: pointer;
   }
 }
+.intelligenceType {
+  cursor: pointer;
+  color: #409eff;
+}
 </style>