Merge branch 'xy-ly' of http://dev.xinyingpower.com:8080/git/xymp/frontend into xy-ly

src/assets/css/element.less

@@ -69,6 +69,6 @@
 .el-dropdown-menu--small .el-dropdown-menu__item {
   font-size: 12px;
 }
-.el-popper[x-placement^="bottom"] {
+.el-select-dropdown {
-  margin-top: 2px !important;
+  margin-top: 4px !important;
 }

src/components/common/Sidebar.vue

@@ -133,7 +133,7 @@ export default {
           ],
         },
       ],
-      items2: [
+      items1: [
         // {
         //   icon: "el-icon-s-home",
         //   index: "stritl",
@@ -150,12 +150,92 @@ export default {
           index: "/pictureRotation",
           title: "图片轮巡",
         },
+        {
+          icon: "el-icon-bell",
+          index: "/photoAlarm",
+          title: "告警处理",
+        },
+
+        {
+          icon: "el-icon-search",
+          index: "/realTimeSearch",
+          title: "历史图片",
+        },
+        {
+          icon: "el-icon-files",
+          index: "/property",
+          title: "资产管理",
+          subs: [
+            {
+              index: "/lineInformation",
+              title: "线路信息管理",
+            },
+            {
+              index: "/towerInformation",
+              title: "杆塔信息管理",
+            },
+
+            {
+              index: "/cameraChannel",
+              title: "通道管理",
+            },
+            {
+              index: "/photographicDevice",
+              title: "拍照装置管理",
+            },
+            {
+              index: "/devicePhotoSchedule",
+              title: "拍照时间表设置",
+            },
+            // {
+            //   index: "/deviceUpgrade",
+            //   title: "装置升级",
+            // },
+            // {
+            //   icon: "el-icon-picture-outline",
+            //   index: "imageSettings",
+            //   title: "图像采集参数设置",
+            // },
+          ],
+        },
+        {
+          icon: "el-icon-monitor",
+          index: "/system",
+          title: "系统管理",
+          subs: [
+            {
+              index: "/userManagement",
+              title: "用户管理",
+            },
+            // {
+            //   index: "/globalTools",
+            //   title: "全局设置",
+            // },
+          ],
+        },
+      ],
+      items2: [
         // {
-        //   icon: "el-icon-bell",
+        //   icon: "el-icon-s-home",
-        //   index: "photoAlarm",
+        //   index: "stritl",
-        //   title: "告警处理",
+        //   title: "首页",
         // },
+        {
+          icon: "el-icon-camera",
+          index: "/realTimeMonitor",
+          title: "实时监控",
+        },
 
+        {
+          icon: "el-icon-film",
+          index: "/pictureRotation",
+          title: "图片轮巡",
+        },
+        {
+          icon: "el-icon-bell",
+          index: "photoAlarm",
+          title: "告警处理",
+        },
         {
           icon: "el-icon-search",
           index: "/realTimeSearch",
@@ -199,6 +279,7 @@ export default {
           ],
         },
       ],
+
       role: "",
     };
   },
@@ -218,11 +299,14 @@ export default {
     console.log("用户管理");
     console.log(this.role);
 
-    if (this.role == 1) {
+    if (this.role == 0) {
       this.items = this.items;
-    } else {
+    } else if (this.role == 1) {
+      this.items = this.items1;
+    } else if (this.role == 2) {
       this.items = this.items2;
     }
+
     console.log(this.items);
   },
 };

src/views/Login.vue

@@ -20,7 +20,7 @@
         >
           <el-form-item prop="userName">
             <el-input v-model="userInfo.userName" placeholder="用户名">
-              <el-button slot="prepend" icon="el-icon-user"></el-button>
+              <span slot="prepend" class="el-icon-user"></span>
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
@@ -31,7 +31,7 @@
               v-model="userInfo.password"
               @keyup.enter.native="submitForm()"
             >
