消防安全添加附件添加按钮

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

@@ -399,14 +399,23 @@
     <el-dialog v-dialog-drag title="灭火和应急疏散预案文件" :visible.sync="xfaqglrOpen" width="800px" append-to-body>
       <file-upload v-model="form.mhhjyssya" :fileType="fileType" :fileSize="fileSize" :limit="limit"
         :isFile="!accessoryIs"></file-upload>
+	    <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="xfaqglrOpen = false">确 定</el-button>
+      </span>
     </el-dialog>
     <el-dialog v-dialog-drag title="消防安全制度建立情况证明材料" :visible.sync="aqzdOpen" width="800px" append-to-body>
       <file-upload v-model="form.aqzd" :fileType="fileType" :fileSize="fileSize" :limit="limit" :isFile="!accessoryIs">
       </file-upload>
+	    <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="aqzdOpen = false">确 定</el-button>
+      </span>
     </el-dialog>
     <el-dialog v-dialog-drag title="消防审验或备案情况证明材料" :visible.sync="xfsyhbaqkOpen" width="800px" append-to-body>
       <file-upload v-model="form.jtqk" :fileType="fileType" :fileSize="fileSize" :limit="limit" :isFile="!accessoryIs">
       </file-upload>
+	    <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="xfsyhbaqkOpen = false">确 定</el-button>
+      </span>
     </el-dialog>
     <el-dialog v-dialog-drag title="选择消防设施配备类型" :visible.sync="xfsspbqkOpen" width="800px" append-to-body>
       <span>消防设施配备情况:</span>
@@ -425,6 +434,9 @@
       <file-upload v-if="form.yljgJcxmxxList && form.yljgJcxmxxList[accessoryIndex]"
         v-model="form.yljgJcxmxxList[accessoryIndex].fj" :fileType="fileType" :fileSize="fileSize" :limit="limit"
         :isFile="!accessoryIs"></file-upload>
+	    <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="accessoryOpen = false">确 定</el-button>
+      </span>
     </el-dialog>
     <!--详情-->
     <el-dialog v-dialog-drag title="消防安全自查信息详情" :visible.sync="openXQ" width="1500px" append-to-body>

ruoyi-ui/src/views/organization/jggl/xfaqzcxx/index.vue

@@ -320,14 +320,23 @@
     <el-dialog v-dialog-drag title="灭火和应急疏散预案文件" :visible.sync="xfaqglrOpen" width="800px" append-to-body>
       <file-upload v-model="form.mhhjyssya" :fileType="fileType" :fileSize="fileSize" :limit="limit"
         :isFile="!accessoryIs"></file-upload>
+	    <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="xfaqglrOpen = false">确 定</el-button>
+      </span>
     </el-dialog>
     <el-dialog v-dialog-drag title="消防安全制度建立情况证明材料" :visible.sync="aqzdOpen" width="800px" append-to-body>
       <file-upload v-model="form.aqzd" :fileType="fileType" :fileSize="fileSize" :limit="limit" :isFile="!accessoryIs">
       </file-upload>
+	    <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="aqzdOpen = false">确 定</el-button>
+      </span>
     </el-dialog>
     <el-dialog v-dialog-drag title="消防审验或备案情况证明材料" :visible.sync="xfsyhbaqkOpen" width="800px" append-to-body>
       <file-upload v-model="form.jtqk" :fileType="fileType" :fileSize="fileSize" :limit="limit" :isFile="!accessoryIs">
       </file-upload>
+	    <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="xfsyhbaqkOpen = false">确 定</el-button>
+      </span>
     </el-dialog>
     <el-dialog v-dialog-drag title="选择消防设施配备类型" :visible.sync="xfsspbqkOpen" width="800px" append-to-body>
       <span>消防设施配备情况:</span>
@@ -346,6 +355,9 @@
       <file-upload v-if="form.yljgJcxmxxList && form.yljgJcxmxxList[accessoryIndex]"
         v-model="form.yljgJcxmxxList[accessoryIndex].fj" :fileType="fileType" :fileSize="fileSize" :limit="limit"
         :isFile="!accessoryIs"></file-upload>
