Merge branch 'dev-xiaole' into shenzhen-dev

public/js/config.js

@@ -17,7 +17,7 @@ var PROJECT = {
 }
 
 
-var PROJECT_TYPE = PROJECT.online_zjsj
+var PROJECT_TYPE = PROJECT.local_test
 
 var headerShow = true; // 是否显示头部
 var tabsShow = true;  // 是否显示tabs

src/assets/js/api/quality.js

@@ -50,8 +50,9 @@ export const deletePositionFloorApi = data => post('xmgl/massReboundFloor/delete
 export const getPositionFloorListApi  = data => post('xmgl/massReboundFloor/getMassReboundFloorList', data);
 
 // 电子浇筑令
-// export const addElectronPourOrderApi = data => post('xmgl/electronPourOrder/add', data);
+
-export const addElectronPourOrderApi = data => post('/xmgl/massReboundPouringOrder/add', data);
+export const addElectronPourOrderApi = data => post('xmgl/electronPourOrder/add', data);
+// export const addElectronPourOrderApi = data => post('/xmgl/massReboundPouringOrder/add', data);
 export const editElectronPourOrderApi = data => post('xmgl/electronPourOrder/edit', data);
 export const deleteElectronPourOrderApi = data => post('xmgl/electronPourOrder/delete', data);
 export const getElectronPourOrderListApi  = data => post('xmgl/electronPourOrder/list', data);

src/assets/js/http.js

@@ -41,8 +41,8 @@ if (process.env.NODE_ENV == 'development') {
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-  axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
+  // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
-  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL = 'http://192.168.34.216:18070/'   // 邱平毅本地
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地

src/views/projectAdmin/zjsj/security/centerBottom.vue

@@ -108,7 +108,7 @@ export default {
   data() {
     return {
       tabIndex: 0,
-      tabs: ["边临防护", "卸料平台", "深基坑检测", "高支模检测"]
+      tabs: ["临边防护", "卸料平台", "深基坑检测", "高支模检测"]
     };
   },
   methods: {

src/views/projectAdmin/zjsj/sourse/rightTop.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="隐患趋势">
+  <Card title="工程量管理">
     <div class="typedata">
       <div class="containbox">
         <span>物料类型</span>

src/views/projectFront/laborManage/personModule/administration.vue

@@ -505,6 +505,7 @@
                   <el-checkbox
                     v-model="scope.row.isUploadHousing"
                     :checked="scope.row.isUploadHousing == 1 ? true : false"
+                    :indeterminate="scope.row.isUploadHousing == 1 ? true : false"
                     @change="
                       uploadToHouseFn(scope.row.isUploadHousing, scope.row.id)
                     "

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -449,6 +449,7 @@
                   <el-checkbox
                     v-model="scope.row.isUploadHousing"
                     :checked="scope.row.isUploadHousing == 1 ? true : false"
+                    :indeterminate="scope.row.isUploadHousing == 1 ? true : false"
                     @change="
                       uploadToHouseFn(scope.row.isUploadHousing, scope.row.id)
                     "
@@ -2862,7 +2863,7 @@ export default {
       getWorkerInfoList(data).then((res) => {
         if (res.code == 200) {
           this.tableListData = res.result.records
-          console.log(res.result.records)
+          console.log('------------',res.result.records)
           let boole = true
           for (let i in res.result.records) {
             if (res.result.records[i].inserviceType == 1) {

src/views/projectFront/safetyEducation/addCourse.vue

@@ -48,12 +48,12 @@
         <!-- 课程视频 -->
         <el-form-item :label="$t('message.safetyEducation.courseVideo')" prop="eduVideo">
           <!-- <el-input v-model="ruleForm.eduVideo"></el-input> -->
-          <el-upload :disabled="eduVideo!=''"
+          <el-upload :disabled="eduId!=''"
             class="upload-demo" name="files"
             :action="$store.state.UPLOADURL"
             :on-success="handleSuccess"
             :show-file-list="false" accept="video/mp4">
-            <el-button size="small" type="primary"  v-show="eduVideo==''">
+            <el-button size="small" type="primary"  v-show="eduId==''">
               <!-- 点击上传 -->
               {{ $t('message.safetyEducation.clickUpload') }}
             </el-button>
@@ -173,11 +173,36 @@
           </el-form-item>
           <!-- 试题选项及答案 -->
           <el-form-item :label="$t('message.safetyEducation.optionsAndAnswers')"> </el-form-item>
+          <!-- 单选 -->
+          <el-radio-group v-model="radio1" @change="checkedVal">
+            <el-form-item
+              prop="lsit"
+              v-for="(item, index) in addEditForm.optionList"
+              :key="index"
+              v-if="addEditForm.questionType != '2'"
+            >
+              <template slot="label">
+                <p>
+                  <el-radio :label="index"
+                  :value="item.correctType"
+                    >{{ indexList[index] }}、</el-radio
+                  >
+                </p>
+              </template>
+              <el-input
+                v-model="item.optionName"
+                :placeholder="$t('message.workType.placeholder')"
+              ></el-input>
+              <i class="el-icon-remove" @click="removeOptions(index)"></i>
+            </el-form-item>          
+          </el-radio-group>
+          <!-- 多选 -->
           <el-form-item
             :label="'A、'"
             prop="lsit"
             v-for="(item, index) in addEditForm.optionList"
             :key="index"
+            v-if="addEditForm.questionType == '2'"
           >
             <template slot="label">
               <p>
@@ -285,6 +310,7 @@ export default {
   props:['eduId','classifyId'],
   data() {
     return {
+      radio1:'',
       styleType: 1,
       ruleForm: {
         eduAddr: "",
@@ -521,6 +547,10 @@ export default {
         });
       
     },
+    checkedVal(val){
+      console.log('当前选择的值',val)
+      console.log('当前绑定的值',this.radio1)
+    },
     saveQuesFn() {
       this.$refs['addEditForm'].validate((valid) => {
         if (valid) {
@@ -532,12 +562,17 @@ export default {
               return;
           }
           var correctNum = 0
+          var correctOne = 0
           optionList.forEach((element,index) => {
             if(element.optionName==''){
               // 请输入选项内容
               this.$message.error(this.$t('message.safetyEducation.rulesB2'))
               return;
             }
+            if(index == this.radio1){
+              correctOne = 1
+              data.optionList[index].correctType=1
+            }
             if(element.correctType===true||element.correctType===1){
               data.optionList[index].correctType=1
               correctNum++
@@ -546,12 +581,13 @@ export default {
             }
           });
           console.log(data)
-          if(data.questionType==1&&correctNum==0){
+          if(data.questionType==1&&correctNum==0&&correctOne==0){
             // 请选中正确选项
             this.$message.error(this.$t('message.safetyEducation.rulesB3'))
               return;
           }
-          if(data.questionType==1&&correctNum>1){
+          if(data.questionType==1&&correctOne>1){
+            console.log('当前是有几个',correctNum)
             // 正确选项只能是1个
             this.$message.error(this.$t('message.safetyEducation.rulesB4'))
               return;
@@ -566,7 +602,7 @@ export default {
           }else{
             this.ruleForm.questionList[this.questionIndex]=data
           }
-          
+          this.radio1=''
           this.dialogVisible=false
           this.computeTotalScore()
         } else {