Merge branch 'nan' of sckj/mz-cloud into master

ruoyi-ui/src/views/business/fwjggl/ajgsx/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="activeName" stretch>
+	    <el-tab-pane label="标准实施情况" name="ten">
+		    <zhjgbzssqk :isXxcx="false" :data="form"></zhjgbzssqk>
+	    </el-tab-pane>
       <el-tab-pane label="消防检查" name="first">
         <xfaqjcxx :isXxcx="false" :data="form"></xfaqjcxx>
       </el-tab-pane>
@@ -16,9 +19,6 @@
       <el-tab-pane label="投诉举报" name="six">
         <zhjgtsjb :isXxcx="false" :data="form"></zhjgtsjb>
       </el-tab-pane>
-      <el-tab-pane label="标准实施情况" name="ten">
-        <zhjgbzssqk :isXxcx="false" :data="form"></zhjgbzssqk>
-      </el-tab-pane>
       <el-tab-pane label="重大事件" name="seven">
         <zdsj :isXxcx="false" :data="form"></zdsj>
       </el-tab-pane>

ruoyi-ui/src/views/business/fwjggl/bn/index.vue

@@ -1552,7 +1552,7 @@ export default {
         this.decodeStr = decryptData_ECB(this.deepCopy(response.data), ["txdz", "frxm", "frzjhm", "frlxfs", "barXm", "barZjhm", "barLxfs", "babgXm", "babgSfzhm", "babgLxfs"], [99, 99, 99, 99, 99, 99, 99, 99, 99, 99]);
 
         let data = decryptData_ECB(response.data, ["txdz", "frxm", "frzjhm", "frlxfs", "barXm", "barZjhm", "barLxfs", "babgXm", "babgSfzhm", "babgLxfs"], [4, 1, 2, 3, 1, 2, 3, 1, 2, 3]);
-        
+
         this.form = { barXm: '', barZjlx: '', barZjhm: '', babgXm: '', barLxfs: '', babgZjlx: '', babgSfzhm: '', babgMs: '', babgLxfs: '', ...data }
         if (this.form.szxzqhIds) {
           // this.form.szxzqh = JSON.stringify(this.form.szxzqhName.split(','))
@@ -1656,7 +1656,7 @@ export default {
       } else {
         let copyForm = {
           ...this.form,
-          ...pamar, 
+          ...pamar,
         }
         if (copyForm.frxm) {
           copyForm.frxm = this.form.frxm.includes('✱') ? this.decodeStr.frxm : this.form.frxm
@@ -1674,12 +1674,12 @@ export default {
           copyForm.jglxdh = this.form.jglxdh.includes('✱') ? this.decodeStr.jglxdh : this.form.jglxdh
         }
         if(copyForm.barXm || copyForm.barZjhm || copyForm.barLxfs){
-          copyForm.barXm = this.form.barXm.includes('✱') ? this.decodeStr.frxm : this.form.barXm,
-          copyForm.barZjhm = this.form.barZjhm.includes('✱') ? this.decodeStr.frzjhm : this.form.barZjhm,
+          copyForm.barXm = this.form.barXm.includes('✱') ? this.decodeStr.frxm : this.form.barXm
+          copyForm.barZjhm = this.form.barZjhm.includes('✱') ? this.decodeStr.frzjhm : this.form.barZjhm
           copyForm.barLxfs = this.form.barLxfs.includes('✱') ? this.decodeStr.frlxfs : this.form.barLxfs
         }else if(copyForm.babgXm || copyForm.babgSfzhm || copyForm.babgLxfs){
-          copyForm.babgXm = this.form.babgXm.includes('✱') ? this.decodeStr.frxm : this.form.babgXm,
-          copyForm.babgSfzhm = this.form.babgSfzhm.includes('✱') ? this.decodeStr.frzjhm : this.form.babgSfzhm,
+          copyForm.babgXm = this.form.babgXm.includes('✱') ? this.decodeStr.frxm : this.form.babgXm
+          copyForm.babgSfzhm = this.form.babgSfzhm.includes('✱') ? this.decodeStr.frzjhm : this.form.babgSfzhm
           copyForm.babgLxfs = this.form.babgLxfs.includes('✱') ? this.decodeStr.frlxfs : this.form.babgLxfs
         }
         addBn(copyForm).then(response => {
@@ -1841,4 +1841,4 @@ h3 {
   font-size: 1.1rem;
   margin-bottom: 10px;
 }
-</style>
+</style>

ruoyi-ui/src/views/organization/rcyy/zdsj/index.vue

@@ -229,6 +229,7 @@
 <script>
 import {addZdsj, delZdsj, getZdsj, listZdsj, updateYljgZdsjByCljg, updateZdsj} from "@/api/organization/rcyy/zdsj";
 import {mapState} from 'vuex'
+import { decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: "Zdsj",
@@ -308,7 +309,7 @@ export default {
         this.queryParams.params["endFssj"] = this.daterangeSjfssj[1];
       }
       listZdsj(this.queryParams).then(response => {
-        this.zdsjList = response.rows;
+        this.zdsjList = decryptRowData_ECB(response.rows,['tbf','txdz'],[1,4]);
         this.total = response.total;
         this.loading = false;
       });

ruoyi-ui/src/views/organization/zwyw/babgsq/module/index.vue

@@ -958,10 +958,10 @@ export default {
         return false
       }
       if (is) {
-        this.form.barXm = this.decodeStr.frxm
-        this.form.barZjlx = this.decodeStr.frzjlx
-        this.form.barZjhm = this.decodeStr.frzjhm
-        this.form.barLxfs = this.decodeStr.frlxfs
+        this.form.barXm = this.form.frxm
+        this.form.barZjlx = this.form.frzjlx
+        this.form.barZjhm = this.form.frzjhm
+        this.form.barLxfs = this.form.frlxfs
         this.changeBarzjlx()
       } else {
         this.form.barXm = null
@@ -978,10 +978,10 @@ export default {
         return false
       }
       if (is) {
-        this.form.babgXm = this.decodeStr.frxm
-        this.form.babgZjlx = this.decodeStr.frzjlx
-        this.form.babgSfzhm = this.decodeStr.frzjhm
-        this.form.babgLxfs = this.decodeStr.frlxfs
+        this.form.babgXm = this.form.frxm
+        this.form.babgZjlx = this.form.frzjlx
+        this.form.babgSfzhm = this.form.frzjhm
+        this.form.babgLxfs = this.form.frlxfs
         this.changeBabgZjlx()
       } else {
         this.form.babgXm = null
@@ -1291,12 +1291,18 @@ export default {
         this.open = true
       })
     },
-    /** 修改按钮操作 */
+
+    /** 继续填写按钮操作 */
     handleUpdate(row) {
       this.reset()
       const id = row.id || this.ids
       getBn(id).then(response => {
-        this.form = response.data
+	      this.decodeStr = {}
+	      this.decodeStr = decryptData_ECB(this.deepCopy(response.data), ["txdz", "frxm", "frzjhm", "frlxfs", "barXm", "barZjhm", "barLxfs", "babgXm", "babgSfzhm", "babgLxfs"], [99, 99, 99, 99, 99, 99, 99, 99, 99, 99]);
+
+	      let data = decryptData_ECB(response.data, ["txdz", "frxm", "frzjhm", "frlxfs", "barXm", "barZjhm", "barLxfs", "babgXm", "babgSfzhm", "babgLxfs"], [4, 1, 2, 3, 1, 2, 3, 1, 2, 3]);
+
+	      this.form = { barXm: '', barZjlx: '', barZjhm: '', babgXm: '', barLxfs: '', babgZjlx: '', babgSfzhm: '', babgMs: '', babgLxfs: '', ...data }
         if (this.form.szxzqhIds) {
           // this.form.szxzqh = JSON.stringify(this.form.szxzqhName.split(','))
           this.form.szxzqh = JSON.stringify(this.form.szxzqhIds.split(','))
@@ -1357,6 +1363,15 @@ export default {
         /****** sks 需要改动的地方 start ******/
         // let formData=this.comparisonObject(this.form,this.copyForm);
         let formData = this.comparisonObject({ ...this.form, ...pamar }, this.copyForm)
+	      if (formData.barXm) {
+		      formData.barXm = formData.barXm.includes('✱') ? this.decodeStr.frxm : formData.barXm
+	      }
+	      if (formData.barZjhm) {
+		      formData.barZjhm = formData.barZjhm.includes('✱') ? this.decodeStr.frzjhm : formData.barZjhm
+	      }
+	      if (formData.barLxfs) {
+		      formData.barLxfs = formData.barLxfs.includes('✱') ? this.decodeStr.frlxfs : formData.barLxfs
+	      }
         if (formData) {
           updateBn({ ...formData, id: this.form.id }).then(response => {
             this.$modal.msgSuccess('修改成功')
@@ -1371,15 +1386,34 @@ export default {
         }
         /****** sks 需要改动的地方 end ******/
       } else {
-        let copyForm = {
-          ...this.form,
-          ...pamar,
-          frxm: this.form.frxm.includes('✱') ? this.decodeStr.frxm : this.form.frxm,
-          frzjhm: this.form.frzjhm.includes('✱') ? this.decodeStr.frzjhm : this.form.frzjhm,
-          frlxfs: this.form.frlxfs.includes('✱') ? this.decodeStr.frlxfs : this.form.frlxfs,
-          txdz: this.form.txdz.includes('✱') ? this.decodeStr.txdz : this.form.txdz,
-          jglxdh: this.form.jglxdh.includes('✱') ? this.decodeStr.jglxdh : this.form.jglxdh
-        }
+	      let copyForm = {
+		      ...this.form,
+		      ...pamar,
+	      }
+	      if (copyForm.frxm) {
+		      copyForm.frxm = this.form.frxm.includes('✱') ? this.decodeStr.frxm : this.form.frxm
+	      }
+	      if (copyForm.frlxfs) {
+		      copyForm.frlxfs = this.form.frlxfs.includes('✱') ? this.decodeStr.frlxfs : this.form.frlxfs
+	      }
+	      if (copyForm.frzjhm) {
+		      copyForm.frzjhm = this.form.frzjhm.includes('✱') ? this.decodeStr.frzjhm : this.form.frzjhm
+	      }
+	      if (copyForm.txdz) {
+		      copyForm.txdz = this.form.txdz.includes('✱') ? this.decodeStr.txdz : this.form.txdz
+	      }
+	      if (copyForm.jglxdh) {
+		      copyForm.jglxdh = this.form.jglxdh.includes('✱') ? this.decodeStr.jglxdh : this.form.jglxdh
+	      }
+	      if(copyForm.barXm || copyForm.barZjhm || copyForm.barLxfs){
+		      copyForm.barXm = this.form.barXm.includes('✱') ? this.decodeStr.frxm : this.form.barXm
+		      copyForm.barZjhm = this.form.barZjhm.includes('✱') ? this.decodeStr.frzjhm : this.form.barZjhm
+		      copyForm.barLxfs = this.form.barLxfs.includes('✱') ? this.decodeStr.frlxfs : this.form.barLxfs
+	      }else if(copyForm.babgXm || copyForm.babgSfzhm || copyForm.babgLxfs){
+		      copyForm.babgXm = this.form.babgXm.includes('✱') ? this.decodeStr.frxm : this.form.babgXm
+		      copyForm.babgSfzhm = this.form.babgSfzhm.includes('✱') ? this.decodeStr.frzjhm : this.form.babgSfzhm
+		      copyForm.babgLxfs = this.form.babgLxfs.includes('✱') ? this.decodeStr.frlxfs : this.form.babgLxfs
+	      }
         addBn(copyForm).then(response => {
           this.$modal.msgSuccess('新增成功')
           this.open = false

ruoyi-ui/src/views/qxhome/index.vue

@@ -305,6 +305,7 @@ export default {
           item.children.some(elem => elem.name === 'Ggxx') ? this.blockShow.gggl = true : false
         }
       })
+	    this.blockShow.gggl ? this.getGGXXList() : false
     },
     // 首页按钮路由跳转
     routingTo(path1, path2) {
@@ -313,7 +314,11 @@ export default {
       if (path2) {
         router.children.forEach(elem => {
           if (elem.name === path2) {
-            elem.children ? resRouter = `${elem.path}/${elem.children[0].path}` : resRouter = elem.path
+           if(elem.name === 'Ggxx'){
+		          elem.children ? resRouter = `${elem.path}/${elem.children[1].path}` : resRouter = elem.path
+	          }else{
+	           elem.children ? resRouter = `${elem.path}/${elem.children[0].path}` : resRouter = elem.path
+           }
           }
         });
       } else {
@@ -334,12 +339,13 @@ export default {
       }
       return this.selectDictLabel(this.dict.type[type], value)
     },
-    /** 修改按钮操作 */
+    /** 公告条目点击操作 */
     handleUpdate(item) {
       getGgxx(item.id).then((response) => {
-        this.form = response.data
+	      console.log('getGgxx',response.data);
+        this.form =decryptData_ECB(response.data,['tzz'],[1])
         /****** sks 需要改动的地方 start ******/
-        this.copyForm = this.deepCopy(response.data)
+        this.copyForm = decryptData_ECB(this.deepCopy(response.data),['tzz'],[1])
         /****** sks 需要改动的地方 end ******/
         this.form.tzfw = this.form.tzfw.split(',')
         this.form.tzdx = this.form.tzdx.split(',')
@@ -353,23 +359,22 @@ export default {
       })
     },
     // 获得公告信息列表数据
-    getGGXXList() {
-      if(this.blockShow.gggl){
-        listGgxx(this.queryParams).then((response) => {
-          this.ggxxList = response.rows
-          // if (response.rows[0].tzdx.indexOf(',') != -1) {
-          //   this.tzdx1 = response.rows[0].tzdx.split(',')
-          // } else {
-          //   this.tzdx1 = response.rows[0].tzdx
-          // }
-          // if (response.rows[1].tzdx.indexOf(',') != -1) {
-          //   this.tzdx2 = response.rows[1].tzdx.split(',')
-          // } else {
-          //   this.tzdx2 = response.rows[1].tzdx
-          // }
-        })
-      }
-    },
+	  getGGXXList() {
+		  listGgxx(this.queryParams).then((response) => {
+			  this.ggxxList = decryptRowData_ECB(response.rows,['tzz'],[1])
+			  // if (response.rows[0].tzdx.indexOf(',') != -1) {
+			  //   this.tzdx1 = response.rows[0].tzdx.split(',')
+			  // } else {
+			  //   this.tzdx1 = response.rows[0].tzdx
+			  // }
+			  // if (response.rows[1].tzdx.indexOf(',') != -1) {
+			  //   this.tzdx2 = response.rows[1].tzdx.split(',')
+			  // } else {
+			  //   this.tzdx2 = response.rows[1].tzdx
+			  // }
+		  });
+
+	  },
     initEcharts() {
       // 多列柱状图
       const mulColumnZZTData = {
@@ -1340,7 +1345,7 @@ export default {
     this.getYLJGEchartsList()
     this.getYLJGList()
     this.getSQYLFWEcharts()
-    this.getGGXXList()
+    // this.getGGXXList()
     this.changeBlock()
   },
   watch: {