+	    <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="accessoryOpen = false">确 定</el-button>
+      </span>
     </el-dialog>
     <!--详情-->
     <el-dialog v-dialog-drag title="消防安全自查信息详情" :visible.sync="openXQ" width="1500px" append-to-body>

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

@@ -282,7 +282,7 @@ export default {
       },
     }
   },
-  
+
   mounted() {
     // this.initEcharts()
     // this.zcEcharts()
@@ -585,7 +585,8 @@ export default {
               show: false,
               position: 'center'
             },
-            emphasis: {
+	          emphasis: {
+		          disabled: true,
               label: {
                 show: true,
                 fontSize: '20'
@@ -610,9 +611,6 @@ export default {
                 }
               }
             ],
-            emphasis: {
-              disabled: true
-            },
             tooltip: {
               show: false
             }
@@ -713,7 +711,8 @@ export default {
               position: 'center'
             },
             emphasis: {
-              label: {
+	            disabled: true,
+							label: {
                 show: true,
                 fontSize: '20'
               }
@@ -737,9 +736,6 @@ export default {
                 }
               }
             ],
-            emphasis: {
-              disabled: true
-            },
             tooltip: {
               show: false
             }
@@ -836,6 +832,7 @@ export default {
               position: 'center'
             },
             emphasis: {
+	            disabled: true,
               label: {
                 show: true,
                 fontSize: '20'
@@ -860,9 +857,6 @@ export default {
                 }
               }
             ],
-            emphasis: {
-              disabled: true
-            },
             tooltip: {
               show: false
             }
@@ -959,6 +953,7 @@ export default {
               position: 'center'
             },
             emphasis: {
+	            disabled: true,
               label: {
                 show: true,
                 fontSize: '20'
@@ -983,9 +978,6 @@ export default {
                 }
               }
             ],
-            emphasis: {
-              disabled: true
-            },
             tooltip: {
               show: false
             }
@@ -1082,6 +1074,7 @@ export default {
               position: 'center'
             },
             emphasis: {
+	            disabled: true,
               label: {
                 show: true,
                 fontSize: '20'
@@ -1106,9 +1099,6 @@ export default {
                 }
               }
             ],
-            emphasis: {
-              disabled: true
-            },
             tooltip: {
               show: false
             }
@@ -1209,6 +1199,7 @@ export default {
               position: 'center'
             },
             emphasis: {
+	            disabled: true,
               label: {
                 show: true,
                 fontSize: '20'
@@ -1233,9 +1224,6 @@ export default {
                 }
               }
             ],
-            emphasis: {
-              disabled: true
-            },
             tooltip: {
               show: false
             }

ruoyi-web/package-lock.json

@@ -25,6 +25,7 @@
         "@types/node": "^18.0.3",
         "@vitejs/plugin-vue": "^2.3.3",
         "@vue/compiler-sfc": "^3.0.4",
+        "crypto-js": "^4.1.1",
         "lib-flexible": "^0.3.2",
         "postcss-pxtorem": "^6.0.0",
         "sass": "1.52.1",
@@ -773,6 +774,12 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/crypto-js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
+      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==",
+      "dev": true
+    },
     "node_modules/css-select": {
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/css-select/-/css-select-4.3.0.tgz",
@@ -4598,6 +4605,12 @@
         "vary": "^1"
       }
     },
+    "crypto-js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
+      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==",
+      "dev": true
+    },
     "css-select": {
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/css-select/-/css-select-4.3.0.tgz",

ruoyi-web/src/views/rzyljgsq/sqzltx/index.vue

@@ -28,7 +28,7 @@
           <el-button type="danger" @click="chooseBtn">选 择</el-button>
         </el-form-item>
         <el-form-item label="老人居住地址所在行政区划" prop="lrjzdzxzqh">
-          <RegionCascaderSelect v-model="form.lrjzdzxzqh" :checkStrictly="false"></RegionCascaderSelect>
+          <RegionCascaderSelect v-model="form.lrjzdzxzqh"></RegionCascaderSelect>
         </el-form-item>
         <el-form-item label="详细地址" prop="lrjzdz">
           <el-input v-model="form.lrjzdz" type="textarea" maxlength="400" show-word-limit placeholder="请输入老人详细居住地址">