Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/edu/task/dialog.info.vue

@@ -225,17 +225,17 @@ export default {
                 let link = document.createElement("a");
                 let body = document.querySelector("body");
 
-               //  link.href = URL.createObjectURL(blob);
-               //  link.download = filename;
-               //
-               //  // fix Firefox
-               //  link.style.display = "none";
-               //  body.appendChild(link);
-               //
-               //  link.click();
-               //  body.removeChild(link);
-               //
-               // window.URL.revokeObjectURL(link.href);
+                link.href = URL.createObjectURL(blob);
+                link.download = filename;
+
+                // fix Firefox
+                link.style.display = "none";
+                body.appendChild(link);
+
+                link.click();
+                body.removeChild(link);
+
+               window.URL.revokeObjectURL(link.href);
            }
         },
         // 事件

src/views/safetycheck/ruleManager/index.vue

@@ -348,7 +348,7 @@ export default {
         return (
           <span class="custom-tree-node">
             <span class="show-ellipsis">
-              {data.label}
+              {data.shortName}
             </span>
           </span>
         );
@@ -360,7 +360,7 @@ export default {
                 class="el-icon-s-management"
                 style="color: #008cd6; padding-top: 3px"
               ></i>
-              <span class="show-ellipsis">{data.label}</span>
+              <span class="show-ellipsis">{data.shortName}</span>
             </span>
           </span>
         );

src/views/system/dept/extend.vue

@@ -43,12 +43,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="type == 4" label="天气区域编码">
-              <el-input
+            <el-form-item v-if="type == 4" label="城市天气区域">
+<!--              <el-input
                 v-model="weatherAreaCode"
                 placeholder="天气区域编码"
                 @input="handleInput2"
-              ></el-input>
+              ></el-input>-->
+              <el-select v-model="weatherAreaCode" placeholder="请选择"   clearable>
+                <el-option v-for="item in areaList" :key="item.key" :label="item.value" :value="item.key"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -1088,6 +1091,7 @@ import {
   updateOrgPhysicalDefenseConstruction,
   delOrgPhysicalDefenseConstruction,
 } from "@/api/system/OrgPhysicalDefenseConstruction";
+import {findAreaList} from "@/api/core/weather";
 
 export default {
   dicts: [
@@ -1223,6 +1227,7 @@ export default {
       propItem: "",
 
       row: "",
+      areaList:[],
     };
   },
   watch: {},
@@ -1243,6 +1248,7 @@ export default {
     this.getBankPhysicalDefenseConstructionInfo();
     this.getBusinessPhysicalDefenseConstructionInfo();
     this.getdetachedPhysicalDefenseConstructionInfo();
+    this.getAreaList();
   },
   mounted() {},
   methods: {
@@ -1256,6 +1262,11 @@ export default {
       // this.askariCertificate=img;
       console.log(this.askariCertificate, "imgs");
     },
+    getAreaList() {
+      findAreaList({}).then(response => {
+        this.areaList = response.data;
+      });
+    },
     downBusiness(file) {
       window.open(file);
     },

src/views/system/dept/index.vue

@@ -166,9 +166,14 @@
           <el-table-column
             align="center"
             prop="weatherCityCode"
-            label="天气区域编码"
+            label="城市天气区域"
             width="150"
-          ></el-table-column>
+          >
+            <template slot-scope="r">
+              <span>{{getCode(r.row.weatherCityCode)}}</span>
+            </template>
+
+          </el-table-column>
           <!-- <el-table-column prop="address" label="地址"></el-table-column> -->
           <!-- <el-table-column label="负责人" align="center">
             <template v-slot:default="scope">
@@ -394,6 +399,7 @@ import { deptTreeSelect } from "@/api/system/public";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import DialogEdit from "@/views/system/dept/dialog.edit.vue";
+import {findAreaList} from "@/api/core/weather";
 export default {
   name: "Dept",
   dicts: ["sys_normal_disable", "sys_org_type"],
@@ -474,6 +480,7 @@ export default {
       },
       //默认选中节点
       defaultKeys: [],
+      areaList:[],
     };
   },
   computed: {
@@ -486,8 +493,22 @@ export default {
   created() {
     this.getDeptTree();
     this.getList();
+    this.getAreaList();
   },
   methods: {
+    getCode(item){
+      if(item!=null&&item.length>0){
+        let area = this.areaList.find(v=>v.key === item);
+        if(area){
+          return area.value;
+        }else {
+          return "";
+        }
+      }else{
+        return "";
+      }
+
+    },
     closeHandler() {
       // alert(11111)
     },
@@ -521,6 +542,11 @@ export default {
         this.handleQuery();
       });
     },
+    getAreaList() {
+      findAreaList({}).then(response => {
+        this.areaList = response.data;
+      });
+    },
     // 筛选节点
     filterNode(value, data) {
       if (!value) return true;