修改

jwtech-admin-page/src/views/building/projectInfo/index.vue

@@ -838,6 +838,42 @@
               />
             </el-form-item>
           </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="是否为安全度汛重点工程" prop="isKeyProject">
+              <el-select
+                v-model="form.isKeyProject"
+                placeholder="是否为安全度汛重点工程"
+                clearable
+                size="small"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in SFoptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否穿破堤坝施工" prop="isPierceProject">
+              <el-select
+                v-model="form.isPierceProject"
+                placeholder="是否穿破堤坝施工"
+                clearable
+                size="small"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in SFoptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       <!-- <div slot="footer" class="dialog-footer"> -->
@@ -1006,6 +1042,14 @@
             <template slot="label"> 资金下达文号 </template>
             {{ this.proMsg.fundingNumber }}
           </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 是否为安全度汛重点工程 </template>
+            {{ this.proMsg.isKeyProject }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 是否穿破堤坝施工 </template>
+            {{ this.proMsg.isPierceProject }}
+          </el-descriptions-item>
         </el-descriptions>
       </div>
     </el-dialog>
@@ -1117,6 +1161,8 @@ export default {
           updateUid: null,
           updateTime: null,
           owerDept: null,
+          isKeyProject: null,
+          isPierceProject: null,
         },
         // 排序方式
         params: {
@@ -1437,6 +1483,10 @@ export default {
       //是否又建议书审批字典
       isApprovalOptions: [],
       isEdit: false,
+      SFoptions: [
+        { label: "是", value: "是" },
+        { label: "否", value: "否" },
+      ],
     };
   },
   created() {
@@ -1697,6 +1747,8 @@ export default {
       this.allDrawMsg = [];
       this.form = {
         id: null,
+        isKeyProject: null,
+        isPierceProject: null,
         isMajor: null,
         projectName: null,
         unitLeader: null,
@@ -1756,6 +1808,8 @@ export default {
         pageSize: 10,
         data: {
           id: null,
+          isKeyProject: null,
+          isPierceProject: null,
           isMajor: null,
           projectName: null,
           unitLeader: null,

jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg.vue

@@ -181,6 +181,14 @@
         <template slot="label"> 资金下达文号 </template>
         {{ this.proMsg.fundingNumber }}
       </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 是否为安全度汛重点工程 </template>
+        {{ this.proMsg.isKeyProject }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 是否穿破堤坝施工 </template>
+        {{ this.proMsg.isPierceProject }}
+      </el-descriptions-item>
     </el-descriptions>
 
     <el-dialog
@@ -740,6 +748,42 @@
               />
             </el-form-item>
           </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="是否为安全度汛重点工程" prop="isKeyProject">
+              <el-select
+                v-model="form.isKeyProject"
+                placeholder="是否为安全度汛重点工程"
+                clearable
+                size="small"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in SFoptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否穿破堤坝施工" prop="isPierceProject">
+              <el-select
+                v-model="form.isPierceProject"
+                placeholder="是否穿破堤坝施工"
+                clearable
+                size="small"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in SFoptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       <div class="dialog-footer" slot="footer">
@@ -832,6 +876,8 @@ export default {
         pageSize: 10,
         ids: null,
         data: {
+          isKeyProject: null,
+          isPierceProject: null,
           isMajor: null,
           projectName: null,
           unitLeader: null,
@@ -1188,6 +1234,10 @@ export default {
       isDrawEdit: true,
       //是否又建议书审批字典
       isApprovalOptions: [],
+      SFoptions: [
+        { label: "是", value: "是" },
+        { label: "否", value: "否" },
+      ],
     };
   },
   created() {
@@ -1447,6 +1497,8 @@ export default {
     reset() {
       this.form = {
         id: null,
+        isKeyProject: null,
+        isPierceProject: null,
         isMajor: null,
         projectName: null,
         unitLeader: null,

jwtech-admin-page/src/views/gateway/earlyWarningDivisionSituation.vue

@@ -129,7 +129,7 @@
     </div>
 
     <!-- svg -->
-    <svg width="0" height="0" style="display: none">
+    <svg width="0" height="0" style="position: absolute">
       <defs>
         <linearGradient id="green" x1="0%" y1="0%" x2="100%" y2="0%">
           <stop offset="0%" style="stop-color: #12c299; stop-opacity: 1" />
@@ -137,7 +137,7 @@
         </linearGradient>
       </defs>
     </svg>
-    <svg width="0" height="0" style="display: none">
+    <svg width="0" height="0" style="position: absolute">
       <defs>
         <linearGradient id="orange" x1="0%" y1="0%" x2="100%" y2="0%">
           <stop offset="0%" style="stop-color: #ff6400; stop-opacity: 1" />

jwtech-admin-page/src/views/gateway/projectDistributionADiagram.vue

@@ -105,9 +105,10 @@ export default {
     returnToken(this.parmas).then((res) => {
       console.log("有效token", res);
       let token = res.token;
-      setToken(token);
+      setToken(token).thren(() => {
         this.getTreeData();
       });
+    });
   },
   methods: {
     chooseName(key) {