接口调整

src/views/backstage/job/index.vue

@@ -152,13 +152,13 @@
         <template scope="scope">
 <!--          <span v-if="scope.row.rectifyStatus == null">没有进行整改</span>-->
           <span v-if="scope.row.rectifyStatus != null && (scope.row.rectifyStatus == '1' || scope.row.rectifyStatus == '2')">整改中</span>
-          <span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">整改中</span>
+          <span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">已整改</span>
         </template>
       </el-table-column>
       <el-table-column width="100px" label="整改审批状态" align="center" prop="rectifyStatus" >
         <template scope="scope">
-          <span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '2'">待审批</span>
-          <span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">已审批</span>
+          <span v-if="scope.row.approveStatus != null && (scope.row.approveStatus == '1' ||scope.row.approveStatus == '2'||scope.row.approveStatus == '3' )">待审批</span>
+          <span v-if="scope.row.approveStatus != null && scope.row.approveStatus == '4'">已审批</span>
         </template>
       </el-table-column>
       <el-table-column width="100px" label="是否已复查" align="center" >
@@ -167,6 +167,9 @@
             <span v-if="scope.row.checkUserName == null">否</span>
             <span v-else>是</span>
           </div>
+          <div v-else="scope.row.jobType == '2'">
+            <span v-if="scope.row.isCheck == '1'">是</span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="复查人员" align="center" prop="checkUserName" />
@@ -430,6 +433,7 @@ export default {
         themeName: null,
         jobAssessmentType: null,
         rectifyStatus: null,
+        approveStatus:null,
         checkUserName: null,
         isCheck: null,
       },
@@ -482,8 +486,8 @@ export default {
         checkTime: null,
         createTime: null,
         updateTime: null,
-        status: "0",
-        jobStatus: "0"
+        status: "1",
+        jobStatus: "1"
       };
       this.resetForm("form");
     },

src/views/backstage/project/index.vue

@@ -143,6 +143,18 @@
             </el-option>
           </el-select>
         </el-form-item>
+
+  <el-form-item label="选择级别" prop="projectType">
+          <el-select style="width: 100%"  clearable filterable v-model="form.projectType" placeholder="请选择级别">
+            <el-option
+                v-for="dict in projectTypeSelectValueOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :disabled="repeatSubmit">确 定</el-button>
@@ -236,6 +248,7 @@ export default {
       themeListOpen: false,
       themeList: [],//主题列表
       themeSelectValueOptions: [],
+      projectTypeSelectValueOptions:[],
       // 不可重复提交
       repeatSubmit: false,
       // 遮罩层
@@ -280,6 +293,9 @@ export default {
         themeSelectValue: [
           { required: true, message: "主题不能为空，请选择主题", trigger: "blur" }
         ],
+        projectType:[
+          { required: true, message: "项目级别不能为空，请选择级别", trigger: "blur" }
+        ]
       }
     };
   },
@@ -315,7 +331,8 @@ export default {
         updateTime: null,
         status: "1",
         themeSelectValue: null,
-        areaSelectValue: null
+        areaSelectValue: null,
+        projectType:null,
       };
       this.resetForm("form");
     },
@@ -345,7 +362,10 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.getThemeList();
-
+    this.getDicts("project_type").then(response => {
+        this.projectTypeSelectValueOptions = response.data;
+      });      
+      
       this.reset();
       this.open = true;
       this.title = "添加项目";

vue.config.js

@@ -37,8 +37,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:7788`,
-        changeOrigin: true,
+     //  target: `http://localhost:7788`,
+      target: 'https://faces.diaosaas.com/investigation',
+      changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }