diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 21dc317..4e4a29e 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -816,3 +816,12 @@ export function updateTermCamera(data) {
     params: data,
   });
 }
+
+//规约版本
+export function getProtocolList(data) {
+  return request({
+    url: "/api/getProtocolList",
+    method: "get",
+    params: data,
+  });
+}
diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue
index cb1fc90..d474624 100644
--- a/src/views/devicePhotoSchedule/components/setdevice.vue
+++ b/src/views/devicePhotoSchedule/components/setdevice.vue
@@ -378,7 +378,12 @@ export default {
             ////判断河南规约
             if (
               this.allCheckNode[i].protocol == "65286" ||
-              this.allCheckNode[i].protocol == "65282"
+              this.allCheckNode[i].protocol == "65282" ||
+              this.allCheckNode[i].protocol == "65280" ||
+              this.allCheckNode[i].protocol == "65296" ||
+              this.allCheckNode[i].protocol == "65281" ||
+              this.allCheckNode[i].protocol == "65284" ||
+              this.allCheckNode[i].protocol == "65285"
             ) {
               console.log("河南规约");
               //偏移时间
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index 32883d1..2b6d4f4 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -59,8 +59,8 @@
       <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-select v-model="formInfo.networkId" placeholder="请选择">
+      <el-form-item label="网络类型：" prop="netType">
+        <el-select v-model="formInfo.netType" placeholder="请选择">
           <el-option
             v-for="item in networkOptions"
             :key="item.id"
@@ -70,12 +70,12 @@
         </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 label="装置型号：" prop="model">
+        <el-input v-model="formInfo.model" auto-complete="on"></el-input>
       </el-form-item>
-      <el-form-item label="装置厂家：" prop="deviceFactory">
+      <el-form-item label="装置厂家：" prop="bsManufacturer">
         <el-input
-          v-model="formInfo.deviceFactory"
+          v-model="formInfo.bsManufacturer"
           auto-complete="on"
         ></el-input>
       </el-form-item>
@@ -84,7 +84,7 @@
           v-model="formInfo.protocolVersion"
           auto-complete="on"
         ></el-input> -->
-        <el-select v-model="formInfo.protocolVersion" placeholder="请选择">
+        <el-select v-model="formInfo.protocol" placeholder="请选择">
           <el-option
             v-for="item in protocolOptions"
             :key="item.id"
@@ -99,6 +99,7 @@
           v-model="formInfo.workingDate"
           type="date"
           placeholder="选择日期"
+          format="yyyy 年 MM 月 dd 日"
           value-format="timestamp"
         ></el-date-picker>
       </el-form-item>
@@ -180,6 +181,7 @@ import {
   updateTerminalJoggle,
   getAllChannelListJoggle,
   getLineAndGtInfo,
+  getProtocolList,
 } from "@/utils/api/index";
 export default {
   props: {
@@ -256,10 +258,22 @@ export default {
       photoDialogtype: 0, //1 线路change时，修改杆塔数据
     };
   },
-  mounted() {},
+  mounted() {
+    this.getProtocol();
+  },
   created() {},
   watch: {},
   methods: {
+    getProtocol() {
+      //获取规约版本
+      getProtocolList()
+        .then((res) => {
+          console.log(res);
+          this.protocolOptions = res.data.list;
+          console.log(this.protocolOptions);
+        })
+        .catch((err) => {});
+    },
     //判断
     getdataform(val) {
       this.getLine();
@@ -272,10 +286,10 @@ export default {
           equipName: "",
           hasPan: this.hasPanOptions[0].id,
           sim: "",
-          networkId: this.networkOptions[0].id,
-          deviceType: "",
-          deviceFactory: "",
-          protocolVersion: "",
+          netType: this.networkOptions[0].id,
+          model: "",
+          bsManufacturer: "",
+          protocol: this.protocolOptions[0].id,
           workingDate: new Date().getTime(),
           list: [
             {
@@ -285,8 +299,15 @@ export default {
           ],
         });
       }
+
       //this.formInfo = val;
       this.formInfo = JSON.parse(JSON.stringify(val));
+      this.$set(
+        this.formInfo,
+        "workingDate",
+        new Date(this.formInfo.workingDate).getTime()
+      );
+      console.log(this.formInfo.workingDate);
     },
     //通道号值改变
     changeHandle() {
@@ -344,6 +365,7 @@ export default {
             //   list: this.formInfo.list,
             //   displayName: this.formInfo.cmdId,
             // };
+            this.$set(this.formInfo, "workingDate", new Date().getTime());
             this.$set(this.formInfo, "displayName", this.formInfo.cmdId);
             console.log(this.formInfo);
             addTerminalJoggle(this.formInfo)
@@ -366,6 +388,8 @@ export default {
                 });
               });
           } else {
+            console.log(this.formInfo);
+
             updateTerminalJoggle(this.formInfo)
               .then((res) => {
                 this.isShow = false;
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 8638ff6..0513cec 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -141,7 +141,7 @@
             >
           </el-table-column>
           <el-table-column
-            prop="isonline"
+            prop="hasPan"
             label="是否带云台"
             show-overflow-tooltip
           >
@@ -157,13 +157,14 @@
             label="网络类型"
             show-overflow-tooltip
           >
+            <template slot-scope="scope">
+              <span v-if="scope.row.netType == 1"> 移动</span>
+              <span v-if="scope.row.netType == 2"> 联通</span>
+              <span v-if="scope.row.netType == 3"> 电信</span>
+            </template>
           </el-table-column>
 
-          <el-table-column
-            prop="essentialInfoVersion"
-            label="装置型号"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="model" label="装置型号" show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             prop="bsManufacturer"
@@ -176,8 +177,14 @@
             prop="workingDate"
             label="投运日期"
             show-overflow-tooltip
-            :formatter="dateFormat"
           >
+            <template slot-scope="scope">
+              {{
+                scope.row.workingDate == null
+                  ? ""
+                  : $moment(scope.row.workingDate).format("yy-MM-DD")
+              }}</template
+            >
           </el-table-column>
 
           <!-- <el-table-column
@@ -549,6 +556,7 @@ export default {
         })
         .catch((err) => {});
     },
+
     //查询
     onSubmit() {
       this.page = 1;
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index 104f602..6e29a33 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -58,7 +58,15 @@
                     >{{ val.substring(val.length - 5) }}</el-tag
                   >
                   <el-tag
-                    v-if="timeProtocol == '65286' || timeProtocol == '65282'"
+                    v-if="
+                      timeProtocol == '65286' ||
+                      timeProtocol == '65282' ||
+                      timeProtocol == '65280' ||
+                      timeProtocol == '65296' ||
+                      timeProtocol == '65281' ||
+                      timeProtocol == '65284' ||
+                      timeProtocol == '65285'
+                    "
                     class="mr10 mt10"
                     size="mini"
                     v-for="(val, index) in this.shedulenr"
@@ -83,7 +91,15 @@
                     >{{ val.substring(val.length - 5) }}</el-tag
                   >
                   <el-tag
-                    v-if="timeProtocol == '65286' || timeProtocol == '65282'"
+                    v-if="
+                      timeProtocol == '65286' ||
+                      timeProtocol == '65282' ||
+                      timeProtocol == '65280' ||
+                      timeProtocol == '65296' ||
+                      timeProtocol == '65281' ||
+                      timeProtocol == '65284' ||
+                      timeProtocol == '65285'
+                    "
                     class="mr10 mt10"
                     size="mini"
                     v-for="(val, index) in this.newshedulenr"
@@ -466,7 +482,12 @@ export default {
               //河南规约
               if (
                 this.timeProtocol == "65286" ||
-                this.timeProtocol == "65282"
+                this.timeProtocol == "65282" ||
+                this.timeProtocol == "65280" ||
+                this.timeProtocol == "65296" ||
+                this.timeProtocol == "65281" ||
+                this.timeProtocol == "65284" ||
+                this.timeProtocol == "65285"
               ) {
                 console.log("河南规约");
                 var hnarr = [];
@@ -713,7 +734,12 @@ export default {
               //河南规约
               if (
                 this.timeProtocol == "65286" ||
-                this.timeProtocol == "65282"
+                this.timeProtocol == "65282" ||
+                this.timeProtocol == "65280" ||
+                this.timeProtocol == "65296" ||
+                this.timeProtocol == "65281" ||
+                this.timeProtocol == "65284" ||
+                this.timeProtocol == "65285"
               ) {
                 console.log("河南规约");
                 var hnarr = [];