Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.3

.env.development

@@ -17,7 +17,7 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://10.87.11.173:8080'
 VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-# VUE_APP_BASE_API = 'http://10.87.10.55:8080'
+# VUE_APP_BASE_API = 'http://10.87.21.103:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/safetycheck/register.js

@@ -10,6 +10,14 @@ export function info(id) {
 }
 
 // 登记信息
+export function appinfo(id) {
+  return request({
+    url: "/core/safetycheck/register/app/" + id,
+    method: "get",
+    showLoading:true
+  });
+}
+// 登记信息
 export function submit(data) {
   return request({
     url: "/core/safetycheck/register/websubmit",

src/plugins/tab.js

@@ -59,6 +59,16 @@ export default {
       router.go(-1);
     });
   },
+  setPageTitle(title){    
+    let  obj = router.currentRoute;
+
+    if(obj){
+      return store.dispatch("tagsView/setPageTitle",{
+        view:obj,
+        title
+      });
+    }
+  },
   // 关闭所有tab页签
   closeAllPage() {
     return store.dispatch("tagsView/delAllViews");

src/router/index.js

@@ -252,6 +252,33 @@ export const dynamicRoutes = [
       }
     ]
   },
+  {
+    path: '/core/safetycheck/rule',
+    component: Layout,
+    hidden: true,
+     permissions: ['safetycheck:rule:contentmanage'],
+    children: [
+      {
+        path: 'content/:id(\\d+)',
+        component: () => import('@/views/safetycheck/ruleManager/index.vue'),
+        name: 'safetycheckRuleManager',
+        meta: { title: '检查内容库管理', activeMenu: '/safetycheck/rule' }
+      }
+    ]
+  },{
+    path: '/core/resumption/rule',
+    component: Layout,
+    hidden: true,
+     permissions: ['resumption:rule:contentmanage'],
+    children: [
+      {
+        path: 'content/:id(\\d+)',
+        component: () => import('@/views/resumption/ruleManager/index.vue'),
+        name: 'resumptionRuleManager',
+        meta: { title: '履职内容库管理', activeMenu: '/resumption/rule' }
+      }
+    ]
+  },
 ]
 
 // 防止连续点击多次路由报错

src/store/modules/tagsView.js

@@ -218,6 +218,16 @@ const actions = {
       resolve([...state.visitedViews])
     })
   },
