diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index 5873a44..32883d1 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -43,33 +43,69 @@
       <el-form-item label="装置ID：" prop="cmdId">
         <el-input v-model="formInfo.cmdId" autocomplete="on"></el-input>
       </el-form-item>
+      <el-form-item label="云台选择：" prop="hasPan">
+        <el-select v-model="formInfo.hasPan" placeholder="请选择">
+          <el-option
+            v-for="item in hasPanOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="装置名称：" prop="equipName">
         <el-input v-model="formInfo.equipName" auto-complete="on"></el-input>
       </el-form-item>
       <el-form-item label="SIM卡：" prop="sim">
         <el-input v-model="formInfo.sim" auto-complete="on"></el-input>
       </el-form-item>
-      <!-- <el-form-item label="网络类型：" prop="networkId">
+      <el-form-item label="网络类型：" prop="networkId">
         <el-select v-model="formInfo.networkId" placeholder="请选择">
-          <el-option v-for="item in networkOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态：" prop="status">
-        <el-select v-model="formInfo.statusId" placeholder="请选择">
-          <el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          <el-option
+            v-for="item in networkOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
+
       <el-form-item label="装置型号：" prop="deviceType">
         <el-input v-model="formInfo.deviceType" auto-complete="on"></el-input>
       </el-form-item>
       <el-form-item label="装置厂家：" prop="deviceFactory">
-        <el-input v-model="formInfo.deviceFactory" auto-complete="on"></el-input>
+        <el-input
+          v-model="formInfo.deviceFactory"
+          auto-complete="on"
+        ></el-input>
       </el-form-item>
       <el-form-item label="规约版本：" prop="protocolVersion">
-        <el-input v-model="formInfo.protocolVersion" auto-complete="on"></el-input>
+        <!-- <el-input
+          v-model="formInfo.protocolVersion"
+          auto-complete="on"
+        ></el-input> -->
+        <el-select v-model="formInfo.protocolVersion" placeholder="请选择">
+          <el-option
+            v-for="item in protocolOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="投运日期：" prop="workingDate">
+        <el-date-picker
+          class="dateClass"
+          v-model="formInfo.workingDate"
+          type="date"
+          placeholder="选择日期"
+          value-format="timestamp"
+        ></el-date-picker>
       </el-form-item>
-      <el-form-item label="投运日期：" prop="putdate">
-        <el-date-picker v-model="formInfo.putdate" type="date" placeholder="选择日期" value-format="timestamp"></el-date-picker>
+      <!-- <el-form-item label="状态：" prop="status">
+        <el-select v-model="formInfo.statusId" placeholder="请选择">
+          <el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
       </el-form-item> -->
       <el-divider></el-divider>
       <h4>添加通道</h4>
@@ -200,6 +236,17 @@ export default {
           name: "调试",
         },
       ], //状态