-              <el-button slot="prepend" icon="el-icon-lock"></el-button>
+              <span slot="prepend" class="el-icon-lock"></span>
             </el-input>
           </el-form-item>
           <!-- <el-form-item prop="verificationCode" class="verifyItem">

src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue

@@ -28,13 +28,13 @@
         <div class="infoCompany">
           <!-- <p><label>电压等级：</label><span>220kv</span></p> -->
           <p>
-            <label>线路名称：</label><span>{{ pictureData.linename }}</span>
+            <label>线路名称：</label><span>{{ pictureData.lineName }}</span>
           </p>
           <p>
-            <label>杆塔名称：</label><span>{{ pictureData.towername }}</span>
+            <label>杆塔名称：</label><span>{{ pictureData.towerName }}</span>
           </p>
           <p>
-            <label>装置名称：</label><span>{{ pictureData.cmdid }}</span>
+            <label>装置名称：</label><span>{{ pictureData.cmdId }}</span>
           </p>
           <p>
             <label>选择通道：</label>

src/views/management/monitoringEquipment/photographicDevice/index.vue

@@ -221,7 +221,12 @@
           >
           </el-table-column> -->
 
-          <el-table-column fixed="right" label="操作" width="580">
+          <el-table-column
+            fixed="right"
+            label="操作"
+            width="580"
+            v-if="roleUser != 2"
+          >
             <template slot-scope="scope">
               <el-button
                 @click.native.stop="handleRevisePhoto(scope.row)"
@@ -293,6 +298,50 @@
               >
             </template>
           </el-table-column>
+          <el-table-column fixed="right" label="操作" width="380" v-else>
+            <template slot-scope="scope">
+              <el-button
+                @click.native.stop="handleRevisePhoto(scope.row)"
+                type="text"
+                >修改</el-button
+              >
+              <el-button
+                type="text"
+                @click.native.stop="handlepicture(scope.row)"
+                >图片标记</el-button
+              >
+
+              <el-button
+                type="text"
+                @click.native.stop="handleShowGPS(scope.row)"
+                >获取GPS位置</el-button
+              >
+
+              <el-dropdown
+                class="dropgps"
+                trigger="click"
+                @command="
+                  (command) => {
+                    handleCommand(command, scope.row);
+                  }
+                "
+              >
+                <span class="el-dropdown-link">
+                  GPS开关<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
+                  <el-dropdown-item command="open">开启GPS</el-dropdown-item>
+                  <el-dropdown-item command="close">关闭GPS</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+              <el-button
+                type="text"
+                class="deleteText"
+                @click.native.stop="handleDelete(scope.row)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
         </el-table>
         <div class="pageNation">
           <el-pagination
@@ -351,6 +400,7 @@ export default {
         towerId: 0,
         searchnr:''
       },
+      roleUser: "",
       terminalTableData: [], //表格数据
       photoDialog: false, //新增弹窗
       photoDialogTitle: "", //弹窗标题
@@ -612,6 +662,8 @@ export default {
   },
   created() {
     this.terminalList();
+    this.roleUser = localStorage.getItem("role");
+    console.log(this.roleUser);
   },
 };
 </script>

src/views/realTimeMonitor/components/setschedule.vue

@@ -581,8 +581,10 @@ export default {
     },
     closebtn() {
       this.isShowset = false;
-
+      this.checkList = "";
+      this.setNum = Math.floor(Math.random() * 10);
       this.deviceList();
+
       clearInterval(this.timers);
       this.timers = null;
     },

src/views/realTimeMonitor/index.vue

@@ -3,6 +3,10 @@
     <div class="monitor-container">
       <!-- 左侧数据列表树 -->
       <div class="sideBar">
+        <div class="searchBar">
+          <el-input placeholder="输入关键字进行过滤" v-model="filterText">
+          </el-input>
+        </div>
         <el-tree
           :data="lineTreeData"
           :props="defaultProps"
