【BUG】账号锁定不生效

public/js/version.json

-{"commit":"5d12b7432475b39f28a0d5076f5d25bb1254e082","commitDate":"2021-6-30 15:16","buildDate":"2021-7-1 13:39","version":"2.1.0","info":"添加用户锁定"}
\ No newline at end of file
+{"commit":"dca6496e41d3bec96878153d5a1559f82c362cf0","commitDate":"2021-7-2 10:31","buildDate":"2021-7-2 14:4","version":"2.1.0","info":"【NEW】增加配置导入 token 【BUG】修改删除判定线导致车道属性丢失"}
\ No newline at end of file

src/views/ops/user_manage.vue

@@ -81,7 +81,7 @@
                 :visible-arrow="false"
                 :visible-arrow="false"
               >
               >
                 <span
                 <span
-                  :class="{'el-icon-lock editIcon':scope.row.lock,'el-icon-unlock delIcon':scope.row.lock==null||scope.row.lock}"
+                  :class="{'el-icon-lock editIcon':scope.row.lock,'el-icon-unlock delIcon':scope.row.lock==null||scope.row.lock==false}"
                   @click="clockuser(scope.$index, scope.row)"
                   @click="clockuser(scope.$index, scope.row)"
                 ></span>
                 ></span>
               </el-tooltip>
               </el-tooltip>
@@ -376,7 +376,7 @@ export default {
       })
       })
         .then(() => {
         .then(() => {
           let params = {
           let params = {
-            lock:row.lock==null?true:row.lock,
+            lock:row.lock==null?true:!row.lock,
             user_type:'user'
             user_type:'user'
           }
           }
           this.$api.ops.lockUser(row.user_unid, params).then(res => {
           this.$api.ops.lockUser(row.user_unid, params).then(res => {

src/views/sceneManage/setting/areaconfig/TraficCanvas.vue

@@ -1436,6 +1436,7 @@ export default {
             this.selectedShape.line_type != 1 &&
             this.selectedShape.line_type != 1 &&
             this.selectedShape.line_type != 7 &&
             this.selectedShape.line_type != 7 &&
             this.selectedShape.line_type != 9 &&
             this.selectedShape.line_type != 9 &&
+            this.selectedShape.line_type != 3 && 
             this.selectedShape.line_type != 5 &&
             this.selectedShape.line_type != 5 &&
             this.selectedShape.line_type != 4 
             this.selectedShape.line_type != 4 
           ) {
           ) {