+      hasPanOptions: [
+        {
+          id: 0,
+          name: "否",
+        },
+        {
+          id: 1,
+          name: "是",
+        },
+      ],
+      protocolOptions: [], //规约版本
       rules: {
         cmdId: [
           { required: true, message: "请输入装置ID", trigger: "blur" },
@@ -223,7 +270,13 @@ export default {
           towerId: "",
           cmdId: "",
           equipName: "",
+          hasPan: this.hasPanOptions[0].id,
           sim: "",
+          networkId: this.networkOptions[0].id,
+          deviceType: "",
+          deviceFactory: "",
+          protocolVersion: "",
+          workingDate: new Date().getTime(),
           list: [
             {
               id: "",
@@ -292,6 +345,7 @@ export default {
             //   displayName: this.formInfo.cmdId,
             // };
             this.$set(this.formInfo, "displayName", this.formInfo.cmdId);
+            console.log(this.formInfo);
             addTerminalJoggle(this.formInfo)
               .then((res) => {
                 this.isShow = false;
@@ -416,6 +470,9 @@ export default {
         .el-form-item__label {
           padding-right: 0px;
         }
+        .dateClass {
+          width: 290px;
+        }
       }
       .el-divider--horizontal {
         margin: 12px;
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
index 4fa8214..3c001b5 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
@@ -271,23 +271,34 @@
       <el-tab-pane label="GPS位置" name="8">
         <div class="runform">
           <el-form :model="gpsForm" :inline="true" label-width="150px">
-            <el-form-item label="坐标类型">
+            <!-- <el-form-item label="坐标类型">
               <el-input v-model="gpsForm.zztime" :disabled="true"></el-input>
+            </el-form-item> -->
+
+            <el-form-item label="经度">
+              <el-input v-model="gpsForm.longitude" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="半径">
-              <el-input v-model="gpsForm.newzztime" :disabled="true"></el-input>
-            </el-form-item>
-            <el-form-item label="维度">
-              <el-input v-model="gpsForm.newzztime" :disabled="true"></el-input>
+            <el-form-item label="纬度">
+              <el-input v-model="gpsForm.latitude" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="经度">
-              <el-input v-model="gpsForm.newzztime" :disabled="true"></el-input>
+            <el-form-item label="半径">
+              <el-input v-model="gpsForm.radius" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="查询最新时间">
-              <el-input v-model="gpsForm.newzztime" :disabled="true"></el-input>
+              <!-- <el-input
+                v-model="gpsForm.updatetime"
+                :disabled="true"
+              ></el-input> -->
+              <el-date-picker
+                :disabled="true"
+                v-model="gpsForm.updatetime"
+                type="datetime"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
             </el-form-item>
             <el-form-item class="runformbtn">
-              <el-button type="primary">查询</el-button>
+              <el-button type="primary" @click="gpsSearch">查询</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -307,7 +318,8 @@
   </el-dialog>
 </template>
 <script>
-import { resetTerminalApi } from "@/utils/api/index";
+import { resetTerminalApi, getTermLastGPSPosition } from "@/utils/api/index";
+
 import imageCapture from "./imageCapture.vue";
 import videoCapture from "./videoCapture.vue";
 export default {
@@ -329,7 +341,7 @@ export default {
         newzztime: "", //新装置时间
       },
       runStatusForm: {},
-      gpsForm: {},
+      gpsForm: {}, //gps位置
       tabsActive: "first",
       rowData: {},
     };
@@ -353,6 +365,25 @@ export default {
         this.$refs.videoCaptureref.getRatio();
       }
     },
+    //gps位置查询
+    gpsSearch() {
+      console.log(this.rowData);
+      getTermLastGPSPosition({
+        termId: this.rowData.id,
+      })
+        .then((res) => {
+          this.gpsForm = res.data;
+          console.log(this.gpsForm);
+          $moment().format("YYYY-MM-DD HH:mm:ss");
+          // this.$message({
+          //   duration: 1500,
+          //   showClose: true,
+          //   message: "gps信息已更新",
+          //   type: "success",
+          // });
+        })
+        .catch((err) => {});
+    },
     //装置复位
     handleDeviceReset() {
       this.$confirm("此操作将复位装置, 是否继续?", "提示", {
@@ -402,6 +433,7 @@ export default {
       this.isShow = false;
       this.activeName = "1";
       this.tabsActive = "first";
+      this.gpsForm = {};
     },
   },
 };
@@ -455,6 +487,9 @@ export default {
         background-color: #169e8c;
       }
     }
+    .el-input.is-disabled .el-input__inner {
+      color: #666;
+    }
   }
 }
 </style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 472481d..8638ff6 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -79,19 +79,13 @@
           @row-click="handleRowClick"
           v-loading="loading"
         >
-          <el-table-column
-            fixed
-            prop="dyValueName"
-            label="电压等级"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="dyName" label="电压等级" show-overflow-tooltip>
           </el-table-column>
-          
+
           <template slot="empty">
             <el-empty :image-size="160" description="暂无数据"></el-empty>
           </template>
           <el-table-column
-            fixed
             prop="lineName"
             label="线路名称"
             show-overflow-tooltip
@@ -104,7 +98,6 @@
             </template>
           </el-table-column>
           <el-table-column
-            fixed
             prop="towerName"
             label="杆塔名称"
             show-overflow-tooltip
@@ -117,7 +110,6 @@
             </template>
           </el-table-column>
           <el-table-column
-            fixed
             prop="equipName"
             label="设备名称"
             show-overflow-tooltip
@@ -125,50 +117,70 @@
           >
           </el-table-column>
           <el-table-column
-            fixed
             prop="cmdId"
             label="设备编号"
             show-overflow-tooltip
             min-width="150"
           >
           </el-table-column>
+
+          <el-table-column
+            prop="protocolName"
+            label="规约名称"
+            show-overflow-tooltip
+            min-width="90"
+            v-if="roleUser != 2"
+          />
           <el-table-column
             prop="isonline"
             label="是否在线"
             show-overflow-tooltip
-            fixed
           >
             <template slot-scope="scope">
               {{ scope.row.isonline ? "在线" : "离线" }}</template
             >
           </el-table-column>
+          <el-table-column
+            prop="isonline"
+            label="是否带云台"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.hasPan == 1 ? "是" : "否" }}</template
+            >
+          </el-table-column>
 
-          <el-table-column prop="cmdid" label="SIM卡号" show-overflow-tooltip>
+          <el-table-column prop="sim" label="SIM卡号" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="cmdid" label="网络类型" show-overflow-tooltip>
+          <el-table-column
+            prop="netType"
+            label="网络类型"
+            show-overflow-tooltip
+          >
           </el-table-column>
 
-          <el-table-column prop="cmdid" label="装置型号" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column prop="cmdid" label="装置厂家" show-overflow-tooltip>
+          <el-table-column
+            prop="essentialInfoVersion"
+            label="装置型号"
+            show-overflow-tooltip
+          >
           </el-table-column>
-          <el-table-column prop="cmdid" label="规约版本" show-overflow-tooltip>
+          <el-table-column
+            prop="bsManufacturer"
+            label="装置厂家"
+            show-overflow-tooltip
+          >
           </el-table-column>
+
           <el-table-column
-            prop="cmdid"
+            prop="workingDate"
             label="投运日期"
             show-overflow-tooltip
             :formatter="dateFormat"
           >
           </el-table-column>
-          <el-table-column
-            prop="protocolName"
-            label="规约名称"
-            show-overflow-tooltip
-            min-width="90"
-            v-if="roleUser != 2"
-          />
-          <el-table-column
+
+          <!-- <el-table-column
             prop="lastHeartbeat"
             label="最后一次心跳时间"
             show-overflow-tooltip
@@ -219,33 +231,8 @@
             show-overflow-tooltip
             min-width="90"
           >
-          </el-table-column>
-          <!-- <el-table-column
-            prop="cmdid"
-            label=" 连续工作时间
-          剩余运行内存
-          剩余存储内存"
-            show-overflow-tooltip
-            
-          >
           </el-table-column> -->
 
-          <!-- <el-table-column
-            prop="updateTime"
-            label="修改时间"
-            :show-overflow-tooltip="true"
-            :formatter="dateFormat"
-            
-          >
-          </el-table-column> -->
-
-          <!-- <el-table-column
-            prop="createTime"
-            label="创建时间"
-            :show-overflow-tooltip="true"
-            :formatter="dateFormat"
-          >
-          </el-table-column> -->
           <el-table-column
             fixed="right"
             label="操作"
@@ -386,11 +373,7 @@
                   <el-dropdown-item command="open">开启GPS</el-dropdown-item>
                   <el-dropdown-item command="close">关闭GPS</el-dropdown-item>
                 </el-dropdown-menu>
-<<<<<<< HEAD
               </el-dropdown> -->
-=======
-              </el-dropdown>
->>>>>>> hn1.0
               <el-button
                 type="text"
                 class="deleteText"
diff --git a/vue.config.js b/vue.config.js
index 2d81f4c..040028d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,11 +29,11 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-        //target: "http://47.96.238.157:8093", //阿里云服务器环境
-        target: "http://180.166.218.222:40080", //dell
+        target: "http://47.96.238.157:8093", //阿里云服务器环境
+        //target: "http://180.166.218.222:40080", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
-          "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+          "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
         },
       },
     },