@@ -12,6 +16,7 @@
           :default-expand-all="true"
           @node-click="handleNodeClick"
           :current-node-key="currentNodekey"
+          :filter-node-method="filterNode"
         >
           <span class="custom-tree-node" slot-scope="{ node, data }">
             <div v-if="node.level === 1">
@@ -246,6 +251,7 @@ export default {
       lineTreeData: [],
       treeStatus: [],
       statusTimer: null,
+      filterText: "",
       defaultProps: {
         //指定参数格式回显数据
         children: "list",
@@ -274,14 +280,13 @@ export default {
       zzstatus: "",
     };
   },
-  // watch: {
+  watch: {
-  //   lineTreeData: {
+    filterText(val) {
-  //     handler() {
+      console.log(val);
-  //       console.log("count改变");
+      this.$refs.tree.filter(val);
-  //     },
+      console.log(this.$refs.tree);
-  //     immediate: true, // 加此属性
+    },
-  //   },
+  },
-  // },
   computed: {
     ...mapState(["channelid", "termid"]),
     channelid() {
@@ -304,6 +309,12 @@ export default {
     }, 300000);
   },
   methods: {
+    //树状图搜索
+    filterNode(value, data) {
+      console.log(value, data);
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
     //获取当前时间
     getDateTime() {
       this.dateValue = new Date().getTime();
@@ -741,9 +752,16 @@ export default {
     .sideBar {
       width: 300px;
       border-right: 1px solid @border-color-base;
-      overflow: auto;
+      display: flex;
+      flex-direction: column;
       padding: 16px 0px;
+      .searchBar {
+        width: 94%;
+        margin: 0 auto;
+        margin-bottom: 16px;
+      }
       .el-tree {
+        overflow: auto;
         .el-tree-node__content {
           height: 40px;
           font-size: 12px;

src/views/system/components/addUser.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    class="addchannelDialog"
+    class="addUserDialog"
     :title="title"
     :visible.sync="isShow"
     :close-on-click-modal="false"
@@ -11,7 +11,7 @@
       label-position="left"
       ref="formInfo"
       label-width="100px"
-      :rules=" title=='新增' ? rules : xgrules"
+      :rules="title == '新增' ? rules : xgrules"
       :model="formdata"
     >
       <el-form-item label="用户名：" prop="userName">
@@ -31,6 +31,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
+
       <el-form-item label="密码：" prop="password">
         <el-input
           placeholder="请输入密码"
@@ -53,6 +54,7 @@ export default {
   },
   data() {
     return {
+      roleUser: "",
       isShow: false,
       roleoptions: [
         {
@@ -64,6 +66,7 @@ export default {
           label: "用户",
         },
       ],
+
       formdata: {},
       rules: {
         userName: [
@@ -72,14 +75,14 @@ export default {
         role: [{ required: true, message: "请选择角色", trigger: "blur" }],
         password: [
           { required: true, message: "请输入密码", trigger: "blur" },
-          { min: 6, max: 8, message: '请输入6-8位字符', trigger: 'blur' }
+          { min: 6, max: 8, message: "请输入6-8位字符", trigger: "blur" },
         ],
       },
       xgrules: {
         userName: [
           { required: true, message: "请输入用户名", trigger: "blur" },
         ],
-        role: [{ required: true, message: "请选择角色", trigger: "blur" }]
+        role: [{ required: true, message: "请选择角色", trigger: "blur" }],
       },
     };
   },
@@ -131,6 +134,7 @@ export default {
     },
     display() {
       this.isShow = true;
+      this.roleUser = localStorage.getItem("role");
     },
     hide() {
       this.isShow = false;
@@ -143,9 +147,10 @@ export default {
 };
 </script>
 <style lang="less">
-.addchannelDialog {
+.addUserDialog {
   .el-form-item {
     .el-input,
+    .el-select,
     .el-input-number {
       width: 100%;
     }