Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

src/views/board/charts/drill/report.vue

@@ -210,7 +210,7 @@ export default {
               },
             },
             axisLabel: {
-              interval: 0,
+              // interval: 0,
               // rotate: -45,
               fontSize: 12,
               color: "#fff",

src/views/board/charts/edu/report.vue

@@ -206,7 +206,7 @@ export default {
               },
             },
             axisLabel: {
-              interval: 0,
+              // interval: 0,
               // rotate: -45,
               fontSize: 12,
               color: "#fff",

src/views/board/charts/ga38/report.vue

@@ -213,7 +213,7 @@ export default {
               },
             },
             axisLabel: {
-              interval: 0,
+              // interval: 0,
               // rotate: -45,
               fontSize: 12,
               color: "#fff",

src/views/board/index.vue

@@ -47,7 +47,7 @@
       <div>
         <div>
           <div>
-            <mapChart :orgId="selectedOrg.id" />
+            <mapChart :orgId="selectedOrg.id" :orgName="selectedOrg.name"/>
           </div>
           <div>
             <comprehesive-chart :orgId="selectedOrg.id" />

src/views/safetycheck/task/components/checkRegister.vue

@@ -101,7 +101,7 @@
             <div
               style="background-color: #d1e0f1 !important; padding-left: 10px"
             >
-              <div class="name namePadding" >
+              <div class="name namePadding">
                 {{ arabicToChinese(index + 1) }}、{{ item.itemName }}
               </div>
             </div>
@@ -112,10 +112,11 @@
               :key="point.pointId"
             >
               <div class="pointContent name">
-                <div class="pointName  namePadding">
-                  <div class="text_nbsp">{{ pIndex + 1 + ".   " + point.pointName }}</div>
+                <div class="pointName namePadding">
+                  <div class="text_nbsp">
+                    {{ pIndex + 1 + ".   " + point.pointName }}
+                  </div>
                   <!-- <i class="circle" /> -->
-                  
                 </div>
                 <div v-if="point.status == 1">
                   <el-form
@@ -398,7 +399,7 @@ export default {
             let form = this.$refs[p];
             if (form.length) {
               isOk &= await this.$refs[p][0].validate();
-            } else {
+            } else if (form.validate) {
               isOk &= await this.$refs[p].validate();
             }
           } catch (e) {
@@ -505,7 +506,7 @@ export default {
 }
 
 .point_btn {
-  padding-top:5px;
+  padding-top: 5px;
   width: 600px;
 }
 

src/views/safetycheck/task/components/register.vue

@@ -61,23 +61,24 @@
             :key="item.itemId"
           >
             <div
-              style="background-color: #d1e0f1 !important; padding-left: 10px"
+              style="background-color: #d1e0f1 !important; padding-left: 10px;display:flex"
             >
-              <div class="name namePadding" >
+              <div class="name namePadding">
                 {{ arabicToChinese(index + 1) }}、{{ item.itemName }}
-              </div>
+              </div >
+              <!-- <div class="namePadding" style="padding-left:20px;">检查结果</div> -->
             </div>
-
             <div
               class="safetycheck_point"
               v-for="(point, pIndex) in item.pointList"
               :key="point.pointId"
             >
               <div class="pointContent name">
-                <div class="pointName  namePadding">
-                  <div class="text_nbsp">{{ pIndex + 1 + ".   " + point.pointName }}</div>
+                <div class="pointName namePadding">
+                  <div class="text_nbsp">
+                    {{ pIndex + 1 + ".   " + point.pointName }}
+                  </div>
                   <!-- <i class="circle" /> -->
-                  
                 </div>
                 <div v-if="point.status == 1">
                   <el-form
@@ -216,7 +217,7 @@ export default {
   },
   mounted() {
     let id = this.$route.params.taskId;
-    let request = api.info;    
+    let request = api.info;
     request(id).then((r) => {
       if (r.data.status == 3) {
         this.onClose();
@@ -391,11 +392,23 @@ export default {
         return;
       }
       let isOk = true;
+      
+      for (let area of this.taskInfo.checkList) {
+        for (let item of area.itemList) {
+          for (let point of item.pointList) {
+            if (point.status == null) {
+              this.$modal.alert("检查结果还未登记！");
+              return;
+            }
+          }
+        }
+      }
       let r = this.$refs;
+      
       for (let p in this.$refs) {
-        if (p.startsWith("point")) {
+        if (p.startsWith("point") && r.length>0) {
           try {
-            isOk &= await this.$refs[p][0].validate();
+            isOk &= await r[0].validate();
           } catch (e) {
             isOk &= false;
             console.error(e);
@@ -414,7 +427,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.app-container{
+.app-container {
   background-color: white;
 }
 .el-row-button {
@@ -507,7 +520,7 @@ export default {
 }
 
 .point_btn {
-  padding-top:5px;
+  padding-top: 5px;
   width: 600px;
 }
 

src/views/system/user/index.vue

@@ -343,14 +343,14 @@
       </el-col>
     </el-row>
   <!-- 重置密码对话框 -->
-    <DialogCom :title="title" :visible.sync="close" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <DialogCom :title="title" :visible.sync="close"  width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules">
         <el-row>
        
           <el-col :span="10">
-            <el-form-item  label="密码" prop="password" >
+            <el-form-item  label="密码" prop="password" label-width="100PX">
               <el-input
-              style="width: 317px;"
+              style="width: 500px;"
                 v-model="form.password"
                 placeholder="请输入密码"
                 autocomplete="off"
@@ -579,15 +579,17 @@ import { getInfo } from "@/api/login";
 import { getRoles } from "@/api/system/public";
 import request from "@/utils/request";
 export default {
-  name: "User",
   dicts: [
     "sys_normal_disable",
     "sys_user_sex",
     "sys_user_is_lock",
     "sys_yes_no",
   ],
-  components: { OrgTree },
+
+  name: "User",
   mixins: [tableList],
+  components: { OrgTree },
+
   data() {
     return {
       defaultProps: {
@@ -734,10 +736,6 @@ export default {
     };
   },
 
-  created() {},
-  mounted() {
-    this.getAllRoles();
-  },
   watch: {
     // 'form.orgId'(newValue) {
     //   if (this.isRoleIdsChanged) {
@@ -760,6 +758,13 @@ export default {
     //   deep: true
     // }
   },
+
+  created() {},
+
+  mounted() {
+    this.getAllRoles();
+  },
+
   methods: {
     changeRoleIds() {
       //手动关闭下拉框
@@ -1196,8 +1201,9 @@ export default {
       // console.log(this.$refs.upload.getFile(),"this.$refs.upload")
       this.$refs.upload.submit();
     },
-  },
+  }
 };
 </script>
+
 <style lang="scss"></style>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>