Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-05-08 2d566accb6eae2fdadf4a4b6e6443a9030d5acdb

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

 src/page/login/codelogin.vue

@@ -63,8 +63,8 @@
    <avue-input-tree style="width:580px !important" default-expand-all v-model="loginForm.deptid" placeholder="请选择部门" type="tree"
                     :dic="dic"></avue-input-tree>
    <div style="margin-top: 16px">
      <el-radio v-model="loginForm.sex" label="0" border size="medium">男</el-radio>
      <el-radio v-model="loginForm.sex" label="1" border size="medium">女</el-radio>
      <el-radio v-model="loginForm.sex" label="1" border size="medium">男</el-radio>
      <el-radio v-model="loginForm.sex" label="2" border size="medium">女</el-radio>
    </div>
    <el-form-item class="z-login-submit-prv">
      <el-button size="small"

 src/views/supervisoryConsole/data.vue

@@ -278,7 +278,7 @@
    var that = this;
    getList().then((res) => {
      res.data.data.forEach((item) => {
        if (item.waringType == "紧急求救") {
        if (item.waringType == "一键求助") {
          that.tableData.push(item);
        }
      });

 src/views/zc/zc.vue

@@ -102,11 +102,11 @@
              dicData: [
                {
                  label: "男",
                  value: "0"
                  value: "1"
                },
                {
                  label: "女",
                  value: "1"
                  value: "2"
                }
            ],
            },