Merge branch 'zcwy-zsx' into 'master'

评估完成

See merge request !38

src/views/investigat/InvestigatPage.vue

@@ -240,7 +240,7 @@
    <!-- 提示用户有未填选项 -->
    <el-dialog v-model="isEmptyValue" title="" width="70%" center :show-close="false" :align-center="true">
     <div style="text-align: center;font-size:12px;"> <span style="color:black">
-      您还有未完成的评估题目，您确认提交么？
+      您还有未完成的评估题目，请继续完成！
 			</span></div>
     <template #footer>
 			<span class="dialog-footer">
@@ -249,7 +249,7 @@
                    @click="isEmptyValue = false">取消</el-button>
 				<el-button class="back"
                    style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;"
-                   type="primary" @click="submit">
+                   type="primary" @click="isEmptyValue = false">
 					确定
 				</el-button>
 			</span>