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

src/assets/map/config.js

@@ -7,6 +7,7 @@ import nangping from "./nanping.json";
 import quangzhou from "./quanzhou.json";
 import sanming from "./sanming.json";
 import xiameng from "./xiameng.json";
+import putian from "./putian.json";
 
 export default {
   default: {
@@ -95,8 +96,8 @@ export default {
     map: nangping,
     coordinates: [
       { name: "南平农商行", value: [118.185343,26.648297, 10] },
-      { name: "邵武市农联社", value: [118.115004,27.364321, 10] },
-      { name: "建阳市农联社", value: [118.126144,27.336885, 10] },
+      { name: "邵武市农联社", value: [117.499641,27.339004, 10] },
+      { name: "建阳市农联社", value: [118.128905,27.337197, 10] },
       { name: "顺昌县农联社", value: [117.815179,26.796944, 10] },
       { name: "建瓯农商银行", value: [118.326437,27.039505, 10] },
       { name: "浦城县农联社", value: [118.382047,27.930925, 10] },
@@ -118,4 +119,11 @@ export default {
         { name: "连城县农联社", value: [116.650912,25.615751, 10] }
     ],
   },
+  莆田地区行社: {
+    map: putian,
+    coordinates: [
+        { name: "莆田农商银行", value: [119.014794,25.427314, 10] },
+        { name: "仙游农商银行", value: [118.703527,25.361068, 10] },        
+    ],
+  },
 };

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

@@ -7,22 +7,22 @@
       <div class="content">
         <div>
           <div v-if="data.length >= 1" v-for="item in data[0]">
-            {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
+            {{ item.orgName }}:{{ item.reachRate }}
           </div>
         </div>
         <div>
           <div v-if="data.length >= 1" v-for="item in data[1]">
-            {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
+            {{ item.orgName }}:{{ item.reachRate }}
           </div>
         </div>
         <div>
           <div v-if="data.length >= 2" v-for="item in data[2]">
-            {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
+            {{ item.orgName }}:{{ item.reachRate }}
           </div>
         </div>
         <div>
           <div v-if="data.length >= 3" v-for="item in data[3]">
-            {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
+            {{ item.orgName }}:{{ item.reachRate }}
           </div>
         </div>
         <!-- <div><div v-for="item in data[3]">{{item.orgName}},达标率:{{item.rate*100+'%'}}</div></div> -->
@@ -110,6 +110,7 @@ export default {
           orgName = r[i].orgName.substr(this.orgName.length);
         }
         r[i].orgName = parseInt(i) + 1 + "." + orgName;
+        r[i].reachRate = (r[i].reachRate * 100).toFixed(2) + "%";
         data[columnIndex].push(r[i]);
       }
 

src/views/board/index.vue

@@ -21,8 +21,7 @@
         <span>移动安全保卫管理平台项目</span>
       </div>
       <div class="iconDiv">
-        <span> {{ time }} {{ week }}</span>
-        <span>|</span>
+        <span> {{ time }} {{ getweek() }}</span>
       </div>
     </div>
     <div class="main">
@@ -174,7 +173,7 @@ export default {
   },
   methods: {
     getweek() {
-      let week = this.moment().day();
+      let week = dayjs().day();
       switch (week) {
         case 1:
           return "星期一";
@@ -412,8 +411,8 @@ export default {
   }
   .iconDiv {
     text-align: right;
-    padding-right: 2.5rem;
-    padding-top: 1.5rem;
+    padding-right: 4rem;
+    padding-top: 1rem;
     font-size: 16px;
     width: 30%;
   }

src/views/resumption/plan/dialog.edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="rule-type">
     <DialogCom
-      @colse="onHide"
+      @closed="onClose"
       :title="id ? '编辑履职任务' : '新增履职任务'"
       :visible.sync="isShow"
       width="1500px"
@@ -408,10 +408,9 @@ export default {
       //   this.id == undefined ||
       //   (this.defbuildTaskNow && this.formData.planStatus == 0)
       // )
-      if (
-        this.id == null ||
-        this.id == undefined ||
-        ( this.formData.planStatus == 0)
+      if (this.isShow && (
+        !this.id ||
+        ( this.formData.planStatus == 0))
       )
         return true;
       else return false;
@@ -778,7 +777,9 @@ export default {
     },
     // 事件
     onHide() {
-      this.isShow = false;
+      this.isShow = false;     
+    },
+    onClose(){
       this.formData = this.reset();
       this.$refs.form.resetFields();
     },
@@ -802,7 +803,7 @@ export default {
     },
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {
-        this.formData.planStatus = 0;
+        // this.formData.planStatus = 0;
         this.isSubmitting = true;
         // this.formData.note = this.formData.description;
         this.formData.planCreateOrgId = this.orgId;

src/views/resumption/rule/index.vue

@@ -179,7 +179,7 @@
                   icon="el-icon-edit-outline"
                   @click="onManageContent(r.row.id)"
                   v-hasPermi="['resumption:rule:contentmanage']"
-                  v-if="orgId == r.row.orgId"
+                  v-if="orgId == r.row.orgId && r.row.status == 0"
                   >管理内容库</el-button
                 >
                 <el-button
@@ -188,7 +188,7 @@
                   icon="el-icon-view"
                   @click="onManageContent(r.row.id)"
                   v-hasPermi="['resumption:rule:contentmanage']"
-                  v-if="orgId != r.row.orgId"
+                  v-if="orgId != r.row.orgId || r.row.status == 1"
                   >查看内容库</el-button
                 >
                 <el-button

src/views/resumption/taskManager/dialog.scanrecord.vue

@@ -41,7 +41,7 @@
           prop="executeTime"
         >
           <template slot-scope="r">
-            {{ dayjs(r.row.executeTime).format("YYYY-MM-DD") }}
+            {{ dayjs(r.row.executeTime).format("YYYY-MM-DD HH:mm") }}
           </template>
         </el-table-column>
         <el-table-column

src/views/safetycheck/rule/index.vue

@@ -159,12 +159,13 @@
             ></el-table-column>
             <el-table-column header-align="center" label="操作" width="250">
               <template slot-scope="r">
-                <div v-if="orgId == r.row.orgId">
+                <div>
                   <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-edit-outline"
                     @click="onEdit(r.row.id)"
+                    v-if="orgId == r.row.orgId"
                     v-hasPermi="['safetycheck:rule:edit']"
                     >编辑</el-button
                   >
@@ -173,11 +174,19 @@
                     type="text"
                     icon="el-icon-edit-outline"
                     @click="onManageContent(r.row.id)"
-                    v-if="r.row.status == 0"
+                    v-if="r.row.status == 0 && orgId == r.row.orgId"
                     v-hasPermi="['safetycheck:rule:contentmanage']"
                     >管理内容库</el-button
                   >
-
+                  <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-view"
+                  @click="onManageContent(r.row.id)"
+                  v-if="r.row.status != 0 || orgId != r.row.orgId"
+                  v-hasPermi="['safetycheck:rule:contentmanage']"
+                  >查看内容库</el-button
+                >
                   <el-button
                     type="text"
                     size="mini"
@@ -188,17 +197,7 @@
                     v-hasPermi="['safetycheck:rule:remove']"
                     >删除</el-button
                   >
-                </div>
-                <div v-else>
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-view"
-                    @click="onManageContent(r.row.id)"
-                    v-hasPermi="['safetycheck:rule:contentmanage']"
-                    >查看内容库</el-button
-                  >
-                </div>
+                </div>                
               </template>
             </el-table-column>
           </el-table>

src/views/safetycheck/task/dialog.scanrecord.vue

@@ -1,10 +1,6 @@
 <template>
   <div>
-    <DialogCom
-      title="扫描记录"
-      :visible.sync="isShow"
-      width="850px"
-    >
+    <DialogCom title="扫描记录" :visible.sync="isShow" width="850px">
       <el-table :data="tableData" border>
         <el-table-column
           label="检查区域"
@@ -23,13 +19,13 @@
         >
         </el-table-column>
         <el-table-column
-        label="NFC标签名称"
-        align="center"
-        :show-overflow-tooltip="true"
-        prop="nfcName"
-        min-width="120px"
-      >
-      </el-table-column>
+          label="NFC标签名称"
+          align="center"
+          :show-overflow-tooltip="true"
+          prop="nfcName"
+          min-width="120px"
+        >
+        </el-table-column>
         <el-table-column
           label="扫描时间"
           align="center"
@@ -37,6 +33,9 @@
           width="180px"
           prop="executeTime"
         >
+          <template slot-scope="r">
+            {{ dayjs(r.row.executeTime).format("YYYY-MM-DD HH:mm") }}
+          </template>
         </el-table-column>
         <el-table-column
           label="扫描方式"
@@ -58,7 +57,7 @@
           min-width="150px"
         >
           <template slot-scope="r">
-            <label v-if="r.row.scanMethod == 0">{{r.row.nfcCode}}}</label>
+            <label v-if="r.row.scanMethod == 0">{{ r.row.nfcCode }}}</label>
             <el-image
               v-else
               style="width: 50px; height: 50px"

src/views/system/dept/index.vue

@@ -99,6 +99,16 @@
                   >新增机构</el-button
                 >
               </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-upload2"
+                  size="mini"
+                  @click="handleExportSecurity"
+                  v-hasPermi="['system:dept:exportConstruction']"
+                >导出全省农信系统物防建设达标情况</el-button
+                >
+              </el-col>
               <right-toolbar
                 :showSearch.sync="showSearch"
                 @queryTable="getList"
@@ -605,6 +615,16 @@ export default {
        
       });
     },
+
+    handleExportSecurity() {
+      this.download(
+        "system/dept/exportConstruction",
+        {
+          ...this.queryParams,
+        },
+        `机构信息管理-物防建设达标情况统计_${new Date().getTime()}.xlsx`
+      );
+    },
     /** 转换机构数据结构 */
     // normalizer(node) {
     //   if (node.children && !node.children.length) {