xsh 3 年之前
父节点
当前提交
aa4074d98b
共有 2 个文件被更改,包括 37 次插入31 次删除
  1. 0 1
      src/views/MainLayout.vue
  2. 37 30
      src/views/Video/VideoAdmin.vue

+ 0 - 1
src/views/MainLayout.vue

@@ -66,7 +66,6 @@ export default {
     setRouterName(data) {
       this.routerName = data.name;
       this.routerSite = data.router;
-      console.log(this.routerSite);
     },
     refresh() {
       location.reload();

+ 37 - 30
src/views/Video/VideoAdmin.vue

@@ -56,9 +56,12 @@
           <el-form-item label="密码" prop="password">
             <el-input v-model="form.password"></el-input>
           </el-form-item>
-          <el-form-item label="排序" prop="sort">
-            <el-input v-model="form.sort"></el-input>
+          <el-form-item label="对应erp栋舍id">
+            <el-input v-model="form.roomId"></el-input>
           </el-form-item>
+<!--          <el-form-item label="排序" prop="sort">-->
+<!--            <el-input v-model="form.sort"></el-input>-->
+<!--          </el-form-item>-->
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -112,22 +115,22 @@ export default {
           field: 'brandId',
           options: []
         },
-        {
-          type: 'select',
-          label: '摄像头排序:',
-          placeholder: '请选择排序',
-          field: 'sort',
-          options: [
-            {
-              label: '正序',
-              value: 0,
-            },
-            {
-              label: '倒序',
-              value: 1
-            }
-          ]
-        },
+        // {
+        //   type: 'select',
+        //   label: '摄像头排序:',
+        //   placeholder: '请选择排序',
+        //   field: 'sort',
+        //   options: [
+        //     {
+        //       label: '正序',
+        //       value: 0,
+        //     },
+        //     {
+        //       label: '倒序',
+        //       value: 1
+        //     }
+        //   ]
+        // },
         {
           type: 'input',
           label: '名称搜索:',
@@ -187,12 +190,12 @@ export default {
           minWidth: '100',
           slotName: 'password'
         },
-        {
-          prop: 'sort',
-          label: '排序',
-          minWidth: '50',
-          slotName: 'sort'
-        },
+        // {
+        //   prop: 'sort',
+        //   label: '排序',
+        //   minWidth: '50',
+        //   slotName: 'sort'
+        // },
         {
           label: '是否启用',
           minWidth: '80',
@@ -218,6 +221,7 @@ export default {
         account: '',
         password: '',
         sort: '',
+        roomId: '',
       },
       rules: {
         cameraName: [ { required: true, message: '请输入摄像头名称', trigger: 'blur' } ],
@@ -255,12 +259,11 @@ export default {
         areaId: this.areaId,
         brandId: this.brandId,
         strchStr: this.keyWord,
-        sort: this.sort
+        // sort: this.sort
       }
       videoList(params).then(res => {
         if(res.code === 10000) {
           this.videoLists = res.data.records;
-          console.log(this.videoLists)
           this.total = res.data.total;
         }
       })
@@ -332,7 +335,8 @@ export default {
       this.form.cameraIp = row.cameraIp;
       this.form.account = row.account;
       this.form.password = row.password;
-      this.form.sort = row.sort;
+      this.form.roomId = row.roomId;
+      // this.form.sort = row.sort;
     },
     // 单个删除
     del(row) {
@@ -388,7 +392,7 @@ export default {
           strchStr: this.keyWord,
           areaId: this.areaId,
           brandId: this.brandId,
-          sort: this.sort
+          // sort: this.sort
         }
        getVideo(params).then(res => {
          if(res.code === 10000) {
@@ -420,7 +424,8 @@ export default {
               cameraIp: this.form.cameraIp,
               account: this.form.account,
               password: this.form.password,
-              sort: this.form.sort
+              roomId: this.form.roomId,
+              // sort: this.form.sort
             }
             editVideo(params).then(res => {
               this.dialogVisible = false;
@@ -441,7 +446,8 @@ export default {
               cameraIp: this.form.cameraIp,
               account: this.form.account,
               password: this.form.password,
-              sort: this.form.sort
+              roomId: this.form.roomId,
+              // sort: this.form.sort
             }
             addVideo(params).then(res => {
               this.dialogVisible = false;
@@ -468,6 +474,7 @@ export default {
         cameraIp: '',
         account: '',
         password: '',
+        roomId: '',
       }
     },
     // 上一个下一个