+  setPageTitle({commit}, obj){
+    let view={...obj.view} 
+    view.title=obj.title;
+    for (let v of state.visitedViews) {
+      if (v.path === view.path) {
+        v = Object.assign(v, view)
+        break
+      }
+    }    
+  }
 }
 
 export default {

src/views/evaluationRule/addEvaluate.vue

@@ -127,7 +127,9 @@ export default {
             //当前是新增
             this.ruleForm.uid = guid();
           }
-          this.$emit("submitHandler", this.ruleForm);
+          let obj=JSON.parse(JSON.stringify(this.ruleForm))
+          this.$emit("submitHandler", obj);
+         
           this.isShow = false;
         } else {
           return false;

src/views/evaluationRule/editEvaluationRuleDialog.vue

@@ -213,8 +213,8 @@ export default {
         projectCode: "",
         deductionType: 1,
         formula: "",
-        score:'',
-        remark:'',
+        score: "",
+        remark: "",
       },
       formDataRules: {
         pointCode: [{ required: true, message: "请选择指标要点" }],
@@ -262,9 +262,10 @@ export default {
     },
 
     onSelect(form) {
+      console.log(form);
       let isAdd = true;
       this.tableData?.forEach((item) => {
-        console.log("item",item)
+        console.log("item", item);
         if (item.uid == form.uid) {
           Object.assign(item, form);
           //当前是编辑
@@ -274,6 +275,7 @@ export default {
       if (isAdd || this.tableData.length == 0) {
         this.tableData.push(form);
       }
+      
       console.log(this.tableData);
     },
     onOrgTypeChanged() {},
@@ -288,12 +290,12 @@ export default {
           let { code, msg, data } = res;
           if (code == 200) {
             Object.assign(this.queryParams, data);
-            this.changeTargetList(this.queryParams.typeCode,1)
-            this.changeTargetListChild(this.queryParams.projectCode,1)
+            this.changeTargetList(this.queryParams.typeCode, 1);
+            this.changeTargetListChild(this.queryParams.projectCode, 1);
             this.tableData = data.itemList;
-            this.tableData.forEach(item=>{
-              item.uid=guid()
-            })
+            this.tableData.forEach((item) => {
+              item.uid = guid();
+            });
             delete this.queryParams.itemList;
             console.log(this.queryParams);
           } else {
@@ -326,11 +328,11 @@ export default {
         pointCode: "",
         typeCode: "",
         orgType: "",
-        score:'',
+        score: "",
         projectCode: "",
         deductionType: 1,
         formula: "",
-        remark:'',
+        remark: "",
       };
 
       this.tableData = [];

src/views/resumption/rule/index.vue

@@ -145,7 +145,7 @@
               header-align="center"
               label="操作"
               class="small-padding fixed-width"
-              width="150"
+              width="250"
             >
               <template slot-scope="r">
                 <el-button
@@ -158,6 +158,24 @@
                   >编辑</el-button
                 >
                 <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="onManageContent(r.row.id)"
+                  v-hasPermi="['resumption:rule:contentmanage']"
+                  v-if="orgId == r.row.orgId"
+                  >管理内容库</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-view"
+                  @click="onManageContent(r.row.id)"
+                  v-hasPermi="['resumption:rule:contentmanage']"
+                  v-if="orgId != r.row.orgId"
+                  >查看内容库</el-button
+                >
+                <el-button
                   type="text"
                   size="mini"
                   slot="reference"
@@ -278,6 +296,10 @@ export default {
     onEdit(id, other = {}) {
       this.$refs.editDialog.show(id, other);
     },
+    onManageContent(id){
+      let path=`/core/resumption/rule/content/${id}`
+      this.$router.push(path)
+    },
     onDel(id) {
       this.$modal
         .confirm("确定删除履职内容库定义？")

src/views/resumption/ruleManager/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10">
-      <el-col :span="4" :xs="24">
+      <!-- <el-col :span="4" :xs="24">
         <org-tree
           v-model="queryParams.orgId"
           @click="clicktreenode"
@@ -16,11 +16,14 @@
           :renderContent="renderContent"
         >
         </org-tree>
-      </el-col>
-      <el-col :span="20" :xs="24">
-        <div class="main-right-box">
+      </el-col> -->
+      <el-col :span="24" :xs="24">
+        <div class="main-right-box">          
           <!--    搜索条件    -->
           <div class="main-search-box" v-show="showSearch && rule">
+            <div v-if="rule" style="padding-bottom:10px;font-weight: 700;">
+              {{rule.name}}
+            </div>
             <el-form
               :model="queryParams"
               ref="search"
@@ -53,7 +56,7 @@
                   icon="el-icon-search"
                   size="mini"
                   @click="refresh"
-                  v-hasPermi="['resumption:ruleManager']"
+                  v-hasPermi="['resumption:rule:contentmanage']"
                   >搜索</el-button
                 >
                 <el-button
@@ -69,8 +72,8 @@
                   icon="el-icon-plus"
                   @click="onAddItem()"
                   :disabled="rule ? false : true"
-                  v-hasPermi="['resumption:ruleManager:add']"
-                  v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
+                  v-hasPermi="['resumption:rule:contentmanage']"
+                  v-if="rule && rule.orgId == orgId && rule.status == 0"
                   >新增履职项</el-button
                 >
                 <!-- <el-button
@@ -193,7 +196,7 @@
               header-align="center"
               label="操作"
               width="150"
-              v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
+              v-if="rule && rule.orgId == orgId && rule.status == 0"
             >
               <template slot-scope="scope">
                 <el-button
@@ -201,7 +204,7 @@
                   size="mini"
                   icon="el-icon-edit-outline"
                   @click="onEditItem(scope.row.id)"
-                  v-hasPermi="['resumption:ruleManager:edit']"
+                  v-hasPermi="['resumption:rule:contentmanage']"
                   >编辑</el-button
                 >
                 <el-button
@@ -210,7 +213,7 @@
                   slot="reference"
                   icon="el-icon-delete"
                   @click="deldata(scope.row.id)"
-                  v-hasPermi="['resumption:ruleManager:remove']"
+                  v-hasPermi="['resumption:rule:contentmanage']"
                   >删除</el-button
                 >
               </template>
@@ -239,6 +242,8 @@
 import OrgTree from "@/components/orgTree";
 import { mapGetters } from "vuex";
 import { page, treeData, del } from "@/api/resumption/ruleManager.js";
+import { get as getRule } from "@/api/resumption/rule.js";
+import { getLabel } from "./../../commonOption";
 import DialogEdit from "./dialog.editItem.vue";
 
 export default {
@@ -311,10 +316,24 @@ export default {
     // await this.getassetlist();
   },
 
-  mounted() {},
+  mounted() {
+    let id = this.$route.params.id;
+    if (!id) {
+      this.$tab.closePageAndPushPrev();
+      return;
+    }
+
+    getRule(id).then((r) => {
+      this.rule = r.data;
+      // this.$tab.setPageTitle(r.data.name);
+    });
+    this.queryParams.ruleId = id;
+    this.getList();
+  },
 
   methods: {
     treeData,
+    getLabel,
     dakai() {
       this.expandAll = !this.expandAll;
       this.fresh = false;
@@ -346,7 +365,7 @@ export default {
       this.tableData = data.rows;
       this.total = Number.parseInt(data.total);
       this.loading = false;
-    }, 
+    },
     clicktreenode(data, node) {
       this.tableData = [];
       this.rule = null;
@@ -359,7 +378,7 @@ export default {
       this.queryParams.ruleId = data.id;
       this.rule = data;
       this.rule.orgId = node.parent.data.id;
-      if (this.rule.ruleStatus != 0) {
+      if (this.rule.status != 0) {
         this.$message.info("履职内容库已禁用，无法编辑履职项、履职内容");
       }
       this.refresh();
@@ -417,7 +436,7 @@ export default {
     onSelect() {
       this.$refs.DialogSelect.show();
     },
-    onSuccess(isAdd) {   
+    onSuccess(isAdd) {
       if (isAdd) {
         this.queryParams.pageNum = 1;
       }

src/views/resumptionEvaluate/evaluate/addEvaluate.vue

@@ -90,7 +90,8 @@ export default {
             //当前是新增
             this.ruleForm.uid = guid();
           }
-          this.$emit("submitHandler", this.ruleForm);
+          let obj=JSON.parse(JSON.stringify(this.ruleForm))
+          this.$emit("submitHandler", obj);
           this.isShow = false;
         } else {
           return false;

src/views/safetycheck/rule/index.vue

@@ -141,9 +141,9 @@
               label="备注"
               v-if="columns[5].visible"
             ></el-table-column>
-            <el-table-column header-align="center" label="操作" width="150">
-              <template slot-scope="r" v-if="orgId == r.row.orgId">
-                <el-button
+            <el-table-column header-align="center" label="操作" width="250">
+              <template slot-scope="r">
+                <div  v-if="orgId == r.row.orgId"><el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit-outline"
@@ -152,6 +152,15 @@
                   >编辑</el-button
                 >
                 <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="onManageContent(r.row.id)"
+                  v-hasPermi="['safetycheck:rule:contentmanage']"
+                  >管理内容库</el-button
+                >
+
+                <el-button
                   type="text"
                   size="mini"
                   slot="reference"
@@ -160,7 +169,17 @@
                   v-if="orgId == r.row.orgId"
                   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>
               </template>
             </el-table-column>
           </el-table>
@@ -272,6 +291,10 @@ export default {
     onEdit(id, other = {}) {
       this.$refs.editDialog.show(id, other);
     },
+    onManageContent(id) {
+      let path = `/core/safetycheck/rule/content/${id}`;
+      this.$router.push(path);
+    },
     onDel(id) {
       this.$modal
         .confirm("确定删除检查内容库定义？")

src/views/safetycheck/ruleManager/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10">
-      <el-col :span="4" :xs="24">
+      <!-- <el-col :span="4" :xs="24">
         <org-tree
           v-model="queryParams.orgId"
           @click="clicktreenode"
@@ -17,11 +17,14 @@
           :renderContent="renderContent"
         >
         </org-tree>
-      </el-col>
-      <el-col :span="20" :xs="24">
+      </el-col> -->
+      <el-col :span="24" :xs="24">
         <div class="main-right-box">
           <!--    搜索条件    -->
           <div class="main-search-box" v-show="showSearch && rule">
+            <div style="padding-bottom:10px;font-weight: 700;">
+              {{rule.name}}
+            </div>
             <el-form
               :model="queryParams"
               ref="search"
@@ -54,7 +57,7 @@
                   icon="el-icon-search"
                   size="mini"
                   @click="refresh"
-                  v-hasPermi="['safetycheck:ruleManager']"
+                  v-hasPermi="['safetycheck:rule:contentmanage']"
                   >搜索</el-button
                 >
                 <el-button
@@ -70,8 +73,8 @@
                   icon="el-icon-plus"
                   @click="onAddItem()"
                   :disabled="rule ? false : true"
-                  v-hasPermi="['safetycheck:ruleManager:add']"
-                  v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
+                  v-hasPermi="['safetycheck:rule:contentmanage']"
+                  v-if="rule && rule.orgId == orgId && rule.status == 0"
                   >新增检查项</el-button
                 >
                 <!-- <el-button
@@ -158,7 +161,7 @@
               header-align="center"
               label="操作"
               width="140"
-              v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
+              v-if="rule && rule.orgId == orgId && rule.status == 0"
             >
               <template slot-scope="scope">
                 <el-button
@@ -166,7 +169,7 @@
                   size="mini"
                   icon="el-icon-edit-outline"
                   @click="onEditItem(scope.row.id)"
-                  v-hasPermi="['safetycheck:ruleManager:edit']"
+                  v-hasPermi="['safetycheck:rule:contentmanage']"
                   >编辑</el-button
                 >
                 <el-button
@@ -175,7 +178,7 @@
                   slot="reference"
                   icon="el-icon-delete"
                   @click="deldata(scope.row.id)"
-                  v-hasPermi="['safetycheck:ruleManager:remove']"
+                  v-hasPermi="['safetycheck:rule:contentmanage']"
                   >删除</el-button
                 >
               </template>
@@ -197,14 +200,13 @@
       :pointDataSource="dict.type.point_data_source"
       @success="onSuccess"
     ></dialog-edit>
-    <SelectPoint ref="DialogSelect" @success="onSuccess" orgType="4">
-    </SelectPoint>
   </div>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
 import { page, treeData, del } from "@/api/safetycheck/ruleManager.js";
+import { get as getRule } from "@/api/safetycheck/rule.js";
 import DialogEdit from "./dialog.editItem.vue";
 import SelectPoint from "./dialog.select.point.vue";
 import OrgTree from "@/components/orgTree";
@@ -276,7 +278,20 @@ export default {
     // await this.getassetlist();
   },
 
-  mounted() {},
+  mounted() {
+    let id = this.$route.params.id;
+    if (!id) {
+      this.$tab.closePageAndPushPrev();
+      return;
+    }
+
+    getRule(id).then((r) => {
+      this.rule = r.data;
+      // this.$tab.setPageTitle(r.data.name);
+    });
+    this.queryParams.ruleId = id;
+    this.getList();
+  },
 
   methods: {
     treeData,
@@ -323,7 +338,7 @@ export default {
       this.queryParams.ruleId = data.id;
       this.rule = data;
       this.rule.orgId = node.parent.data.id;
-      if (this.rule.ruleStatus != 0) {
+      if (this.rule.status != 0) {
         this.$message.info("履职内容库已禁用，无法编辑履职项、履职内容");
       }
       this.refresh();

src/views/check/task/index.vue → src/views/safetycheck/task/index.vue

@@ -402,7 +402,7 @@ import { checkPermi } from "@/utils/permission.js";
 import dayjs from "dayjs";
 import request from "@/utils/request";
 export default {
-  name: "checkTaskList",
+  name: "Saftask",
   dicts: ["resumption_plan_cycle", "resumption_status", "safety_check_status"],
   components: {
     DialogDetail,
@@ -472,6 +472,10 @@ export default {
   computed: {
     ...mapGetters(["orgName", "userId", "roleList", "orgId"]),
   },
+  activated (){
+    console.log("刷新");
+    this.getList();
+  },
   methods: {
     async onDown(pdfUrl) {
       window.open(pdfUrl);
@@ -534,6 +538,7 @@ export default {
       this.$router.push(path);
     },
     getDefaultKey(key) {
+      // console.log("wwewe")
       this.queryParams.orgId = key;
       this.selectedOrgName = this.orgName;
       this.getList();
@@ -580,7 +585,7 @@ export default {
         });
     },
     async getList() {
-      console.log(this.queryParams, "this.queryParams");
+      console.log(this.queryParams, "this.queryParams2222");
       this.loading = true;
       api
         .page(this.queryParams)

src/views/safetycheck/taskManager/components/register.vue

@@ -4,6 +4,16 @@
       <el-descriptions-item label="任务名称">{{
         taskInfo.taskName
       }}</el-descriptions-item>
+      <el-descriptions-item label="任务进度"
+        >{{ getLabel(dict.type.safety_check_status, taskInfo.status) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="任务时间"
+        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
+      </el-descriptions-item>
+      <el-descriptions-item label="截止日期"
+        >{{ dayjs(taskInfo.planEndTime).format("YYYY-MM-DD") }}
+      </el-descriptions-item>
+
       <el-descriptions-item label="检查主体">{{
         taskInfo.checkOrgName
       }}</el-descriptions-item>
@@ -17,15 +27,6 @@
             : ""
         }}
       </el-descriptions-item>
-      <el-descriptions-item label="开始日期"
-        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
-      </el-descriptions-item>
-      <el-descriptions-item label="截止日期"
-        >{{ dayjs(taskInfo.planEndTime).format("YYYY-MM-DD") }}
-      </el-descriptions-item>
-      <el-descriptions-item label="创建时间"
-        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
-      </el-descriptions-item>
       <el-descriptions-item label="检查组成员"
         ><el-input
           style="width: 80%; margin-top: -8px"
@@ -36,24 +37,30 @@
         ></el-input>
         <span v-else>{{ taskInfo.checkTeam }}</span>
       </el-descriptions-item>
-      <el-descriptions-item label="检查状态"
-        >{{ getLabel(dict.type.safety_check_status, taskInfo.status) }}
+      <el-descriptions-item label="登记人" v-if="!isRegister"
+        >{{ taskInfo.submitBy }}
+      </el-descriptions-item>
+      <el-descriptions-item label="隐患问题数" v-if="!isRegister"
+        >{{ taskInfo.exceptionCount }}
+      </el-descriptions-item>
+      <el-descriptions-item label="检查时间" v-if="!isRegister"
+        >{{
+          taskInfo.submitTime
+            ? dayjs(taskInfo.submitTime).format("YYYY-MM-DD")
+            : ""
+        }}
       </el-descriptions-item>
     </el-descriptions>
-    <el-row class="el-row-button">
+    <el-row class="el-row-button" v-if="isRegister">
       <el-col>
         <span style="margin-right: 20px">检查区域</span>
-        <el-button
-          type="primary"
-          size="mini"
-          @click="onAddPoint()"
-          v-if="isRegister"
+        <el-button type="primary" size="mini" @click="onAddPoint()"
           >新增检查内容</el-button
         >
       </el-col>
     </el-row>
 
-    <div class="content">
+    <div class="content" v-if="isRegister">
       <div class="area_content" v-for="area in taskInfo.checkList">
         <div>
           {{ area.areaName }}
@@ -107,17 +114,6 @@
                       maxlength="255"
                     ></el-input>
                   </el-form-item>
-                  <el-form-item label="异常图片" prop="image">
-                    <imgUpload
-                      type="more"
-                      :value="
-                        point.imgData
-                          ? point.imgData.map((d) => d.imgPath).join(',')
-                          : ''
-                      "
-                      @input="onImageChanged(point, $event)"
-                    ></imgUpload>
-                  </el-form-item>
                   <el-form-item label="整改期限" prop="rectificationDeadline">
                     <el-select
                       v-model="point.rectificationDeadline"
@@ -131,8 +127,19 @@
                       ></el-option>
                     </el-select>
                   </el-form-item>
+                  <el-form-item label="异常图片" prop="image">
+                    <imgUpload
+                      type="more"
+                      :value="
+                        point.imgData
+                          ? point.imgData.map((d) => d.imgPath).join(',')
+                          : ''
+                      "
+                      @input="onImageChanged(point, $event)"
+                    ></imgUpload>
+                  </el-form-item>
                 </el-form>
-                <el-descriptions v-else :column="1">
+                <!-- <el-descriptions v-else :column="1">
                   <el-descriptions-item label="情况描述">{{
                     point.remark
                   }}</el-descriptions-item>
@@ -153,24 +160,77 @@
                       >
                       </el-image></div
                   ></el-descriptions-item>
-                </el-descriptions>
+                </el-descriptions> -->
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-
+    <div v-else class="itemDetail">
+      <el-collapse>
+        <el-collapse-item
+          v-for="item in taskInfo.checkList"
+          :title="item.itemName"
+          :value="item.itemId"
+        >
+          <el-table :data="item.pointList" size="small">
+            <el-table-column
+              header-align="center"
+              prop="pointName"
+              label="检查内容"
+            >
+            </el-table-column>
+            <el-table-column align="center" prop="areaName" label="检查区域">
+            </el-table-column>
+            <el-table-column align="center" prop="status" label="检查结果">
+              <template slot-scope="r">
+                {{
+                  r.row.status == null
+                    ? "-"
+                    : r.row.status == 0
+                    ? "正常"
+                    : "异常"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="remark"
+              label="问题描述"
+            >
+              <template slot-scope="r">
+                {{ r.row.remark ? r.row.remark : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              header-align="center"
+              prop="imgData"
+              label="异常图片"
+            >
+              <template slot-scope="r">
+                <div  v-if="r.row.imgData && r.row.imgData.length > 0">
+                  <el-image                 
+                  style="width: 30px; height: 30px; margin: 0 10px"
+                  v-for="img in r.row.imgData"
+                  :src="img.imgPath"
+                  :preview-src-list="
+                    r.row.imgData ? r.row.imgData.map((r) => r.imgPath) : []
+                  "
+                ></el-image></div>                
+                <span v-else>-</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
     <div class="dialog-footer">
       <el-button type="primary" @click="onSubmit()" v-if="showSaveBtn"
         >提交</el-button
       >
       <el-button @click="onSave" v-if="showSaveBtn">保存</el-button>
-      <el-button
-        @click="onGrant"
-        v-if="showGrantBtn"
-        >授权</el-button
-      >
+      <el-button @click="onGrant" v-if="showGrantBtn">授权</el-button>
       <el-button @click="onClose">关闭</el-button>
     </div>
     <SelectPoint
@@ -234,7 +294,7 @@ export default {
       return (
         this.isRegister &&
         this.taskInfo.status != 3 &&
-        this.taskInfo.planType==3 &&
+        this.taskInfo.planType == 3 &&
         this.taskInfo.checkOrgId == this.orgId &&
         userRoleIds.find((ur) => taskRoleIds.includes(ur))
       );
@@ -243,11 +303,16 @@ export default {
   mounted() {
     let id = this.$route.params.taskId;
     let mode = this.$route.query.mode;
+    let request = api.info;
     if (!mode) {
       mode = "info";
     }
 
-    api.info(id).then((r) => {
+    if (mode == "info") {
+      request = api.appinfo;
+    }
+
+    request(id).then((r) => {
       this.mode = mode;
       if (mode != "register") {
         this.taskInfo = r.data;
@@ -461,6 +526,11 @@ export default {
   margin-top: 20px;
   flex-direction: column;
 }
+.itemDetail {
+  max-height: calc(100% - 300px);
+  overflow-y: auto;
+  margin-top: 20px;
+}
 .area_content {
   border: #b8bdc0 1px solid;
   display: flex;
@@ -534,10 +604,9 @@ export default {
   margin-bottom: 3px;
   margin-top: 6px;
 }
-.el-descriptions{
-  ::v-deep .el-descriptions__body{
-  background-color:transparent !important;
-}
+.el-descriptions {
+  ::v-deep .el-descriptions__body {
+    background-color: transparent !important;
+  }
 }
-
 </style>